diff --git a/COPYING b/COPYING index 7c52fb768978..9a73903d6df1 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2003-2018 Eelco Dolstra and the Nixpkgs/NixOS contributors +Copyright (c) 2003-2019 Eelco Dolstra and the Nixpkgs/NixOS contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.md b/README.md index 29c023e4dcdf..8cdbb73595bf 100644 --- a/README.md +++ b/README.md @@ -12,12 +12,12 @@ build daemon as so-called channels. To get channel information via git, add ``` For stability and maximum binary package support, it is recommended to maintain -custom changes on top of one of the channels, e.g. `nixos-18.09` for the latest +custom changes on top of one of the channels, e.g. `nixos-19.03` for the latest release and `nixos-unstable` for the latest successful build of master: ``` % git remote update channels -% git rebase channels/nixos-18.09 +% git rebase channels/nixos-19.03 ``` For pull requests, please rebase onto nixpkgs `master`. @@ -31,9 +31,9 @@ For pull requests, please rebase onto nixpkgs `master`. * [Manual (NixOS)](https://nixos.org/nixos/manual/) * [Community maintained wiki](https://nixos.wiki/) * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for 18.09 release](https://hydra.nixos.org/jobset/nixos/release-18.09) +* [Continuous package builds for 19.03 release](https://hydra.nixos.org/jobset/nixos/release-19.03) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for 18.09 release](https://hydra.nixos.org/job/nixos/release-18.09/tested#tabs-constituents) +* [Tests for 19.03 release](https://hydra.nixos.org/job/nixos/release-19.03/tested#tabs-constituents) Communication: diff --git a/doc/functions.xml b/doc/functions.xml index 53b3654fc450..1f2d00b9e1af 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -16,6 +16,7 @@ + diff --git a/doc/functions/appimagetools.xml b/doc/functions/appimagetools.xml new file mode 100644 index 000000000000..270ab067bc39 --- /dev/null +++ b/doc/functions/appimagetools.xml @@ -0,0 +1,121 @@ +
+ pkgs.appimageTools + + + pkgs.appimageTools is a set of functions for extracting and wrapping + AppImage files. + + They are meant to be used if traditional packaging from source is infeasible, or it would take too long. + To quickly run an AppImage file, pkgs.appimage-run can be used as well. + + + + + The appimageTools API is unstable and may be subject to + backwards-incompatible changes in the future. + + + + +
+ AppImage formats + + + There are different formats for AppImages, see + the specification for details. + + + + + + Type 1 images are ISO 9660 files that are also ELF executables. + + + + + + Type 2 images are ELF executables with an appended filesystem. + + + + + + They can be told apart with file -k: + + + +$ file -k type1.AppImage +type1.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) ISO 9660 CD-ROM filesystem data 'AppImage' (Lepton 3.x), scale 0-0, +spot sensor temperature 0.000000, unit celsius, color scheme 0, calibration: offset 0.000000, slope 0.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=d629f6099d2344ad82818172add1d38c5e11bc6d, stripped\012- data + +$ file -k type2.AppImage +type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x), scale 232-60668, spot sensor temperature -4.187500, color scheme 15, show scale bar, calibration: offset -0.000000, slope 0.000000 (Lepton 2.x), scale 4111-45000, spot sensor temperature 412442.250000, color scheme 3, minimum point enabled, calibration: offset -75402534979642766821519867692934234112.000000, slope 5815371847733706829839455140374904832.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=79dcc4e55a61c293c5e19edbd8d65b202842579f, stripped\012- data + + + + Note how the type 1 AppImage is described as an ISO 9660 CD-ROM filesystem, and the type 2 AppImage is not. + +
+ +
+ Wrapping + + + Depending on the type of AppImage you're wrapping, you'll have to use + wrapType1 or wrapType2. + + + + +appimageTools.wrapType2 { # or wrapType1 + name = "patchwork"; + src = fetchurl { + url = https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage; + sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s"; + }; + extraPkgs = pkgs: with pkgs; [ ]; +} + + + + + + name specifies the name of the resulting image. + + + + + src specifies the AppImage file to extract. + + + + + extraPkgs allows you to pass a function to include additional packages + inside the FHS environment your AppImage is going to run in. + + There are a few ways to learn which dependencies an application needs: + + + + + Looking through the extracted AppImage files, reading its scripts and running patchelf and ldd on its executables. + This can also be done in appimage-run, by setting APPIMAGE_DEBUG_EXEC=bash. + + + + + + Running strace -vfefile on the wrapped executable, looking for libraries that can't be found. + + + + + + + + +
+
diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml index ff446cbfffdd..2c8eb2cb7743 100644 --- a/doc/functions/dockertools.xml +++ b/doc/functions/dockertools.xml @@ -47,7 +47,7 @@ buildImage { contents = pkgs.redis; runAsRoot = '' - #!${stdenv.shell} + #!${pkgs.runtimeShell} mkdir -p /data ''; @@ -544,7 +544,7 @@ buildImage { name = "shadow-basic"; runAsRoot = '' - #!${stdenv.shell} + #!${pkgs.runtimeShell} ${shadowSetup} groupadd -r redis useradd -r -g redis redis diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index ab4c9f0f7c88..6f6e7925a1b5 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -3,12 +3,91 @@ xml:id="sec-language-go"> Go - - The function buildGoPackage builds standard Go programs. - +
+ Go modules - - buildGoPackage + + The function buildGoModule builds Go programs managed + with Go modules. It builds a + Go + modules through a two phase build: + + + + An intermediate fetcher derivation. This derivation will be used to fetch + all of the dependencies of the Go module. + + + + + A final derivation will use the output of the intermediate derivation to + build the binaries and produce the final output. + + + + + + + buildGoModule + +pet = buildGoModule rec { + name = "pet-${version}"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "knqyf263"; + repo = "pet"; + rev = "v${version}"; + sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s"; + }; + + modSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Simple command-line snippet manager, written in Go"; + homepage = https://github.com/knqyf263/pet; + license = licenses.mit; + maintainers = with maintainers; [ kalbasit ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} + + + + + is an example expression using + buildGoModule, the following arguments are of special significance to the + function: + + + + modSha256 is the hash of the output of the + intermediate fetcher derivation. + + + + + subPackages limits the builder from building child + packages that have not been listed. If subPackages is + not specified, all child packages will be built. + + + + +
+ +
+ Go legacy + + + The function buildGoPackage builds legacy Go programs, + not supporting Go modules. + + + + buildGoPackage deis = buildGoPackage rec { name = "deis-${version}"; @@ -29,56 +108,56 @@ deis = buildGoPackage rec { buildFlags = "--tags release"; } - + - - is an example expression using - buildGoPackage, the following arguments are of special significance to the - function: - - - - goPackagePath specifies the package's canonical Go - import path. - - - - - subPackages limits the builder from building child - packages that have not been listed. If subPackages is - not specified, all child packages will be built. - - - In this example only github.com/deis/deis/client will - be built. - - - - - goDeps is where the Go dependencies of a Go program are - listed as a list of package source identified by Go import path. It could - be imported as a separate deps.nix file for - readability. The dependency data structure is described below. - - - - - buildFlags is a list of flags passed to the go build - command. - - - - + + is an example expression using + buildGoPackage, the following arguments are of special significance to the + function: + + + + goPackagePath specifies the package's canonical Go + import path. + + + + + subPackages limits the builder from building child + packages that have not been listed. If subPackages is + not specified, all child packages will be built. + + + In this example only github.com/deis/deis/client will + be built. + + + + + goDeps is where the Go dependencies of a Go program + are listed as a list of package source identified by Go import path. It + could be imported as a separate deps.nix file for + readability. The dependency data structure is described below. + + + + + buildFlags is a list of flags passed to the go build + command. + + + + - - The goDeps attribute can be imported from a separate - nix file that defines which Go libraries are needed and - should be included in GOPATH for - buildPhase. - + + The goDeps attribute can be imported from a separate + nix file that defines which Go libraries are needed and + should be included in GOPATH for + buildPhase. + - - deps.nix + + deps.nix [ { @@ -101,60 +180,62 @@ deis = buildGoPackage rec { } ] - + - - - - - goDeps is a list of Go dependencies. - - - - - goPackagePath specifies Go package import path. - - - - - fetch type that needs to be used to get package source. - If git is used there should be url, - rev and sha256 defined next to it. - - - - + + + + + goDeps is a list of Go dependencies. + + + + + goPackagePath specifies Go package import path. + + + + + fetch type that needs to be used to get package + source. If git is used there should be + url, rev and + sha256 defined next to it. + + + + - - To extract dependency information from a Go package in automated way use - go2nix. It can - produce complete derivation and goDeps file for Go - programs. - + + To extract dependency information from a Go package in automated way use + go2nix. It can + produce complete derivation and goDeps file for Go + programs. + - - buildGoPackage produces - where - bin includes program binaries. You can test build a Go - binary as follows: + + buildGoPackage produces + where + bin includes program binaries. You can test build a Go + binary as follows: $ nix-build -A deis.bin - or build all outputs with: + or build all outputs with: $ nix-build -A deis.all - bin output will be installed by default with - nix-env -i or systemPackages. - + bin output will be installed by default with + nix-env -i or systemPackages. + - - You may use Go packages installed into the active Nix profiles by adding the - following to your ~/.bashrc: + + You may use Go packages installed into the active Nix profiles by adding the + following to your ~/.bashrc: for p in $NIX_PROFILES; do GOPATH="$p/share/go:$GOPATH" done - + +
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index acd2bf769b0d..8e78d18a17d9 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -188,23 +188,22 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th ```nix { lib, buildPythonPackage, fetchPypi }: - toolz = buildPythonPackage rec { - pname = "toolz"; - version = "0.7.4"; +buildPythonPackage rec { + pname = "toolz"; + version = "0.7.4"; - src = fetchPypi { - inherit pname version; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + }; - doCheck = false; + doCheck = false; - meta = with lib; { - homepage = https://github.com/pytoolz/toolz; - description = "List processing tools and functional utilities"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; + meta = with lib; { + homepage = https://github.com/pytoolz/toolz; + description = "List processing tools and functional utilities"; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; }; } ``` @@ -279,32 +278,31 @@ The following example shows which arguments are given to `buildPythonPackage` in order to build [`datashape`](https://github.com/blaze/datashape). ```nix -{ # ... +{ lib, buildPythonPackage, fetchPypi, numpy, multipledispatch, dateutil, pytest }: - datashape = buildPythonPackage rec { - pname = "datashape"; - version = "0.4.7"; +buildPythonPackage rec { + pname = "datashape"; + version = "0.4.7"; - src = fetchPypi { - inherit pname version; - sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278"; + }; - checkInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy multipledispatch dateutil ]; - meta = with lib; { - homepage = https://github.com/ContinuumIO/datashape; - description = "A data description language"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; - }; + meta = with lib; { + homepage = https://github.com/ContinuumIO/datashape; + description = "A data description language"; + license = licenses.bsd2; + maintainers = with maintainers; [ fridh ]; }; } ``` We can see several runtime dependencies, `numpy`, `multipledispatch`, and -`dateutil`. Furthermore, we have one `buildInput`, i.e. `pytest`. `pytest` is a +`dateutil`. Furthermore, we have one `checkInputs`, i.e. `pytest`. `pytest` is a test runner and is only used during the `checkPhase` and is therefore not added to `propagatedBuildInputs`. @@ -314,25 +312,24 @@ Python bindings to `libxml2` and `libxslt`. These libraries are only required when building the bindings and are therefore added as `buildInputs`. ```nix -{ # ... +{ lib, pkgs, buildPythonPackage, fetchPypi }: - lxml = buildPythonPackage rec { - pname = "lxml"; - version = "3.4.4"; +buildPythonPackage rec { + pname = "lxml"; + version = "3.4.4"; - src = fetchPypi { - inherit pname version; - sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk"; + }; - buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; + buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; - meta = with lib; { - description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = https://lxml.de; - license = licenses.bsd3; - maintainers = with maintainers; [ sjourdois ]; - }; + meta = with lib; { + description = "Pythonic binding for the libxml2 and libxslt libraries"; + homepage = https://lxml.de; + license = licenses.bsd3; + maintainers = with maintainers; [ sjourdois ]; }; } ``` @@ -348,35 +345,34 @@ find each of them in a different folder, and therefore we have to set `LDFLAGS` and `CFLAGS`. ```nix -{ # ... +{ lib, pkgs, buildPythonPackage, fetchPypi, numpy, scipy }: - pyfftw = buildPythonPackage rec { - pname = "pyFFTW"; - version = "0.9.2"; +buildPythonPackage rec { + pname = "pyFFTW"; + version = "0.9.2"; - src = fetchPypi { - inherit pname version; - sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074"; + }; - buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; + buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; - propagatedBuildInputs = with self; [ numpy scipy ]; + propagatedBuildInputs = [ numpy scipy ]; - # Tests cannot import pyfftw. pyfftw works fine though. - doCheck = false; + # Tests cannot import pyfftw. pyfftw works fine though. + doCheck = false; - preConfigure = '' - export LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib" - export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include" - ''; + preConfigure = '' + export LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib" + export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include" + ''; - meta = with lib; { - description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; - homepage = http://hgomersall.github.com/pyFFTW; - license = with licenses; [ bsd2 bsd3 ]; - maintainers = with maintainers; [ fridh ]; - }; + meta = with lib; { + description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; + homepage = http://hgomersall.github.com/pyFFTW; + license = with licenses; [ bsd2 bsd3 ]; + maintainers = with maintainers; [ fridh ]; }; } ``` @@ -404,7 +400,7 @@ Indeed, we can just add any package we like to have in our environment to `propa ```nix with import {}; -with pkgs.python35Packages; +with python35Packages; buildPythonPackage rec { name = "mypackage"; @@ -437,7 +433,7 @@ Let's split the package definition from the environment definition. We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` ```nix -{ lib, pkgs, buildPythonPackage }: +{ lib, buildPythonPackage }: buildPythonPackage rec { pname = "toolz"; @@ -457,18 +453,17 @@ buildPythonPackage rec { } ``` -It takes two arguments, `pkgs` and `buildPythonPackage`. +It takes an argument `buildPythonPackage`. We now call this function using `callPackage` in the definition of our environment ```nix with import {}; ( let - toolz = pkgs.callPackage /path/to/toolz/release.nix { - pkgs = pkgs; - buildPythonPackage = pkgs.python35Packages.buildPythonPackage; + toolz = callPackage /path/to/toolz/release.nix { + buildPythonPackage = python35Packages.buildPythonPackage; }; - in pkgs.python35.withPackages (ps: [ ps.numpy toolz ]) + in python35.withPackages (ps: [ ps.numpy toolz ]) ).env ``` @@ -515,7 +510,7 @@ Each interpreter has the following attributes: ### Building packages and applications Python libraries and applications that use `setuptools` or -`distutils` are typically build with respectively the `buildPythonPackage` and +`distutils` are typically built with respectively the `buildPythonPackage` and `buildPythonApplication` functions. These two functions also support installing a `wheel`. All Python packages reside in `pkgs/top-level/python-packages.nix` and all @@ -566,7 +561,7 @@ buildPythonPackage rec { ''; checkInputs = [ hypothesis ]; - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy ]; meta = with lib; { @@ -586,11 +581,6 @@ The `buildPythonPackage` mainly does four things: environment variable and add dependent libraries to script's `sys.path`. * In the `installCheck` phase, `${python.interpreter} setup.py test` is ran. -As in Perl, dependencies on other Python packages can be specified in the -`buildInputs` and `propagatedBuildInputs` attributes. If something is -exclusively a build-time dependency, use `buildInputs`; if it is (also) a runtime -dependency, use `propagatedBuildInputs`. - By default tests are run because `doCheck = true`. Test dependencies, like e.g. the test runner, should be added to `checkInputs`. @@ -602,11 +592,10 @@ as the interpreter unless overridden otherwise. All parameters from `stdenv.mkDerivation` function are still supported. The following are specific to `buildPythonPackage`: * `catchConflicts ? true`: 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`. * `disabled` ? false: If `true`, package is not build for the particular Python interpreter version. * `dontWrapPythonPrograms ? false`: Skip wrapping of python programs. -* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]. -* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed. +* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]`. +* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"pyproject"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed. * `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. * `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications to `""`. * `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). @@ -615,6 +604,14 @@ All parameters from `stdenv.mkDerivation` function are still supported. The foll * `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`. * `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command. +The `stdenv.mkDerivation` function accepts various parameters for describing build inputs (see "Specifying dependencies"). The following are of special +interest for Python packages, either because these are primarily used, or because their behaviour is different: + +* `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables as well as the items listed in `setup_requires`. +* `buildInputs ? []`: Build and/or run-time dependencies that need to be be compiled for the host machine. Typically non-Python libraries which are being linked. +* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `nativeBuildInputs` when `doCheck = true`. Items listed in `tests_require` go here. +* `propagatedBuildInputs ? []`: Aside from propagating dependencies, `buildPythonPackage` also injects code into and wraps executables with the paths included in this list. Items listed in `install_requires` go here. + ##### Overriding Python packages The `buildPythonPackage` function has a `overridePythonAttrs` method that @@ -638,7 +635,7 @@ with import {}; }; }); }; - in pkgs.python3.override {inherit packageOverrides;}; + in pkgs.python3.override {inherit packageOverrides; self = python;}; in python.withPackages(ps: [ps.blaze])).env ``` @@ -727,7 +724,7 @@ Saving the following as `default.nix` with import {}; python.buildEnv.override { - extraLibs = [ pkgs.pythonPackages.pyramid ]; + extraLibs = [ pythonPackages.pyramid ]; ignoreCollisions = true; } ``` @@ -809,11 +806,12 @@ Given a `default.nix`: ```nix with import {}; -buildPythonPackage { name = "myproject"; +pythonPackages.buildPythonPackage { + name = "myproject"; + buildInputs = with pythonPackages; [ pyramid ]; -buildInputs = with pkgs.pythonPackages; [ pyramid ]; - -src = ./.; } + src = ./.; +} ``` Running `nix-shell` with no arguments should give you @@ -874,7 +872,6 @@ example of such a situation is when `py.test` is used. ''; } ``` -- Unicode issues can typically be fixed by including `glibcLocales` in `buildInputs` and exporting `LC_ALL=en_US.utf-8`. - Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)` ## FAQ @@ -1000,10 +997,13 @@ Create this `default.nix` file, together with a `requirements.txt` and simply ex ```nix with import {}; -with pkgs.python27Packages; +with python27Packages; stdenv.mkDerivation { name = "impurePythonEnv"; + + src = null; + buildInputs = [ # these packages are required for virtualenv and pip to work: # @@ -1023,14 +1023,15 @@ stdenv.mkDerivation { libxslt libzip stdenv - zlib ]; - src = null; + zlib + ]; + shellHook = '' - # set SOURCE_DATE_EPOCH so that we can use python wheels - SOURCE_DATE_EPOCH=$(date +%s) - virtualenv --no-setuptools venv - export PATH=$PWD/venv/bin:$PATH - pip install -r requirements.txt + # set SOURCE_DATE_EPOCH so that we can use python wheels + SOURCE_DATE_EPOCH=$(date +%s) + virtualenv --no-setuptools venv + export PATH=$PWD/venv/bin:$PATH + pip install -r requirements.txt ''; } ``` @@ -1123,6 +1124,14 @@ LLVM implementation. To use that one instead, Intel recommends users set it with Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms; moreover, Hydra is not building and distributing pre-compiled binaries using it. +### What inputs do `setup_requires`, `install_requires` and `tests_require` map to? + +In a `setup.py` or `setup.cfg` it is common to declare dependencies: + +* `setup_requires` corresponds to `nativeBuildInputs` +* `install_requires` corresponds to `propagatedBuildInputs` +* `tests_require` corresponds to `checkInputs` + ## Contributing ### Contributing guidelines diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 14b36f55f52f..2d9338f2e89b 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -336,9 +336,9 @@ with import {}; let src = fetchFromGitHub { owner = "mozilla"; repo = "nixpkgs-mozilla"; - # commit from: 2018-03-27 - rev = "2945b0b6b2fd19e7d23bac695afd65e320efcebe"; - sha256 = "034m1dryrzh2lmjvk3c0krgip652dql46w5yfwpvh7gavd3iypyw"; + # commit from: 2019-05-15 + rev = "9f35c4b09fd44a77227e79ff0c1b4b6a69dff533"; + sha256 = "18h0nvh55b5an4gmlgfbvwbyqj91bklf1zymis6lbdh75571qaz0"; }; in with import "${src.out}/rust-overlay.nix" pkgs pkgs; diff --git a/doc/package-notes.xml b/doc/package-notes.xml index e23593107d8d..c93f99d256b9 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -882,6 +882,33 @@ citrix_receiver.override { On NixOS it can be installed using the following expression: { pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; +} + + + +
+ DLib + + + DLib is a modern, C++-based toolkit which + provides several machine learning algorithms. + + +
+ Compiling without AVX support + + + Especially older CPUs don't support + AVX + (Advanced Vector Extensions) instructions that are used by DLib to + optimize their algorithms. + + + + On the affected hardware errors like Illegal instruction will occur. + In those cases AVX support needs to be disabled: +self: super: { + dlib = super.dlib.override { avxSupport = false; }; }
diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 81bd4556193f..ad15118a7a7f 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -704,7 +704,7 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] For information about how to run the updates, execute - nix-shell maintainers/scripts/update.nix. + nix-shell maintainers/scripts/update.nix. @@ -2740,9 +2740,9 @@ addEnvHooks "$hostOffset" myBashFunction Overrides the configure, build, and install phases. This will run the - "waf" script used by many projects. If waf doesn’t exist, it will copy - the version of waf available in Nixpkgs wafFlags can be used to pass - flags to the waf script. + "waf" script used by many projects. If wafPath (default ./waf) + doesn’t exist, it will copy the version of waf available in Nixpkgs. + wafFlags can be used to pass flags to the waf script. diff --git a/lib/default.nix b/lib/default.nix index d400907ebb0c..dbb90081b2c3 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -109,7 +109,7 @@ let mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule - mkAliasOptionModule mkAliasOptionModuleWithPriority doRename filterModules; + mkAliasOptionModule doRename filterModules; inherit (options) isOption mkEnableOption mkSinkUndeclaredOptions mergeDefaultOption mergeOneOption mergeEqualOption getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' diff --git a/lib/licenses.nix b/lib/licenses.nix index b022d8bc11bf..d285ba2ea0aa 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -561,6 +561,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "OpenSSL License"; }; + osl2 = spdx { + spdxId = "OSL-2.0"; + fullName = "Open Software License 2.0"; + }; + osl21 = spdx { spdxId = "OSL-2.1"; fullName = "Open Software License 2.1"; diff --git a/lib/modules.nix b/lib/modules.nix index 5c9d66d8f97b..0869eae1982b 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -476,8 +476,22 @@ rec { optionSet to options of type submodule. FIXME: remove eventually. */ fixupOptionType = loc: opt: - if opt.type.getSubModules or null == null - then opt // { type = opt.type or types.unspecified; } + let + options = opt.options or + (throw "Option `${showOption loc'}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}."); + f = tp: + let optionSetIn = type: (tp.name == type) && (tp.functor.wrapped.name == "optionSet"); + in + if tp.name == "option set" || tp.name == "submodule" then + throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}." + else if optionSetIn "attrsOf" then types.attrsOf (types.submodule options) + else if optionSetIn "loaOf" then types.loaOf (types.submodule options) + else if optionSetIn "listOf" then types.listOf (types.submodule options) + else if optionSetIn "nullOr" then types.nullOr (types.submodule options) + else tp; + in + if opt.type.getSubModules or null == null + then opt // { type = f (opt.type or types.unspecified); } else opt // { type = opt.type.substSubModules opt.options; options = []; }; @@ -596,6 +610,9 @@ rec { forwards any definitions of boot.copyKernels to boot.loader.grub.copyKernels while printing a warning. + + This also copies over the priority from the aliased option to the + non-aliased option. */ mkRenamedOptionModule = from: to: doRename { inherit from to; @@ -690,16 +707,7 @@ rec { use = id; }; - /* Like ‘mkAliasOptionModule’, but copy over the priority of the option as well. */ - mkAliasOptionModuleWithPriority = from: to: doRename { - inherit from to; - visible = true; - warn = false; - use = id; - withPriority = true; - }; - - doRename = { from, to, visible, warn, use, withPriority ? false }: + doRename = { from, to, visible, warn, use, withPriority ? true }: { config, options, ... }: let fromOpt = getAttrFromPath from options; diff --git a/lib/options.nix b/lib/options.nix index 5cea99067aab..6307921f9c67 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -48,6 +48,8 @@ rec { visible ? null, # Whether the option can be set only once readOnly ? null, + # Deprecated, used by types.optionSet. + options ? null } @ attrs: attrs // { _type = "option"; }; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 90068f566ed0..c374f98aff38 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -44,14 +44,6 @@ rec { platform = platforms.aarch64-multiplatform; }; - armv5te-android-prebuilt = rec { - config = "armv5tel-unknown-linux-androideabi"; - sdkVer = "21"; - ndkVer = "18b"; - platform = platforms.armv5te-android; - useAndroidPrebuilt = true; - }; - armv7a-android-prebuilt = rec { config = "armv7a-unknown-linux-androideabi"; sdkVer = "24"; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index bf186126d4a9..c5a0e647092c 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -21,6 +21,7 @@ rec { isSparc = { cpu = { family = "sparc"; }; }; isWasm = { cpu = { family = "wasm"; }; }; isAvr = { cpu = { family = "avr"; }; }; + isAlpha = { cpu = { family = "alpha"; }; }; is32bit = { cpu = { bits = 32; }; }; is64bit = { cpu = { bits = 64; }; }; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 03bfce256103..a2b43c970a41 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -253,22 +253,11 @@ rec { kernelTarget = "zImage"; }; - # https://developer.android.com/ndk/guides/abis#armeabi - armv5te-android = { - name = "armeabi"; - gcc = { - arch = "armv5te"; - float = "soft"; - float-abi = "soft"; - }; - }; - # https://developer.android.com/ndk/guides/abis#v7a armv7a-android = { name = "armeabi-v7a"; gcc = { arch = "armv7-a"; - float = "hard"; float-abi = "softfp"; fpu = "vfpv3-d16"; }; diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index a72777cbf2a6..eadaa0521b35 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -149,7 +149,7 @@ checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.ni # Check loaOf with many merges of lists. checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix -# Check mkAliasOptionModuleWithPriority. +# Check mkAliasOptionModule. checkConfigOutput "true" config.enable ./alias-with-priority.nix checkConfigOutput "true" config.enableAlias ./alias-with-priority.nix checkConfigOutput "false" config.enable ./alias-with-priority-can-override.nix diff --git a/lib/tests/modules/alias-with-priority-can-override.nix b/lib/tests/modules/alias-with-priority-can-override.nix index a6b26895f3a8..9a18c9d9f613 100644 --- a/lib/tests/modules/alias-with-priority-can-override.nix +++ b/lib/tests/modules/alias-with-priority-can-override.nix @@ -1,5 +1,8 @@ # This is a test to show that mkAliasOptionModule sets the priority correctly # for aliased options. +# +# This test shows that an alias with a high priority is able to override +# a non-aliased option. { config, lib, ... }: @@ -32,10 +35,10 @@ with lib; imports = [ # Create an alias for the "enable" option. - (mkAliasOptionModuleWithPriority [ "enableAlias" ] [ "enable" ]) + (mkAliasOptionModule [ "enableAlias" ] [ "enable" ]) - # Disable the aliased option, but with a default (low) priority so it - # should be able to be overridden by the next import. + # Disable the aliased option with a high priority so it + # should override the next import. ( { config, lib, ... }: { enableAlias = lib.mkForce false; diff --git a/lib/tests/modules/alias-with-priority.nix b/lib/tests/modules/alias-with-priority.nix index 923483684cb1..a35a06fc6974 100644 --- a/lib/tests/modules/alias-with-priority.nix +++ b/lib/tests/modules/alias-with-priority.nix @@ -1,5 +1,8 @@ # This is a test to show that mkAliasOptionModule sets the priority correctly # for aliased options. +# +# This test shows that an alias with a low priority is able to be overridden +# with a non-aliased option. { config, lib, ... }: @@ -32,7 +35,7 @@ with lib; imports = [ # Create an alias for the "enable" option. - (mkAliasOptionModuleWithPriority [ "enableAlias" ] [ "enable" ]) + (mkAliasOptionModule [ "enableAlias" ] [ "enable" ]) # Disable the aliased option, but with a default (low) priority so it # should be able to be overridden by the next import. diff --git a/lib/types.nix b/lib/types.nix index 7a88e1b9e36b..b225119299da 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -469,8 +469,10 @@ rec { # Obsolete alternative to configOf. It takes its option # declarations from the ‘options’ attribute of containing option # declaration. - optionSet = builtins.throw "types.optionSet is deprecated; use types.submodule instead" "optionSet"; - + optionSet = mkOptionType { + name = builtins.trace "types.optionSet is deprecated; use types.submodule instead" "optionSet"; + description = "option set"; + }; # Augment the given type with an additional type check function. addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bbf016194efe..94b38bf493c2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -485,6 +485,11 @@ github = "avnik"; name = "Alexander V. Nikolaev"; }; + aw = { + email = "aw-nixos@meterriblecrew.net"; + github = "herrwiese"; + name = "Andreas Wiese"; + }; aycanirican = { email = "iricanaycan@gmail.com"; github = "aycanirican"; @@ -752,6 +757,11 @@ github = "calbrecht"; name = "Christian Albrecht"; }; + callahad = { + email = "dan.callahan@gmail.com"; + github = "callahad"; + name = "Dan Callahan"; + }; calvertvl = { email = "calvertvl@gmail.com"; github = "calvertvl"; @@ -812,6 +822,11 @@ github = "cdepillabout"; name = "Dennis Gosnell"; }; + ceedubs = { + email = "ceedubs@gmail.com"; + github = "ceedubs"; + name = "Cody Allen"; + }; cfouche = { email = "chaddai.fouche@gmail.com"; github = "Chaddai"; @@ -1185,6 +1200,11 @@ github = "dgonyeo"; name = "Derek Gonyeo"; }; + dhkl = { + email = "david@davidslab.com"; + github = "dhl"; + name = "David Leung"; + }; dipinhora = { email = "dipinhora+github@gmail.com"; github = "dipinhora"; @@ -1618,6 +1638,10 @@ email = "fpletz@fnordicwalking.de"; github = "fpletz"; name = "Franz Pletz"; + keys = [{ + longkeyid = "rsa4096/0x846FDED7792617B4"; + fingerprint = "8A39 615D CE78 AF08 2E23 F303 846F DED7 7926 17B4"; + }]; }; fps = { email = "mista.tapas@gmx.net"; @@ -1742,6 +1766,11 @@ github = "Gerschtli"; name = "Tobias Happ"; }; + ggpeti = { + email = "ggpeti@gmail.com"; + github = "ggpeti"; + name = "Peter Ferenczy"; + }; gilligan = { email = "tobias.pflug@gmail.com"; github = "gilligan"; @@ -2439,6 +2468,11 @@ github = "kisonecat"; name = "Jim Fowler"; }; + kjuvi = { + email = "quentin.vaucher@pm.me"; + github = "kjuvi"; + name = "Quentin Vaucher"; + }; kkallio = { email = "tierpluspluslists@gmail.com"; name = "Karn Kallio"; @@ -2446,7 +2480,7 @@ klntsky = { email = "klntsky@gmail.com"; name = "Vladimir Kalnitsky"; - github = "8084"; + github = "klntsky"; }; kmeakin = { email = "karlwfmeakin@gmail.com"; @@ -2454,6 +2488,12 @@ github = "Kmeakin"; }; + kmein = { + email = "kieran.meinhardt@gmail.com"; + name = "Kierán Meinhardt"; + github = "kmein"; + }; + knedlsepp = { email = "josef.kemetmueller@gmail.com"; github = "knedlsepp"; @@ -2464,6 +2504,11 @@ github = "knl"; name = "Nikola Knežević"; }; + kolaente = { + email = "k@knt.li"; + github = "kolaente"; + name = "Konrad Langenberg"; + }; konimex = { email = "herdiansyah@netc.eu"; github = "konimex"; @@ -4303,6 +4348,15 @@ github = "sleexyz"; name = "Sean Lee"; }; + smakarov = { + email = "setser200018@gmail.com"; + github = "setser"; + name = "Sergey Makarov"; + keys = [{ + longkeyid = "rsa2048/6AA23A1193B7064B"; + fingerprint = "6F8A 18AE 4101 103F 3C54 24B9 6AA2 3A11 93B7 064B"; + }]; + }; smaret = { email = "sebastien.maret@icloud.com"; github = "smaret"; @@ -4337,6 +4391,15 @@ github = "solson"; name = "Scott Olson"; }; + sondr3 = { + email = "nilsen.sondre@gmail.com"; + github = "sondr3"; + name = "Sondre Nilsen"; + keys = [{ + longkeyid = "ed25519/0x25676BCBFFAD76B1"; + fingerprint = "0EC3 FA89 EFBA B421 F82E 40B0 2567 6BCB FFAD 76B1"; + }]; + }; sorki = { email = "srk@48.io"; github = "sorki"; @@ -4876,9 +4939,13 @@ name = "Vincent Bernardoff"; }; vcunat = { - email = "vcunat@gmail.com"; - github = "vcunat"; name = "Vladimír Čunát"; + email = "v@cunat.cz"; # vcunat@gmail.com predominated in commits before 2019/03 + github = "vcunat"; + keys = [{ + longkeyid = "rsa4096/0xE747DF1F9575A3AA"; + fingerprint = "B600 6460 B60A 80E7 8206 2449 E747 DF1F 9575 A3AA"; + }]; }; vdemeester = { email = "vincent@sbr.pm"; @@ -5001,6 +5068,11 @@ email = "windenntw@gmail.com"; name = "Antonio Vargas Gonzalez"; }; + winpat = { + email = "patrickwinter@posteo.ch"; + github = "winpat"; + name = "Patrick Winter"; + }; wizeman = { email = "rcorreia@wizy.org"; github = "wizeman"; @@ -5167,9 +5239,9 @@ name = "Christian Zagrodnick"; }; zalakain = { - email = "contact@unaizalakain.info"; + email = "ping@umazalakain.info"; github = "umazalakain"; - name = "Unai Zalakain"; + name = "Uma Zalakain"; }; zaninime = { email = "francesco@zanini.me"; diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index 1357f87aaa5d..a267a5fa8715 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/maintainers/scripts/fetch-kde-qt.sh @@ -14,12 +14,13 @@ fi tmp=$(mktemp -d) pushd $tmp >/dev/null -wget -nH -r -c --no-parent "${WGET_ARGS[@]}" >/dev/null +wget -nH -r -c --no-parent "${WGET_ARGS[@]}" -A '*.tar.xz.sha256' -A '*.mirrorlist' >/dev/null +find -type f -name '*.mirrorlist' -delete csv=$(mktemp) find . -type f | while read src; do # Sanitize file name - filename=$(basename "$src" | tr '@' '_') + filename=$(gawk '{ print $2 }' "$src" | tr '@' '_') nameVersion="${filename%.tar.*}" name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,' | sed -e 's,-everywhere-src$,,') version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') @@ -38,8 +39,8 @@ gawk -F , "{ print \$1 }" $csv | sort | uniq | while read name; do latestVersion=$(echo "$versions" | sort -rV | head -n 1) src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" $csv) filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" $csv) - url="${src:2}" - sha256=$(nix-hash --type sha256 --base32 --flat "$src") + url="$(dirname "${src:2}")/$filename" + sha256=$(gawk '{ print $1 }' "$src") cat >>"$SRCS" < = pkgs.postgresql_10; The latter option definition changes the default PostgreSQL package used - by NixOS’s PostgreSQL service to 10.x. For more information on packages, - including how to add new ones, see . + by NixOS’s PostgreSQL service to 10.x. For more information on + packages, including how to add new ones, see + . diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index cebc4122c6c6..d7e3081f5f01 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -21,7 +21,9 @@ + + diff --git a/nixos/doc/manual/configuration/kubernetes.xml b/nixos/doc/manual/configuration/kubernetes.xml new file mode 100644 index 000000000000..54a100e44795 --- /dev/null +++ b/nixos/doc/manual/configuration/kubernetes.xml @@ -0,0 +1,112 @@ + + Kubernetes + + The NixOS Kubernetes module is a collective term for a handful of individual + submodules implementing the Kubernetes cluster components. + + + There are generally two ways of enabling Kubernetes on NixOS. One way is to + enable and configure cluster components appropriately by hand: + +services.kubernetes = { + apiserver.enable = true; + controllerManager.enable = true; + scheduler.enable = true; + addonManager.enable = true; + proxy.enable = true; + flannel.enable = true; +}; + + Another way is to assign cluster roles ("master" and/or "node") to the host. + This enables apiserver, controllerManager, scheduler, addonManager, + kube-proxy and etcd: + + = [ "master" ]; + + While this will enable the kubelet and kube-proxy only: + + = [ "node" ]; + + Assigning both the master and node roles is usable if you want a single node + Kubernetes cluster for dev or testing purposes: + + = [ "master" "node" ]; + + Note: Assigning either role will also default both + and + to true. This sets up + flannel as CNI and activates automatic PKI bootstrapping. + + + As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled ports + on kubernetes components. Thus, from NixOS 19.03 all plain HTTP ports have + been disabled by default. While opening insecure ports is still possible, it + is recommended not to bind these to other interfaces than loopback. To + re-enable the insecure port on the apiserver, see options: + and + + + + + As of NixOS 19.03, it is mandatory to configure: + . The masterAddress + must be resolveable and routeable by all cluster nodes. In single node + clusters, this can be set to localhost. + + + + Role-based access control (RBAC) authorization mode is enabled by default. + This means that anonymous requests to the apiserver secure port will + expectedly cause a permission denied error. All cluster components must + therefore be configured with x509 certificates for two-way tls communication. + The x509 certificate subject section determines the roles and permissions + granted by the apiserver to perform clusterwide or namespaced operations. See + also: + + Using RBAC Authorization. + + + The NixOS kubernetes module provides an option for automatic certificate + bootstrapping and configuration, + . The PKI bootstrapping + process involves setting up a certificate authority (CA) daemon (cfssl) on + the kubernetes master node. cfssl generates a CA-cert for the cluster, and + uses the CA-cert for signing subordinate certs issued to each of the cluster + components. Subsequently, the certmgr daemon monitors active certificates and + renews them when needed. For single node Kubernetes clusters, setting + = true is sufficient and + no further action is required. For joining extra node machines to an existing + cluster on the other hand, establishing initial trust is mandatory. + + + To add new nodes to the cluster: On any (non-master) cluster node where + is enabled, the helper + script nixos-kubernetes-node-join is available on PATH. + Given a token on stdin, it will copy the token to the kubernetes secrets + directory and restart the certmgr service. As requested certificates are + issued, the script will restart kubernetes cluster components as needed for + them to pick up new keypairs. + + + + Multi-master (HA) clusters are not supported by the easyCerts module. + + + + In order to interact with an RBAC-enabled cluster as an administrator, one + needs to have cluster-admin privileges. By default, when easyCerts is + enabled, a cluster-admin kubeconfig file is generated and linked into + /etc/kubernetes/cluster-admin.kubeconfig as determined by + . + export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig + will make kubectl use this kubeconfig to access and authenticate the cluster. + The cluster-admin kubeconfig references an auto-generated keypair owned by + root. Thus, only root on the kubernetes master may obtain cluster-admin + rights by means of this file. + + diff --git a/nixos/doc/manual/configuration/matrix.xml b/nixos/doc/manual/configuration/matrix.xml new file mode 100644 index 000000000000..66965460a15d --- /dev/null +++ b/nixos/doc/manual/configuration/matrix.xml @@ -0,0 +1,203 @@ + + Matrix + + Matrix is an open standard for + interoperable, decentralised, real-time communication over IP. It can be used + to power Instant Messaging, VoIP/WebRTC signalling, Internet of Things + communication - or anywhere you need a standard HTTP API for publishing and + subscribing to data whilst tracking the conversation history. + + + This chapter will show you how to set up your own, self-hosted Matrix + homeserver using the Synapse reference homeserver, and how to serve your own + copy of the Riot web client. See the + Try + Matrix Now! overview page for links to Riot Apps for Android and iOS, + desktop clients, as well as bridges to other networks and other projects + around Matrix. + +
+ Synapse Homeserver + + + Synapse is + the reference homeserver implementation of Matrix from the core development + team at matrix.org. The following configuration example will set up a + synapse server for the example.org domain, served from + the host myhostname.example.org. For more information, + please refer to the + + installation instructions of Synapse . + + let + fqdn = + let + join = hostName: domain: hostName + optionalString (domain != null) ".${domain}"; + in join config.networking.hostName config.networking.domain; + in { + networking = { + hostName = "myhostname"; + domain = "example.org"; + }; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + + services.nginx = { + enable = true; + # only recommendedProxySettings and recommendedGzipSettings are strictly required, + # but the rest make sense as well + recommendedTlsSettings = true; + recommendedOptimisation = true; + recommendedGzipSettings = true; + recommendedProxySettings = true; + + virtualHosts = { + # This host section can be placed on a different host than the rest, + # i.e. to delegate from the host being accessible as ${config.networking.domain} + # to another host actually running the Matrix homeserver. + "${config.networking.domain}" = { + locations."= /.well-known/matrix/server".extraConfig = + let + # use 443 instead of the default 8448 port to unite + # the client-server and server-server port for simplicity + server = { "m.server" = "${fqdn}:443"; }; + in '' + add_header Content-Type application/json; + return 200 '${builtins.toJSON server}'; + ''; + locations."= /.well-known/matrix/client".extraConfig = + let + client = { + "m.homeserver" = { "base_url" = "https://${fqdn}"; }; + "m.identity_server" = { "base_url" = "https://vector.im"; }; + }; + # ACAO required to allow riot-web on any URL to request this json file + in '' + add_header Content-Type application/json; + add_header Access-Control-Allow-Origin *; + return 200 '${builtins.toJSON client}'; + ''; + }; + + # Reverse proxy for Matrix client-server and server-server communication + ${fqdn} = { + enableACME = true; + forceSSL = true; + + # Or do a redirect instead of the 404, or whatever is appropriate for you. + # But do not put a Matrix Web client here! See the Riot Web section below. + locations."/".extraConfig = '' + return 404; + ''; + + # forward all Matrix API calls to the synapse Matrix homeserver + locations."/_matrix" = { + proxyPass = "http://[::1]:8008"; + }; + }; + }; + }; + services.matrix-synapse = { + enable = true; + server_name = config.networking.domain; + listeners = [ + { + port = 8008; + bind_address = "::1"; + type = "http"; + tls = false; + x_forwarded = true; + resources = [ + { names = [ "client" "federation" ]; compress = false; } + ]; + } + ]; + }; + }; + + + + + If the A and AAAA DNS records on + example.org do not point on the same host as the records + for myhostname.example.org, you can easily move the + /.well-known virtualHost section of the code to the host that + is serving example.org, while the rest stays on + myhostname.example.org with no other changes required. + This pattern also allows to seamlessly move the homeserver from + myhostname.example.org to + myotherhost.example.org by only changing the + /.well-known redirection target. + + + + If you want to run a server with public registration by anybody, you can + then enable . Otherwise, or you can generate a registration secret with + pwgen -s 64 1 and set it with + . To + create a new user or admin, run the following after you have set the secret + and have rebuilt NixOS: + + $ nix run nixpkgs.matrix-synapse + $ register_new_matrix_user -k <your-registration-shared-secret> http://localhost:8008 + New user localpart: <your-username> + Password: + Confirm password: + Make admin [no]: + Success! + + In the example, this would create a user with the Matrix Identifier + @your-username:example.org. Note that the registration + secret ends up in the nix store and therefore is world-readable by any user + on your machine, so it makes sense to only temporarily activate the + option until a better solution + for NixOS is in place. + +
+
+ Riot Web Client + + + Riot Web is + the reference web client for Matrix and developed by the core team at + matrix.org. The following snippet can be optionally added to the code before + to complete the synapse installation with a web client served at + https://riot.myhostname.example.org and + https://riot.example.org. Alternatively, you can use the hosted + copy at https://riot.im/app, + or use other web clients or native client applications. Due to the + /.well-known urls set up done above, many clients should + fill in the required connection details automatically when you enter your + Matrix Identifier. See + Try + Matrix Now! for a list of existing clients and their supported + featureset. + + services.nginx.virtualHosts."riot.${fqdn}" = { + enableACME = true; + forceSSL = true; + serverAliases = [ + "riot.${config.networking.domain}" + ]; + + root = pkgs.riot-web; + }; + + + + + Note that the Riot developers do not recommend running Riot and your Matrix + homeserver on the same fully-qualified domain name for security reasons. In + the example, this means that you should not reuse the + myhostname.example.org virtualHost to also serve Riot, + but instead serve it on a different subdomain, like + riot.example.org in the example. See the + Riot + Important Security Notes for more information on this subject. + +
+ diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 5ff5bc22c85e..724abd31ca4e 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -112,9 +112,8 @@ true $ nixos-option [ "tun" "ipv6" "loop" ... ] - Interactive exploration of the configuration is possible using - nix repl, a read-eval-print loop for Nix expressions. - A typical use: + Interactive exploration of the configuration is possible using nix + repl, a read-eval-print loop for Nix expressions. A typical use: $ nix repl '<nixpkgs/nixos>' @@ -127,11 +126,10 @@ nix-repl> map (x: x.hostName) config. - +
diff --git a/nixos/doc/manual/configuration/profiles.xml b/nixos/doc/manual/configuration/profiles.xml index 92c0f6202f28..c0a8f55785fc 100644 --- a/nixos/doc/manual/configuration/profiles.xml +++ b/nixos/doc/manual/configuration/profiles.xml @@ -12,14 +12,14 @@ That is to say, expected usage is to add them to the imports list of your /etc/configuration.nix as such: - + imports = [ <nixpkgs/nixos/modules/profiles/profile-name.nix> ]; - Even if some of these profiles seem only useful in the context of - install media, many are actually intended to be used in real installs. + Even if some of these profiles seem only useful in the context of install + media, many are actually intended to be used in real installs. What follows is a brief explanation on the purpose and use-case for each diff --git a/nixos/doc/manual/configuration/profiles/all-hardware.xml b/nixos/doc/manual/configuration/profiles/all-hardware.xml index 172975199474..2936f71069d5 100644 --- a/nixos/doc/manual/configuration/profiles/all-hardware.xml +++ b/nixos/doc/manual/configuration/profiles/all-hardware.xml @@ -1,15 +1,16 @@ -
All Hardware + - Enables all hardware supported by NixOS: i.e., all firmware is - included, and all devices from which one may boot are enabled in the initrd. - Its primary use is in the NixOS installation CDs. + Enables all hardware supported by NixOS: i.e., all firmware is included, and + all devices from which one may boot are enabled in the initrd. Its primary + use is in the NixOS installation CDs. + The enabled kernel modules include support for SATA and PATA, SCSI (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and diff --git a/nixos/doc/manual/configuration/profiles/base.xml b/nixos/doc/manual/configuration/profiles/base.xml index f58a35d626ed..b75f6ba25b4f 100644 --- a/nixos/doc/manual/configuration/profiles/base.xml +++ b/nixos/doc/manual/configuration/profiles/base.xml @@ -1,15 +1,15 @@ -
Base + - Defines the software packages included in the "minimal" - installation CD. It installs several utilities useful in a simple recovery or - install media, such as a text-mode web browser, and tools for manipulating - block devices, networking, hardware diagnostics, and filesystems (with their - respective kernel modules). + Defines the software packages included in the "minimal" installation CD. It + installs several utilities useful in a simple recovery or install media, such + as a text-mode web browser, and tools for manipulating block devices, + networking, hardware diagnostics, and filesystems (with their respective + kernel modules).
diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixos/doc/manual/configuration/profiles/clone-config.xml index 87c8b9ee31b6..234835845e2d 100644 --- a/nixos/doc/manual/configuration/profiles/clone-config.xml +++ b/nixos/doc/manual/configuration/profiles/clone-config.xml @@ -1,14 +1,14 @@ -
Clone Config + - This profile is used in installer images. - It provides an editable configuration.nix that imports all the modules that - were also used when creating the image in the first place. - As a result it allows users to edit and rebuild the live-system. + This profile is used in installer images. It provides an editable + configuration.nix that imports all the modules that were also used when + creating the image in the first place. As a result it allows users to edit + and rebuild the live-system.
diff --git a/nixos/doc/manual/configuration/profiles/demo.xml b/nixos/doc/manual/configuration/profiles/demo.xml index 98829e4696df..395a5ec357c9 100644 --- a/nixos/doc/manual/configuration/profiles/demo.xml +++ b/nixos/doc/manual/configuration/profiles/demo.xml @@ -1,13 +1,15 @@ -
Demo + - This profile just enables a demo user, with password demo, uid 1000, wheel - group and - autologin in the SDDM display manager. + This profile just enables a demo + user, with password demo, uid 1000, + wheel group and + autologin + in the SDDM display manager.
diff --git a/nixos/doc/manual/configuration/profiles/docker-container.xml b/nixos/doc/manual/configuration/profiles/docker-container.xml index bf962442ccef..efa7b8f24c43 100644 --- a/nixos/doc/manual/configuration/profiles/docker-container.xml +++ b/nixos/doc/manual/configuration/profiles/docker-container.xml @@ -1,15 +1,16 @@ -
Docker Container + This is the profile from which the Docker images are generated. It prepares a - working system by importing the Minimal and - Clone Config profiles, and setting appropriate - configuration options that are useful inside a container context, like - . + working system by importing the + Minimal and + Clone Config profiles, and + setting appropriate configuration options that are useful inside a container + context, like .
diff --git a/nixos/doc/manual/configuration/profiles/graphical.xml b/nixos/doc/manual/configuration/profiles/graphical.xml index 5ded61d9763b..73e3abc59d0c 100644 --- a/nixos/doc/manual/configuration/profiles/graphical.xml +++ b/nixos/doc/manual/configuration/profiles/graphical.xml @@ -1,20 +1,21 @@ -
Graphical + Defines a NixOS configuration with the Plasma 5 desktop. It's used by the graphical installation CD. + It sets , , ( - without Qt4 Support), and + without Qt4 Support), and to true. It also includes glxinfo and firefox in the system packages list. diff --git a/nixos/doc/manual/configuration/profiles/hardened.xml b/nixos/doc/manual/configuration/profiles/hardened.xml index b3b433792f53..dc83fc837e2a 100644 --- a/nixos/doc/manual/configuration/profiles/hardened.xml +++ b/nixos/doc/manual/configuration/profiles/hardened.xml @@ -1,22 +1,24 @@ -
Hardened + A profile with most (vanilla) hardening options enabled by default, potentially at the cost of features and performance. + This includes a hardened kernel, and limiting the system information available to processes through the /sys and /proc filesystems. It also disables the User Namespaces feature of the kernel, which stops Nix from being able to build anything (this particular setting can be overriden via - ). See the ). See the + - profile source for further detail on which settings are altered. + profile source for further detail on which settings are altered.
diff --git a/nixos/doc/manual/configuration/profiles/headless.xml b/nixos/doc/manual/configuration/profiles/headless.xml index 54dc61f236e0..1b64497ebf7f 100644 --- a/nixos/doc/manual/configuration/profiles/headless.xml +++ b/nixos/doc/manual/configuration/profiles/headless.xml @@ -1,18 +1,19 @@ -
Headless + Common configuration for headless machines (e.g., Amazon EC2 instances). + Disables sound, vesa, serial consoles, emergency mode, - grub splash images and - configures the kernel to reboot automatically on panic. + grub splash images + and configures the kernel to reboot automatically on panic.
diff --git a/nixos/doc/manual/configuration/profiles/installation-device.xml b/nixos/doc/manual/configuration/profiles/installation-device.xml index 44ccfc538ad1..3dcdf403d89d 100644 --- a/nixos/doc/manual/configuration/profiles/installation-device.xml +++ b/nixos/doc/manual/configuration/profiles/installation-device.xml @@ -1,31 +1,34 @@ -
Installation Device + Provides a basic configuration for installation devices like CDs. This means enabling hardware scans, using the - Clone Config profile to guarantee + Clone Config profile to guarantee /etc/nixos/configuration.nix exists (for nixos-rebuild to work), a copy of the Nixpkgs channel snapshot used to create the install media. + Additionally, documentation for - Nixpkgs and NixOS - are forcefully enabled (to override the - Minimal profile preference); the - NixOS manual is shown automatically on TTY 8, sudo and udisks are disabled. - Autologin is enabled as root. + Nixpkgs and NixOS + are forcefully enabled (to override the + Minimal profile preference); the + NixOS manual is shown automatically on TTY 8, sudo and udisks are disabled. + Autologin is enabled as root. + - A message is shown to the user to start a display manager if needed, - ssh with are enabled (but + A message is shown to the user to start a display manager if needed, ssh with + are enabled (but doesn't autostart). WPA Supplicant is also enabled without autostart. + Finally, vim is installed, root is set to not have a password, the kernel is made more silent for remote public IP installs, and several settings are diff --git a/nixos/doc/manual/configuration/profiles/minimal.xml b/nixos/doc/manual/configuration/profiles/minimal.xml index a24af21bd7f7..179f2d0be64b 100644 --- a/nixos/doc/manual/configuration/profiles/minimal.xml +++ b/nixos/doc/manual/configuration/profiles/minimal.xml @@ -1,16 +1,16 @@ -
Minimal + This profile defines a small NixOS configuration. It does not contain any graphical stuff. It's a very short file that enables noXlibs, sets - i18n.supportedLocales - to only support the user-selected locale, + i18n.supportedLocales to + only support the user-selected locale, disables packages' documentation , and disables sound. diff --git a/nixos/doc/manual/configuration/profiles/qemu-guest.xml b/nixos/doc/manual/configuration/profiles/qemu-guest.xml index d08068650fbe..5d055c45d2d8 100644 --- a/nixos/doc/manual/configuration/profiles/qemu-guest.xml +++ b/nixos/doc/manual/configuration/profiles/qemu-guest.xml @@ -4,10 +4,12 @@ version="5.0" xml:id="sec-profile-qemu-guest"> QEMU Guest + This profile contains common configuration for virtual machines running under QEMU (using virtio). + It makes virtio modules available on the initrd, sets the system time from the hardware clock to work around a bug in qemu-kvm, and diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml index f7e99ff0e35c..e8859ca08b63 100644 --- a/nixos/doc/manual/configuration/wireless.xml +++ b/nixos/doc/manual/configuration/wireless.xml @@ -28,11 +28,9 @@ Be aware that keys will be written to the nix store in plaintext! When no networks are set, it will default to using a configuration file at /etc/wpa_supplicant.conf. You should edit this file - yourself to define wireless networks, WPA keys and so on (see - - wpa_supplicant.conf - 5 - ). + yourself to define wireless networks, WPA keys and so on (see + wpa_supplicant.conf + 5 ). diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index e7d66f391f55..3bcb288b5ebf 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -35,8 +35,8 @@ NixOS’s default display manager (the program that - provides a graphical login prompt and manages the X server) is LightDM. You can - select an alternative one by picking one of the following lines: + provides a graphical login prompt and manages the X server) is LightDM. You + can select an alternative one by picking one of the following lines: = true; = true; @@ -59,9 +59,16 @@ # systemctl start display-manager.service + + + On 64-bit systems, if you want OpenGL for 32-bit programs such as in Wine, + you should also set the following: + + = true; + - NVIDIA Graphics Cards + Proprietary NVIDIA drivers NVIDIA provides a proprietary driver for its graphics cards that has better 3D performance than the X.org drivers. It is not enabled by default because @@ -71,6 +78,7 @@ Or if you have an older card, you may have to use one of the legacy drivers: + = [ "nvidiaLegacy390" ]; = [ "nvidiaLegacy340" ]; = [ "nvidiaLegacy304" ]; = [ "nvidiaLegacy173" ]; @@ -78,16 +86,9 @@ You may need to reboot after enabling this driver to prevent a clash with other kernel modules. - - On 64-bit systems, if you want full acceleration for 32-bit programs such as - Wine, you should also set the following: - - = true; - - - AMD Graphics Cards + Proprietary AMD drivers AMD provides a proprietary driver for its graphics cards that has better 3D performance than the X.org drivers. It is not enabled by default because @@ -99,11 +100,8 @@ other kernel modules. - On 64-bit systems, if you want full acceleration for 32-bit programs such as - Wine, you should also set the following: - - = true; - + Note: for recent AMD GPUs you most likely want to keep either the defaults + or "amdgpu" (both free). diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml index d4e5ff3f4312..8b4e5ab7f756 100755 --- a/nixos/doc/manual/development/releases.xml +++ b/nixos/doc/manual/development/releases.xml @@ -182,6 +182,12 @@ git tag -s -a -m "Release 15.09" 15.09 + + + Update "Chapter 4. Upgrading NixOS" section of the manual to match + new stable release version. + + Update http://nixos.org/nixos/download.html and diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml index 766785dfe070..5c86eacfbf45 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -77,10 +77,10 @@ Shared folders can be given a name and a path in the host system in the VirtualBox settings (Machine / Settings / Shared Folders, then click on the "Add" icon). Add the following to the - /etc/nixos/configuration.nix to auto-mount them. If you - do not add "nofail", the system will no boot properly. - The same goes for disabling rngd which is normally used - to get randomness but this does not work in virtual machines. + /etc/nixos/configuration.nix to auto-mount them. If you do + not add "nofail", the system will no boot properly. The + same goes for disabling rngd which is normally used to get + randomness but this does not work in virtual machines. diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index 69668b1d4bd6..35b4d266e12e 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -14,11 +14,11 @@ Stable channels, such as nixos-17.03. + xlink:href="https://nixos.org/channels/nixos-19.03">nixos-19.03. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded - from 4.9.16 to 4.9.17 (a minor bug fix), but not from - 4.9.x to 4.11.x (a + from 4.19.34 to 4.19.38 (a minor bug fix), but not from + 4.19.x to 4.20.x (a major change that has the potential to break things). Stable channels are generally maintained until the next stable branch is created. @@ -38,7 +38,7 @@ Small channels, such as nixos-17.03-small + xlink:href="https://nixos.org/channels/nixos-19.03-small">nixos-19.03-small or nixos-unstable-small. @@ -63,8 +63,8 @@ When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For instance, if you - installed from a 17.03 ISO, you will be subscribed to the - nixos-17.03 channel. To see which NixOS channel you’re + installed from a 19.03 ISO, you will be subscribed to the + nixos-19.03 channel. To see which NixOS channel you’re subscribed to, run the following as root: # nix-channel --list | grep nixos @@ -75,13 +75,13 @@ nixos https://nixos.org/channels/nixos-unstable # nix-channel --add https://nixos.org/channels/channel-name nixos (Be sure to include the nixos parameter at the end.) For - instance, to use the NixOS 17.03 stable channel: + instance, to use the NixOS 19.03 stable channel: -# nix-channel --add https://nixos.org/channels/nixos-17.03 nixos +# nix-channel --add https://nixos.org/channels/nixos-19.03 nixos If you have a server, you may want to use the “small” channel instead: -# nix-channel --add https://nixos.org/channels/nixos-17.03-small nixos +# nix-channel --add https://nixos.org/channels/nixos-19.03-small nixos And if you want to live on the bleeding edge: @@ -127,7 +127,7 @@ nixos https://nixos.org/channels/nixos-unstable current channel. (To see when the service runs, see systemctl list-timers.) You can also specify a channel explicitly, e.g. - = https://nixos.org/channels/nixos-17.03; + = https://nixos.org/channels/nixos-19.03;
diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml index 43d6c2696a28..160ada9fff31 100644 --- a/nixos/doc/manual/man-nixos-generate-config.xml +++ b/nixos/doc/manual/man-nixos-generate-config.xml @@ -13,18 +13,18 @@ - nixos-generate-config + nixos-generate-config - + root - + diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index b6a247286d4b..0b0c0b8f6ea2 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -13,35 +13,39 @@ - nixos-rebuild + nixos-rebuild - + - + - + - + - + - + + + + + - + @@ -50,33 +54,33 @@ - + - + - + - + + - - builder-spec + builder-spec - + - + @@ -188,6 +192,16 @@ $ nix-build /path/to/nixpkgs/nixos -A system + + + + + + + Opens configuration.nix in the default editor. + + + @@ -320,25 +334,23 @@ $ ./result/bin/run-*-vm - - - builder-spec - - - - Allow ad-hoc remote builders for building the new system. - This requires the user executing nixos-rebuild (usually - root) to be configured as a trusted user in the Nix daemon. This can be - achieved by using the nix.trustedUsers NixOS option. - Examples values for that option are described in the - Remote builds chapter in the Nix manual, - (i.e. --builders "ssh://bigbrother x86_64-linux"). - By specifying an empty string existing builders specified in - /etc/nix/machines can be ignored: - --builders "" for example when they are not - reachable due to network connectivity. - - + + builder-spec + + + + Allow ad-hoc remote builders for building the new system. This requires + the user executing nixos-rebuild (usually root) to be + configured as a trusted user in the Nix daemon. This can be achieved by + using the nix.trustedUsers NixOS option. Examples + values for that option are described in the Remote builds + chapter in the Nix manual, (i.e. --builders + "ssh://bigbrother x86_64-linux"). By specifying an empty string + existing builders specified in /etc/nix/machines can + be ignored: --builders "" for example when they are + not reachable due to network connectivity. + + diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 8715a05f508b..3f10b26223dd 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -639,7 +639,8 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' - Groups kvm and render are introduced now, as systemd requires them. + Groups kvm and render are introduced + now, as systemd requires them. diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 6f78983d4829..89e6a3a86a27 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-19.03"> - Release 19.03 (“Koi”, 2019/03/??) + Release 19.03 (“Koi”, 2019/04/11)
- The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6. + End of support is planned for end of October 2019, handing over to 19.09. - Added the Pantheon desktop environment. - It can be enabled through services.xserver.desktopManager.pantheon.enable. + The default Python 3 interpreter is now CPython 3.7 instead of CPython + 3.6. + + + + + Added the Pantheon desktop environment. It can be enabled through + services.xserver.desktopManager.pantheon.enable. - services.xserver.desktopManager.pantheon default enables lightdm - as a display manager and using Pantheon's greeter. + By default, services.xserver.desktopManager.pantheon + enables LightDM as a display manager, as pantheon's screen locking + implementation relies on it. - This is because of limitations with the screenlocking implementation, whereas the - screenlocker would be non-functional without it. + Because of that it is recommended to leave LightDM enabled. If you'd like + to disable it anyway, set + to + false and enable your preferred display manager. - - Because of that it is recommended to retain this precaution, however if you'd like to change this set: - - - - - - - - - - - - - - to false and enable your preferred display manager. + + Also note that Pantheon's LightDM greeter is not enabled by default, + because it has numerous issues in NixOS and isn't optimal for use here + yet. + + + + + A major refactoring of the Kubernetes module has been completed. + Refactorings primarily focus on decoupling components and enhancing + security. Two-way TLS and RBAC has been enabled by default for all + components, which slightly changes the way the module is configured. See: + for details. + + + + + There is now a set of options for + , which allows to restrict services + into a + chroot + 2 + ed environment that only contains the store paths from + the runtime closure of the service. + + + + + A UEFI installer image for Aarch64 is now + + built by Hydra. + It should work on all devices with a UEFI implementation + such as upstream u-boot. +
@@ -62,28 +89,94 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-19.03-new-services"> - New Services - + xml:id="sec-release-19.03-new-modules"> + New Modules - The following new services were added since the last release: + The following new modules were added since the last release: - - ./programs/nm-applet.nix - - - + security/google_oslogin.nix There is a new security.googleOsLogin module for using - OS Login - to manage SSH access to Google Compute Engine instances, which supersedes - the imperative and broken google-accounts-daemon used - in nixos/modules/virtualisation/google-compute-config.nix. + OS + Login to manage SSH access to Google Compute Engine instances, + which supersedes the imperative and broken + google-accounts-daemon used in + nixos/modules/virtualisation/google-compute-config.nix. + + + services/misc/beanstalkd.nix + + There is a new services.cockroachdb module for running + CockroachDB databases. NixOS now ships with CockroachDB 2.1.x as well, + available on x86_64-linux and + aarch64-linux. + + + + + + security/duosec.nix + + + The PAM module for Duo + Security has been enabled for use. One can configure it using the + options along with the corresponding PAM + option in + . + + + + + + Besides the existing module which + targets Prometheus-1 a new module + has been added which targets Prometheus-2. + + + Both modules can be enabled at the same time. In fact + + this is needed for upgrading existing Prometheus-1 data to Prometheus-2 + . + + + config/appstream.nix + config/xdg/sounds.nix + hardware/acpilight.nix + hardware/ledger.nix + programs/dmrconfig.nix + programs/iotop.nix + programs/mininet.nix + programs/nm-applet.nix + programs/wavemon.nix + security/google_oslogin.nix + security/misc.nix + services/desktops/gnome3/rygel.nix + services/desktops/gsignond.nix + services/hardware/bolt.nix + services/hardware/lirc.nix + services/hardware/ratbagd.nix + services/hardware/triggerhappy.nix + services/hardware/vdr.nix + services/mail/davmail.nix + services/mail/roundcube.nix + services/mail/rss2email.nix + services/misc/beanstalkd.nix + services/misc/bees.nix + services/misc/headphones.nix + services/misc/lidarr.nix + services/misc/sickbeard.nix + services/misc/weechat.nix + services/misc/zoneminder.nix + services/monitoring/alerta.nix + services/monitoring/kapacitor.nix + services/networking/iperf3.nix + services/networking/knot.nix +
@@ -146,22 +239,37 @@ - The Syncthing state and configuration data has been moved from - services.syncthing.dataDir to the newly defined - services.syncthing.configDir, which default to - /var/lib/syncthing/.config/syncthing. - This change makes possible to share synced directories using ACLs - without Syncthing resetting the permission on every start. + The buildPythonPackage function now sets + strictDeps = true to help distinguish between native + and non-native dependencies in order to improve cross-compilation + compatibility. Note however that this may break user expressions. - The ntp module now has sane default restrictions. - If you're relying on the previous defaults, which permitted all queries - and commands from all firewall-permitted sources, you can set - services.ntp.restrictDefault and - services.ntp.restrictSource to - []. + The buildPythonPackage function now sets LANG + = C.UTF-8 to enable Unicode support. The + glibcLocales package is no longer needed as a build + input. + + + + + The Syncthing state and configuration data has been moved from + services.syncthing.dataDir to the newly defined + services.syncthing.configDir, which default to + /var/lib/syncthing/.config/syncthing. This change makes + possible to share synced directories using ACLs without Syncthing + resetting the permission on every start. + + + + + The ntp module now has sane default restrictions. If + you're relying on the previous defaults, which permitted all queries and + commands from all firewall-permitted sources, you can set + services.ntp.restrictDefault and + services.ntp.restrictSource to []. @@ -189,17 +297,21 @@ - Options - services.znc.confOptions.networks.name.userName and - services.znc.confOptions.networks.name.modulePackages - were removed. They were never used for anything and can therefore safely be removed. + Options + services.znc.confOptions.networks.name.userName + and + services.znc.confOptions.networks.name.modulePackages + were removed. They were never used for anything and can therefore safely + be removed. - Package wasm has been renamed proglodyte-wasm. The package - wasm will be pointed to ocamlPackages.wasm in 19.09, so - make sure to update your configuration if you want to keep proglodyte-wasm + Package wasm has been renamed + proglodyte-wasm. The package wasm + will be pointed to ocamlPackages.wasm in 19.09, so make + sure to update your configuration if you want to keep + proglodyte-wasm @@ -221,43 +333,47 @@ The versioned postgresql have been renamed to use - underscore number seperators. For example, postgresql96 + underscore number separators. For example, postgresql96 has been renamed to postgresql_9_6. - Package consul-ui and passthrough consul.ui have been removed. - The package consul now uses upstream releases that vendor the UI into the binary. - See #48714 + Package consul-ui and passthrough + consul.ui have been removed. The package + consul now uses upstream releases that vendor the UI + into the binary. See + #48714 for details. - Slurm introduces the new option - services.slurm.stateSaveLocation, - which is now set to /var/spool/slurm by default - (instead of /var/spool). - Make sure to move all files to the new directory or to set the option accordingly. + Slurm introduces the new option + services.slurm.stateSaveLocation, which is now set to + /var/spool/slurm by default (instead of + /var/spool). Make sure to move all files to the new + directory or to set the option accordingly. - The slurmctld now runs as user slurm instead of root. - If you want to keep slurmctld running as root, set - services.slurm.user = root. + The slurmctld now runs as user slurm instead of + root. If you want to keep slurmctld running as + root, set services.slurm.user = + root. - The options services.slurm.nodeName and - services.slurm.partitionName are now sets of - strings to correctly reflect that fact that each of these - options can occour more than once in the configuration. + The options services.slurm.nodeName and + services.slurm.partitionName are now sets of strings to + correctly reflect that fact that each of these options can occour more + than once in the configuration. - The solr package has been upgraded from 4.10.3 to 7.5.0 and has undergone - some major changes. The services.solr module has been updated to reflect - these changes. Please review http://lucene.apache.org/solr/ carefully before upgrading. + The solr package has been upgraded from 4.10.3 to 7.5.0 + and has undergone some major changes. The services.solr + module has been updated to reflect these changes. Please review + http://lucene.apache.org/solr/ carefully before upgrading. @@ -269,46 +385,49 @@ - The option services.xserver.displayManager.job.logToFile which was + The option + services.xserver.displayManager.job.logToFile which was previously set to true when using the display managers - lightdm, sddm or xpra has been - reset to the default value (false). + lightdm, sddm or + xpra has been reset to the default value + (false). Network interface indiscriminate NixOS firewall options - (networking.firewall.allow*) are now preserved when also - setting interface specific rules such as networking.firewall.interfaces.en0.allow*. - These rules continue to use the pseudo device "default" - (networking.firewall.interfaces.default.*), and assigning - to this pseudo device will override the (networking.firewall.allow*) - options. - - - - + (networking.firewall.allow*) are now preserved when + also setting interface specific rules such as + networking.firewall.interfaces.en0.allow*. These rules + continue to use the pseudo device "default" + (networking.firewall.interfaces.default.*), and + assigning to this pseudo device will override the + (networking.firewall.allow*) options. + + + + The nscd service now disables all caching of passwd and group databases by default. This was interferring with the correct functioning of the libnss_systemd.so module which is used by systemd to manage uids and usernames in the presence of - DynamicUser= in systemd services. This was already the + DynamicUser= in systemd services. This was already the default behaviour in presence of services.sssd.enable = - true because nscd caching would interfere with - sssd in unpredictable ways as well. Because we're - using nscd not for caching, but for convincing glibc to find NSS modules - in the nix store instead of an absolute path, we have decided to disable - caching globally now, as it's usually not the behaviour the user wants and - can lead to surprising behaviour. Furthermore, negative caching of host + true because nscd caching would interfere with + sssd in unpredictable ways as well. Because we're using + nscd not for caching, but for convincing glibc to find NSS modules in the + nix store instead of an absolute path, we have decided to disable caching + globally now, as it's usually not the behaviour the user wants and can + lead to surprising behaviour. Furthermore, negative caching of host lookups is also disabled now by default. This should fix the issue of dns lookups failing in the presence of an unreliable network. - - - If the old behaviour is desired, this can be restored by setting - the services.nscd.config option - with the desired caching parameters. - + + + If the old behaviour is desired, this can be restored by setting the + services.nscd.config option with the desired caching + parameters. + services.nscd.config = '' server-user nscd @@ -341,90 +460,142 @@ shared hosts yes ''; - See #50316 + See + #50316 for details. - - - - + + + + GitLab Shell previously used the nix store paths for the gitlab-shell command in its authorized_keys file, which might stop working after garbage collection. To circumvent that, we regenerated that file on each - startup. As gitlab-shell has now been changed to use + startup. As gitlab-shell has now been changed to use /var/run/current-system/sw/bin/gitlab-shell, this is not necessary anymore, but there might be leftover lines with a nix store path. Regenerate the authorized_keys file via sudo -u git -H gitlab-rake gitlab:shell:setup in that case. - - - - + + + + The pam_unix account module is now loaded with its control field set to required instead of sufficient, so that later PAM account modules that - might do more extensive checks are being executed. - Previously, the whole account module verification was exited prematurely - in case a nss module provided the account name to - pam_unix. - The LDAP and SSSD NixOS modules already add their NSS modules when - enabled. In case your setup breaks due to some later PAM account module - previosuly shadowed, or failing NSS lookups, please file a bug. You can - get back the old behaviour by manually setting - .text]]>. - - - - - The pam_unix password module is now loaded with its - control field set to sufficient instead of - required, so that password managed only - by later PAM password modules are being executed. - Previously, for example, changing an LDAP account's password through PAM - was not possible: the whole password module verification - was exited prematurely by pam_unix, - preventing pam_ldap to manage the password as it should. - - - - - fish has been upgraded to 3.0. - It comes with a number of improvements and backwards incompatible changes. - See the fish release notes for more information. + might do more extensive checks are being executed. Previously, the whole + account module verification was exited prematurely in case a nss module + provided the account name to pam_unix. The LDAP and + SSSD NixOS modules already add their NSS modules when enabled. In case + your setup breaks due to some later PAM account module previously + shadowed, or failing NSS lookups, please file a bug. You can get back the + old behaviour by manually setting +.text]]> + . - + - The ibus-table input method has had a change in config format, which - causes all previous settings to be lost. See - this commit message - for details. + The pam_unix password module is now loaded with its + control field set to sufficient instead of + required, so that password managed only by later PAM + password modules are being executed. Previously, for example, changing an + LDAP account's password through PAM was not possible: the whole password + module verification was exited prematurely by pam_unix, + preventing pam_ldap to manage the password as it + should. - - - - Support for NixOS module system type types.optionSet and - lib.mkOption argument options is removed. - Use types.submodule instead. - (#54637) - - - - - matrix-synapse has been updated to version 0.99. It will - no longer generate a self-signed certificate on first launch - and will be the last version to accept self-signed certificates. - As such, it is now recommended to use a proper certificate verified by a - root CA (for example Let's Encrypt). - - + + + + fish has been upgraded to 3.0. It comes with a number + of improvements and backwards incompatible changes. See the + fish + release + notes for more information. + + + + + The ibus-table input method has had a change in config format, which + causes all previous settings to be lost. See + this + commit message for details. + + + + + NixOS module system type types.optionSet and + lib.mkOption argument options are + deprecated. Use types.submodule instead. + (#54637) + + + + + matrix-synapse has been updated to version 0.99. It + will no + longer generate a self-signed certificate on first launch and will + be + the + last version to accept self-signed certificates. As such, it is now + recommended to use a proper certificate verified by a root CA (for example + Let's Encrypt). The new manual + chapter on Matrix contains a working example of using nginx as a + reverse proxy in front of matrix-synapse, using Let's + Encrypt certificates. + + mailutils now works by default when sendmail is not in a setuid wrapper. As a consequence, - the sendmailPath argument, having lost its main use, has - been removed. + the sendmailPath argument, having lost its main use, + has been removed. + + + + + graylog has been upgraded from version 2.* to 3.*. Some + setups making use of extraConfig (especially those exposing Graylog via + reverse proxies) need to be updated as upstream removed/replaced some + settings. See + Upgrading + Graylog for details. + + + + + The option users.ldap.bind.password was renamed to users.ldap.bind.passwordFile, + and needs to be readable by the nslcd user. + Same applies to the new users.ldap.daemon.rootpwmodpwFile option. + + + + + nodejs-6_x is end-of-life. + nodejs-6_x, nodejs-slim-6_x and + nodePackages_6_x are removed. + + + + + The directory where Prometheus will store its metric data is now + managed by systemd's StateDirectory mechanism. It still defaults + to /var/lib/prometheus. + + + Its location can be specified by the new + option which + defaults to prometheus. Note that this should + be a directory relative to /var/lib/. + + + The option has been + deprecated. You can still set it but it's now required to have + /var/lib/ as a prefix and you can't set + at the same time. @@ -441,129 +612,237 @@ The module gained the option - which determines the used - Matomo version. + which determines the used Matomo + version. - The Matomo module now also comes with the systemd service matomo-archive-processing.service - and a timer that automatically triggers archive processing every hour. - This means that you can safely + The Matomo module now also comes with the systemd service + matomo-archive-processing.service and a timer that + automatically triggers archive processing every hour. This means that you + can safely - disable browser triggers for Matomo archiving - at Administration > System > General Settings. + disable browser triggers for Matomo archiving at + Administration > System > General Settings. Additionally, you can enable to - delete old visitor logs - at Administration > System > Privacy, - but make sure that you run systemctl start matomo-archive-processing.service - at least once without errors if you have already collected data before, - so that the reports get archived before the source data gets deleted. + delete old visitor logs at Administration > System > + Privacy, but make sure that you run systemctl start + matomo-archive-processing.service at least once without errors + if you have already collected data before, so that the reports get + archived before the source data gets deleted. - composableDerivation along with supporting library functions - has been removed. + composableDerivation along with supporting library + functions has been removed. - The deprecated truecrypt package has been removed - and truecrypt attribute is now an alias for + The deprecated truecrypt package has been removed and + truecrypt attribute is now an alias for veracrypt. VeraCrypt is backward-compatible with - TrueCrypt volumes. Note that cryptsetup also - supports loading TrueCrypt volumes. + TrueCrypt volumes. Note that cryptsetup also supports + loading TrueCrypt volumes. - The Kubernetes DNS addons, kube-dns, has been replaced with CoreDNS. - This change is made in accordance with Kubernetes making CoreDNS the official default - starting from - Kubernetes v1.11. - Please beware that upgrading DNS-addon on existing clusters might induce - minor downtime while the DNS-addon terminates and re-initializes. - Also note that the DNS-service now runs with 2 pod replicas by default. - The desired number of replicas can be configured using: - . + The Kubernetes DNS addons, kube-dns, has been replaced with CoreDNS. This + change is made in accordance with Kubernetes making CoreDNS the official + default starting from + Kubernetes + v1.11. Please beware that upgrading DNS-addon on existing clusters + might induce minor downtime while the DNS-addon terminates and + re-initializes. Also note that the DNS-service now runs with 2 pod + replicas by default. The desired number of replicas can be configured + using: . - - The quassel-webserver package and module was removed from nixpkgs due to the lack - of maintainers. - - - - - The astah-community package was removed from nixpkgs due to it being discontinued and the downloads not being available anymore. - - - - - The httpd service now saves log files with a .log file extension by default for - easier integration with the logrotate service. - - - - - The owncloud server packages and httpd subservice module were removed - from nixpkgs due to the lack of maintainers. - - - - - It is possible now to uze ZRAM devices as general purpose ephemeral block devices, - not only as swap. Using more than 1 device as ZRAM swap is no longer recommended, - but is still possible by setting zramSwap.swapDevices explicitly. - - - Default algorithm for ZRAM swap was changed to zstd. - - - Changes to ZRAM algorithm are applied during nixos-rebuild switch, - so make sure you have enough swap space on disk to survive ZRAM device rebuild. Alternatively, - use nixos-rebuild boot; reboot. - + + The quassel-webserver package and module was removed from nixpkgs due to + the lack of maintainers. + - Flat volumes are now disabled by default in hardware.pulseaudio. - This has been done to prevent applications, which are unaware of this feature, setting - their volumes to 100% on startup causing harm to your audio hardware and potentially your ears. + The manual gained a new chapter on + self-hosting matrix-synapse and + riot-web , the most prevalent server and client + implementations for the + Matrix federated + communication network. + + + + + The astah-community package was removed from nixpkgs due to it being + discontinued and the downloads not being available anymore. + + + + + The httpd service now saves log files with a .log file extension by + default for easier integration with the logrotate service. + + + + + The owncloud server packages and httpd subservice module were removed from + nixpkgs due to the lack of maintainers. + + + + + It is possible now to uze ZRAM devices as general purpose ephemeral block + devices, not only as swap. Using more than 1 device as ZRAM swap is no + longer recommended, but is still possible by setting + zramSwap.swapDevices explicitly. + + + ZRAM algorithm can be changed now. + + + Changes to ZRAM algorithm are applied during nixos-rebuild + switch, so make sure you have enough swap space on disk to + survive ZRAM device rebuild. Alternatively, use nixos-rebuild + boot; reboot. + + + + + Flat volumes are now disabled by default in + hardware.pulseaudio. This has been done to prevent + applications, which are unaware of this feature, setting their volumes to + 100% on startup causing harm to your audio hardware and potentially your + ears. - With this change application specific volumes are relative to the master volume which can be - adjusted independently, whereas before they were absolute; meaning that in effect, it scaled the - device-volume with the volume of the loudest application. + With this change application specific volumes are relative to the master + volume which can be adjusted independently, whereas before they were + absolute; meaning that in effect, it scaled the device-volume with the + volume of the loudest application. - The ndppd module - now supports all config options provided by the current - upstream version as service options. Additionally the ndppd package doesn't contain - the systemd unit configuration from upstream anymore, the unit is completely configured by the NixOS module now. + The + ndppd + module now supports all config + options provided by the current upstream version as service + options. Additionally the ndppd package doesn't contain + the systemd unit configuration from upstream anymore, the unit is + completely configured by the NixOS module now. - New installs of NixOS will default to the Redmine 4.x series unless otherwise specified in - services.redmine.package while existing installs of NixOS will default to - the Redmine 3.x series. + New installs of NixOS will default to the Redmine 4.x series unless + otherwise specified in services.redmine.package while + existing installs of NixOS will default to the Redmine 3.x series. - The Grafana module now supports declarative - datasource and dashboard - provisioning. + The Grafana module now + supports declarative + datasource + and dashboard provisioning. + + + The use of insecure ports on kubernetes has been deprecated. Thus options: + services.kubernetes.apiserver.port and + services.kubernetes.controllerManager.port has been + renamed to .insecurePort, and default of both options + has changed to 0 (disabled). + + + + + The default value of + services.kubernetes.apiserver.bindAddress has changed + from 127.0.0.1 to 0.0.0.0, allowing the apiserver to be accessible from + outside the master node itself. If the apiserver insecurePort is enabled, + it is strongly recommended to only bind on the loopback interface. See: + services.kubernetes.apiserver.insecurebindAddress. + + + + + The option + services.kubernetes.apiserver.allowPrivileged and + services.kubernetes.kubelet.allowPrivileged now + defaults to false. Disallowing privileged containers on the cluster. + + + + + The kubernetes module no longer adds the kubernetes package to + environment.systemPackages implicitly. + + + + + The intel driver has been removed from the default list + of X.org video + drivers. The modesetting driver should take over + automatically, it is better maintained upstream and has less problems with + advanced X11 features. This can lead to a change in the output names used + by xrandr. Some performance regressions on some GPU + models might happen. Some OpenCL and VA-API applications might also break + (Beignet seems to provide OpenCL support with + modesetting driver, too). Kernel mode setting API does + not support backlight control, so xbacklight tool will + not work; backlight level can be controlled directly via + /sys/ or with brightnessctl or + light. Users + who need this functionality more than multi-output XRandR are advised to + add intel to videoDrivers and report + an issue (or provide additional details in an existing one). + + + + + Openmpi has been updated to version 4.0.0, which removes some deprecated + MPI-1 symbols. This may break some older applications that still rely on + those symbols. An upgrade guide can be found + here. + + + + + The nginx package now relies on OpenSSL 1.1 and supports TLS 1.3 by + default. You can set the protocols used by the nginx service using + . + + + + + A new subcommand nixos-rebuild edit was added. + + + + + stdenv.mkDerivation may now be passed + pname and version attributes + instead of name, and will now automatically + construct the package name by joining them with a dash. + + + + + The Sway tiling Wayland compositor has been updated to version 1.0, and the + corresponding NixOS module has been refined to fix some bugs. + +
diff --git a/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix b/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix new file mode 100644 index 000000000000..37b46db059c0 --- /dev/null +++ b/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix @@ -0,0 +1,23 @@ +# nix-build '' -A config.system.build.cloudstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/cloudstack/cloudstack-image.nix ]; }" + +{ config, lib, pkgs, ... }: + +with lib; + +{ + imports = + [ ../../../modules/virtualisation/cloudstack-config.nix ]; + + system.build.cloudstackImage = import ../../../lib/make-disk-image.nix { + inherit lib config pkgs; + diskSize = 8192; + format = "qcow2"; + configFile = pkgs.writeText "configuration.nix" + '' + { + imports = [ ]; + } + ''; + }; + +} diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index eeae27ede0f8..88d95e675447 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -53,6 +53,7 @@ in { pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package partitionTableType = if config.ec2.hvm then "legacy" else "none"; diskSize = cfg.sizeMB; + fsType = "ext4"; configFile = pkgs.writeText "configuration.nix" '' { diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix index 7e05e77d967a..2c18244621af 100644 --- a/nixos/modules/config/fonts/fontconfig-penultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix @@ -55,7 +55,9 @@ let localConf = pkgs.writeText "fc-local.conf" cfg.localConf; # The configuration to be included in /etc/font/ - penultimateConf = pkgs.runCommand "font-penultimate-conf" {} '' + penultimateConf = pkgs.runCommand "font-penultimate-conf" { + preferLocalBuild = true; + } '' support_folder=$out/etc/fonts/conf.d latest_folder=$out/etc/fonts/${latestVersion}/conf.d diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix index 7549dc6c0651..45328f3eaf13 100644 --- a/nixos/modules/config/fonts/fontconfig-ultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix @@ -7,7 +7,7 @@ let cfg = config.fonts.fontconfig.ultimate; latestVersion = pkgs.fontconfig.configVersion; # The configuration to be included in /etc/font/ - confPkg = pkgs.runCommand "font-ultimate-conf" {} '' + confPkg = pkgs.runCommand "font-ultimate-conf" { preferLocalBuild = true; } '' support_folder=$out/etc/fonts/conf.d latest_folder=$out/etc/fonts/${latestVersion}/conf.d diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 12f5ca2e7993..d79c43c0b5b9 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -190,7 +190,7 @@ let cfg = config.fonts.fontconfig; ''; # fontconfig configuration package - confPkg = pkgs.runCommand "fontconfig-conf" {} '' + confPkg = pkgs.runCommand "fontconfig-conf" { preferLocalBuild = true; } '' support_folder=$out/etc/fonts latest_folder=$out/etc/fonts/${latestVersion} diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix index 180e38f81f4f..cc70fbf8744d 100644 --- a/nixos/modules/config/fonts/fontdir.nix +++ b/nixos/modules/config/fonts/fontdir.nix @@ -4,7 +4,7 @@ with lib; let - x11Fonts = pkgs.runCommand "X11-fonts" { } '' + x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } '' mkdir -p "$out/share/X11-fonts" find ${toString config.fonts.fonts} \ \( -name fonts.dir -o -name '*.ttf' -o -name '*.otf' \) \ diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index f65a3fc50d54..e008497a2a6e 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -27,25 +27,29 @@ let ''; }; - nslcdConfig = { - target = "nslcd.conf"; - source = writeText "nslcd.conf" '' - uid nslcd - gid nslcd - uri ${cfg.server} - base ${cfg.base} - timelimit ${toString cfg.timeLimit} - bind_timelimit ${toString cfg.bind.timeLimit} - ${optionalString (cfg.bind.distinguishedName != "") - "binddn ${cfg.bind.distinguishedName}" } - ${optionalString (cfg.daemon.rootpwmoddn != "") - "rootpwmoddn ${cfg.daemon.rootpwmoddn}" } - ${optionalString (cfg.daemon.extraConfig != "") cfg.daemon.extraConfig } - ''; - }; + nslcdConfig = writeText "nslcd.conf" '' + uid nslcd + gid nslcd + uri ${cfg.server} + base ${cfg.base} + timelimit ${toString cfg.timeLimit} + bind_timelimit ${toString cfg.bind.timeLimit} + ${optionalString (cfg.bind.distinguishedName != "") + "binddn ${cfg.bind.distinguishedName}" } + ${optionalString (cfg.daemon.rootpwmoddn != "") + "rootpwmoddn ${cfg.daemon.rootpwmoddn}" } + ${optionalString (cfg.daemon.extraConfig != "") cfg.daemon.extraConfig } + ''; - insertLdapPassword = !config.users.ldap.daemon.enable && - config.users.ldap.bind.distinguishedName != ""; + # nslcd normally reads configuration from /etc/nslcd.conf. + # this file might contain secrets. We append those at runtime, + # so redirect its location to something more temporary. + nslcdWrapped = runCommandNoCC "nslcd-wrapped" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p $out/bin + makeWrapper ${nss_pam_ldapd}/sbin/nslcd $out/bin/nslcd \ + --set LD_PRELOAD "${pkgs.libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS "/etc/nslcd.conf=/run/nslcd/nslcd.conf" + ''; in @@ -139,13 +143,13 @@ in ''; }; - rootpwmodpw = mkOption { + rootpwmodpwFile = mkOption { default = ""; example = "/run/keys/nslcd.rootpwmodpw"; type = types.str; description = '' - The path to a file containing the credentials with which - to bind to the LDAP server if the root user tries to change a user's password + The path to a file containing the credentials with which to bind to + the LDAP server if the root user tries to change a user's password. ''; }; }; @@ -161,7 +165,7 @@ in ''; }; - password = mkOption { + passwordFile = mkOption { default = "/etc/ldap/bind.password"; type = types.str; description = '' @@ -220,14 +224,14 @@ in config = mkIf cfg.enable { - environment.etc = if cfg.daemon.enable then [nslcdConfig] else [ldapConfig]; + environment.etc = optional (!cfg.daemon.enable) ldapConfig; - system.activationScripts = mkIf insertLdapPassword { + system.activationScripts = mkIf (!cfg.daemon.enable) { ldap = stringAfter [ "etc" "groups" "users" ] '' - if test -f "${cfg.bind.password}" ; then + if test -f "${cfg.bind.passwordFile}" ; then umask 0077 conf="$(mktemp)" - printf 'bindpw %s\n' "$(cat ${cfg.bind.password})" | + printf 'bindpw %s\n' "$(cat ${cfg.bind.passwordFile})" | cat ${ldapConfig.source} - >"$conf" mv -fT "$conf" /etc/ldap.conf fi @@ -251,7 +255,6 @@ in }; systemd.services = mkIf cfg.daemon.enable { - nslcd = { wantedBy = [ "multi-user.target" ]; @@ -259,32 +262,32 @@ in umask 0077 conf="$(mktemp)" { - cat ${nslcdConfig.source} - test -z '${cfg.bind.distinguishedName}' -o ! -f '${cfg.bind.password}' || - printf 'bindpw %s\n' "$(cat '${cfg.bind.password}')" - test -z '${cfg.daemon.rootpwmoddn}' -o ! -f '${cfg.daemon.rootpwmodpw}' || - printf 'rootpwmodpw %s\n' "$(cat '${cfg.daemon.rootpwmodpw}')" + cat ${nslcdConfig} + test -z '${cfg.bind.distinguishedName}' -o ! -f '${cfg.bind.passwordFile}' || + printf 'bindpw %s\n' "$(cat '${cfg.bind.passwordFile}')" + test -z '${cfg.daemon.rootpwmoddn}' -o ! -f '${cfg.daemon.rootpwmodpwFile}' || + printf 'rootpwmodpw %s\n' "$(cat '${cfg.daemon.rootpwmodpwFile}')" } >"$conf" - mv -fT "$conf" /etc/nslcd.conf + mv -fT "$conf" /run/nslcd/nslcd.conf ''; - - # NOTE: because one cannot pass a custom config path to `nslcd` - # (which is only able to use `/etc/nslcd.conf`) - # changes in `nslcdConfig` won't change `serviceConfig`, - # and thus won't restart `nslcd`. - # Therefore `restartTriggers` is used on `/etc/nslcd.conf`. - restartTriggers = [ nslcdConfig.source ]; + restartTriggers = [ "/run/nslcd/nslcd.conf" ]; serviceConfig = { - ExecStart = "${nss_pam_ldapd}/sbin/nslcd"; + ExecStart = "${nslcdWrapped}/bin/nslcd"; Type = "forking"; - PIDFile = "/run/nslcd/nslcd.pid"; Restart = "always"; + User = "nslcd"; + Group = "nslcd"; RuntimeDirectory = [ "nslcd" ]; + PIDFile = "/run/nslcd/nslcd.pid"; }; }; }; }; + + imports = + [ (mkRenamedOptionModule [ "users" "ldap" "bind" "password"] [ "users" "ldap" "bind" "passwordFile"]) + ]; } diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 37e66c645429..aad02a9ca4e3 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -34,7 +34,7 @@ with lib; networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; }; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; - pinentry = super.pinentry_ncurses; + pinentry = super.pinentry.override { gtk2 = null; gcr = null; qt = null; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; })); }; diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index b601e908e49f..13277fe56e42 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -61,6 +61,15 @@ in { }; }; + system.nssHosts = mkOption { + type = types.listOf types.str; + default = []; + example = [ "mdns" ]; + description = '' + List of host entries to configure in /etc/nsswitch.conf. + ''; + }; + }; config = { @@ -85,7 +94,7 @@ in { group: ${concatStringsSep " " passwdArray} shadow: ${concatStringsSep " " shadowArray} - hosts: ${concatStringsSep " " hostArray} + hosts: ${concatStringsSep " " config.system.nssHosts} networks: files ethers: files @@ -94,6 +103,8 @@ in { rpc: files ''; + system.nssHosts = hostArray; + # Systemd provides nss-myhostname to ensure that our hostname # always resolves to a valid IP address. It returns all locally # configured IP addresses, or ::1 and 127.0.0.2 as diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 7a65e44e828d..fae2fc740082 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -7,7 +7,7 @@ with lib; let - requiredPackages = map lib.lowPrio + requiredPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg) [ config.nix.package pkgs.acl pkgs.attr diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index c3f228c9bcc4..25f1c67ce830 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -564,7 +564,10 @@ in { }; }) (filterAttrs (_: u: u.packages != []) cfg.users)); - environment.profiles = [ "/etc/profiles/per-user/$USER" ]; + environment.profiles = [ + "$HOME/.nix-profile" + "/etc/profiles/per-user/$USER" + ]; assertions = [ { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique); diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index 925d945c081e..5d411c73a560 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -91,13 +91,13 @@ in }; algorithm = mkOption { - default = "zstd"; - example = "lzo"; + default = "lzo"; + example = "lz4"; type = with types; either (enum [ "lzo" "lz4" "zstd" ]) str; description = '' Compression algorithm. lzo has good compression, but is slow. lz4 has bad compression, but is fast. - zstd is both good compression and fast. + zstd is both good compression and fast, but requires newer kernel. You can check what other algorithms are supported by your zram device with cat /sys/class/block/zram*/comp_algorithm ''; diff --git a/nixos/modules/hardware/acpilight.nix b/nixos/modules/hardware/acpilight.nix new file mode 100644 index 000000000000..34e8a2220965 --- /dev/null +++ b/nixos/modules/hardware/acpilight.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.hardware.acpilight; +in +{ + options = { + hardware.acpilight = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enable acpilight. + This will allow brightness control via xbacklight from users in the video group + ''; + }; + }; + }; + + config = mkIf cfg.enable { + services.udev.packages = with pkgs; [ acpilight ]; + }; +} diff --git a/nixos/modules/hardware/ledger.nix b/nixos/modules/hardware/ledger.nix new file mode 100644 index 000000000000..41abe74315a0 --- /dev/null +++ b/nixos/modules/hardware/ledger.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.ledger; + +in { + options.hardware.ledger.enable = mkEnableOption "udev rules for Ledger devices"; + + config = mkIf cfg.enable { + services.udev.packages = [ pkgs.ledger-udev-rules ]; + }; +} diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 6ba8130af71f..80ea7bc5d5c9 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -172,6 +172,11 @@ in environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ]; + systemd.tmpfiles.rules = optional config.virtualisation.docker.enableNvidia + "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin" + ++ optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia) + "L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced"; + boot.extraModulePackages = [ nvidia_x11.bin ]; # nvidia-uvm is required by CUDA applications. diff --git a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix index 2cf5f13bc159..a808429c9996 100644 --- a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix +++ b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix @@ -29,6 +29,7 @@ runCommand "uvcdynctrl-udev-rules-${version}" ]; dontPatchELF = true; dontStrip = true; + preferLocalBuild = true; } '' mkdir -p "$out/lib/udev" diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index e946c4abc576..ab5e7c0645f3 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -13,7 +13,7 @@ let # user, as expected by nixos-rebuild/nixos-install. FIXME: merge # with make-channel.nix. channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}" - { } + { preferLocalBuild = true; } '' mkdir -p $out cp -prd ${nixpkgs.outPath} $out/nixos diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index 228ef371d252..917b3758d384 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -31,6 +31,10 @@ with lib; # there is no power management backend such as upower). powerManagement.enable = true; + # Enable sound in graphical iso's. + hardware.pulseaudio.enable = true; + hardware.pulseaudio.systemWide = true; # Needed since we run plasma as root. + environment.systemPackages = [ # Include gparted for partitioning disks. pkgs.gparted diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index e78e290e7438..fd780be20825 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -88,7 +88,7 @@ let # result in incorrect boot entries. baseIsolinuxCfg = '' - SERIAL 0 38400 + SERIAL 0 115200 TIMEOUT ${builtins.toString syslinuxTimeout} UI vesamenu.c32 MENU TITLE NixOS @@ -165,6 +165,8 @@ let else "# No refind for ${targetArch}" ; + + grubPkgs = if config.boot.loader.grub.forcei686 then pkgs.pkgsi686Linux else pkgs; grubMenuCfg = '' # @@ -241,7 +243,7 @@ let # Modules that may or may not be available per-platform. echo "Adding additional modules:" for mod in efi_uga; do - if [ -f ${pkgs.grub2_efi}/lib/grub/${pkgs.grub2_efi.grubTarget}/$mod.mod ]; then + if [ -f ${grubPkgs.grub2_efi}/lib/grub/${grubPkgs.grub2_efi.grubTarget}/$mod.mod ]; then echo " - $mod" MODULES+=" $mod" fi @@ -249,9 +251,9 @@ let # Make our own efi program, we can't rely on "grub-install" since it seems to # probe for devices, even with --skip-fs-probe. - ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/boot${targetArch}.efi -p /EFI/boot -O ${pkgs.grub2_efi.grubTarget} \ + ${grubPkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/boot${targetArch}.efi -p /EFI/boot -O ${grubPkgs.grub2_efi.grubTarget} \ $MODULES - cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/ + cp ${grubPkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/ cat < $out/EFI/boot/grub.cfg @@ -362,7 +364,7 @@ let # Name used by UEFI for architectures. targetArch = - if pkgs.stdenv.isi686 then + if pkgs.stdenv.isi686 || config.boot.loader.grub.forcei686 then "ia32" else if pkgs.stdenv.isx86_64 then "x64" @@ -506,7 +508,7 @@ in # here and it causes a cyclic dependency. boot.loader.grub.enable = false; - environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi ] + environment.systemPackages = [ grubPkgs.grub2 grubPkgs.grub2_efi ] ++ optional canx86BiosBoot pkgs.syslinux ; diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 5d431df4b114..b9ab2053c41f 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/pid1yakjasch4pwl63nzbj22z9zf0q26-nix-2.2"; - i686-linux = "/nix/store/qpkl0cxy0xh4h432lv2qsjrmhvx5x2vy-nix-2.2"; - aarch64-linux = "/nix/store/0jg7h94x986d8cskg6gcfza9x67spdbp-nix-2.2"; - x86_64-darwin = "/nix/store/a48whqkmxnsfhwbk6nay74iyc1cf0lr2-nix-2.2"; + x86_64-linux = "/nix/store/hbhdjn5ik3byg642d1m11k3k3s0kn3py-nix-2.2.2"; + i686-linux = "/nix/store/fz5cikwvj3n0a6zl44h6l2z3cin64mda-nix-2.2.2"; + aarch64-linux = "/nix/store/2gba4cyl4wvxzfbhmli90jy4n5aj0kjj-nix-2.2.2"; + x86_64-darwin = "/nix/store/87i4fp46jfw9yl8c7i9gx75m5yph7irl-nix-2.2.2"; } diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 686204ee0342..18ca9626ab0e 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -258,6 +258,16 @@ foreach my $path (glob "/sys/class/{block,mmc_host}/*") { } } +# Add bcache module, if needed. +my @bcacheDevices = glob("/dev/bcache*"); +if (scalar @bcacheDevices > 0) { + push @initrdAvailableKernelModules, "bcache"; +} + +# Prevent unbootable systems if LVM snapshots are present at boot time. +if (`lsblk -o TYPE` =~ "lvm") { + push @initrdKernelModules, "dm-snapshot"; +} my $virt = `systemd-detect-virt`; chomp $virt; @@ -319,10 +329,19 @@ my @swapDevices; if (@swaps) { shift @swaps; foreach my $swap (@swaps) { - $swap =~ /^(\S+)\s/; - next unless -e $1; - my $dev = findStableDevPath $1; - push @swapDevices, "{ device = \"$dev\"; }"; + my @fields = split ' ', $swap; + my $swapFilename = $fields[0]; + my $swapType = $fields[1]; + next unless -e $swapFilename; + my $dev = findStableDevPath $swapFilename; + if ($swapType =~ "partition") { + push @swapDevices, "{ device = \"$dev\"; }"; + } elsif ($swapType =~ "file") { + # swap *files* are more likely specified in configuration.nix, so + # ignore them here. + } else { + die "Unsupported swap type: $swapType\n"; + } } } @@ -422,6 +441,10 @@ EOF } } + # Don't emit tmpfs entry for /tmp, because it most likely comes from the + # boot.tmpOnTmpfs option in configuration.nix (managed declaratively). + next if ($mountPoint eq "/tmp" && $fsType eq "tmpfs"); + # Emit the filesystem. $fileSystems .= <&2 diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index 2e1b4b3998b5..af3e1aecca71 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -57,7 +57,5 @@ with lib; # Enable the OpenSSH daemon. # services.openssh.enable = true; - - system.stateVersion = mkDefault "18.03"; ''; } diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix index 6e0b49fa9af0..3c47e79d0512 100644 --- a/nixos/modules/misc/crashdump.nix +++ b/nixos/modules/misc/crashdump.nix @@ -58,7 +58,6 @@ in "crashkernel=${crashdump.reservedMemory}" "nmi_watchdog=panic" "softlockup_panic=1" - "idle=poll" ]; kernelPatches = [ { name = "crashdump-config"; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 5f134b51939c..e78673514e3b 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -272,7 +272,7 @@ nzbget = 245; mosquitto = 246; toxvpn = 247; - squeezelite = 248; + # squeezelite = 248; # DynamicUser = true turnserver = 249; smokeping = 250; gocd-agent = 251; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 3a717fddaba2..6c1b519720b8 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -19,7 +19,7 @@ let lhs = optCall lhs_ { inherit pkgs; }; rhs = optCall rhs_ { inherit pkgs; }; in - lhs // rhs // + recursiveUpdate lhs rhs // optionalAttrs (lhs ? packageOverrides) { packageOverrides = pkgs: optCall lhs.packageOverrides pkgs // @@ -195,7 +195,6 @@ in system = mkOption { type = types.str; example = "i686-linux"; - default = { system = builtins.currentSystem; }; description = '' Specifies the Nix platform type on which NixOS should be built. It is better to specify nixpkgs.localSystem instead. diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index c576cf4cb925..9ef736e2ad06 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -66,7 +66,7 @@ in defaultChannel = mkOption { internal = true; type = types.str; - default = https://nixos.org/channels/nixos-unstable; + default = https://nixos.org/channels/nixos-19.03; description = "Default NixOS channel to which the root user is subscribed."; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8a9a936d3b20..c4e88255ea00 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -35,6 +35,7 @@ ./config/users-groups.nix ./config/vpnc.nix ./config/zram.nix + ./hardware/acpilight.nix ./hardware/all-firmware.nix ./hardware/bladeRF.nix ./hardware/brightnessctl.nix @@ -44,8 +45,10 @@ ./hardware/digitalbitbox.nix ./hardware/sensor/iio.nix ./hardware/ksm.nix + ./hardware/ledger.nix ./hardware/mcelog.nix ./hardware/network/b43.nix + ./hardware/network/intel-2200bg.nix ./hardware/nitrokey.nix ./hardware/opengl.nix ./hardware/pcmcia.nix @@ -128,7 +131,6 @@ ./programs/sysdig.nix ./programs/systemtap.nix ./programs/sway.nix - ./programs/sway-beta.nix ./programs/thefuck.nix ./programs/tmux.nix ./programs/udevil.nix @@ -170,6 +172,7 @@ ./security/rtkit.nix ./security/wrappers/default.nix ./security/sudo.nix + ./security/systemd-confinement.nix ./services/admin/oxidized.nix ./services/admin/salt/master.nix ./services/admin/salt/minion.nix @@ -183,6 +186,7 @@ ./services/audio/slimserver.nix ./services/audio/squeezelite.nix ./services/audio/ympd.nix + ./services/backup/automysqlbackup.nix ./services/backup/bacula.nix ./services/backup/borgbackup.nix ./services/backup/duplicati.nix @@ -196,9 +200,17 @@ ./services/backup/tarsnap.nix ./services/backup/znapzend.nix ./services/cluster/hadoop/default.nix + ./services/cluster/kubernetes/addons/dns.nix + ./services/cluster/kubernetes/addons/dashboard.nix + ./services/cluster/kubernetes/addon-manager.nix + ./services/cluster/kubernetes/apiserver.nix + ./services/cluster/kubernetes/controller-manager.nix ./services/cluster/kubernetes/default.nix - ./services/cluster/kubernetes/dns.nix - ./services/cluster/kubernetes/dashboard.nix + ./services/cluster/kubernetes/flannel.nix + ./services/cluster/kubernetes/kubelet.nix + ./services/cluster/kubernetes/pki.nix + ./services/cluster/kubernetes/proxy.nix + ./services/cluster/kubernetes/scheduler.nix ./services/computing/boinc/client.nix ./services/computing/torque/server.nix ./services/computing/torque/mom.nix @@ -284,6 +296,7 @@ ./services/hardware/acpid.nix ./services/hardware/actkbd.nix ./services/hardware/bluetooth.nix + ./services/hardware/bolt.nix ./services/hardware/brltty.nix ./services/hardware/freefall.nix ./services/hardware/fwupd.nix @@ -327,6 +340,7 @@ ./services/logging/syslog-ng.nix ./services/logging/syslogd.nix ./services/mail/clamsmtp.nix + ./services/mail/davmail.nix ./services/mail/dkimproxy-out.nix ./services/mail/dovecot.nix ./services/mail/dspam.nix @@ -352,6 +366,7 @@ ./services/misc/apache-kafka.nix ./services/misc/autofs.nix ./services/misc/autorandr.nix + ./services/misc/beanstalkd.nix ./services/misc/bees.nix ./services/misc/bepasty.nix ./services/misc/canto-daemon.nix @@ -467,6 +482,7 @@ ./services/monitoring/prometheus/default.nix ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/prometheus/exporters.nix + ./services/monitoring/prometheus/pushgateway.nix ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-tools.nix @@ -562,6 +578,7 @@ ./services/networking/keepalived/default.nix ./services/networking/keybase.nix ./services/networking/kippo.nix + ./services/networking/knot.nix ./services/networking/kresd.nix ./services/networking/lambdabot.nix ./services/networking/libreswan.nix diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index fba756391b11..649f5564ac61 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/nixos/modules/profiles/graphical.nix @@ -14,5 +14,9 @@ libinput.enable = true; # for touchpad support on many laptops }; + # Enable sound in virtualbox appliances. + hardware.pulseaudio.enable = true; + hardware.pulseaudio.systemWide = true; # Needed since we run plasma as root. + environment.systemPackages = [ pkgs.glxinfo pkgs.firefox ]; } diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index d22f9dfa3199..d53c6b318f1d 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -102,7 +102,7 @@ in # Emacs term mode doesn't support xterm title escape sequence (\e]0;) PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] " else - PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] " + PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\\$\[\033[0m\] " fi if test "$TERM" = "xterm"; then PS1="\[\033]2;\h:\u:\w\007\]$PS1" diff --git a/nixos/modules/programs/browserpass.nix b/nixos/modules/programs/browserpass.nix index 5f8a44a9848e..47b9d1ccb1f6 100644 --- a/nixos/modules/programs/browserpass.nix +++ b/nixos/modules/programs/browserpass.nix @@ -4,15 +4,34 @@ with lib; { - ###### interface - options = { - programs.browserpass.enable = mkEnableOption "the NativeMessaging configuration for Chromium, Chrome, and Vivaldi."; - }; + options.programs.browserpass.enable = mkEnableOption "Browserpass native messaging host"; - ###### implementation config = mkIf config.programs.browserpass.enable { - environment.systemPackages = [ pkgs.browserpass ]; - environment.etc = { + environment.etc = let + appId = "com.github.browserpass.native.json"; + source = part: "${pkgs.browserpass}/lib/browserpass/${part}/${appId}"; + in { + # chromium + "chromium/native-messaging-hosts/${appId}".source = source "hosts/chromium"; + "chromium/policies/managed/${appId}".source = source "policies/chromium"; + + # chrome + "opt/chrome/native-messaging-hosts/${appId}".source = source "hosts/chromium"; + "opt/chrome/policies/managed/${appId}".source = source "policies/chromium"; + + # vivaldi + "opt/vivaldi/native-messaging-hosts/${appId}".source = source "hosts/chromium"; + "opt/vivaldi/policies/managed/${appId}".source = source "policies/chromium"; + + # brave + "opt/brave/native-messaging-hosts/${appId}".source = source "hosts/chromium"; + "opt/brave/policies/managed/${appId}".source = source "policies/chromium"; + } + # As with the v2 backwards compatibility in the pkgs.browserpass + # declaration, this part can be removed once the browser extension + # auto-updates to v3 (planned 2019-04-13, see + # https://github.com/browserpass/browserpass-native/issues/31) + // { "chromium/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json"; "chromium/policies/managed/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-policy.json"; "opt/chrome/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json"; diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 3c6d356ef998..4d762314298d 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -23,9 +23,8 @@ in XCURSOR_PATH = [ "$HOME/.icons" ]; }; - environment.profiles = - [ "$HOME/.nix-profile" - "/nix/var/nix/profiles/default" + environment.profiles = mkAfter + [ "/nix/var/nix/profiles/default" "/run/current-system/sw" ]; diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index b01de9efaa5e..22521280e936 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -85,11 +85,13 @@ in # SSH agent protocol doesn't support changing TTYs, so bind the agent # to every new TTY. ${pkgs.gnupg}/bin/gpg-connect-agent --quiet updatestartuptty /bye > /dev/null + ''); + environment.extraInit = mkIf cfg.agent.enableSSHSupport '' if [ -z "$SSH_AUTH_SOCK" ]; then export SSH_AUTH_SOCK=$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket) fi - ''); + ''; assertions = [ { assertion = cfg.agent.enableSSHSupport -> !config.programs.ssh.startAgent; diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix index d39103a58057..9fdf99e9c694 100644 --- a/nixos/modules/programs/less.nix +++ b/nixos/modules/programs/less.nix @@ -25,7 +25,7 @@ let ''; lessKey = pkgs.runCommand "lesskey" - { src = pkgs.writeText "lessconfig" configText; } + { src = pkgs.writeText "lessconfig" configText; preferLocalBuild = true; } "${pkgs.less}/bin/lesskey -o $out $src"; in diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix index 9842e2bef643..b7f7b91b5fbe 100644 --- a/nixos/modules/programs/shell.nix +++ b/nixos/modules/programs/shell.nix @@ -12,7 +12,7 @@ with lib; '' # Set up the per-user profile. mkdir -m 0755 -p "$NIX_USER_PROFILE_DIR" - if [ "$(stat --printf '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)" ]; then + if [ "$(stat -c '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)" ]; then echo "WARNING: the per-user profile dir $NIX_USER_PROFILE_DIR should belong to user id $(id -u)" >&2 fi @@ -34,7 +34,7 @@ with lib; # Create the per-user garbage collector roots directory. NIX_USER_GCROOTS_DIR="/nix/var/nix/gcroots/per-user/$USER" mkdir -m 0755 -p "$NIX_USER_GCROOTS_DIR" - if [ "$(stat --printf '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)" ]; then + if [ "$(stat -c '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)" ]; then echo "WARNING: the per-user gcroots dir $NIX_USER_GCROOTS_DIR should belong to user id $(id -u)" >&2 fi diff --git a/nixos/modules/programs/sway-beta.nix b/nixos/modules/programs/sway-beta.nix deleted file mode 100644 index 3c235de0ce63..000000000000 --- a/nixos/modules/programs/sway-beta.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.programs.sway-beta; - swayPackage = cfg.package; - - swayWrapped = pkgs.writeShellScriptBin "sway" '' - set -o errexit - - if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then - export _SWAY_WRAPPER_ALREADY_EXECUTED=1 - ${cfg.extraSessionCommands} - fi - - if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then - export DBUS_SESSION_BUS_ADDRESS - exec ${swayPackage}/bin/sway "$@" - else - exec ${pkgs.dbus}/bin/dbus-run-session ${swayPackage}/bin/sway "$@" - fi - ''; - swayJoined = pkgs.symlinkJoin { - name = "sway-joined"; - paths = [ swayWrapped swayPackage ]; - }; -in { - options.programs.sway-beta = { - enable = mkEnableOption '' - Sway, the i3-compatible tiling Wayland compositor. This module will be removed after the final release of Sway 1.0 - ''; - - package = mkOption { - type = types.package; - default = pkgs.sway-beta; - defaultText = "pkgs.sway-beta"; - description = '' - The package to be used for `sway`. - ''; - }; - - extraSessionCommands = mkOption { - type = types.lines; - default = ""; - example = '' - export SDL_VIDEODRIVER=wayland - # needs qt5.qtwayland in systemPackages - export QT_QPA_PLATFORM=wayland - export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" - # Fix for some Java AWT applications (e.g. Android Studio), - # use this if they aren't displayed properly: - export _JAVA_AWT_WM_NONREPARENTING=1 - ''; - description = '' - Shell commands executed just before Sway is started. - ''; - }; - - extraPackages = mkOption { - type = with types; listOf package; - default = with pkgs; [ - swaylock swayidle - xwayland rxvt_unicode dmenu - ]; - defaultText = literalExample '' - with pkgs; [ swaylock swayidle xwayland rxvt_unicode dmenu ]; - ''; - example = literalExample '' - with pkgs; [ - xwayland - i3status i3status-rust - termite rofi light - ] - ''; - description = '' - Extra packages to be installed system wide. - ''; - }; - }; - - config = mkIf cfg.enable { - environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages; - security.pam.services.swaylock = {}; - hardware.opengl.enable = mkDefault true; - fonts.enableDefaultFonts = mkDefault true; - programs.dconf.enable = mkDefault true; - }; - - meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ]; -} diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index b3847db8cd9c..457faaa3c102 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -16,9 +16,9 @@ let if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then export DBUS_SESSION_BUS_ADDRESS - exec sway-setcap "$@" + exec ${swayPackage}/bin/sway "$@" else - exec ${pkgs.dbus}/bin/dbus-run-session sway-setcap "$@" + exec ${pkgs.dbus}/bin/dbus-run-session ${swayPackage}/bin/sway "$@" fi ''; swayJoined = pkgs.symlinkJoin { @@ -28,22 +28,24 @@ let in { options.programs.sway = { enable = mkEnableOption '' - the tiling Wayland compositor Sway. After adding yourself to the "sway" - group you can manually launch Sway by executing "sway" from a terminal. - If you call "sway" with any parameters the extraSessionCommands won't be - executed and Sway won't be launched with dbus-launch''; + Sway, the i3-compatible tiling Wayland compositor. You can manually launch + Sway by executing "exec sway" on a TTY. Copy /etc/sway/config to + ~/.config/sway/config to modify the default configuration. See + https://github.com/swaywm/sway/wiki and "man 5 sway" for more information. + Please have a look at the "extraSessionCommands" example for running + programs natively under Wayland''; extraSessionCommands = mkOption { type = types.lines; default = ""; example = '' - # Define a keymap (US QWERTY is the default) - export XKB_DEFAULT_LAYOUT=de,us - export XKB_DEFAULT_VARIANT=nodeadkeys - export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:escape - # Change the Keyboard repeat delay and rate - export WLC_REPEAT_DELAY=660 - export WLC_REPEAT_RATE=25 + export SDL_VIDEODRIVER=wayland + # needs qt5.qtwayland in systemPackages + export QT_QPA_PLATFORM=wayland + export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" + # Fix for some Java AWT applications (e.g. Android Studio), + # use this if they aren't displayed properly: + export _JAVA_AWT_WM_NONREPARENTING=1 ''; description = '' Shell commands executed just before Sway is started. @@ -53,14 +55,17 @@ in { extraPackages = mkOption { type = with types; listOf package; default = with pkgs; [ - i3status xwayland rxvt_unicode dmenu + swaylock swayidle + xwayland rxvt_unicode dmenu ]; defaultText = literalExample '' - with pkgs; [ i3status xwayland rxvt_unicode dmenu ]; + with pkgs; [ swaylock swayidle xwayland rxvt_unicode dmenu ]; ''; example = literalExample '' with pkgs; [ - i3lock light termite + xwayland + i3status i3status-rust + termite rofi light ] ''; description = '' @@ -70,23 +75,19 @@ in { }; config = mkIf cfg.enable { - environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages; - security.wrappers.sway = { - program = "sway-setcap"; - source = "${swayPackage}/bin/sway"; - capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip"; - owner = "root"; - group = "sway"; - permissions = "u+rx,g+rx"; + environment = { + systemPackages = [ swayJoined ] ++ cfg.extraPackages; + etc = { + "sway/config".source = "${swayPackage}/etc/sway/config"; + #"sway/security.d".source = "${swayPackage}/etc/sway/security.d/"; + #"sway/config.d".source = "${swayPackage}/etc/sway/config.d/"; + }; }; - - users.groups.sway = {}; security.pam.services.swaylock = {}; - hardware.opengl.enable = mkDefault true; fonts.enableDefaultFonts = mkDefault true; programs.dconf.enable = mkDefault true; }; - meta.maintainers = with lib.maintainers; [ gnidorah primeos ]; + meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ]; } diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml index b26980daf067..568c2de65576 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.xml +++ b/nixos/modules/programs/zsh/oh-my-zsh.xml @@ -87,9 +87,9 @@ Please keep in mind that this is not compatible with - programs.zsh.ohMyZsh.custom as it requires an immutable store - path while custom shall remain mutable! An evaluation - failure will be thrown if both custom and + programs.zsh.ohMyZsh.custom as it requires an immutable + store path while custom shall remain mutable! An + evaluation failure will be thrown if both custom and customPkgs are set. diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 7bcdfdb52309..18649e57e9d1 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -4,11 +4,6 @@ with lib; { imports = [ - # !!! These were renamed the other way, but got reverted later. - # !!! Drop these before 18.09 is released. - (mkRenamedOptionModule [ "system" "nixos" "stateVersion" ] [ "system" "stateVersion" ]) - (mkRenamedOptionModule [ "system" "nixos" "defaultChannel" ] [ "system" "defaultChannel" ]) - (mkRenamedOptionModule [ "environment" "x11Packages" ] [ "environment" "systemPackages" ]) (mkRenamedOptionModule [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ]) (mkRenamedOptionModule [ "environment" "nix" ] [ "nix" "package" ]) @@ -40,9 +35,19 @@ with lib; (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ]) (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ]) (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"]) + (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "port" ] ["services" "kubernetes" "apiserver" "insecurePort"]) (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "") (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ]) + (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "address" ] ["services" "kubernetes" "controllerManager" "bindAddress"]) + (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "port" ] ["services" "kubernetes" "controllerManager" "insecurePort"]) + (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "servers" ] [ "services" "kubernetes" "apiserver" "etcd" "servers" ]) + (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "keyFile" ] [ "services" "kubernetes" "apiserver" "etcd" "keyFile" ]) + (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "certFile" ] [ "services" "kubernetes" "apiserver" "etcd" "certFile" ]) + (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "caFile" ] [ "services" "kubernetes" "apiserver" "etcd" "caFile" ]) + (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "applyManifests" ] "") (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "") + (mkRenamedOptionModule [ "services" "kubernetes" "proxy" "address" ] ["services" "kubernetes" "proxy" "bindAddress"]) + (mkRemovedOptionModule [ "services" "kubernetes" "verbose" ] "") (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ]) (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ]) diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index d323a158a4df..84ffaf2266ea 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -29,11 +29,18 @@ in config = mkIf cfg.enable { environment.systemPackages = [ pkgs.apparmor-utils ]; + boot.kernelParams = [ "apparmor=1" "security=apparmor" ]; + systemd.services.apparmor = let paths = concatMapStrings (s: " -I ${s}/etc/apparmor.d") ([ pkgs.apparmor-profiles ] ++ cfg.packages); in { - wantedBy = [ "local-fs.target" ]; + after = [ "local-fs.target" ]; + before = [ "sysinit.target" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig = { + DefaultDependencies = "no"; + }; serviceConfig = { Type = "oneshot"; RemainAfterExit = "yes"; diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 67469be18b41..1c4ee421fc56 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -14,6 +14,7 @@ let { files = cfg.certificateFiles ++ [ (builtins.toFile "extra.crt" (concatStringsSep "\n" cfg.certificates)) ]; + preferLocalBuild = true; } '' cat $files > $out diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index df6108dede7c..997328ad9e6a 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -7,7 +7,7 @@ let boolToStr = b: if b then "yes" else "no"; - configFile = '' + configFilePam = '' [duo] ikey=${cfg.ikey} skey=${cfg.skey} @@ -16,21 +16,24 @@ let failmode=${cfg.failmode} pushinfo=${boolToStr cfg.pushinfo} autopush=${boolToStr cfg.autopush} - motd=${boolToStr cfg.motd} prompts=${toString cfg.prompts} - accept_env_factor=${boolToStr cfg.acceptEnvFactor} fallback_local_ip=${boolToStr cfg.fallbackLocalIP} ''; + configFileLogin = configFilePam + '' + motd=${boolToStr cfg.motd} + accept_env_factor=${boolToStr cfg.acceptEnvFactor} + ''; + loginCfgFile = optional cfg.ssh.enable - { source = pkgs.writeText "login_duo.conf" configFile; + { source = pkgs.writeText "login_duo.conf" configFileLogin; mode = "0600"; user = "sshd"; target = "duo/login_duo.conf"; }; pamCfgFile = optional cfg.pam.enable - { source = pkgs.writeText "pam_duo.conf" configFile; + { source = pkgs.writeText "pam_duo.conf" configFilePam; mode = "0600"; user = "sshd"; target = "duo/pam_duo.conf"; @@ -73,7 +76,7 @@ in }; failmode = mkOption { - type = types.enum [ "safe" "enum" ]; + type = types.enum [ "safe" "secure" ]; default = "safe"; description = '' On service or configuration errors that prevent Duo @@ -180,12 +183,6 @@ in }; config = mkIf (cfg.ssh.enable || cfg.pam.enable) { - assertions = - [ { assertion = !cfg.pam.enable; - message = "PAM support is currently not implemented."; - } - ]; - environment.systemPackages = [ pkgs.duo-unix ]; security.wrappers.login_duo.source = "${pkgs.duo-unix.out}/bin/login_duo"; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 206b529ed680..4d683ac7c731 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -131,6 +131,18 @@ let ''; }; + duoSecurity = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + If set, use the Duo Security pam module + pam_duo for authentication. Requires + configuration of options. + ''; + }; + }; + startSession = mkOption { default = false; type = types.bool; @@ -340,7 +352,8 @@ let || cfg.pamMount || cfg.enableKwallet || cfg.enableGnomeKeyring - || cfg.googleAuthenticator.enable)) '' + || cfg.googleAuthenticator.enable + || cfg.duoSecurity.enable)) '' auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth ${optionalString config.security.pam.enableEcryptfs "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} @@ -350,9 +363,11 @@ let ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} ${optionalString cfg.enableGnomeKeyring - ("auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so")} + "auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so"} ${optionalString cfg.googleAuthenticator.enable - "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"} + "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"} + ${optionalString cfg.duoSecurity.enable + "auth required ${pkgs.duo-unix}/lib/security/pam_duo.so"} '') + '' ${optionalString cfg.unixAuth "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} @@ -383,6 +398,8 @@ let "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"} ${optionalString config.services.samba.syncPasswordsByPam "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"} + ${optionalString cfg.enableGnomeKeyring + "password optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"} # Session management. ${optionalString cfg.setEnvironment '' diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 69a2a4f8f9ae..573588aaeecc 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -215,7 +215,10 @@ in environment.etc = singleton { source = pkgs.runCommand "sudoers" - { src = pkgs.writeText "sudoers-in" cfg.configFile; } + { + src = pkgs.writeText "sudoers-in" cfg.configFile; + preferLocalBuild = true; + } # Make sure that the sudoers file is syntactically valid. # (currently disabled - NIXOS-66) "${pkgs.buildPackages.sudo}/sbin/visudo -f $src -c && cp $src $out"; diff --git a/nixos/modules/security/systemd-confinement.nix b/nixos/modules/security/systemd-confinement.nix new file mode 100644 index 000000000000..cd4eb81dbe19 --- /dev/null +++ b/nixos/modules/security/systemd-confinement.nix @@ -0,0 +1,199 @@ +{ config, pkgs, lib, ... }: + +let + toplevelConfig = config; + inherit (lib) types; + inherit (import ../system/boot/systemd-lib.nix { + inherit config pkgs lib; + }) mkPathSafeName; +in { + options.systemd.services = lib.mkOption { + type = types.attrsOf (types.submodule ({ name, config, ... }: { + options.confinement.enable = lib.mkOption { + type = types.bool; + default = false; + description = '' + If set, all the required runtime store paths for this service are + bind-mounted into a tmpfs-based + chroot + 2 + . + ''; + }; + + options.confinement.fullUnit = lib.mkOption { + type = types.bool; + default = false; + description = '' + Whether to include the full closure of the systemd unit file into the + chroot, instead of just the dependencies for the executables. + + While it may be tempting to just enable this option to + make things work quickly, please be aware that this might add paths + to the closure of the chroot that you didn't anticipate. It's better + to use to explicitly add additional store paths to the + chroot. + ''; + }; + + options.confinement.packages = lib.mkOption { + type = types.listOf (types.either types.str types.package); + default = []; + description = let + mkScOption = optName: ""; + in '' + Additional packages or strings with context to add to the closure of + the chroot. By default, this includes all the packages from the + ${lib.concatMapStringsSep ", " mkScOption [ + "ExecReload" "ExecStartPost" "ExecStartPre" "ExecStop" + "ExecStopPost" + ]} and ${mkScOption "ExecStart"} options. If you want to have all the + dependencies of this systemd unit, you can use + . + + The store paths listed in are + not included in the closure as + well as paths from other options except those listed + above. + ''; + }; + + options.confinement.binSh = lib.mkOption { + type = types.nullOr types.path; + default = toplevelConfig.environment.binsh; + defaultText = "config.environment.binsh"; + example = lib.literalExample "\${pkgs.dash}/bin/dash"; + description = '' + The program to make available as /bin/sh inside + the chroot. If this is set to null, no + /bin/sh is provided at all. + + This is useful for some applications, which for example use the + + system + 3 + library function to execute commands. + ''; + }; + + options.confinement.mode = lib.mkOption { + type = types.enum [ "full-apivfs" "chroot-only" ]; + default = "full-apivfs"; + description = '' + The value full-apivfs (the default) sets up + private /dev, /proc, /sys and /tmp file systems in a separate user + name space. + + If this is set to chroot-only, only the file + system name space is set up along with the call to + chroot + 2 + . + + This doesn't cover network namespaces and is solely for + file system level isolation. + ''; + }; + + config = let + rootName = "${mkPathSafeName name}-chroot"; + inherit (config.confinement) binSh fullUnit; + wantsAPIVFS = lib.mkDefault (config.confinement.mode == "full-apivfs"); + in lib.mkIf config.confinement.enable { + serviceConfig = { + RootDirectory = pkgs.runCommand rootName {} "mkdir \"$out\""; + TemporaryFileSystem = "/"; + PrivateMounts = lib.mkDefault true; + + # https://github.com/NixOS/nixpkgs/issues/14645 is a future attempt + # to change some of these to default to true. + # + # If we run in chroot-only mode, having something like PrivateDevices + # set to true by default will mount /dev within the chroot, whereas + # with "chroot-only" it's expected that there are no /dev, /proc and + # /sys file systems available. + # + # However, if this suddenly becomes true, the attack surface will + # increase, so let's explicitly set these options to true/false + # depending on the mode. + MountAPIVFS = wantsAPIVFS; + PrivateDevices = wantsAPIVFS; + PrivateTmp = wantsAPIVFS; + PrivateUsers = wantsAPIVFS; + ProtectControlGroups = wantsAPIVFS; + ProtectKernelModules = wantsAPIVFS; + ProtectKernelTunables = wantsAPIVFS; + }; + confinement.packages = let + execOpts = [ + "ExecReload" "ExecStart" "ExecStartPost" "ExecStartPre" "ExecStop" + "ExecStopPost" + ]; + execPkgs = lib.concatMap (opt: let + isSet = config.serviceConfig ? ${opt}; + in lib.optional isSet config.serviceConfig.${opt}) execOpts; + unitAttrs = toplevelConfig.systemd.units."${name}.service"; + allPkgs = lib.singleton (builtins.toJSON unitAttrs); + unitPkgs = if fullUnit then allPkgs else execPkgs; + in unitPkgs ++ lib.optional (binSh != null) binSh; + }; + })); + }; + + config.assertions = lib.concatLists (lib.mapAttrsToList (name: cfg: let + whatOpt = optName: "The 'serviceConfig' option '${optName}' for" + + " service '${name}' is enabled in conjunction with" + + " 'confinement.enable'"; + in lib.optionals cfg.confinement.enable [ + { assertion = !cfg.serviceConfig.RootDirectoryStartOnly or false; + message = "${whatOpt "RootDirectoryStartOnly"}, but right now systemd" + + " doesn't support restricting bind-mounts to 'ExecStart'." + + " Please either define a separate service or find a way to run" + + " commands other than ExecStart within the chroot."; + } + { assertion = !cfg.serviceConfig.DynamicUser or false; + message = "${whatOpt "DynamicUser"}. Please create a dedicated user via" + + " the 'users.users' option instead as this combination is" + + " currently not supported."; + } + ]) config.systemd.services); + + config.systemd.packages = lib.concatLists (lib.mapAttrsToList (name: cfg: let + rootPaths = let + contents = lib.concatStringsSep "\n" cfg.confinement.packages; + in pkgs.writeText "${mkPathSafeName name}-string-contexts.txt" contents; + + chrootPaths = pkgs.runCommand "${mkPathSafeName name}-chroot-paths" { + closureInfo = pkgs.closureInfo { inherit rootPaths; }; + serviceName = "${name}.service"; + excludedPath = rootPaths; + } '' + mkdir -p "$out/lib/systemd/system" + serviceFile="$out/lib/systemd/system/$serviceName" + + echo '[Service]' > "$serviceFile" + + # /bin/sh is special here, because the option value could contain a + # symlink and we need to properly resolve it. + ${lib.optionalString (cfg.confinement.binSh != null) '' + binsh=${lib.escapeShellArg cfg.confinement.binSh} + realprog="$(readlink -e "$binsh")" + echo "BindReadOnlyPaths=$realprog:/bin/sh" >> "$serviceFile" + ''} + + while read storePath; do + if [ -L "$storePath" ]; then + # Currently, systemd can't cope with symlinks in Bind(ReadOnly)Paths, + # so let's just bind-mount the target to that location. + echo "BindReadOnlyPaths=$(readlink -e "$storePath"):$storePath" + elif [ "$storePath" != "$excludedPath" ]; then + echo "BindReadOnlyPaths=$storePath" + fi + done < "$closureInfo/store-paths" >> "$serviceFile" + ''; + in lib.optional cfg.confinement.enable chrootPaths) config.systemd.services); +} diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix index 70f7dd9e3647..369a369190a4 100644 --- a/nixos/modules/services/admin/oxidized.nix +++ b/nixos/modules/services/admin/oxidized.nix @@ -97,8 +97,8 @@ in preStart = '' mkdir -p ${cfg.dataDir}/.config/oxidized - cp -v ${cfg.routerDB} ${cfg.dataDir}/.config/oxidized/router.db - cp -v ${cfg.configFile} ${cfg.dataDir}/.config/oxidized/config + ln -f -s ${cfg.routerDB} ${cfg.dataDir}/.config/oxidized/router.db + ln -f -s ${cfg.configFile} ${cfg.dataDir}/.config/oxidized/config ''; serviceConfig = { diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixos/modules/services/audio/squeezelite.nix index 57ae38559939..05506f5bcc7a 100644 --- a/nixos/modules/services/audio/squeezelite.nix +++ b/nixos/modules/services/audio/squeezelite.nix @@ -3,8 +3,7 @@ with lib; let - - uid = config.ids.uids.squeezelite; + dataDir = "/var/lib/squeezelite"; cfg = config.services.squeezelite; in { @@ -17,14 +16,6 @@ in { enable = mkEnableOption "Squeezelite, a software Squeezebox emulator"; - dataDir = mkOption { - default = "/var/lib/squeezelite"; - type = types.str; - description = '' - The directory where Squeezelite stores its name file. - ''; - }; - extraArguments = mkOption { default = ""; type = types.str; @@ -46,22 +37,14 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" "sound.target" ]; description = "Software Squeezebox emulator"; - preStart = "mkdir -p ${cfg.dataDir} && chown -R squeezelite ${cfg.dataDir}"; serviceConfig = { - ExecStart = "${pkgs.squeezelite}/bin/squeezelite -N ${cfg.dataDir}/player-name ${cfg.extraArguments}"; - User = "squeezelite"; - PermissionsStartOnly = true; + DynamicUser = true; + ExecStart = "${pkgs.squeezelite}/bin/squeezelite -N ${dataDir}/player-name ${cfg.extraArguments}"; + StateDirectory = builtins.baseNameOf dataDir; + SupplementaryGroups = "audio"; }; }; - users.users.squeezelite= { - inherit uid; - group = "nogroup"; - extraGroups = [ "audio" ]; - description = "Squeezelite user"; - home = "${cfg.dataDir}"; - }; - }; } diff --git a/nixos/modules/services/backup/automysqlbackup.nix b/nixos/modules/services/backup/automysqlbackup.nix new file mode 100644 index 000000000000..b845f370fb70 --- /dev/null +++ b/nixos/modules/services/backup/automysqlbackup.nix @@ -0,0 +1,115 @@ +{ config, lib, pkgs, ... }: + +let + + inherit (lib) concatMapStringsSep concatStringsSep isInt isList literalExample; + inherit (lib) mapAttrs mapAttrsToList mkDefault mkEnableOption mkIf mkOption optional types; + + cfg = config.services.automysqlbackup; + pkg = pkgs.automysqlbackup; + user = "automysqlbackup"; + group = "automysqlbackup"; + + toStr = val: + if isList val then "( ${concatMapStringsSep " " (val: "'${val}'") val} )" + else if isInt val then toString val + else if true == val then "'yes'" + else if false == val then "'no'" + else "'${toString val}'"; + + configFile = pkgs.writeText "automysqlbackup.conf" '' + #version=${pkg.version} + # DONT'T REMOVE THE PREVIOUS VERSION LINE! + # + ${concatStringsSep "\n" (mapAttrsToList (name: value: "CONFIG_${name}=${toStr value}") cfg.config)} + ''; + +in +{ + # interface + options = { + services.automysqlbackup = { + + enable = mkEnableOption "AutoMySQLBackup"; + + calendar = mkOption { + type = types.str; + default = "01:15:00"; + description = '' + Configured when to run the backup service systemd unit (DayOfWeek Year-Month-Day Hour:Minute:Second). + ''; + }; + + config = mkOption { + type = with types; attrsOf (either (either str (either int bool)) (listOf str)); + default = {}; + description = '' + automysqlbackup configuration. Refer to + ''${pkgs.automysqlbackup}/etc/automysqlbackup.conf + for details on supported values. + ''; + example = literalExample '' + { + db_names = [ "nextcloud" "matomo" ]; + table_exclude = [ "nextcloud.oc_users" "nextcloud.oc_whats_new" ]; + mailcontent = "log"; + mail_address = "admin@example.org"; + } + ''; + }; + + }; + }; + + # implementation + config = mkIf cfg.enable { + + assertions = [ + { assertion = !config.services.mysqlBackup.enable; + message = "Please choose one of services.mysqlBackup or services.automysqlbackup."; + } + ]; + + services.automysqlbackup.config = mapAttrs (name: mkDefault) { + mysql_dump_username = user; + mysql_dump_host = "localhost"; + backup_dir = "/var/backup/mysql"; + db_exclude = [ "information_schema" "performance_schema" ]; + mailcontent = "stdout"; + mysql_dump_single_transaction = true; + }; + + systemd.timers.automysqlbackup = { + description = "automysqlbackup timer"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = cfg.calendar; + AccuracySec = "5m"; + }; + }; + + systemd.services.automysqlbackup = { + description = "automysqlbackup service"; + serviceConfig = { + User = user; + Group = group; + ExecStart = "${pkg}/bin/automysqlbackup ${configFile}"; + }; + }; + + environment.systemPackages = [ pkg ]; + + users.users.${user}.group = group; + users.groups.${group} = { }; + + systemd.tmpfiles.rules = [ + "d '${cfg.config.backup_dir}' 0750 ${user} ${group} - -" + ]; + + services.mysql.ensureUsers = optional (config.services.mysql.enable && cfg.config.mysql_dump_host == "localhost") { + name = user; + ensurePermissions = { "*.*" = "SELECT, SHOW VIEW, TRIGGER, LOCK TABLES"; }; + }; + + }; +} diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix index 80287f30b813..ed542d3280dd 100644 --- a/nixos/modules/services/backup/duplicati.nix +++ b/nixos/modules/services/backup/duplicati.nix @@ -26,6 +26,15 @@ in Set it to "any" to listen on all available interfaces ''; }; + + user = mkOption { + default = "duplicati"; + type = types.str; + description = '' + Duplicati runs as it's own user. It will only be able to backup world-readable files. + Run as root with special care. + ''; + }; }; }; @@ -37,14 +46,19 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - User = "duplicati"; + User = cfg.user; + PermissionsStartOnly = true; Group = "duplicati"; ExecStart = "${pkgs.duplicati}/bin/duplicati-server --webservice-interface=${cfg.interface} --webservice-port=${toString cfg.port} --server-datafolder=/var/lib/duplicati"; Restart = "on-failure"; }; + preStart = '' + mkdir -p /var/lib/duplicati + chown -R ${cfg.user}:duplicati /var/lib/duplicati + ''; }; - users.users.duplicati = { + users.users.duplicati = lib.optionalAttrs (cfg.user == "duplicati") { uid = config.ids.uids.duplicati; home = "/var/lib/duplicati"; createHome = true; diff --git a/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/nixos/modules/services/cluster/kubernetes/addon-manager.nix new file mode 100644 index 000000000000..17f2dde31a71 --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/addon-manager.nix @@ -0,0 +1,167 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.addonManager; + + isRBACEnabled = elem "RBAC" top.apiserver.authorizationMode; + + addons = pkgs.runCommand "kubernetes-addons" { } '' + mkdir -p $out + # since we are mounting the addons to the addon manager, they need to be copied + ${concatMapStringsSep ";" (a: "cp -v ${a}/* $out/") (mapAttrsToList (name: addon: + pkgs.writeTextDir "${name}.json" (builtins.toJSON addon) + ) (cfg.addons))} + ''; +in +{ + ###### interface + options.services.kubernetes.addonManager = with lib.types; { + + bootstrapAddons = mkOption { + description = '' + Bootstrap addons are like regular addons, but they are applied with cluster-admin rigths. + They are applied at addon-manager startup only. + ''; + default = { }; + type = attrsOf attrs; + example = literalExample '' + { + "my-service" = { + "apiVersion" = "v1"; + "kind" = "Service"; + "metadata" = { + "name" = "my-service"; + "namespace" = "default"; + }; + "spec" = { ... }; + }; + } + ''; + }; + + addons = mkOption { + description = "Kubernetes addons (any kind of Kubernetes resource can be an addon)."; + default = { }; + type = attrsOf (either attrs (listOf attrs)); + example = literalExample '' + { + "my-service" = { + "apiVersion" = "v1"; + "kind" = "Service"; + "metadata" = { + "name" = "my-service"; + "namespace" = "default"; + }; + "spec" = { ... }; + }; + } + // import { cfg = config.services.kubernetes; }; + ''; + }; + + enable = mkEnableOption "Whether to enable Kubernetes addon manager."; + }; + + ###### implementation + config = mkIf cfg.enable { + environment.etc."kubernetes/addons".source = "${addons}/"; + + systemd.services.kube-addon-manager = { + description = "Kubernetes addon manager"; + wantedBy = [ "kubernetes.target" ]; + after = [ "kube-apiserver.service" ]; + environment.ADDON_PATH = "/etc/kubernetes/addons/"; + path = [ pkgs.gawk ]; + serviceConfig = { + Slice = "kubernetes.slice"; + ExecStart = "${top.package}/bin/kube-addons"; + WorkingDirectory = top.dataDir; + User = "kubernetes"; + Group = "kubernetes"; + Restart = "on-failure"; + RestartSec = 10; + }; + }; + + services.kubernetes.addonManager.bootstrapAddons = mkIf isRBACEnabled + (let + name = system:kube-addon-manager; + namespace = "kube-system"; + in + { + + kube-addon-manager-r = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "Role"; + metadata = { + inherit name namespace; + }; + rules = [{ + apiGroups = ["*"]; + resources = ["*"]; + verbs = ["*"]; + }]; + }; + + kube-addon-manager-rb = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "RoleBinding"; + metadata = { + inherit name namespace; + }; + roleRef = { + apiGroup = "rbac.authorization.k8s.io"; + kind = "Role"; + inherit name; + }; + subjects = [{ + apiGroup = "rbac.authorization.k8s.io"; + kind = "User"; + inherit name; + }]; + }; + + kube-addon-manager-cluster-lister-cr = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "ClusterRole"; + metadata = { + name = "${name}:cluster-lister"; + }; + rules = [{ + apiGroups = ["*"]; + resources = ["*"]; + verbs = ["list"]; + }]; + }; + + kube-addon-manager-cluster-lister-crb = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "ClusterRoleBinding"; + metadata = { + name = "${name}:cluster-lister"; + }; + roleRef = { + apiGroup = "rbac.authorization.k8s.io"; + kind = "ClusterRole"; + name = "${name}:cluster-lister"; + }; + subjects = [{ + kind = "User"; + inherit name; + }]; + }; + }); + + services.kubernetes.pki.certs = { + addonManager = top.lib.mkCert { + name = "kube-addon-manager"; + CN = "system:kube-addon-manager"; + action = "systemctl restart kube-addon-manager.service"; + }; + }; + }; + +} diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix similarity index 100% rename from nixos/modules/services/cluster/kubernetes/dashboard.nix rename to nixos/modules/services/cluster/kubernetes/addons/dashboard.nix diff --git a/nixos/modules/services/cluster/kubernetes/dns.nix b/nixos/modules/services/cluster/kubernetes/addons/dns.nix similarity index 93% rename from nixos/modules/services/cluster/kubernetes/dns.nix rename to nixos/modules/services/cluster/kubernetes/addons/dns.nix index ea3e0706163a..4368159ea6e3 100644 --- a/nixos/modules/services/cluster/kubernetes/dns.nix +++ b/nixos/modules/services/cluster/kubernetes/addons/dns.nix @@ -38,6 +38,18 @@ in { type = types.int; }; + reconcileMode = mkOption { + description = '' + Controls the addon manager reconciliation mode for the DNS addon. + + Setting reconcile mode to EnsureExists makes it possible to tailor DNS behavior by editing the coredns ConfigMap. + + See: . + ''; + default = "Reconcile"; + type = types.enum [ "Reconcile" "EnsureExists" ]; + }; + coredns = mkOption { description = "Docker image to seed for the CoreDNS container."; type = types.attrs; @@ -54,21 +66,7 @@ in { services.kubernetes.kubelet.seedDockerImages = singleton (pkgs.dockerTools.pullImage cfg.coredns); - services.kubernetes.addonManager.addons = { - coredns-sa = { - apiVersion = "v1"; - kind = "ServiceAccount"; - metadata = { - labels = { - "addonmanager.kubernetes.io/mode" = "Reconcile"; - "k8s-app" = "kube-dns"; - "kubernetes.io/cluster-service" = "true"; - }; - name = "coredns"; - namespace = "kube-system"; - }; - }; - + services.kubernetes.addonManager.bootstrapAddons = { coredns-cr = { apiVersion = "rbac.authorization.k8s.io/v1beta1"; kind = "ClusterRole"; @@ -123,13 +121,29 @@ in { } ]; }; + }; + + services.kubernetes.addonManager.addons = { + coredns-sa = { + apiVersion = "v1"; + kind = "ServiceAccount"; + metadata = { + labels = { + "addonmanager.kubernetes.io/mode" = "Reconcile"; + "k8s-app" = "kube-dns"; + "kubernetes.io/cluster-service" = "true"; + }; + name = "coredns"; + namespace = "kube-system"; + }; + }; coredns-cm = { apiVersion = "v1"; kind = "ConfigMap"; metadata = { labels = { - "addonmanager.kubernetes.io/mode" = "Reconcile"; + "addonmanager.kubernetes.io/mode" = cfg.reconcileMode; "k8s-app" = "kube-dns"; "kubernetes.io/cluster-service" = "true"; }; @@ -160,7 +174,7 @@ in { kind = "Deployment"; metadata = { labels = { - "addonmanager.kubernetes.io/mode" = "Reconcile"; + "addonmanager.kubernetes.io/mode" = cfg.reconcileMode; "k8s-app" = "kube-dns"; "kubernetes.io/cluster-service" = "true"; "kubernetes.io/name" = "CoreDNS"; diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix new file mode 100644 index 000000000000..455d02396040 --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix @@ -0,0 +1,428 @@ + { config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.apiserver; + + isRBACEnabled = elem "RBAC" cfg.authorizationMode; + + apiserverServiceIP = (concatStringsSep "." ( + take 3 (splitString "." cfg.serviceClusterIpRange + )) + ".1"); +in +{ + ###### interface + options.services.kubernetes.apiserver = with lib.types; { + + advertiseAddress = mkOption { + description = '' + Kubernetes apiserver IP address on which to advertise the apiserver + to members of the cluster. This address must be reachable by the rest + of the cluster. + ''; + default = null; + type = nullOr str; + }; + + allowPrivileged = mkOption { + description = "Whether to allow privileged containers on Kubernetes."; + default = false; + type = bool; + }; + + authorizationMode = mkOption { + description = '' + Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/Webhook/RBAC/Node). See + + ''; + default = ["RBAC" "Node"]; # Enabling RBAC by default, although kubernetes default is AllowAllow + type = listOf (enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "Webhook" "RBAC" "Node"]); + }; + + authorizationPolicy = mkOption { + description = '' + Kubernetes apiserver authorization policy file. See + + ''; + default = []; + type = listOf attrs; + }; + + basicAuthFile = mkOption { + description = '' + Kubernetes apiserver basic authentication file. See + + ''; + default = null; + type = nullOr path; + }; + + bindAddress = mkOption { + description = '' + The IP address on which to listen for the --secure-port port. + The associated interface(s) must be reachable by the rest + of the cluster, and by CLI/web clients. + ''; + default = "0.0.0.0"; + type = str; + }; + + clientCaFile = mkOption { + description = "Kubernetes apiserver CA file for client auth."; + default = top.caFile; + type = nullOr path; + }; + + disableAdmissionPlugins = mkOption { + description = '' + Kubernetes admission control plugins to disable. See + + ''; + default = []; + type = listOf str; + }; + + enable = mkEnableOption "Kubernetes apiserver"; + + enableAdmissionPlugins = mkOption { + description = '' + Kubernetes admission control plugins to enable. See + + ''; + default = [ + "NamespaceLifecycle" "LimitRanger" "ServiceAccount" + "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds" + "NodeRestriction" + ]; + example = [ + "NamespaceLifecycle" "NamespaceExists" "LimitRanger" + "SecurityContextDeny" "ServiceAccount" "ResourceQuota" + "PodSecurityPolicy" "NodeRestriction" "DefaultStorageClass" + ]; + type = listOf str; + }; + + etcd = { + servers = mkOption { + description = "List of etcd servers."; + default = ["http://127.0.0.1:2379"]; + type = types.listOf types.str; + }; + + keyFile = mkOption { + description = "Etcd key file."; + default = null; + type = types.nullOr types.path; + }; + + certFile = mkOption { + description = "Etcd cert file."; + default = null; + type = types.nullOr types.path; + }; + + caFile = mkOption { + description = "Etcd ca file."; + default = top.caFile; + type = types.nullOr types.path; + }; + }; + + extraOpts = mkOption { + description = "Kubernetes apiserver extra command line options."; + default = ""; + type = str; + }; + + extraSANs = mkOption { + description = "Extra x509 Subject Alternative Names to be added to the kubernetes apiserver tls cert."; + default = []; + type = listOf str; + }; + + featureGates = mkOption { + description = "List set of feature gates"; + default = top.featureGates; + type = listOf str; + }; + + insecureBindAddress = mkOption { + description = "The IP address on which to serve the --insecure-port."; + default = "127.0.0.1"; + type = str; + }; + + insecurePort = mkOption { + description = "Kubernetes apiserver insecure listening port. (0 = disabled)"; + default = 0; + type = int; + }; + + kubeletClientCaFile = mkOption { + description = "Path to a cert file for connecting to kubelet."; + default = top.caFile; + type = nullOr path; + }; + + kubeletClientCertFile = mkOption { + description = "Client certificate to use for connections to kubelet."; + default = null; + type = nullOr path; + }; + + kubeletClientKeyFile = mkOption { + description = "Key to use for connections to kubelet."; + default = null; + type = nullOr path; + }; + + kubeletHttps = mkOption { + description = "Whether to use https for connections to kubelet."; + default = true; + type = bool; + }; + + runtimeConfig = mkOption { + description = '' + Api runtime configuration. See + + ''; + default = "authentication.k8s.io/v1beta1=true"; + example = "api/all=false,api/v1=true"; + type = str; + }; + + storageBackend = mkOption { + description = '' + Kubernetes apiserver storage backend. + ''; + default = "etcd3"; + type = enum ["etcd2" "etcd3"]; + }; + + securePort = mkOption { + description = "Kubernetes apiserver secure port."; + default = 6443; + type = int; + }; + + serviceAccountKeyFile = mkOption { + description = '' + Kubernetes apiserver PEM-encoded x509 RSA private or public key file, + used to verify ServiceAccount tokens. By default tls private key file + is used. + ''; + default = null; + type = nullOr path; + }; + + serviceClusterIpRange = mkOption { + description = '' + A CIDR notation IP range from which to assign service cluster IPs. + This must not overlap with any IP ranges assigned to nodes for pods. + ''; + default = "10.0.0.0/24"; + type = str; + }; + + tlsCertFile = mkOption { + description = "Kubernetes apiserver certificate file."; + default = null; + type = nullOr path; + }; + + tlsKeyFile = mkOption { + description = "Kubernetes apiserver private key file."; + default = null; + type = nullOr path; + }; + + tokenAuthFile = mkOption { + description = '' + Kubernetes apiserver token authentication file. See + + ''; + default = null; + type = nullOr path; + }; + + verbosity = mkOption { + description = '' + Optional glog verbosity level for logging statements. See + + ''; + default = null; + type = nullOr int; + }; + + webhookConfig = mkOption { + description = '' + Kubernetes apiserver Webhook config file. It uses the kubeconfig file format. + See + ''; + default = null; + type = nullOr path; + }; + + }; + + + ###### implementation + config = mkMerge [ + + (mkIf cfg.enable { + systemd.services.kube-apiserver = { + description = "Kubernetes APIServer Service"; + wantedBy = [ "kubernetes.target" ]; + after = [ "network.target" ]; + serviceConfig = { + Slice = "kubernetes.slice"; + ExecStart = ''${top.package}/bin/kube-apiserver \ + --allow-privileged=${boolToString cfg.allowPrivileged} \ + --authorization-mode=${concatStringsSep "," cfg.authorizationMode} \ + ${optionalString (elem "ABAC" cfg.authorizationMode) + "--authorization-policy-file=${ + pkgs.writeText "kube-auth-policy.jsonl" + (concatMapStringsSep "\n" (l: builtins.toJSON l) cfg.authorizationPolicy) + }" + } \ + ${optionalString (elem "Webhook" cfg.authorizationMode) + "--authorization-webhook-config-file=${cfg.webhookConfig}" + } \ + --bind-address=${cfg.bindAddress} \ + ${optionalString (cfg.advertiseAddress != null) + "--advertise-address=${cfg.advertiseAddress}"} \ + ${optionalString (cfg.clientCaFile != null) + "--client-ca-file=${cfg.clientCaFile}"} \ + --disable-admission-plugins=${concatStringsSep "," cfg.disableAdmissionPlugins} \ + --enable-admission-plugins=${concatStringsSep "," cfg.enableAdmissionPlugins} \ + --etcd-servers=${concatStringsSep "," cfg.etcd.servers} \ + ${optionalString (cfg.etcd.caFile != null) + "--etcd-cafile=${cfg.etcd.caFile}"} \ + ${optionalString (cfg.etcd.certFile != null) + "--etcd-certfile=${cfg.etcd.certFile}"} \ + ${optionalString (cfg.etcd.keyFile != null) + "--etcd-keyfile=${cfg.etcd.keyFile}"} \ + ${optionalString (cfg.featureGates != []) + "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ + ${optionalString (cfg.basicAuthFile != null) + "--basic-auth-file=${cfg.basicAuthFile}"} \ + --kubelet-https=${boolToString cfg.kubeletHttps} \ + ${optionalString (cfg.kubeletClientCaFile != null) + "--kubelet-certificate-authority=${cfg.kubeletClientCaFile}"} \ + ${optionalString (cfg.kubeletClientCertFile != null) + "--kubelet-client-certificate=${cfg.kubeletClientCertFile}"} \ + ${optionalString (cfg.kubeletClientKeyFile != null) + "--kubelet-client-key=${cfg.kubeletClientKeyFile}"} \ + --insecure-bind-address=${cfg.insecureBindAddress} \ + --insecure-port=${toString cfg.insecurePort} \ + ${optionalString (cfg.runtimeConfig != "") + "--runtime-config=${cfg.runtimeConfig}"} \ + --secure-port=${toString cfg.securePort} \ + ${optionalString (cfg.serviceAccountKeyFile!=null) + "--service-account-key-file=${cfg.serviceAccountKeyFile}"} \ + --service-cluster-ip-range=${cfg.serviceClusterIpRange} \ + --storage-backend=${cfg.storageBackend} \ + ${optionalString (cfg.tlsCertFile != null) + "--tls-cert-file=${cfg.tlsCertFile}"} \ + ${optionalString (cfg.tlsKeyFile != null) + "--tls-private-key-file=${cfg.tlsKeyFile}"} \ + ${optionalString (cfg.tokenAuthFile != null) + "--token-auth-file=${cfg.tokenAuthFile}"} \ + ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ + ${cfg.extraOpts} + ''; + WorkingDirectory = top.dataDir; + User = "kubernetes"; + Group = "kubernetes"; + AmbientCapabilities = "cap_net_bind_service"; + Restart = "on-failure"; + RestartSec = 5; + }; + }; + + services.etcd = { + clientCertAuth = mkDefault true; + peerClientCertAuth = mkDefault true; + listenClientUrls = mkDefault ["https://0.0.0.0:2379"]; + listenPeerUrls = mkDefault ["https://0.0.0.0:2380"]; + advertiseClientUrls = mkDefault ["https://${top.masterAddress}:2379"]; + initialCluster = mkDefault ["${top.masterAddress}=https://${top.masterAddress}:2380"]; + name = mkDefault top.masterAddress; + initialAdvertisePeerUrls = mkDefault ["https://${top.masterAddress}:2380"]; + }; + + services.kubernetes.addonManager.bootstrapAddons = mkIf isRBACEnabled { + + apiserver-kubelet-api-admin-crb = { + apiVersion = "rbac.authorization.k8s.io/v1"; + kind = "ClusterRoleBinding"; + metadata = { + name = "system:kube-apiserver:kubelet-api-admin"; + }; + roleRef = { + apiGroup = "rbac.authorization.k8s.io"; + kind = "ClusterRole"; + name = "system:kubelet-api-admin"; + }; + subjects = [{ + kind = "User"; + name = "system:kube-apiserver"; + }]; + }; + + }; + + services.kubernetes.pki.certs = with top.lib; { + apiServer = mkCert { + name = "kube-apiserver"; + CN = "kubernetes"; + hosts = [ + "kubernetes.default.svc" + "kubernetes.default.svc.${top.addons.dns.clusterDomain}" + cfg.advertiseAddress + top.masterAddress + apiserverServiceIP + "127.0.0.1" + ] ++ cfg.extraSANs; + action = "systemctl restart kube-apiserver.service"; + }; + apiserverKubeletClient = mkCert { + name = "kube-apiserver-kubelet-client"; + CN = "system:kube-apiserver"; + action = "systemctl restart kube-apiserver.service"; + }; + apiserverEtcdClient = mkCert { + name = "kube-apiserver-etcd-client"; + CN = "etcd-client"; + action = "systemctl restart kube-apiserver.service"; + }; + clusterAdmin = mkCert { + name = "cluster-admin"; + CN = "cluster-admin"; + fields = { + O = "system:masters"; + }; + privateKeyOwner = "root"; + }; + etcd = mkCert { + name = "etcd"; + CN = top.masterAddress; + hosts = [ + "etcd.local" + "etcd.${top.addons.dns.clusterDomain}" + top.masterAddress + cfg.advertiseAddress + ]; + privateKeyOwner = "etcd"; + action = "systemctl restart etcd.service"; + }; + }; + + }) + + ]; + +} diff --git a/nixos/modules/services/cluster/kubernetes/controller-manager.nix b/nixos/modules/services/cluster/kubernetes/controller-manager.nix new file mode 100644 index 000000000000..060fd9b78db6 --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/controller-manager.nix @@ -0,0 +1,162 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.controllerManager; +in +{ + ###### interface + options.services.kubernetes.controllerManager = with lib.types; { + + allocateNodeCIDRs = mkOption { + description = "Whether to automatically allocate CIDR ranges for cluster nodes."; + default = true; + type = bool; + }; + + bindAddress = mkOption { + description = "Kubernetes controller manager listening address."; + default = "127.0.0.1"; + type = str; + }; + + clusterCidr = mkOption { + description = "Kubernetes CIDR Range for Pods in cluster."; + default = top.clusterCidr; + type = str; + }; + + enable = mkEnableOption "Kubernetes controller manager."; + + extraOpts = mkOption { + description = "Kubernetes controller manager extra command line options."; + default = ""; + type = str; + }; + + featureGates = mkOption { + description = "List set of feature gates"; + default = top.featureGates; + type = listOf str; + }; + + insecurePort = mkOption { + description = "Kubernetes controller manager insecure listening port."; + default = 0; + type = int; + }; + + kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes controller manager"; + + leaderElect = mkOption { + description = "Whether to start leader election before executing main loop."; + type = bool; + default = true; + }; + + rootCaFile = mkOption { + description = '' + Kubernetes controller manager certificate authority file included in + service account's token secret. + ''; + default = top.caFile; + type = nullOr path; + }; + + securePort = mkOption { + description = "Kubernetes controller manager secure listening port."; + default = 10252; + type = int; + }; + + serviceAccountKeyFile = mkOption { + description = '' + Kubernetes controller manager PEM-encoded private RSA key file used to + sign service account tokens + ''; + default = null; + type = nullOr path; + }; + + tlsCertFile = mkOption { + description = "Kubernetes controller-manager certificate file."; + default = null; + type = nullOr path; + }; + + tlsKeyFile = mkOption { + description = "Kubernetes controller-manager private key file."; + default = null; + type = nullOr path; + }; + + verbosity = mkOption { + description = '' + Optional glog verbosity level for logging statements. See + + ''; + default = null; + type = nullOr int; + }; + + }; + + ###### implementation + config = mkIf cfg.enable { + systemd.services.kube-controller-manager = { + description = "Kubernetes Controller Manager Service"; + wantedBy = [ "kubernetes.target" ]; + after = [ "kube-apiserver.service" ]; + serviceConfig = { + RestartSec = "30s"; + Restart = "on-failure"; + Slice = "kubernetes.slice"; + ExecStart = ''${top.package}/bin/kube-controller-manager \ + --allocate-node-cidrs=${boolToString cfg.allocateNodeCIDRs} \ + --bind-address=${cfg.bindAddress} \ + ${optionalString (cfg.clusterCidr!=null) + "--cluster-cidr=${cfg.clusterCidr}"} \ + ${optionalString (cfg.featureGates != []) + "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ + --kubeconfig=${top.lib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig} \ + --leader-elect=${boolToString cfg.leaderElect} \ + ${optionalString (cfg.rootCaFile!=null) + "--root-ca-file=${cfg.rootCaFile}"} \ + --port=${toString cfg.insecurePort} \ + --secure-port=${toString cfg.securePort} \ + ${optionalString (cfg.serviceAccountKeyFile!=null) + "--service-account-private-key-file=${cfg.serviceAccountKeyFile}"} \ + ${optionalString (cfg.tlsCertFile!=null) + "--tls-cert-file=${cfg.tlsCertFile}"} \ + ${optionalString (cfg.tlsKeyFile!=null) + "--tls-private-key-file=${cfg.tlsKeyFile}"} \ + ${optionalString (elem "RBAC" top.apiserver.authorizationMode) + "--use-service-account-credentials"} \ + ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ + ${cfg.extraOpts} + ''; + WorkingDirectory = top.dataDir; + User = "kubernetes"; + Group = "kubernetes"; + }; + path = top.path; + }; + + services.kubernetes.pki.certs = with top.lib; { + controllerManager = mkCert { + name = "kube-controller-manager"; + CN = "kube-controller-manager"; + action = "systemctl restart kube-controller-manager.service"; + }; + controllerManagerClient = mkCert { + name = "kube-controller-manager-client"; + CN = "system:kube-controller-manager"; + action = "systemctl restart kube-controller-manager.service"; + }; + }; + + services.kubernetes.controllerManager.kubeconfig.server = mkDefault top.apiserverAddress; + }; +} diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 6f3c45b29bf2..3e53d18f8bbf 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -5,74 +5,52 @@ with lib; let cfg = config.services.kubernetes; - # YAML config; see: - # https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ - # https://github.com/kubernetes/kubernetes/blob/release-1.10/pkg/kubelet/apis/kubeletconfig/v1beta1/types.go - # - # TODO: migrate the following flags to this config file - # - # --pod-manifest-path - # --address - # --port - # --tls-cert-file - # --tls-private-key-file - # --client-ca-file - # --authentication-token-webhook - # --authentication-token-webhook-cache-ttl - # --authorization-mode - # --healthz-bind-address - # --healthz-port - # --allow-privileged - # --cluster-dns - # --cluster-domain - # --hairpin-mode - # --feature-gates - kubeletConfig = pkgs.runCommand "kubelet-config.yaml" { } '' - echo > $out ${pkgs.lib.escapeShellArg (builtins.toJSON { - kind = "KubeletConfiguration"; - apiVersion = "kubelet.config.k8s.io/v1beta1"; - ${if cfg.kubelet.applyManifests then "staticPodPath" else null} = - manifests; - })} - ''; - - infraContainer = pkgs.dockerTools.buildImage { - name = "pause"; - tag = "latest"; - contents = cfg.package.pause; - config.Cmd = "/bin/pause"; - }; - - mkKubeConfig = name: cfg: pkgs.writeText "${name}-kubeconfig" (builtins.toJSON { + mkKubeConfig = name: conf: pkgs.writeText "${name}-kubeconfig" (builtins.toJSON { apiVersion = "v1"; kind = "Config"; clusters = [{ name = "local"; - cluster.certificate-authority = cfg.caFile; - cluster.server = cfg.server; + cluster.certificate-authority = conf.caFile or cfg.caFile; + cluster.server = conf.server; }]; users = [{ - name = "kubelet"; + inherit name; user = { - client-certificate = cfg.certFile; - client-key = cfg.keyFile; + client-certificate = conf.certFile; + client-key = conf.keyFile; }; }]; contexts = [{ context = { cluster = "local"; - user = "kubelet"; + user = name; }; - current-context = "kubelet-context"; + current-context = "local"; }]; }); + caCert = secret "ca"; + + etcdEndpoints = ["https://${cfg.masterAddress}:2379"]; + + mkCert = { name, CN, hosts ? [], fields ? {}, action ? "", + privateKeyOwner ? "kubernetes" }: rec { + inherit name caCert CN hosts fields action; + cert = secret name; + key = secret "${name}-key"; + privateKeyOptions = { + owner = privateKeyOwner; + group = "nogroup"; + mode = "0600"; + path = key; + }; + }; + + secret = name: "${cfg.secretsPath}/${name}.pem"; + mkKubeConfigOptions = prefix: { server = mkOption { description = "${prefix} kube-apiserver server address."; - default = "http://${if cfg.apiserver.advertiseAddress != null - then cfg.apiserver.advertiseAddress - else "127.0.0.1"}:${toString cfg.apiserver.port}"; type = types.str; }; @@ -101,66 +79,6 @@ let certFile = mkDefault cfg.kubeconfig.certFile; keyFile = mkDefault cfg.kubeconfig.keyFile; }; - - cniConfig = - if cfg.kubelet.cni.config != [] && !(isNull cfg.kubelet.cni.configDir) then - throw "Verbatim CNI-config and CNI configDir cannot both be set." - else if !(isNull cfg.kubelet.cni.configDir) then - cfg.kubelet.cni.configDir - else - (pkgs.buildEnv { - name = "kubernetes-cni-config"; - paths = imap (i: entry: - pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry) - ) cfg.kubelet.cni.config; - }); - - manifests = pkgs.buildEnv { - name = "kubernetes-manifests"; - paths = mapAttrsToList (name: manifest: - pkgs.writeTextDir "${name}.json" (builtins.toJSON manifest) - ) cfg.kubelet.manifests; - }; - - addons = pkgs.runCommand "kubernetes-addons" { } '' - mkdir -p $out - # since we are mounting the addons to the addon manager, they need to be copied - ${concatMapStringsSep ";" (a: "cp -v ${a}/* $out/") (mapAttrsToList (name: addon: - pkgs.writeTextDir "${name}.json" (builtins.toJSON addon) - ) (cfg.addonManager.addons))} - ''; - - taintOptions = { name, ... }: { - options = { - key = mkOption { - description = "Key of taint."; - default = name; - type = types.str; - }; - value = mkOption { - description = "Value of taint."; - type = types.str; - }; - effect = mkOption { - description = "Effect of taint."; - example = "NoSchedule"; - type = types.enum ["NoSchedule" "PreferNoSchedule" "NoExecute"]; - }; - }; - }; - - taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (mapAttrsToList (n: v: v) cfg.kubelet.taints); - - # needed for flannel to pass options to docker - mkDockerOpts = pkgs.runCommand "mk-docker-opts" { - buildInputs = [ pkgs.makeWrapper ]; - } '' - mkdir -p $out - cp ${pkgs.kubernetes.src}/cluster/centos/node/bin/mk-docker-opts.sh $out/mk-docker-opts.sh - - # bashInteractive needed for `compgen` - makeWrapper ${pkgs.bashInteractive}/bin/bash $out/mk-docker-opts --add-flags "$out/mk-docker-opts.sh" - ''; in { ###### interface @@ -170,8 +88,9 @@ in { description = '' Kubernetes role that this machine should take. - Master role will enable etcd, apiserver, scheduler and controller manager - services. Node role will enable etcd, docker, kubelet and proxy services. + Master role will enable etcd, apiserver, scheduler, controller manager + addon manager, flannel and proxy services. + Node role will enable flannel, docker, kubelet and proxy services. ''; default = []; type = types.listOf (types.enum ["master" "node"]); @@ -184,40 +103,17 @@ in { defaultText = "pkgs.kubernetes"; }; - verbose = mkOption { - description = "Kubernetes enable verbose mode for debugging."; - default = false; - type = types.bool; - }; - - etcd = { - servers = mkOption { - description = "List of etcd servers. By default etcd is started, except if this option is changed."; - default = ["http://127.0.0.1:2379"]; - type = types.listOf types.str; - }; - - keyFile = mkOption { - description = "Etcd key file."; - default = null; - type = types.nullOr types.path; - }; - - certFile = mkOption { - description = "Etcd cert file."; - default = null; - type = types.nullOr types.path; - }; - - caFile = mkOption { - description = "Etcd ca file."; - default = cfg.caFile; - type = types.nullOr types.path; - }; - }; - kubeconfig = mkKubeConfigOptions "Default kubeconfig"; + apiserverAddress = mkOption { + description = '' + Clusterwide accessible address for the kubernetes apiserver, + including protocol and optional port. + ''; + example = "https://kubernetes-apiserver.example.com:6443"; + type = types.str; + }; + caFile = mkOption { description = "Default kubernetes certificate authority"; type = types.nullOr types.path; @@ -230,549 +126,22 @@ in { type = types.path; }; + easyCerts = mkOption { + description = "Automatically setup x509 certificates and keys for the entire cluster."; + default = false; + type = types.bool; + }; + featureGates = mkOption { - description = "List set of feature gates"; + description = "List set of feature gates."; default = []; type = types.listOf types.str; }; - apiserver = { - enable = mkOption { - description = "Whether to enable Kubernetes apiserver."; - default = false; - type = types.bool; - }; - - featureGates = mkOption { - description = "List set of feature gates"; - default = cfg.featureGates; - type = types.listOf types.str; - }; - - bindAddress = mkOption { - description = '' - The IP address on which to listen for the --secure-port port. - The associated interface(s) must be reachable by the rest - of the cluster, and by CLI/web clients. - ''; - default = "0.0.0.0"; - type = types.str; - }; - - advertiseAddress = mkOption { - description = '' - Kubernetes apiserver IP address on which to advertise the apiserver - to members of the cluster. This address must be reachable by the rest - of the cluster. - ''; - default = null; - type = types.nullOr types.str; - }; - - storageBackend = mkOption { - description = '' - Kubernetes apiserver storage backend. - ''; - default = "etcd3"; - type = types.enum ["etcd2" "etcd3"]; - }; - - port = mkOption { - description = "Kubernetes apiserver listening port."; - default = 8080; - type = types.int; - }; - - securePort = mkOption { - description = "Kubernetes apiserver secure port."; - default = 443; - type = types.int; - }; - - tlsCertFile = mkOption { - description = "Kubernetes apiserver certificate file."; - default = null; - type = types.nullOr types.path; - }; - - tlsKeyFile = mkOption { - description = "Kubernetes apiserver private key file."; - default = null; - type = types.nullOr types.path; - }; - - clientCaFile = mkOption { - description = "Kubernetes apiserver CA file for client auth."; - default = cfg.caFile; - type = types.nullOr types.path; - }; - - tokenAuthFile = mkOption { - description = '' - Kubernetes apiserver token authentication file. See - - ''; - default = null; - type = types.nullOr types.path; - }; - - basicAuthFile = mkOption { - description = '' - Kubernetes apiserver basic authentication file. See - - ''; - default = pkgs.writeText "users" '' - kubernetes,admin,0 - ''; - type = types.nullOr types.path; - }; - - authorizationMode = mkOption { - description = '' - Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/Webhook/RBAC/Node). See - - ''; - default = ["RBAC" "Node"]; - type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "Webhook" "RBAC" "Node"]); - }; - - authorizationPolicy = mkOption { - description = '' - Kubernetes apiserver authorization policy file. See - - ''; - default = []; - type = types.listOf types.attrs; - }; - - webhookConfig = mkOption { - description = '' - Kubernetes apiserver Webhook config file. It uses the kubeconfig file format. - See - ''; - default = null; - type = types.nullOr types.path; - }; - - allowPrivileged = mkOption { - description = "Whether to allow privileged containers on Kubernetes."; - default = true; - type = types.bool; - }; - - serviceClusterIpRange = mkOption { - description = '' - A CIDR notation IP range from which to assign service cluster IPs. - This must not overlap with any IP ranges assigned to nodes for pods. - ''; - default = "10.0.0.0/24"; - type = types.str; - }; - - runtimeConfig = mkOption { - description = '' - Api runtime configuration. See - - ''; - default = "authentication.k8s.io/v1beta1=true"; - example = "api/all=false,api/v1=true"; - type = types.str; - }; - - enableAdmissionPlugins = mkOption { - description = '' - Kubernetes admission control plugins to enable. See - - ''; - default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds" "NodeRestriction"]; - example = [ - "NamespaceLifecycle" "NamespaceExists" "LimitRanger" - "SecurityContextDeny" "ServiceAccount" "ResourceQuota" - "PodSecurityPolicy" "NodeRestriction" "DefaultStorageClass" - ]; - type = types.listOf types.str; - }; - - disableAdmissionPlugins = mkOption { - description = '' - Kubernetes admission control plugins to disable. See - - ''; - default = []; - type = types.listOf types.str; - }; - - serviceAccountKeyFile = mkOption { - description = '' - Kubernetes apiserver PEM-encoded x509 RSA private or public key file, - used to verify ServiceAccount tokens. By default tls private key file - is used. - ''; - default = null; - type = types.nullOr types.path; - }; - - kubeletClientCaFile = mkOption { - description = "Path to a cert file for connecting to kubelet."; - default = cfg.caFile; - type = types.nullOr types.path; - }; - - kubeletClientCertFile = mkOption { - description = "Client certificate to use for connections to kubelet."; - default = null; - type = types.nullOr types.path; - }; - - kubeletClientKeyFile = mkOption { - description = "Key to use for connections to kubelet."; - default = null; - type = types.nullOr types.path; - }; - - kubeletHttps = mkOption { - description = "Whether to use https for connections to kubelet."; - default = true; - type = types.bool; - }; - - extraOpts = mkOption { - description = "Kubernetes apiserver extra command line options."; - default = ""; - type = types.str; - }; - }; - - scheduler = { - enable = mkOption { - description = "Whether to enable Kubernetes scheduler."; - default = false; - type = types.bool; - }; - - featureGates = mkOption { - description = "List set of feature gates"; - default = cfg.featureGates; - type = types.listOf types.str; - }; - - address = mkOption { - description = "Kubernetes scheduler listening address."; - default = "127.0.0.1"; - type = types.str; - }; - - port = mkOption { - description = "Kubernetes scheduler listening port."; - default = 10251; - type = types.int; - }; - - leaderElect = mkOption { - description = "Whether to start leader election before executing main loop."; - type = types.bool; - default = true; - }; - - kubeconfig = mkKubeConfigOptions "Kubernetes scheduler"; - - extraOpts = mkOption { - description = "Kubernetes scheduler extra command line options."; - default = ""; - type = types.str; - }; - }; - - controllerManager = { - enable = mkOption { - description = "Whether to enable Kubernetes controller manager."; - default = false; - type = types.bool; - }; - - featureGates = mkOption { - description = "List set of feature gates"; - default = cfg.featureGates; - type = types.listOf types.str; - }; - - address = mkOption { - description = "Kubernetes controller manager listening address."; - default = "127.0.0.1"; - type = types.str; - }; - - port = mkOption { - description = "Kubernetes controller manager listening port."; - default = 10252; - type = types.int; - }; - - leaderElect = mkOption { - description = "Whether to start leader election before executing main loop."; - type = types.bool; - default = true; - }; - - serviceAccountKeyFile = mkOption { - description = '' - Kubernetes controller manager PEM-encoded private RSA key file used to - sign service account tokens - ''; - default = null; - type = types.nullOr types.path; - }; - - rootCaFile = mkOption { - description = '' - Kubernetes controller manager certificate authority file included in - service account's token secret. - ''; - default = cfg.caFile; - type = types.nullOr types.path; - }; - - kubeconfig = mkKubeConfigOptions "Kubernetes controller manager"; - - extraOpts = mkOption { - description = "Kubernetes controller manager extra command line options."; - default = ""; - type = types.str; - }; - }; - - kubelet = { - enable = mkOption { - description = "Whether to enable Kubernetes kubelet."; - default = false; - type = types.bool; - }; - - featureGates = mkOption { - description = "List set of feature gates"; - default = cfg.featureGates; - type = types.listOf types.str; - }; - - seedDockerImages = mkOption { - description = "List of docker images to preload on system"; - default = []; - type = types.listOf types.package; - }; - - registerNode = mkOption { - description = "Whether to auto register kubelet with API server."; - default = true; - type = types.bool; - }; - - address = mkOption { - description = "Kubernetes kubelet info server listening address."; - default = "0.0.0.0"; - type = types.str; - }; - - port = mkOption { - description = "Kubernetes kubelet info server listening port."; - default = 10250; - type = types.int; - }; - - tlsCertFile = mkOption { - description = "File containing x509 Certificate for HTTPS."; - default = null; - type = types.nullOr types.path; - }; - - tlsKeyFile = mkOption { - description = "File containing x509 private key matching tlsCertFile."; - default = null; - type = types.nullOr types.path; - }; - - clientCaFile = mkOption { - description = "Kubernetes apiserver CA file for client authentication."; - default = cfg.caFile; - type = types.nullOr types.path; - }; - - healthz = { - bind = mkOption { - description = "Kubernetes kubelet healthz listening address."; - default = "127.0.0.1"; - type = types.str; - }; - - port = mkOption { - description = "Kubernetes kubelet healthz port."; - default = 10248; - type = types.int; - }; - }; - - hostname = mkOption { - description = "Kubernetes kubelet hostname override."; - default = config.networking.hostName; - type = types.str; - }; - - allowPrivileged = mkOption { - description = "Whether to allow Kubernetes containers to request privileged mode."; - default = true; - type = types.bool; - }; - - clusterDns = mkOption { - description = "Use alternative DNS."; - default = "10.1.0.1"; - type = types.str; - }; - - clusterDomain = mkOption { - description = "Use alternative domain."; - default = config.services.kubernetes.addons.dns.clusterDomain; - type = types.str; - }; - - networkPlugin = mkOption { - description = "Network plugin to use by Kubernetes."; - type = types.nullOr (types.enum ["cni" "kubenet"]); - default = "kubenet"; - }; - - cni = { - packages = mkOption { - description = "List of network plugin packages to install."; - type = types.listOf types.package; - default = []; - }; - - config = mkOption { - description = "Kubernetes CNI configuration."; - type = types.listOf types.attrs; - default = []; - example = literalExample '' - [{ - "cniVersion": "0.2.0", - "name": "mynet", - "type": "bridge", - "bridge": "cni0", - "isGateway": true, - "ipMasq": true, - "ipam": { - "type": "host-local", - "subnet": "10.22.0.0/16", - "routes": [ - { "dst": "0.0.0.0/0" } - ] - } - } { - "cniVersion": "0.2.0", - "type": "loopback" - }] - ''; - }; - - configDir = mkOption { - description = "Path to Kubernetes CNI configuration directory."; - type = types.nullOr types.path; - default = null; - }; - }; - - manifests = mkOption { - description = "List of manifests to bootstrap with kubelet (only pods can be created as manifest entry)"; - type = types.attrsOf types.attrs; - default = {}; - }; - - applyManifests = mkOption { - description = "Whether to apply manifests (this is true for master node)."; - default = false; - type = types.bool; - }; - - unschedulable = mkOption { - description = "Whether to set node taint to unschedulable=true as it is the case of node that has only master role."; - default = false; - type = types.bool; - }; - - taints = mkOption { - description = "Node taints (https://kubernetes.io/docs/concepts/configuration/assign-pod-node/)."; - default = {}; - type = types.attrsOf (types.submodule [ taintOptions ]); - }; - - nodeIp = mkOption { - description = "IP address of the node. If set, kubelet will use this IP address for the node."; - default = null; - type = types.nullOr types.str; - }; - - kubeconfig = mkKubeConfigOptions "Kubelet"; - - extraOpts = mkOption { - description = "Kubernetes kubelet extra command line options."; - default = ""; - type = types.str; - }; - }; - - proxy = { - enable = mkOption { - description = "Whether to enable Kubernetes proxy."; - default = false; - type = types.bool; - }; - - featureGates = mkOption { - description = "List set of feature gates"; - default = cfg.featureGates; - type = types.listOf types.str; - }; - - address = mkOption { - description = "Kubernetes proxy listening address."; - default = "0.0.0.0"; - type = types.str; - }; - - kubeconfig = mkKubeConfigOptions "Kubernetes proxy"; - - extraOpts = mkOption { - description = "Kubernetes proxy extra command line options."; - default = ""; - type = types.str; - }; - }; - - addonManager = { - enable = mkOption { - description = "Whether to enable Kubernetes addon manager."; - default = false; - type = types.bool; - }; - - addons = mkOption { - description = "Kubernetes addons (any kind of Kubernetes resource can be an addon)."; - default = { }; - type = types.attrsOf (types.either types.attrs (types.listOf types.attrs)); - example = literalExample '' - { - "my-service" = { - "apiVersion" = "v1"; - "kind" = "Service"; - "metadata" = { - "name" = "my-service"; - "namespace" = "default"; - }; - "spec" = { ... }; - }; - } - // import { cfg = config.services.kubernetes; }; - ''; - }; + masterAddress = mkOption { + description = "Clusterwide available network address or hostname for the kubernetes master server."; + example = "master.example.com"; + type = types.str; }; path = mkOption { @@ -787,304 +156,75 @@ in { type = types.nullOr types.str; }; - flannel.enable = mkOption { - description = "Whether to enable flannel networking"; - default = false; - type = types.bool; + lib = mkOption { + description = "Common functions for the kubernetes modules."; + default = { + inherit mkCert; + inherit mkKubeConfig; + inherit mkKubeConfigOptions; + }; + type = types.attrs; }; + secretsPath = mkOption { + description = "Default location for kubernetes secrets. Not a store location."; + type = types.path; + default = cfg.dataDir + "/secrets"; + }; }; ###### implementation config = mkMerge [ - (mkIf cfg.kubelet.enable { - services.kubernetes.kubelet.seedDockerImages = [infraContainer]; - systemd.services.kubelet-bootstrap = { - description = "Boostrap Kubelet"; - wantedBy = ["kubernetes.target"]; - after = ["docker.service" "network.target"]; - path = with pkgs; [ docker ]; - script = '' - ${concatMapStrings (img: '' - echo "Seeding docker image: ${img}" - docker load <${img} - '') cfg.kubelet.seedDockerImages} - - rm /opt/cni/bin/* || true - ${concatMapStrings (package: '' - echo "Linking cni package: ${package}" - ln -fs ${package}/bin/* /opt/cni/bin - '') cfg.kubelet.cni.packages} - ''; - serviceConfig = { - Slice = "kubernetes.slice"; - Type = "oneshot"; - }; - }; - - systemd.services.kubelet = { - description = "Kubernetes Kubelet Service"; - wantedBy = [ "kubernetes.target" ]; - after = [ "network.target" "docker.service" "kube-apiserver.service" "kubelet-bootstrap.service" ]; - path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ cfg.path; - serviceConfig = { - Slice = "kubernetes.slice"; - CPUAccounting = true; - MemoryAccounting = true; - ExecStart = ''${cfg.package}/bin/kubelet \ - ${optionalString (taints != "") - "--register-with-taints=${taints}"} \ - --kubeconfig=${mkKubeConfig "kubelet" cfg.kubelet.kubeconfig} \ - --config=${kubeletConfig} \ - --address=${cfg.kubelet.address} \ - --port=${toString cfg.kubelet.port} \ - --register-node=${boolToString cfg.kubelet.registerNode} \ - ${optionalString (cfg.kubelet.tlsCertFile != null) - "--tls-cert-file=${cfg.kubelet.tlsCertFile}"} \ - ${optionalString (cfg.kubelet.tlsKeyFile != null) - "--tls-private-key-file=${cfg.kubelet.tlsKeyFile}"} \ - ${optionalString (cfg.kubelet.clientCaFile != null) - "--client-ca-file=${cfg.kubelet.clientCaFile}"} \ - --authentication-token-webhook \ - --authentication-token-webhook-cache-ttl="10s" \ - --authorization-mode=Webhook \ - --healthz-bind-address=${cfg.kubelet.healthz.bind} \ - --healthz-port=${toString cfg.kubelet.healthz.port} \ - --hostname-override=${cfg.kubelet.hostname} \ - --allow-privileged=${boolToString cfg.kubelet.allowPrivileged} \ - --root-dir=${cfg.dataDir} \ - ${optionalString (cfg.kubelet.clusterDns != "") - "--cluster-dns=${cfg.kubelet.clusterDns}"} \ - ${optionalString (cfg.kubelet.clusterDomain != "") - "--cluster-domain=${cfg.kubelet.clusterDomain}"} \ - --pod-infra-container-image=pause \ - ${optionalString (cfg.kubelet.networkPlugin != null) - "--network-plugin=${cfg.kubelet.networkPlugin}"} \ - --cni-conf-dir=${cniConfig} \ - --hairpin-mode=hairpin-veth \ - ${optionalString (cfg.kubelet.nodeIp != null) - "--node-ip=${cfg.kubelet.nodeIp}"} \ - ${optionalString (cfg.kubelet.featureGates != []) - "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.kubelet.featureGates}"} \ - ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ - ${cfg.kubelet.extraOpts} - ''; - WorkingDirectory = cfg.dataDir; - }; - }; - - # Allways include cni plugins - services.kubernetes.kubelet.cni.packages = [pkgs.cni-plugins]; - - boot.kernelModules = ["br_netfilter"]; - - services.kubernetes.kubelet.kubeconfig = kubeConfigDefaults; + (mkIf cfg.easyCerts { + services.kubernetes.pki.enable = mkDefault true; + services.kubernetes.caFile = caCert; }) - (mkIf (cfg.kubelet.applyManifests && cfg.kubelet.enable) { - environment.etc = mapAttrs' (name: manifest: - nameValuePair "kubernetes/manifests/${name}.json" { - text = builtins.toJSON manifest; - mode = "0755"; - } - ) cfg.kubelet.manifests; - }) - - (mkIf (cfg.kubelet.unschedulable && cfg.kubelet.enable) { - services.kubernetes.kubelet.taints.unschedulable = { - value = "true"; - effect = "NoSchedule"; - }; - }) - - (mkIf cfg.apiserver.enable { - systemd.services.kube-apiserver = { - description = "Kubernetes APIServer Service"; - wantedBy = [ "kubernetes.target" ]; - after = [ "network.target" "docker.service" ]; - serviceConfig = { - Slice = "kubernetes.slice"; - ExecStart = ''${cfg.package}/bin/kube-apiserver \ - --etcd-servers=${concatStringsSep "," cfg.etcd.servers} \ - ${optionalString (cfg.etcd.caFile != null) - "--etcd-cafile=${cfg.etcd.caFile}"} \ - ${optionalString (cfg.etcd.certFile != null) - "--etcd-certfile=${cfg.etcd.certFile}"} \ - ${optionalString (cfg.etcd.keyFile != null) - "--etcd-keyfile=${cfg.etcd.keyFile}"} \ - --insecure-port=${toString cfg.apiserver.port} \ - --bind-address=${cfg.apiserver.bindAddress} \ - ${optionalString (cfg.apiserver.advertiseAddress != null) - "--advertise-address=${cfg.apiserver.advertiseAddress}"} \ - --allow-privileged=${boolToString cfg.apiserver.allowPrivileged}\ - ${optionalString (cfg.apiserver.tlsCertFile != null) - "--tls-cert-file=${cfg.apiserver.tlsCertFile}"} \ - ${optionalString (cfg.apiserver.tlsKeyFile != null) - "--tls-private-key-file=${cfg.apiserver.tlsKeyFile}"} \ - ${optionalString (cfg.apiserver.tokenAuthFile != null) - "--token-auth-file=${cfg.apiserver.tokenAuthFile}"} \ - ${optionalString (cfg.apiserver.basicAuthFile != null) - "--basic-auth-file=${cfg.apiserver.basicAuthFile}"} \ - --kubelet-https=${if cfg.apiserver.kubeletHttps then "true" else "false"} \ - ${optionalString (cfg.apiserver.kubeletClientCaFile != null) - "--kubelet-certificate-authority=${cfg.apiserver.kubeletClientCaFile}"} \ - ${optionalString (cfg.apiserver.kubeletClientCertFile != null) - "--kubelet-client-certificate=${cfg.apiserver.kubeletClientCertFile}"} \ - ${optionalString (cfg.apiserver.kubeletClientKeyFile != null) - "--kubelet-client-key=${cfg.apiserver.kubeletClientKeyFile}"} \ - ${optionalString (cfg.apiserver.clientCaFile != null) - "--client-ca-file=${cfg.apiserver.clientCaFile}"} \ - --authorization-mode=${concatStringsSep "," cfg.apiserver.authorizationMode} \ - ${optionalString (elem "ABAC" cfg.apiserver.authorizationMode) - "--authorization-policy-file=${ - pkgs.writeText "kube-auth-policy.jsonl" - (concatMapStringsSep "\n" (l: builtins.toJSON l) cfg.apiserver.authorizationPolicy) - }" - } \ - ${optionalString (elem "Webhook" cfg.apiserver.authorizationMode) - "--authorization-webhook-config-file=${cfg.apiserver.webhookConfig}" - } \ - --secure-port=${toString cfg.apiserver.securePort} \ - --service-cluster-ip-range=${cfg.apiserver.serviceClusterIpRange} \ - ${optionalString (cfg.apiserver.runtimeConfig != "") - "--runtime-config=${cfg.apiserver.runtimeConfig}"} \ - --enable-admission-plugins=${concatStringsSep "," cfg.apiserver.enableAdmissionPlugins} \ - --disable-admission-plugins=${concatStringsSep "," cfg.apiserver.disableAdmissionPlugins} \ - ${optionalString (cfg.apiserver.serviceAccountKeyFile!=null) - "--service-account-key-file=${cfg.apiserver.serviceAccountKeyFile}"} \ - ${optionalString cfg.verbose "--v=6"} \ - ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ - --storage-backend=${cfg.apiserver.storageBackend} \ - ${optionalString (cfg.kubelet.featureGates != []) - "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.kubelet.featureGates}"} \ - ${cfg.apiserver.extraOpts} - ''; - WorkingDirectory = cfg.dataDir; - User = "kubernetes"; - Group = "kubernetes"; - AmbientCapabilities = "cap_net_bind_service"; - Restart = "on-failure"; - RestartSec = 5; - }; - }; - }) - - (mkIf cfg.scheduler.enable { - systemd.services.kube-scheduler = { - description = "Kubernetes Scheduler Service"; - wantedBy = [ "kubernetes.target" ]; - after = [ "kube-apiserver.service" ]; - serviceConfig = { - Slice = "kubernetes.slice"; - ExecStart = ''${cfg.package}/bin/kube-scheduler \ - --address=${cfg.scheduler.address} \ - --port=${toString cfg.scheduler.port} \ - --leader-elect=${boolToString cfg.scheduler.leaderElect} \ - --kubeconfig=${mkKubeConfig "kube-scheduler" cfg.scheduler.kubeconfig} \ - ${optionalString cfg.verbose "--v=6"} \ - ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ - ${optionalString (cfg.scheduler.featureGates != []) - "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.scheduler.featureGates}"} \ - ${cfg.scheduler.extraOpts} - ''; - WorkingDirectory = cfg.dataDir; - User = "kubernetes"; - Group = "kubernetes"; - }; - }; - - services.kubernetes.scheduler.kubeconfig = kubeConfigDefaults; - }) - - (mkIf cfg.controllerManager.enable { - systemd.services.kube-controller-manager = { - description = "Kubernetes Controller Manager Service"; - wantedBy = [ "kubernetes.target" ]; - after = [ "kube-apiserver.service" ]; - serviceConfig = { - RestartSec = "30s"; - Restart = "on-failure"; - Slice = "kubernetes.slice"; - ExecStart = ''${cfg.package}/bin/kube-controller-manager \ - --address=${cfg.controllerManager.address} \ - --port=${toString cfg.controllerManager.port} \ - --kubeconfig=${mkKubeConfig "kube-controller-manager" cfg.controllerManager.kubeconfig} \ - --leader-elect=${boolToString cfg.controllerManager.leaderElect} \ - ${if (cfg.controllerManager.serviceAccountKeyFile!=null) - then "--service-account-private-key-file=${cfg.controllerManager.serviceAccountKeyFile}" - else "--service-account-private-key-file=/var/run/kubernetes/apiserver.key"} \ - ${if (cfg.controllerManager.rootCaFile!=null) - then "--root-ca-file=${cfg.controllerManager.rootCaFile}" - else "--root-ca-file=/var/run/kubernetes/apiserver.crt"} \ - ${if (cfg.clusterCidr!=null) - then "--cluster-cidr=${cfg.clusterCidr} --allocate-node-cidrs=true" - else "--allocate-node-cidrs=false"} \ - ${optionalString (cfg.controllerManager.featureGates != []) - "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.controllerManager.featureGates}"} \ - ${optionalString cfg.verbose "--v=6"} \ - ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ - ${cfg.controllerManager.extraOpts} - ''; - WorkingDirectory = cfg.dataDir; - User = "kubernetes"; - Group = "kubernetes"; - }; - path = cfg.path; - }; - - services.kubernetes.controllerManager.kubeconfig = kubeConfigDefaults; - }) - - (mkIf cfg.proxy.enable { - systemd.services.kube-proxy = { - description = "Kubernetes Proxy Service"; - wantedBy = [ "kubernetes.target" ]; - after = [ "kube-apiserver.service" ]; - path = [pkgs.iptables pkgs.conntrack_tools]; - serviceConfig = { - Slice = "kubernetes.slice"; - ExecStart = ''${cfg.package}/bin/kube-proxy \ - --kubeconfig=${mkKubeConfig "kube-proxy" cfg.proxy.kubeconfig} \ - --bind-address=${cfg.proxy.address} \ - ${optionalString (cfg.proxy.featureGates != []) - "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.proxy.featureGates}"} \ - ${optionalString cfg.verbose "--v=6"} \ - ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ - ${optionalString (cfg.clusterCidr!=null) - "--cluster-cidr=${cfg.clusterCidr}"} \ - ${cfg.proxy.extraOpts} - ''; - WorkingDirectory = cfg.dataDir; - }; - }; - - # kube-proxy needs iptables - networking.firewall.enable = mkDefault true; - - services.kubernetes.proxy.kubeconfig = kubeConfigDefaults; - }) - - (mkIf (any (el: el == "master") cfg.roles) { - virtualisation.docker.enable = mkDefault true; - services.kubernetes.kubelet.enable = mkDefault true; - services.kubernetes.kubelet.allowPrivileged = mkDefault true; - services.kubernetes.kubelet.applyManifests = mkDefault true; + (mkIf (elem "master" cfg.roles) { services.kubernetes.apiserver.enable = mkDefault true; services.kubernetes.scheduler.enable = mkDefault true; services.kubernetes.controllerManager.enable = mkDefault true; - services.etcd.enable = mkDefault (cfg.etcd.servers == ["http://127.0.0.1:2379"]); services.kubernetes.addonManager.enable = mkDefault true; services.kubernetes.proxy.enable = mkDefault true; + services.etcd.enable = true; # Cannot mkDefault because of flannel default options + services.kubernetes.kubelet = { + enable = mkDefault true; + taints = mkIf (!(elem "node" cfg.roles)) { + master = { + key = "node-role.kubernetes.io/master"; + value = "true"; + effect = "NoSchedule"; + }; + }; + }; }) - # if this node is only a master make it unschedulable by default + (mkIf (all (el: el == "master") cfg.roles) { + # if this node is only a master make it unschedulable by default services.kubernetes.kubelet.unschedulable = mkDefault true; }) - (mkIf (any (el: el == "node") cfg.roles) { + (mkIf (elem "node" cfg.roles) { + services.kubernetes.kubelet.enable = mkDefault true; + services.kubernetes.proxy.enable = mkDefault true; + }) + + # Using "services.kubernetes.roles" will automatically enable easyCerts and flannel + (mkIf (cfg.roles != []) { + services.kubernetes.flannel.enable = mkDefault true; + services.flannel.etcd.endpoints = mkDefault etcdEndpoints; + services.kubernetes.easyCerts = mkDefault true; + }) + + (mkIf cfg.apiserver.enable { + services.kubernetes.pki.etcClusterAdminKubeconfig = mkDefault "kubernetes/cluster-admin.kubeconfig"; + services.kubernetes.apiserver.etcd.servers = mkDefault etcdEndpoints; + }) + + (mkIf cfg.kubelet.enable { virtualisation.docker = { enable = mkDefault true; @@ -1094,26 +234,18 @@ in { # iptables must be disabled for kubernetes extraOptions = "--iptables=false --ip-masq=false"; }; - - services.kubernetes.kubelet.enable = mkDefault true; - services.kubernetes.proxy.enable = mkDefault true; }) - (mkIf cfg.addonManager.enable { - environment.etc."kubernetes/addons".source = "${addons}/"; - - systemd.services.kube-addon-manager = { - description = "Kubernetes addon manager"; - wantedBy = [ "kubernetes.target" ]; - after = [ "kube-apiserver.service" ]; - environment.ADDON_PATH = "/etc/kubernetes/addons/"; - path = [ pkgs.gawk ]; - serviceConfig = { - Slice = "kubernetes.slice"; - ExecStart = "${cfg.package}/bin/kube-addons"; - WorkingDirectory = cfg.dataDir; - User = "kubernetes"; - Group = "kubernetes"; + (mkIf (cfg.apiserver.enable || cfg.controllerManager.enable) { + services.kubernetes.pki.certs = { + serviceAccount = mkCert { + name = "service-account"; + CN = "system:service-account-signer"; + action = '' + systemctl reload \ + kube-apiserver.service \ + kube-controller-manager.service + ''; }; }; }) @@ -1123,7 +255,8 @@ in { cfg.scheduler.enable || cfg.controllerManager.enable || cfg.kubelet.enable || - cfg.proxy.enable + cfg.proxy.enable || + cfg.addonManager.enable ) { systemd.targets.kubernetes = { description = "Kubernetes"; @@ -1132,11 +265,10 @@ in { systemd.tmpfiles.rules = [ "d /opt/cni/bin 0755 root root -" - "d /var/run/kubernetes 0755 kubernetes kubernetes -" + "d /run/kubernetes 0755 kubernetes kubernetes -" "d /var/lib/kubernetes 0755 kubernetes kubernetes -" ]; - environment.systemPackages = [ cfg.package ]; users.users = singleton { name = "kubernetes"; uid = config.ids.uids.kubernetes; @@ -1148,53 +280,12 @@ in { }; users.groups.kubernetes.gid = config.ids.gids.kubernetes; - # dns addon is enabled by default + # dns addon is enabled by default services.kubernetes.addons.dns.enable = mkDefault true; - }) - (mkIf cfg.flannel.enable { - services.flannel = { - enable = mkDefault true; - network = mkDefault cfg.clusterCidr; - etcd = mkDefault { - endpoints = cfg.etcd.servers; - inherit (cfg.etcd) caFile certFile keyFile; - }; - }; - - services.kubernetes.kubelet = { - networkPlugin = mkDefault "cni"; - cni.config = mkDefault [{ - name = "mynet"; - type = "flannel"; - delegate = { - isDefaultGateway = true; - bridge = "docker0"; - }; - }]; - }; - - systemd.services."mk-docker-opts" = { - description = "Pre-Docker Actions"; - wantedBy = [ "flannel.service" ]; - before = [ "docker.service" ]; - after = [ "flannel.service" ]; - path = [ pkgs.gawk pkgs.gnugrep ]; - script = '' - mkdir -p /run/flannel - ${mkDockerOpts}/mk-docker-opts -d /run/flannel/docker - ''; - serviceConfig.Type = "oneshot"; - }; - systemd.services.docker.serviceConfig.EnvironmentFile = "/run/flannel/docker"; - - # read environment variables generated by mk-docker-opts - virtualisation.docker.extraOptions = "$DOCKER_OPTS"; - - networking.firewall.allowedUDPPorts = [ - 8285 # flannel udp - 8472 # flannel vxlan - ]; + services.kubernetes.apiserverAddress = mkDefault ("https://${if cfg.apiserver.advertiseAddress != null + then cfg.apiserver.advertiseAddress + else "${cfg.masterAddress}:${toString cfg.apiserver.securePort}"}"); }) ]; } diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix new file mode 100644 index 000000000000..93ee2fd65eeb --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -0,0 +1,134 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.flannel; + + # we want flannel to use kubernetes itself as configuration backend, not direct etcd + storageBackend = "kubernetes"; + + # needed for flannel to pass options to docker + mkDockerOpts = pkgs.runCommand "mk-docker-opts" { + buildInputs = [ pkgs.makeWrapper ]; + } '' + mkdir -p $out + cp ${pkgs.kubernetes.src}/cluster/centos/node/bin/mk-docker-opts.sh $out/mk-docker-opts.sh + + # bashInteractive needed for `compgen` + makeWrapper ${pkgs.bashInteractive}/bin/bash $out/mk-docker-opts --add-flags "$out/mk-docker-opts.sh" + ''; +in +{ + ###### interface + options.services.kubernetes.flannel = { + enable = mkEnableOption "enable flannel networking"; + }; + + ###### implementation + config = mkIf cfg.enable { + services.flannel = { + + enable = mkDefault true; + network = mkDefault top.clusterCidr; + inherit storageBackend; + nodeName = config.services.kubernetes.kubelet.hostname; + }; + + services.kubernetes.kubelet = { + networkPlugin = mkDefault "cni"; + cni.config = mkDefault [{ + name = "mynet"; + type = "flannel"; + delegate = { + isDefaultGateway = true; + bridge = "docker0"; + }; + }]; + }; + + systemd.services."mk-docker-opts" = { + description = "Pre-Docker Actions"; + path = with pkgs; [ gawk gnugrep ]; + script = '' + ${mkDockerOpts}/mk-docker-opts -d /run/flannel/docker + systemctl restart docker + ''; + serviceConfig.Type = "oneshot"; + }; + + systemd.paths."flannel-subnet-env" = { + wantedBy = [ "flannel.service" ]; + pathConfig = { + PathModified = "/run/flannel/subnet.env"; + Unit = "mk-docker-opts.service"; + }; + }; + + systemd.services.docker = { + environment.DOCKER_OPTS = "-b none"; + serviceConfig.EnvironmentFile = "-/run/flannel/docker"; + }; + + # read environment variables generated by mk-docker-opts + virtualisation.docker.extraOptions = "$DOCKER_OPTS"; + + networking = { + firewall.allowedUDPPorts = [ + 8285 # flannel udp + 8472 # flannel vxlan + ]; + dhcpcd.denyInterfaces = [ "docker*" "flannel*" ]; + }; + + services.kubernetes.pki.certs = { + flannelClient = top.lib.mkCert { + name = "flannel-client"; + CN = "flannel-client"; + action = "systemctl restart flannel.service"; + }; + }; + + # give flannel som kubernetes rbac permissions if applicable + services.kubernetes.addonManager.bootstrapAddons = mkIf ((storageBackend == "kubernetes") && (elem "RBAC" top.apiserver.authorizationMode)) { + + flannel-cr = { + apiVersion = "rbac.authorization.k8s.io/v1beta1"; + kind = "ClusterRole"; + metadata = { name = "flannel"; }; + rules = [{ + apiGroups = [ "" ]; + resources = [ "pods" ]; + verbs = [ "get" ]; + } + { + apiGroups = [ "" ]; + resources = [ "nodes" ]; + verbs = [ "list" "watch" ]; + } + { + apiGroups = [ "" ]; + resources = [ "nodes/status" ]; + verbs = [ "patch" ]; + }]; + }; + + flannel-crb = { + apiVersion = "rbac.authorization.k8s.io/v1beta1"; + kind = "ClusterRoleBinding"; + metadata = { name = "flannel"; }; + roleRef = { + apiGroup = "rbac.authorization.k8s.io"; + kind = "ClusterRole"; + name = "flannel"; + }; + subjects = [{ + kind = "User"; + name = "flannel-client"; + }]; + }; + + }; + }; +} diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix new file mode 100644 index 000000000000..c94bb28bf7fb --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -0,0 +1,358 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.kubelet; + + cniConfig = + if cfg.cni.config != [] && !(isNull cfg.cni.configDir) then + throw "Verbatim CNI-config and CNI configDir cannot both be set." + else if !(isNull cfg.cni.configDir) then + cfg.cni.configDir + else + (pkgs.buildEnv { + name = "kubernetes-cni-config"; + paths = imap (i: entry: + pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry) + ) cfg.cni.config; + }); + + infraContainer = pkgs.dockerTools.buildImage { + name = "pause"; + tag = "latest"; + contents = top.package.pause; + config.Cmd = "/bin/pause"; + }; + + kubeconfig = top.lib.mkKubeConfig "kubelet" cfg.kubeconfig; + + manifests = pkgs.buildEnv { + name = "kubernetes-manifests"; + paths = mapAttrsToList (name: manifest: + pkgs.writeTextDir "${name}.json" (builtins.toJSON manifest) + ) cfg.manifests; + }; + + manifestPath = "kubernetes/manifests"; + + taintOptions = with lib.types; { name, ... }: { + options = { + key = mkOption { + description = "Key of taint."; + default = name; + type = str; + }; + value = mkOption { + description = "Value of taint."; + type = str; + }; + effect = mkOption { + description = "Effect of taint."; + example = "NoSchedule"; + type = enum ["NoSchedule" "PreferNoSchedule" "NoExecute"]; + }; + }; + }; + + taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (mapAttrsToList (n: v: v) cfg.taints); +in +{ + ###### interface + options.services.kubernetes.kubelet = with lib.types; { + + address = mkOption { + description = "Kubernetes kubelet info server listening address."; + default = "0.0.0.0"; + type = str; + }; + + allowPrivileged = mkOption { + description = "Whether to allow Kubernetes containers to request privileged mode."; + default = false; + type = bool; + }; + + clusterDns = mkOption { + description = "Use alternative DNS."; + default = "10.1.0.1"; + type = str; + }; + + clusterDomain = mkOption { + description = "Use alternative domain."; + default = config.services.kubernetes.addons.dns.clusterDomain; + type = str; + }; + + clientCaFile = mkOption { + description = "Kubernetes apiserver CA file for client authentication."; + default = top.caFile; + type = nullOr path; + }; + + cni = { + packages = mkOption { + description = "List of network plugin packages to install."; + type = listOf package; + default = []; + }; + + config = mkOption { + description = "Kubernetes CNI configuration."; + type = listOf attrs; + default = []; + example = literalExample '' + [{ + "cniVersion": "0.2.0", + "name": "mynet", + "type": "bridge", + "bridge": "cni0", + "isGateway": true, + "ipMasq": true, + "ipam": { + "type": "host-local", + "subnet": "10.22.0.0/16", + "routes": [ + { "dst": "0.0.0.0/0" } + ] + } + } { + "cniVersion": "0.2.0", + "type": "loopback" + }] + ''; + }; + + configDir = mkOption { + description = "Path to Kubernetes CNI configuration directory."; + type = nullOr path; + default = null; + }; + }; + + enable = mkEnableOption "Kubernetes kubelet."; + + extraOpts = mkOption { + description = "Kubernetes kubelet extra command line options."; + default = ""; + type = str; + }; + + featureGates = mkOption { + description = "List set of feature gates"; + default = top.featureGates; + type = listOf str; + }; + + healthz = { + bind = mkOption { + description = "Kubernetes kubelet healthz listening address."; + default = "127.0.0.1"; + type = str; + }; + + port = mkOption { + description = "Kubernetes kubelet healthz port."; + default = 10248; + type = int; + }; + }; + + hostname = mkOption { + description = "Kubernetes kubelet hostname override."; + default = config.networking.hostName; + type = str; + }; + + kubeconfig = top.lib.mkKubeConfigOptions "Kubelet"; + + manifests = mkOption { + description = "List of manifests to bootstrap with kubelet (only pods can be created as manifest entry)"; + type = attrsOf attrs; + default = {}; + }; + + networkPlugin = mkOption { + description = "Network plugin to use by Kubernetes."; + type = nullOr (enum ["cni" "kubenet"]); + default = "kubenet"; + }; + + nodeIp = mkOption { + description = "IP address of the node. If set, kubelet will use this IP address for the node."; + default = null; + type = nullOr str; + }; + + registerNode = mkOption { + description = "Whether to auto register kubelet with API server."; + default = true; + type = bool; + }; + + port = mkOption { + description = "Kubernetes kubelet info server listening port."; + default = 10250; + type = int; + }; + + seedDockerImages = mkOption { + description = "List of docker images to preload on system"; + default = []; + type = listOf package; + }; + + taints = mkOption { + description = "Node taints (https://kubernetes.io/docs/concepts/configuration/assign-pod-node/)."; + default = {}; + type = attrsOf (submodule [ taintOptions ]); + }; + + tlsCertFile = mkOption { + description = "File containing x509 Certificate for HTTPS."; + default = null; + type = nullOr path; + }; + + tlsKeyFile = mkOption { + description = "File containing x509 private key matching tlsCertFile."; + default = null; + type = nullOr path; + }; + + unschedulable = mkOption { + description = "Whether to set node taint to unschedulable=true as it is the case of node that has only master role."; + default = false; + type = bool; + }; + + verbosity = mkOption { + description = '' + Optional glog verbosity level for logging statements. See + + ''; + default = null; + type = nullOr int; + }; + + }; + + ###### implementation + config = mkMerge [ + (mkIf cfg.enable { + services.kubernetes.kubelet.seedDockerImages = [infraContainer]; + + systemd.services.kubelet = { + description = "Kubernetes Kubelet Service"; + wantedBy = [ "kubernetes.target" ]; + after = [ "network.target" "docker.service" "kube-apiserver.service" ]; + path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path; + preStart = '' + ${concatMapStrings (img: '' + echo "Seeding docker image: ${img}" + docker load <${img} + '') cfg.seedDockerImages} + + rm /opt/cni/bin/* || true + ${concatMapStrings (package: '' + echo "Linking cni package: ${package}" + ln -fs ${package}/bin/* /opt/cni/bin + '') cfg.cni.packages} + ''; + serviceConfig = { + Slice = "kubernetes.slice"; + CPUAccounting = true; + MemoryAccounting = true; + Restart = "on-failure"; + RestartSec = "1000ms"; + ExecStart = ''${top.package}/bin/kubelet \ + --address=${cfg.address} \ + --allow-privileged=${boolToString cfg.allowPrivileged} \ + --authentication-token-webhook \ + --authentication-token-webhook-cache-ttl="10s" \ + --authorization-mode=Webhook \ + ${optionalString (cfg.clientCaFile != null) + "--client-ca-file=${cfg.clientCaFile}"} \ + ${optionalString (cfg.clusterDns != "") + "--cluster-dns=${cfg.clusterDns}"} \ + ${optionalString (cfg.clusterDomain != "") + "--cluster-domain=${cfg.clusterDomain}"} \ + --cni-conf-dir=${cniConfig} \ + ${optionalString (cfg.featureGates != []) + "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ + --hairpin-mode=hairpin-veth \ + --healthz-bind-address=${cfg.healthz.bind} \ + --healthz-port=${toString cfg.healthz.port} \ + --hostname-override=${cfg.hostname} \ + --kubeconfig=${kubeconfig} \ + ${optionalString (cfg.networkPlugin != null) + "--network-plugin=${cfg.networkPlugin}"} \ + ${optionalString (cfg.nodeIp != null) + "--node-ip=${cfg.nodeIp}"} \ + --pod-infra-container-image=pause \ + ${optionalString (cfg.manifests != {}) + "--pod-manifest-path=/etc/${manifestPath}"} \ + --port=${toString cfg.port} \ + --register-node=${boolToString cfg.registerNode} \ + ${optionalString (taints != "") + "--register-with-taints=${taints}"} \ + --root-dir=${top.dataDir} \ + ${optionalString (cfg.tlsCertFile != null) + "--tls-cert-file=${cfg.tlsCertFile}"} \ + ${optionalString (cfg.tlsKeyFile != null) + "--tls-private-key-file=${cfg.tlsKeyFile}"} \ + ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ + ${cfg.extraOpts} + ''; + WorkingDirectory = top.dataDir; + }; + }; + + # Allways include cni plugins + services.kubernetes.kubelet.cni.packages = [pkgs.cni-plugins]; + + boot.kernelModules = ["br_netfilter"]; + + services.kubernetes.kubelet.hostname = with config.networking; + mkDefault (hostName + optionalString (!isNull domain) ".${domain}"); + + services.kubernetes.pki.certs = with top.lib; { + kubelet = mkCert { + name = "kubelet"; + CN = top.kubelet.hostname; + action = "systemctl restart kubelet.service"; + + }; + kubeletClient = mkCert { + name = "kubelet-client"; + CN = "system:node:${top.kubelet.hostname}"; + fields = { + O = "system:nodes"; + }; + action = "systemctl restart kubelet.service"; + }; + }; + + services.kubernetes.kubelet.kubeconfig.server = mkDefault top.apiserverAddress; + }) + + (mkIf (cfg.enable && cfg.manifests != {}) { + environment.etc = mapAttrs' (name: manifest: + nameValuePair "${manifestPath}/${name}.json" { + text = builtins.toJSON manifest; + mode = "0755"; + } + ) cfg.manifests; + }) + + (mkIf (cfg.unschedulable && cfg.enable) { + services.kubernetes.kubelet.taints.unschedulable = { + value = "true"; + effect = "NoSchedule"; + }; + }) + + ]; +} diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix new file mode 100644 index 000000000000..38deca23a990 --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -0,0 +1,388 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.pki; + + csrCA = pkgs.writeText "kube-pki-cacert-csr.json" (builtins.toJSON { + key = { + algo = "rsa"; + size = 2048; + }; + names = singleton cfg.caSpec; + }); + + csrCfssl = pkgs.writeText "kube-pki-cfssl-csr.json" (builtins.toJSON { + key = { + algo = "rsa"; + size = 2048; + }; + CN = top.masterAddress; + }); + + cfsslAPITokenBaseName = "apitoken.secret"; + cfsslAPITokenPath = "${config.services.cfssl.dataDir}/${cfsslAPITokenBaseName}"; + certmgrAPITokenPath = "${top.secretsPath}/${cfsslAPITokenBaseName}"; + cfsslAPITokenLength = 32; + + clusterAdminKubeconfig = with cfg.certs.clusterAdmin; + top.lib.mkKubeConfig "cluster-admin" { + server = top.apiserverAddress; + certFile = cert; + keyFile = key; + }; + + remote = with config.services; "https://${kubernetes.masterAddress}:${toString cfssl.port}"; +in +{ + ###### interface + options.services.kubernetes.pki = with lib.types; { + + enable = mkEnableOption "Whether to enable easyCert issuer service."; + + certs = mkOption { + description = "List of certificate specs to feed to cert generator."; + default = {}; + type = attrs; + }; + + genCfsslCACert = mkOption { + description = '' + Whether to automatically generate cfssl CA certificate and key, + if they don't exist. + ''; + default = true; + type = bool; + }; + + genCfsslAPICerts = mkOption { + description = '' + Whether to automatically generate cfssl API webserver TLS cert and key, + if they don't exist. + ''; + default = true; + type = bool; + }; + + genCfsslAPIToken = mkOption { + description = '' + Whether to automatically generate cfssl API-token secret, + if they doesn't exist. + ''; + default = true; + type = bool; + }; + + pkiTrustOnBootstrap = mkOption { + description = "Whether to always trust remote cfssl server upon initial PKI bootstrap."; + default = true; + type = bool; + }; + + caCertPathPrefix = mkOption { + description = '' + Path-prefrix for the CA-certificate to be used for cfssl signing. + Suffixes ".pem" and "-key.pem" will be automatically appended for + the public and private keys respectively. + ''; + default = "${config.services.cfssl.dataDir}/ca"; + type = str; + }; + + caSpec = mkOption { + description = "Certificate specification for the auto-generated CAcert."; + default = { + CN = "kubernetes-cluster-ca"; + O = "NixOS"; + OU = "services.kubernetes.pki.caSpec"; + L = "auto-generated"; + }; + type = attrs; + }; + + etcClusterAdminKubeconfig = mkOption { + description = '' + Symlink a kubeconfig with cluster-admin privileges to environment path + (/etc/<path>). + ''; + default = null; + type = nullOr str; + }; + + }; + + ###### implementation + config = mkIf cfg.enable + (let + cfsslCertPathPrefix = "${config.services.cfssl.dataDir}/cfssl"; + cfsslCert = "${cfsslCertPathPrefix}.pem"; + cfsslKey = "${cfsslCertPathPrefix}-key.pem"; + in + { + + services.cfssl = mkIf (top.apiserver.enable) { + enable = true; + address = "0.0.0.0"; + tlsCert = cfsslCert; + tlsKey = cfsslKey; + configFile = toString (pkgs.writeText "cfssl-config.json" (builtins.toJSON { + signing = { + profiles = { + default = { + usages = ["digital signature"]; + auth_key = "default"; + expiry = "720h"; + }; + }; + }; + auth_keys = { + default = { + type = "standard"; + key = "file:${cfsslAPITokenPath}"; + }; + }; + })); + }; + + systemd.services.cfssl.preStart = with pkgs; with config.services.cfssl; mkIf (top.apiserver.enable) + (concatStringsSep "\n" [ + "set -e" + (optionalString cfg.genCfsslCACert '' + if [ ! -f "${cfg.caCertPathPrefix}.pem" ]; then + ${cfssl}/bin/cfssl genkey -initca ${csrCA} | \ + ${cfssl}/bin/cfssljson -bare ${cfg.caCertPathPrefix} + fi + '') + (optionalString cfg.genCfsslAPICerts '' + if [ ! -f "${dataDir}/cfssl.pem" ]; then + ${cfssl}/bin/cfssl gencert -ca "${cfg.caCertPathPrefix}.pem" -ca-key "${cfg.caCertPathPrefix}-key.pem" ${csrCfssl} | \ + ${cfssl}/bin/cfssljson -bare ${cfsslCertPathPrefix} + fi + '') + (optionalString cfg.genCfsslAPIToken '' + if [ ! -f "${cfsslAPITokenPath}" ]; then + head -c ${toString (cfsslAPITokenLength / 2)} /dev/urandom | od -An -t x | tr -d ' ' >"${cfsslAPITokenPath}" + fi + chown cfssl "${cfsslAPITokenPath}" && chmod 400 "${cfsslAPITokenPath}" + '')]); + + systemd.services.kube-certmgr-bootstrap = { + description = "Kubernetes certmgr bootstrapper"; + wantedBy = [ "certmgr.service" ]; + after = [ "cfssl.target" ]; + script = concatStringsSep "\n" ['' + set -e + + # If there's a cfssl (cert issuer) running locally, then don't rely on user to + # manually paste it in place. Just symlink. + # otherwise, create the target file, ready for users to insert the token + + if [ -f "${cfsslAPITokenPath}" ]; then + ln -fs "${cfsslAPITokenPath}" "${certmgrAPITokenPath}" + else + touch "${certmgrAPITokenPath}" && chmod 600 "${certmgrAPITokenPath}" + fi + '' + (optionalString (cfg.pkiTrustOnBootstrap) '' + if [ ! -f "${top.caFile}" ] || [ $(cat "${top.caFile}" | wc -c) -lt 1 ]; then + ${pkgs.curl}/bin/curl --fail-early -f -kd '{}' ${remote}/api/v1/cfssl/info | \ + ${pkgs.cfssl}/bin/cfssljson -stdout >${top.caFile} + fi + '') + ]; + serviceConfig = { + RestartSec = "10s"; + Restart = "on-failure"; + }; + }; + + services.certmgr = { + enable = true; + package = pkgs.certmgr-selfsigned; + svcManager = "command"; + specs = + let + mkSpec = _: cert: { + inherit (cert) action; + authority = { + inherit remote; + file.path = cert.caCert; + root_ca = cert.caCert; + profile = "default"; + auth_key_file = certmgrAPITokenPath; + }; + certificate = { + path = cert.cert; + }; + private_key = cert.privateKeyOptions; + request = { + inherit (cert) CN hosts; + key = { + algo = "rsa"; + size = 2048; + }; + names = [ cert.fields ]; + }; + }; + in + mapAttrs mkSpec cfg.certs; + }; + + #TODO: Get rid of kube-addon-manager in the future for the following reasons + # - it is basically just a shell script wrapped around kubectl + # - it assumes that it is clusterAdmin or can gain clusterAdmin rights through serviceAccount + # - it is designed to be used with k8s system components only + # - it would be better with a more Nix-oriented way of managing addons + systemd.services.kube-addon-manager = mkIf top.addonManager.enable (mkMerge [{ + environment.KUBECONFIG = with cfg.certs.addonManager; + top.lib.mkKubeConfig "addon-manager" { + server = top.apiserverAddress; + certFile = cert; + keyFile = key; + }; + } + + (optionalAttrs (top.addonManager.bootstrapAddons != {}) { + serviceConfig.PermissionsStartOnly = true; + preStart = with pkgs; + let + files = mapAttrsToList (n: v: writeText "${n}.json" (builtins.toJSON v)) + top.addonManager.bootstrapAddons; + in + '' + export KUBECONFIG=${clusterAdminKubeconfig} + ${kubectl}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files} + ''; + })]); + + environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (!isNull cfg.etcClusterAdminKubeconfig) + clusterAdminKubeconfig; + + environment.systemPackages = mkIf (top.kubelet.enable || top.proxy.enable) [ + (pkgs.writeScriptBin "nixos-kubernetes-node-join" '' + set -e + exec 1>&2 + + if [ $# -gt 0 ]; then + echo "Usage: $(basename $0)" + echo "" + echo "No args. Apitoken must be provided on stdin." + echo "To get the apitoken, execute: 'sudo cat ${certmgrAPITokenPath}' on the master node." + exit 1 + fi + + if [ $(id -u) != 0 ]; then + echo "Run as root please." + exit 1 + fi + + read -r token + if [ ''${#token} != ${toString cfsslAPITokenLength} ]; then + echo "Token must be of length ${toString cfsslAPITokenLength}." + exit 1 + fi + + echo $token > ${certmgrAPITokenPath} + chmod 600 ${certmgrAPITokenPath} + + echo "Restarting certmgr..." >&1 + systemctl restart certmgr + + echo "Waiting for certs to appear..." >&1 + + ${optionalString top.kubelet.enable '' + while [ ! -f ${cfg.certs.kubelet.cert} ]; do sleep 1; done + echo "Restarting kubelet..." >&1 + systemctl restart kubelet + ''} + + ${optionalString top.proxy.enable '' + while [ ! -f ${cfg.certs.kubeProxyClient.cert} ]; do sleep 1; done + echo "Restarting kube-proxy..." >&1 + systemctl restart kube-proxy + ''} + + ${optionalString top.flannel.enable '' + while [ ! -f ${cfg.certs.flannelClient.cert} ]; do sleep 1; done + echo "Restarting flannel..." >&1 + systemctl restart flannel + ''} + + echo "Node joined succesfully" + '')]; + + # isolate etcd on loopback at the master node + # easyCerts doesn't support multimaster clusters anyway atm. + services.etcd = with cfg.certs.etcd; { + listenClientUrls = ["https://127.0.0.1:2379"]; + listenPeerUrls = ["https://127.0.0.1:2380"]; + advertiseClientUrls = ["https://etcd.local:2379"]; + initialCluster = ["${top.masterAddress}=https://etcd.local:2380"]; + initialAdvertisePeerUrls = ["https://etcd.local:2380"]; + certFile = mkDefault cert; + keyFile = mkDefault key; + trustedCaFile = mkDefault caCert; + }; + networking.extraHosts = mkIf (config.services.etcd.enable) '' + 127.0.0.1 etcd.${top.addons.dns.clusterDomain} etcd.local + ''; + + services.flannel = with cfg.certs.flannelClient; { + kubeconfig = top.lib.mkKubeConfig "flannel" { + server = top.apiserverAddress; + certFile = cert; + keyFile = key; + }; + }; + + services.kubernetes = { + + apiserver = mkIf top.apiserver.enable (with cfg.certs.apiServer; { + etcd = with cfg.certs.apiserverEtcdClient; { + servers = ["https://etcd.local:2379"]; + certFile = mkDefault cert; + keyFile = mkDefault key; + caFile = mkDefault caCert; + }; + clientCaFile = mkDefault caCert; + tlsCertFile = mkDefault cert; + tlsKeyFile = mkDefault key; + serviceAccountKeyFile = mkDefault cfg.certs.serviceAccount.cert; + kubeletClientCaFile = mkDefault caCert; + kubeletClientCertFile = mkDefault cfg.certs.apiserverKubeletClient.cert; + kubeletClientKeyFile = mkDefault cfg.certs.apiserverKubeletClient.key; + }); + controllerManager = mkIf top.controllerManager.enable { + serviceAccountKeyFile = mkDefault cfg.certs.serviceAccount.key; + rootCaFile = cfg.certs.controllerManagerClient.caCert; + kubeconfig = with cfg.certs.controllerManagerClient; { + certFile = mkDefault cert; + keyFile = mkDefault key; + }; + }; + scheduler = mkIf top.scheduler.enable { + kubeconfig = with cfg.certs.schedulerClient; { + certFile = mkDefault cert; + keyFile = mkDefault key; + }; + }; + kubelet = mkIf top.kubelet.enable { + clientCaFile = mkDefault cfg.certs.kubelet.caCert; + tlsCertFile = mkDefault cfg.certs.kubelet.cert; + tlsKeyFile = mkDefault cfg.certs.kubelet.key; + kubeconfig = with cfg.certs.kubeletClient; { + certFile = mkDefault cert; + keyFile = mkDefault key; + }; + }; + proxy = mkIf top.proxy.enable { + kubeconfig = with cfg.certs.kubeProxyClient; { + certFile = mkDefault cert; + keyFile = mkDefault key; + }; + }; + }; + }); +} diff --git a/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixos/modules/services/cluster/kubernetes/proxy.nix new file mode 100644 index 000000000000..83cd3e231000 --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/proxy.nix @@ -0,0 +1,82 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.proxy; +in +{ + + ###### interface + options.services.kubernetes.proxy = with lib.types; { + + bindAddress = mkOption { + description = "Kubernetes proxy listening address."; + default = "0.0.0.0"; + type = str; + }; + + enable = mkEnableOption "Whether to enable Kubernetes proxy."; + + extraOpts = mkOption { + description = "Kubernetes proxy extra command line options."; + default = ""; + type = str; + }; + + featureGates = mkOption { + description = "List set of feature gates"; + default = top.featureGates; + type = listOf str; + }; + + kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes proxy"; + + verbosity = mkOption { + description = '' + Optional glog verbosity level for logging statements. See + + ''; + default = null; + type = nullOr int; + }; + + }; + + ###### implementation + config = mkIf cfg.enable { + systemd.services.kube-proxy = { + description = "Kubernetes Proxy Service"; + wantedBy = [ "kubernetes.target" ]; + after = [ "kube-apiserver.service" ]; + path = with pkgs; [ iptables conntrack_tools ]; + serviceConfig = { + Slice = "kubernetes.slice"; + ExecStart = ''${top.package}/bin/kube-proxy \ + --bind-address=${cfg.bindAddress} \ + ${optionalString (top.clusterCidr!=null) + "--cluster-cidr=${top.clusterCidr}"} \ + ${optionalString (cfg.featureGates != []) + "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ + --kubeconfig=${top.lib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \ + ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ + ${cfg.extraOpts} + ''; + WorkingDirectory = top.dataDir; + Restart = "on-failure"; + RestartSec = 5; + }; + }; + + services.kubernetes.pki.certs = { + kubeProxyClient = top.lib.mkCert { + name = "kube-proxy-client"; + CN = "system:kube-proxy"; + action = "systemctl restart kube-proxy.service"; + }; + }; + + services.kubernetes.proxy.kubeconfig.server = mkDefault top.apiserverAddress; + }; +} diff --git a/nixos/modules/services/cluster/kubernetes/scheduler.nix b/nixos/modules/services/cluster/kubernetes/scheduler.nix new file mode 100644 index 000000000000..0305b9aefe59 --- /dev/null +++ b/nixos/modules/services/cluster/kubernetes/scheduler.nix @@ -0,0 +1,94 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + top = config.services.kubernetes; + cfg = top.scheduler; +in +{ + ###### interface + options.services.kubernetes.scheduler = with lib.types; { + + address = mkOption { + description = "Kubernetes scheduler listening address."; + default = "127.0.0.1"; + type = str; + }; + + enable = mkEnableOption "Whether to enable Kubernetes scheduler."; + + extraOpts = mkOption { + description = "Kubernetes scheduler extra command line options."; + default = ""; + type = str; + }; + + featureGates = mkOption { + description = "List set of feature gates"; + default = top.featureGates; + type = listOf str; + }; + + kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes scheduler"; + + leaderElect = mkOption { + description = "Whether to start leader election before executing main loop."; + type = bool; + default = true; + }; + + port = mkOption { + description = "Kubernetes scheduler listening port."; + default = 10251; + type = int; + }; + + verbosity = mkOption { + description = '' + Optional glog verbosity level for logging statements. See + + ''; + default = null; + type = nullOr int; + }; + + }; + + ###### implementation + config = mkIf cfg.enable { + systemd.services.kube-scheduler = { + description = "Kubernetes Scheduler Service"; + wantedBy = [ "kubernetes.target" ]; + after = [ "kube-apiserver.service" ]; + serviceConfig = { + Slice = "kubernetes.slice"; + ExecStart = ''${top.package}/bin/kube-scheduler \ + --address=${cfg.address} \ + ${optionalString (cfg.featureGates != []) + "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ + --kubeconfig=${top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \ + --leader-elect=${boolToString cfg.leaderElect} \ + --port=${toString cfg.port} \ + ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ + ${cfg.extraOpts} + ''; + WorkingDirectory = top.dataDir; + User = "kubernetes"; + Group = "kubernetes"; + Restart = "on-failure"; + RestartSec = 5; + }; + }; + + services.kubernetes.pki.certs = { + schedulerClient = top.lib.mkCert { + name = "kube-scheduler-client"; + CN = "system:kube-scheduler"; + action = "systemctl restart kube-scheduler.service"; + }; + }; + + services.kubernetes.scheduler.kubeconfig.server = mkDefault top.apiserverAddress; + }; +} diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index 9daf391c73c4..2136778aff47 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -24,7 +24,7 @@ let EOF chmod 755 $out/${name} ''; - in pkgs.runCommand "buildkite-agent-hooks" {} '' + in pkgs.runCommand "buildkite-agent-hooks" { preferLocalBuild = true; } '' mkdir $out ${concatStringsSep "\n" (mapAttrsToList mkHookEntry (filterAttrs (n: v: v != null) cfg.hooks))} ''; diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index a0aff1b8b5b9..3ceaa6f5ff3e 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -8,6 +8,7 @@ let if (cfg.configFile == null) then (pkgs.runCommand "config.toml" { buildInputs = [ pkgs.remarshal ]; + preferLocalBuild = true; } '' remarshal -if json -of toml \ < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \ diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index 4772e897efe2..52f2d95b4e00 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -18,7 +18,7 @@ let ''; - configDir = pkgs.runCommand "hbase-config-dir" {} '' + configDir = pkgs.runCommand "hbase-config-dir" { preferLocalBuild = true; } '' mkdir -p $out cp ${cfg.package}/conf/* $out/ rm $out/hbase-site.xml diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index d7a028b25d8d..888bf13c3df8 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -98,6 +98,7 @@ let configFile = pkgs.runCommand "config.toml" { buildInputs = [ pkgs.remarshal ]; + preferLocalBuild = true; } '' remarshal -if json -of toml \ < ${pkgs.writeText "config.json" (builtins.toJSON configOptions)} \ diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index 14f4d4909bc0..8d832f66227b 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -52,7 +52,7 @@ alice=> By default, PostgreSQL stores its databases in - /var/db/postgresql. You can override this using + /var/lib/postgresql/$psqlSchema. You can override this using , e.g. = "/data/postgresql"; diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix index 5ea4350be5b4..4c350d8bb1c6 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix @@ -35,6 +35,8 @@ with lib; services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gcr ]; + security.pam.services.login.enableGnomeKeyring = true; + }; } diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index 0f05876aee32..4c97485d9726 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -21,7 +21,7 @@ let }; }; - acpiConfDir = pkgs.runCommand "acpi-events" {} + acpiConfDir = pkgs.runCommand "acpi-events" { preferLocalBuild = true; } '' mkdir -p $out ${ diff --git a/nixos/modules/services/hardware/bolt.nix b/nixos/modules/services/hardware/bolt.nix new file mode 100644 index 000000000000..32b60af06037 --- /dev/null +++ b/nixos/modules/services/hardware/bolt.nix @@ -0,0 +1,34 @@ +# Thunderbolt 3 device manager + +{ config, lib, pkgs, ...}: + +with lib; + +{ + options = { + + services.hardware.bolt = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable Bolt, a userspace daemon to enable + security levels for Thunderbolt 3 on GNU/Linux. + + Bolt is used by GNOME 3 to handle Thunderbolt settings. + ''; + }; + + }; + + }; + + config = mkIf config.services.hardware.bolt.enable { + + environment.systemPackages = [ pkgs.bolt ]; + services.udev.packages = [ pkgs.bolt ]; + systemd.packages = [ pkgs.bolt ]; + + }; +} diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index b894025c0fd5..092ff051a042 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -17,6 +17,7 @@ tlp = pkgs.tlp.override { confFile = pkgs.runCommand "tlp" { config = cfg.extraConfig; passAsFile = [ "config" ]; + preferLocalBuild = true; } '' cat ${tlp}/etc/default/tlp > $out diff --git a/nixos/modules/services/logging/journalbeat.nix b/nixos/modules/services/logging/journalbeat.nix index 8186a3b02c37..89f53b1b2454 100644 --- a/nixos/modules/services/logging/journalbeat.nix +++ b/nixos/modules/services/logging/journalbeat.nix @@ -5,11 +5,13 @@ with lib; let cfg = config.services.journalbeat; + lt6 = builtins.compareVersions cfg.package.version "6" < 0; + journalbeatYml = pkgs.writeText "journalbeat.yml" '' name: ${cfg.name} tags: ${builtins.toJSON cfg.tags} - journalbeat.cursor_state_file: ${cfg.stateDir}/cursor-state + ${optionalString lt6 "journalbeat.cursor_state_file: /var/lib/${cfg.stateDir}/cursor-state"} ${cfg.extraConfig} ''; @@ -22,6 +24,16 @@ in enable = mkEnableOption "journalbeat"; + package = mkOption { + type = types.package; + default = pkgs.journalbeat; + defaultText = "pkgs.journalbeat"; + example = literalExample "pkgs.journalbeat7"; + description = '' + The journalbeat package to use + ''; + }; + name = mkOption { type = types.str; default = "journalbeat"; @@ -36,13 +48,17 @@ in stateDir = mkOption { type = types.str; - default = "/var/lib/journalbeat"; - description = "The state directory. Journalbeat's own logs and other data are stored here."; + default = "journalbeat"; + description = '' + Directory below /var/lib/ to store journalbeat's + own logs and other data. This directory will be created automatically + using systemd's StateDirectory mechanism. + ''; }; extraConfig = mkOption { type = types.lines; - default = '' + default = optionalString lt6 '' journalbeat: seek_position: cursor cursor_seek_fallback: tail @@ -61,7 +77,16 @@ in config = mkIf cfg.enable { - systemd.services.journalbeat = with pkgs; { + assertions = [ + { + assertion = !hasPrefix "/" cfg.stateDir; + message = + "The option services.journalbeat.stateDir shouldn't be an absolute directory." + + " It should be a directory relative to /var/lib/."; + } + ]; + + systemd.services.journalbeat = { description = "Journalbeat log shipper"; wantedBy = [ "multi-user.target" ]; preStart = '' @@ -69,7 +94,13 @@ in mkdir -p ${cfg.stateDir}/logs ''; serviceConfig = { - ExecStart = "${pkgs.journalbeat}/bin/journalbeat -c ${journalbeatYml} -path.data ${cfg.stateDir}/data -path.logs ${cfg.stateDir}/logs"; + StateDirectory = cfg.stateDir; + ExecStart = '' + ${cfg.package}/bin/journalbeat \ + -c ${journalbeatYml} \ + -path.data /var/lib/${cfg.stateDir}/data \ + -path.logs /var/lib/${cfg.stateDir}/logs''; + Restart = "always"; }; }; }; diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 1477d273d5ee..9c64160e92bc 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.logcheck; - defaultRules = pkgs.runCommand "logcheck-default-rules" {} '' + defaultRules = pkgs.runCommand "logcheck-default-rules" { preferLocalBuild = true; } '' cp -prd ${pkgs.logcheck}/etc/logcheck $out chmod u+w $out rm -r $out/logcheck.* diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index aa019d855ea9..9b707e9deb58 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -27,7 +27,10 @@ let logstashSettingsYml = pkgs.writeText "logstash.yml" cfg.extraSettings; - logstashSettingsDir = pkgs.runCommand "logstash-settings" {inherit logstashSettingsYml;} '' + logstashSettingsDir = pkgs.runCommand "logstash-settings" { + inherit logstashSettingsYml; + preferLocalBuild = true; + } '' mkdir -p $out ln -s $logstashSettingsYml $out/logstash.yml ''; diff --git a/nixos/modules/services/mail/davmail.nix b/nixos/modules/services/mail/davmail.nix new file mode 100644 index 000000000000..a0cb81f84dac --- /dev/null +++ b/nixos/modules/services/mail/davmail.nix @@ -0,0 +1,91 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.davmail; + + configType = with types; + either (either (attrsOf configType) str) (either int bool) // { + description = "davmail config type (str, int, bool or attribute set thereof)"; + }; + + toStr = val: if isBool val then boolToString val else toString val; + + linesForAttrs = attrs: concatMap (name: let value = attrs.${name}; in + if isAttrs value + then map (line: name + "." + line) (linesForAttrs value) + else [ "${name}=${toStr value}" ] + ) (attrNames attrs); + + configFile = pkgs.writeText "davmail.properties" (concatStringsSep "\n" (linesForAttrs cfg.config)); + +in + + { + options.services.davmail = { + enable = mkEnableOption "davmail, an MS Exchange gateway"; + + url = mkOption { + type = types.str; + description = "Outlook Web Access URL to access the exchange server, i.e. the base webmail URL."; + example = "https://outlook.office365.com/EWS/Exchange.asmx"; + }; + + config = mkOption { + type = configType; + default = {}; + description = '' + Davmail configuration. Refer to + + and + for details on supported values. + ''; + example = literalExample '' + { + davmail.allowRemote = true; + davmail.imapPort = 55555; + davmail.bindAddress = "10.0.1.2"; + davmail.smtpSaveInSent = true; + davmail.folderSizeLimit = 10; + davmail.caldavAutoSchedule = false; + log4j.logger.rootLogger = "DEBUG"; + } + ''; + }; + }; + + config = mkIf cfg.enable { + + services.davmail.config.davmail = mapAttrs (name: mkDefault) { + server = true; + disableUpdateCheck = true; + logFilePath = "/var/log/davmail/davmail.log"; + logFileSize = "1MB"; + mode = "auto"; + url = cfg.url; + caldavPort = 1080; + imapPort = 1143; + ldapPort = 1389; + popPort = 1110; + smtpPort = 1025; + }; + + systemd.services.davmail = { + description = "DavMail POP/IMAP/SMTP Exchange Gateway"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.davmail}/bin/davmail ${configFile}"; + Restart = "on-failure"; + DynamicUser = "yes"; + LogsDirectory = "davmail"; + }; + }; + + environment.systemPackages = [ pkgs.davmail ]; + }; + } diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index 4276552d4f03..a870550ba50b 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -8,7 +8,7 @@ let conf = pkgs.writeText "smtpd.conf" cfg.serverConfiguration; args = concatStringsSep " " cfg.extraServerArgs; - sendmail = pkgs.runCommand "opensmtpd-sendmail" {} '' + sendmail = pkgs.runCommand "opensmtpd-sendmail" { preferLocalBuild = true; } '' mkdir -p $out/bin ln -s ${cfg.package}/sbin/smtpctl $out/bin/sendmail ''; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index d43733484ffa..dab1b29aa4be 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -13,6 +13,7 @@ let || cfg.extraAliases != ""; haveTransport = cfg.transport != ""; haveVirtual = cfg.virtual != ""; + haveLocalRecipients = cfg.localRecipients != null; clientAccess = optional (cfg.dnsBlacklistOverrides != "") @@ -244,6 +245,7 @@ let aliasesFile = pkgs.writeText "postfix-aliases" aliases; virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual; + localRecipientMapFile = pkgs.writeText "postfix-local-recipient-map" (concatMapStrings (x: x + " ACCEPT\n") cfg.localRecipients); checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides; mainCfFile = pkgs.writeText "postfix-main.cf" mainCf; masterCfFile = pkgs.writeText "postfix-master.cf" masterCfContent; @@ -506,6 +508,19 @@ in ''; }; + localRecipients = mkOption { + type = with types; nullOr (listOf string); + default = null; + description = '' + List of accepted local users. Specify a bare username, an + "@domain.tld" wild-card, or a complete + "user@domain.tld" address. If set, these names end + up in the local recipient map -- see the local(8) man-page -- and + effectively replace the system user database lookup that's otherwise + used by default. + ''; + }; + transport = mkOption { default = ""; description = " @@ -742,6 +757,7 @@ in // 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 haveLocalRecipients { local_recipient_maps = [ "hash:/etc/postfix/local_recipients" ] ++ optional haveAliases "$alias_maps"; } // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; } // optionalAttrs cfg.useSrs { sender_canonical_maps = [ "tcp:127.0.0.1:10001" ]; @@ -869,6 +885,9 @@ in (mkIf haveVirtual { services.postfix.mapFiles."virtual" = virtualFile; }) + (mkIf haveLocalRecipients { + services.postfix.mapFiles."local_recipients" = localRecipientMapFile; + }) (mkIf cfg.enableHeaderChecks { services.postfix.mapFiles."header_checks" = headerChecksFile; }) diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix index 492c64583219..466365b6b305 100644 --- a/nixos/modules/services/mail/rmilter.nix +++ b/nixos/modules/services/mail/rmilter.nix @@ -8,7 +8,7 @@ let postfixCfg = config.services.postfix; cfg = config.services.rmilter; - inetSocket = addr: port: "inet:[${toString port}@${addr}]"; + inetSocket = addr: port: "inet:${addr}:${toString port}"; unixSocket = sock: "unix:${sock}"; systemdSocket = if cfg.bindSocket.type == "unix" then cfg.bindSocket.path @@ -97,7 +97,7 @@ in bindSocket.address = mkOption { type = types.str; - default = "::1"; + default = "[::1]"; example = "0.0.0.0"; description = '' Inet address to listen on. diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index 66b1c1e3e6f9..e8b2e11bf726 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -141,27 +141,31 @@ in systemd.services.roundcube-setup = let pgSuperUser = config.services.postgresql.superUser; - in { - requires = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - wantedBy = [ "multi-user.target" ]; - path = [ config.services.postgresql.package ]; - script = '' - mkdir -p /var/lib/roundcube - if [ ! -f /var/lib/roundcube/db-created ]; then - if [ "${cfg.database.host}" = "localhost" ]; then - ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'"; - ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}"; + in mkMerge [ + (mkIf (cfg.database.host == "localhost") { + requires = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + path = [ config.services.postgresql.package ]; + }) + { + wantedBy = [ "multi-user.target" ]; + script = '' + mkdir -p /var/lib/roundcube + if [ ! -f /var/lib/roundcube/db-created ]; then + if [ "${cfg.database.host}" = "localhost" ]; then + ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'"; + ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}"; + fi + PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \ + -f ${cfg.package}/SQL/postgres.initial.sql \ + -h ${cfg.database.host} ${cfg.database.dbname} + touch /var/lib/roundcube/db-created fi - PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \ - -f ${cfg.package}/SQL/postgres.initial.sql \ - -h ${cfg.database.host} ${cfg.database.dbname} - touch /var/lib/roundcube/db-created - fi - ${pkgs.php}/bin/php ${cfg.package}/bin/update.sh - ''; - serviceConfig.Type = "oneshot"; - }; + ${pkgs.php}/bin/php ${cfg.package}/bin/update.sh + ''; + serviceConfig.Type = "oneshot"; + } + ]; }; } diff --git a/nixos/modules/services/misc/beanstalkd.nix b/nixos/modules/services/misc/beanstalkd.nix new file mode 100644 index 000000000000..8a3e0ab1949a --- /dev/null +++ b/nixos/modules/services/misc/beanstalkd.nix @@ -0,0 +1,52 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.beanstalkd; + pkg = pkgs.beanstalkd; +in + +{ + # interface + + options = { + services.beanstalkd = { + enable = mkEnableOption "Enable the Beanstalk work queue."; + + listen = { + port = mkOption { + type = types.int; + description = "TCP port that will be used to accept client connections."; + default = 11300; + }; + + address = mkOption { + type = types.str; + description = "IP address to listen on."; + default = "127.0.0.1"; + example = "0.0.0.0"; + }; + }; + }; + }; + + # implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkg ]; + + systemd.services.beanstalkd = { + description = "Beanstalk Work Queue"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + Restart = "always"; + ExecStart = "${pkg}/bin/beanstalkd -l ${cfg.listen.address} -p ${toString cfg.listen.port}"; + }; + }; + + }; +} diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index be4d38719785..6fd4183bd6b4 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -8,6 +8,7 @@ let pg = config.services.postgresql; useMysql = cfg.database.type == "mysql"; usePostgresql = cfg.database.type == "postgres"; + useSqlite = cfg.database.type == "sqlite3"; configFile = pkgs.writeText "app.ini" '' APP_NAME = ${cfg.appName} RUN_USER = ${cfg.user} @@ -15,11 +16,15 @@ let [database] DB_TYPE = ${cfg.database.type} - HOST = ${if cfg.database.socket != null then cfg.database.socket else cfg.database.host + ":" + toString cfg.database.port} - NAME = ${cfg.database.name} - USER = ${cfg.database.user} - PASSWD = #dbpass# - PATH = ${cfg.database.path} + ${optionalString (usePostgresql || useMysql) '' + HOST = ${if cfg.database.socket != null then cfg.database.socket else cfg.database.host + ":" + toString cfg.database.port} + NAME = ${cfg.database.name} + USER = ${cfg.database.user} + PASSWD = #dbpass# + ''} + ${optionalString useSqlite '' + PATH = ${cfg.database.path} + ''} ${optionalString usePostgresql '' SSL_MODE = disable ''} diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index b8617e48d8e0..86b1bda6b846 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -52,7 +52,7 @@ let gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}"; http_settings.self_signed_cert = false; repos_path = "${cfg.statePath}/repositories"; - secret_file = "${cfg.statePath}/config/gitlab_shell_secret"; + secret_file = "${cfg.statePath}/gitlab_shell_secret"; log_file = "${cfg.statePath}/log/gitlab-shell.log"; custom_hooks_dir = "${cfg.statePath}/custom_hooks"; redis = { @@ -109,7 +109,7 @@ let gitlab_shell = { path = "${cfg.packages.gitlab-shell}"; hooks_path = "${cfg.statePath}/shell/hooks"; - secret_file = "${cfg.statePath}/config/gitlab_shell_secret"; + secret_file = "${cfg.statePath}/gitlab_shell_secret"; upload_pack = true; receive_pack = true; }; @@ -132,14 +132,9 @@ let HOME = "${cfg.statePath}/home"; UNICORN_PATH = "${cfg.statePath}/"; GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/"; - GITLAB_STATE_PATH = cfg.statePath; - GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads"; SCHEMA = "${cfg.statePath}/db/schema.rb"; + GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads"; GITLAB_LOG_PATH = "${cfg.statePath}/log"; - GITLAB_SHELL_PATH = "${cfg.packages.gitlab-shell}"; - GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml"; - GITLAB_SHELL_SECRET_PATH = "${cfg.statePath}/config/gitlab_shell_secret"; - GITLAB_SHELL_HOOKS_PATH = "${cfg.statePath}/shell/hooks"; GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "redis.yml" (builtins.toJSON redisConfig); prometheus_multiproc_dir = "/run/gitlab"; RAILS_ENV = "production"; @@ -160,6 +155,22 @@ let ''; }; + gitlab-rails = pkgs.stdenv.mkDerivation rec { + name = "gitlab-rails"; + buildInputs = [ pkgs.makeWrapper ]; + dontBuild = true; + unpackPhase = ":"; + installPhase = '' + mkdir -p $out/bin + makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rails $out/bin/gitlab-rails \ + ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \ + --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package pkgs.coreutils pkgs.procps ]}:$PATH' \ + --run 'cd ${cfg.packages.gitlab}/share/gitlab' + ''; + }; + + extraGitlabRb = pkgs.writeText "extra-gitlab.rb" cfg.extraGitlabRb; + smtpSettings = pkgs.writeText "gitlab-smtp-settings.rb" '' if Rails.env.production? Rails.application.config.action_mailer.delivery_method = :smtp @@ -266,6 +277,26 @@ in { description = "Extra configuration in config/database.yml."; }; + extraGitlabRb = mkOption { + type = types.str; + default = ""; + example = '' + if Rails.env.production? + Rails.application.config.action_mailer.delivery_method = :sendmail + ActionMailer::Base.delivery_method = :sendmail + ActionMailer::Base.sendmail_settings = { + location: "/run/wrappers/bin/sendmail", + arguments: "-i -t" + } + end + ''; + description = '' + Extra configuration to be placed in config/extra-gitlab.rb. This can + be used to add configuration not otherwise exposed through this module's + options. + ''; + }; + host = mkOption { type = types.str; default = config.networking.hostName; @@ -439,7 +470,7 @@ in { config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.git gitlab-rake cfg.packages.gitlab-shell ]; + environment.systemPackages = [ pkgs.git gitlab-rake gitlab-rails cfg.packages.gitlab-shell ]; # Redis is required for the sidekiq queue runner. services.redis.enable = mkDefault true; @@ -466,23 +497,44 @@ in { systemd.tmpfiles.rules = [ "d /run/gitlab 0755 ${cfg.user} ${cfg.group} -" "d ${gitlabEnv.HOME} 0750 ${cfg.user} ${cfg.group} -" + "z ${gitlabEnv.HOME}/.ssh/authorized_keys 0600 ${cfg.user} ${cfg.group} -" "d ${cfg.backupPath} 0750 ${cfg.user} ${cfg.group} -" + "d ${cfg.statePath} 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/builds 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/config 0750 ${cfg.user} ${cfg.group} -" + "D ${cfg.statePath}/config/initializers 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/db 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/log 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/repositories 2770 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/shell 0750 ${cfg.user} ${cfg.group} -" + "d ${cfg.statePath}/tmp 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/tmp/pids 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/tmp/sockets 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/uploads 0700 ${cfg.user} ${cfg.group} -" + "d ${cfg.statePath}/custom_hooks 0700 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/custom_hooks/pre-receive.d 0700 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/custom_hooks/post-receive.d 0700 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/custom_hooks/update.d 0700 ${cfg.user} ${cfg.group} -" + "d ${gitlabConfig.production.shared.path} 0750 ${cfg.user} ${cfg.group} -" "d ${gitlabConfig.production.shared.path}/artifacts 0750 ${cfg.user} ${cfg.group} -" "d ${gitlabConfig.production.shared.path}/lfs-objects 0750 ${cfg.user} ${cfg.group} -" "d ${gitlabConfig.production.shared.path}/pages 0750 ${cfg.user} ${cfg.group} -" - ]; + "L+ ${cfg.statePath}/lib - - - - ${cfg.packages.gitlab}/share/gitlab/lib" + "L+ /run/gitlab/config - - - - ${cfg.statePath}/config" + "L+ /run/gitlab/log - - - - ${cfg.statePath}/log" + "L+ /run/gitlab/tmp - - - - ${cfg.statePath}/tmp" + "L+ /run/gitlab/uploads - - - - ${cfg.statePath}/uploads" + + "L+ /run/gitlab/shell-config.yml - - - - ${pkgs.writeText "config.yml" (builtins.toJSON gitlabShellConfig)}" + + "L+ ${cfg.statePath}/config/gitlab.yml - - - - ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)}" + "L+ ${cfg.statePath}/config/database.yml - - - - ${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)}" + "L+ ${cfg.statePath}/config/secrets.yml - - - - ${pkgs.writeText "secrets.yml" (builtins.toJSON secretsConfig)}" + "L+ ${cfg.statePath}/config/unicorn.rb - - - - ${./defaultUnicornConfig.rb}" + + "L+ ${cfg.statePath}/config/initializers/extra-gitlab.rb - - - - ${extraGitlabRb}" + ] ++ optional cfg.smtp.enable + "L+ ${cfg.statePath}/config/initializers/smtp_settings.rb - - - - ${smtpSettings}" ; systemd.services.gitlab-sidekiq = { after = [ "network.target" "redis.service" "gitlab.service" ]; @@ -512,9 +564,12 @@ in { wantedBy = [ "multi-user.target" ]; path = with pkgs; [ openssh + procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562 gitAndTools.git cfg.packages.gitaly.rubyEnv cfg.packages.gitaly.rubyEnv.wrappedRuby + gzip + bzip2 ]; serviceConfig = { Type = "simple"; @@ -531,6 +586,7 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = with pkgs; [ + exiftool gitAndTools.git gnutar gzip @@ -570,39 +626,14 @@ in { gnupg ]; preStart = '' - cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db - rm -rf ${cfg.statePath}/config - mkdir ${cfg.statePath}/config - if [ -e ${cfg.statePath}/lib ]; then - rm ${cfg.statePath}/lib - fi + ${pkgs.sudo}/bin/sudo -u ${cfg.user} cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION + ${pkgs.sudo}/bin/sudo -u ${cfg.user} rm -rf ${cfg.statePath}/db/* + ${pkgs.sudo}/bin/sudo -u ${cfg.user} cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config + ${pkgs.sudo}/bin/sudo -u ${cfg.user} cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db - ln -sf ${cfg.packages.gitlab}/share/gitlab/lib ${cfg.statePath}/lib - [ -L /run/gitlab/config ] || ln -sf ${cfg.statePath}/config /run/gitlab/config - [ -L /run/gitlab/log ] || ln -sf ${cfg.statePath}/log /run/gitlab/log - [ -L /run/gitlab/tmp ] || ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp - [ -L /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads - cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION - cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config - ${optionalString cfg.smtp.enable '' - ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb - ''} - ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret + ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/gitlab_shell_secret - # JSON is a subset of YAML - ln -sf ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)} ${cfg.statePath}/config/gitlab.yml - ln -sf ${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} ${cfg.statePath}/config/database.yml - ln -sf ${pkgs.writeText "secrets.yml" (builtins.toJSON secretsConfig)} ${cfg.statePath}/config/secrets.yml - ln -sf ${./defaultUnicornConfig.rb} ${cfg.statePath}/config/unicorn.rb - - # Install the shell required to push repositories - ln -sf ${pkgs.writeText "config.yml" (builtins.toJSON gitlabShellConfig)} /run/gitlab/shell-config.yml - [ -L ${cfg.statePath}/shell/hooks ] || ln -sf ${cfg.packages.gitlab-shell}/hooks ${cfg.statePath}/shell/hooks - ${cfg.packages.gitlab-shell}/bin/install - - chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}/ - chmod -R ug+rwX,o-rwx+X ${cfg.statePath}/ - chown -R ${cfg.user}:${cfg.group} /run/gitlab + ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${cfg.packages.gitlab-shell}/bin/install if ! test -e "${cfg.statePath}/db-created"; then if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then @@ -615,7 +646,7 @@ in { ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake db:schema:load - touch "${cfg.statePath}/db-created" + ${pkgs.sudo}/bin/sudo -u ${cfg.user} touch "${cfg.statePath}/db-created" fi # Always do the db migrations just to be sure the database is up-to-date @@ -624,22 +655,13 @@ in { if ! test -e "${cfg.statePath}/db-seeded"; then ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${gitlab-rake}/bin/gitlab-rake db:seed_fu \ GITLAB_ROOT_PASSWORD='${cfg.initialRootPassword}' GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}' - touch "${cfg.statePath}/db-seeded" + ${pkgs.sudo}/bin/sudo -u ${cfg.user} touch "${cfg.statePath}/db-seeded" fi - # The gitlab:shell:create_hooks task seems broken for fixing links - # so we instead delete all the hooks and create them anew - rm -f ${cfg.statePath}/repositories/**/*.git/hooks - ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks + # We remove potentially broken links to old gitlab-shell versions + rm -Rf ${cfg.statePath}/repositories/**/*.git/hooks ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${pkgs.git}/bin/git config --global core.autocrlf "input" - - # Change permissions in the last step because some of the - # intermediary scripts like to create directories as root. - chmod -R u+rwX,go-rwx+X ${gitlabEnv.HOME} - chmod -R ug+rwX,o-rwx ${cfg.statePath}/repositories - chmod -R ug-s ${cfg.statePath}/repositories - find ${cfg.statePath}/repositories -type d -print0 | xargs -0 chmod g+s ''; serviceConfig = { diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix index b9c2a966e6f5..c7f2a168f8ab 100644 --- a/nixos/modules/services/misc/gitolite.nix +++ b/nixos/modules/services/misc/gitolite.nix @@ -110,7 +110,7 @@ in config = mkIf cfg.enable ( let manageGitoliteRc = cfg.extraGitoliteRc != ""; - rcDir = pkgs.runCommand "gitolite-rc" { } rcDirScript; + rcDir = pkgs.runCommand "gitolite-rc" { preferLocalBuild = true; } rcDirScript; rcDirScript = '' mkdir "$out" diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 4ccfa22c89e7..31873a44135a 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -19,24 +19,25 @@ let ${pkgs.remarshal}/bin/json2yaml -i ${lovelaceConfigJSON} -o $out ''; - availableComponents = pkgs.home-assistant.availableComponents; + availableComponents = cfg.package.availableComponents; - # Given component "parentConfig.platform", returns whether config.parentConfig - # is a list containing a set with set.platform == "platform". + usedPlatforms = config: + if isAttrs config then + optional (config ? platform) config.platform + ++ concatMap usedPlatforms (attrValues config) + else if isList config then + concatMap usedPlatforms config + else [ ]; + + # Given a component "platform", looks up whether it is used in the config + # as `platform = "platform";`. # - # For example, the component sensor.luftdaten is used as follows: + # For example, the component mqtt.sensor is used as follows: # config.sensor = [ { - # platform = "luftdaten"; + # platform = "mqtt"; # ... # } ]; - useComponentPlatform = component: - let - path = splitString "." component; - parentConfig = attrByPath (init path) null cfg.config; - platform = last path; - in isList parentConfig && any - (item: item.platform or null == platform) - parentConfig; + useComponentPlatform = component: elem component (usedPlatforms cfg.config); # Returns whether component is used in config useComponent = component: diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index a01e34d73629..87999c3614fc 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -651,16 +651,12 @@ in { services.postgresql.enable = mkIf usePostgresql (mkDefault true); - systemd.services.matrix-synapse = - let - python = (pkgs.python3.withPackages (ps: with ps; [ (ps.toPythonModule cfg.package) ])); - in - { + systemd.services.matrix-synapse = { description = "Synapse Matrix homeserver"; after = [ "network.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - ${python.interpreter} -m synapse.app.homeserver \ + ${cfg.package}/bin/homeserver \ --config-path ${configFile} \ --keys-directory ${cfg.dataDir} \ --generate-keys @@ -691,7 +687,7 @@ in { WorkingDirectory = cfg.dataDir; PermissionsStartOnly = true; ExecStart = '' - ${python.interpreter} -m synapse.app.homeserver \ + ${cfg.package}/bin/homeserver \ ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } --keys-directory ${cfg.dataDir} ''; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 9a8116a03e88..665215822af8 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -33,7 +33,7 @@ let sh = pkgs.runtimeShell; binshDeps = pkgs.writeReferencesToFile sh; in - pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } ('' + pkgs.runCommand "nix.conf" { preferLocalBuild = true; extraOptions = cfg.extraOptions; } ('' ${optionalString (!isNix20) '' extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done) ''} diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 5f97abf18715..483bc99ad946 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -109,7 +109,7 @@ let nixos-taskserver = pkgs.pythonPackages.buildPythonApplication { name = "nixos-taskserver"; - src = pkgs.runCommand "nixos-taskserver-src" {} '' + src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } '' mkdir -p "$out" cat "${pkgs.substituteAll { src = ./helper-tool.py; diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix index 7ee870183cac..49957e652900 100644 --- a/nixos/modules/services/monitoring/apcupsd.nix +++ b/nixos/modules/services/monitoring/apcupsd.nix @@ -45,7 +45,7 @@ let eventToShellCmds = event: if builtins.hasAttr event cfg.hooks then (shellCmdsForEventScript event (builtins.getAttr event cfg.hooks)) else ""; - scriptDir = pkgs.runCommand "apcupsd-scriptdir" {} ('' + scriptDir = pkgs.runCommand "apcupsd-scriptdir" { preferLocalBuild = true; } ('' mkdir "$out" # Copy SCRIPTDIR from apcupsd package cp -r ${pkgs.apcupsd}/etc/apcupsd/* "$out"/ diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index a4d29d45bacf..56411a9099d0 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -235,7 +235,7 @@ in { ''; script = '' export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile}) - exec ${datadogPkg}/bin/agent start -c /etc/datadog-agent/datadog.yaml + exec ${datadogPkg}/bin/agent run -c /etc/datadog-agent/datadog.yaml ''; serviceConfig.PermissionsStartOnly = true; }; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index cdc98b407e90..f59bc56962b1 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -9,8 +9,10 @@ let dataDir = cfg.dataDir; staticDir = cfg.dataDir + "/static"; - graphiteLocalSettingsDir = pkgs.runCommand "graphite_local_settings" - {inherit graphiteLocalSettings;} '' + graphiteLocalSettingsDir = pkgs.runCommand "graphite_local_settings" { + inherit graphiteLocalSettings; + preferLocalBuild = true; + } '' mkdir -p $out ln -s $graphiteLocalSettings $out/graphite_local_settings.py ''; diff --git a/nixos/modules/services/monitoring/hdaps.nix b/nixos/modules/services/monitoring/hdaps.nix index be26c44e78d1..2cad3b84d847 100644 --- a/nixos/modules/services/monitoring/hdaps.nix +++ b/nixos/modules/services/monitoring/hdaps.nix @@ -16,6 +16,7 @@ in }; config = mkIf cfg.enable { + boot.kernelModules = [ "hdapsd" ]; services.udev.packages = hdapsd; systemd.packages = hdapsd; }; diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 3e1d727b416e..e5496209f827 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -11,8 +11,10 @@ let nagiosObjectDefs = cfg.objectDefs; - nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" {inherit nagiosObjectDefs;} - "mkdir -p $out; ln -s $nagiosObjectDefs $out/"; + nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" { + inherit nagiosObjectDefs; + preferLocalBuild = true; + } "mkdir -p $out; ln -s $nagiosObjectDefs $out/"; nagiosCfgFile = pkgs.writeText "nagios.cfg" '' diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index 1d86c5d893de..a49555cf677f 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.netdata; - wrappedPlugins = pkgs.runCommand "wrapped-plugins" {} '' + wrappedPlugins = pkgs.runCommand "wrapped-plugins" { preferLocalBuild = true; } '' mkdir -p $out/libexec/netdata/plugins.d ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin ''; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 1b1503ab5fc0..d8384e0d35b3 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -4,11 +4,23 @@ with lib; let cfg = config.services.prometheus; + cfg2 = config.services.prometheus2; promUser = "prometheus"; promGroup = "prometheus"; - # Get a submodule without any embedded metadata: - _filter = x: filterAttrs (k: v: k != "_module") x; + stateDir = + if cfg.stateDir != null + then cfg.stateDir + else + if cfg.dataDir != null + then + # This assumes /var/lib/ is a prefix of cfg.dataDir. + # This is checked as an assertion below. + removePrefix stateDirBase cfg.dataDir + else "prometheus"; + stateDirBase = "/var/lib/"; + workingDir = stateDirBase + stateDir; + workingDir2 = stateDirBase + cfg2.stateDir; # a wrapper that verifies that the configuration is valid promtoolCheck = what: name: file: pkgs.runCommand "${name}-${what}-checked" @@ -17,74 +29,128 @@ let promtool ${what} $out ''; + # a wrapper that verifies that the configuration is valid for + # prometheus 2 + prom2toolCheck = what: name: file: + pkgs.runCommand + "${name}-${replaceStrings [" "] [""] what}-checked" + { buildInputs = [ cfg2.package ]; } '' + ln -s ${file} $out + promtool ${what} $out + ''; + # Pretty-print JSON to a file writePrettyJSON = name: x: - pkgs.runCommand name { } '' + pkgs.runCommand name { preferLocalBuild = true; } '' echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out ''; - # This becomes the main config file + # This becomes the main config file for Prometheus 1 promConfig = { - global = cfg.globalConfig; + global = filterValidPrometheus cfg.globalConfig; rule_files = map (promtoolCheck "check-rules" "rules") (cfg.ruleFiles ++ [ (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules)) ]); - scrape_configs = cfg.scrapeConfigs; + scrape_configs = filterValidPrometheus cfg.scrapeConfigs; }; generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig; prometheusYml = let - yml = if cfg.configText != null then + yml = if cfg.configText != null then pkgs.writeText "prometheus.yml" cfg.configText else generatedPrometheusYml; in promtoolCheck "check-config" "prometheus.yml" yml; cmdlineArgs = cfg.extraFlags ++ [ - "-storage.local.path=${cfg.dataDir}/metrics" + "-storage.local.path=${workingDir}/metrics" "-config.file=${prometheusYml}" "-web.listen-address=${cfg.listenAddress}" "-alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" "-alertmanager.timeout=${toString cfg.alertmanagerTimeout}s" - (optionalString (cfg.alertmanagerURL != []) "-alertmanager.url=${concatStringsSep "," cfg.alertmanagerURL}") - (optionalString (cfg.webExternalUrl != null) "-web.external-url=${cfg.webExternalUrl}") - ]; + ] ++ + optional (cfg.alertmanagerURL != []) "-alertmanager.url=${concatStringsSep "," cfg.alertmanagerURL}" ++ + optional (cfg.webExternalUrl != null) "-web.external-url=${cfg.webExternalUrl}"; + + # This becomes the main config file for Prometheus 2 + promConfig2 = { + global = filterValidPrometheus cfg2.globalConfig; + rule_files = map (prom2toolCheck "check rules" "rules") (cfg2.ruleFiles ++ [ + (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg2.rules)) + ]); + scrape_configs = filterValidPrometheus cfg2.scrapeConfigs; + alerting = optionalAttrs (cfg2.alertmanagerURL != []) { + alertmanagers = [{ + static_configs = [{ + targets = cfg2.alertmanagerURL; + }]; + }]; + }; + }; + + generatedPrometheus2Yml = writePrettyJSON "prometheus.yml" promConfig2; + + prometheus2Yml = let + yml = if cfg2.configText != null then + pkgs.writeText "prometheus.yml" cfg2.configText + else generatedPrometheus2Yml; + in prom2toolCheck "check config" "prometheus.yml" yml; + + cmdlineArgs2 = cfg2.extraFlags ++ [ + "--storage.tsdb.path=${workingDir2}/data/" + "--config.file=${prometheus2Yml}" + "--web.listen-address=${cfg2.listenAddress}" + "--alertmanager.notification-queue-capacity=${toString cfg2.alertmanagerNotificationQueueCapacity}" + "--alertmanager.timeout=${toString cfg2.alertmanagerTimeout}s" + ] ++ + optional (cfg2.webExternalUrl != null) "--web.external-url=${cfg2.webExternalUrl}"; + + filterValidPrometheus = filterAttrsListRecursive (n: v: !(n == "_module" || v == null)); + filterAttrsListRecursive = pred: x: + if isAttrs x then + listToAttrs ( + concatMap (name: + let v = x.${name}; in + if pred name v then [ + (nameValuePair name (filterAttrsListRecursive pred v)) + ] else [] + ) (attrNames x) + ) + else if isList x then + map (filterAttrsListRecursive pred) x + else x; + + mkDefOpt = type : defaultStr : description : mkOpt type (description + '' + + Defaults to ${defaultStr} in prometheus + when set to null. + ''); + + mkOpt = type : description : mkOption { + type = types.nullOr type; + default = null; + inherit description; + }; promTypes.globalConfig = types.submodule { options = { - scrape_interval = mkOption { - type = types.str; - default = "1m"; - description = '' - How frequently to scrape targets by default. - ''; - }; + scrape_interval = mkDefOpt types.str "1m" '' + How frequently to scrape targets by default. + ''; - scrape_timeout = mkOption { - type = types.str; - default = "10s"; - description = '' - How long until a scrape request times out. - ''; - }; + scrape_timeout = mkDefOpt types.str "10s" '' + How long until a scrape request times out. + ''; - evaluation_interval = mkOption { - type = types.str; - default = "1m"; - description = '' - How frequently to evaluate rules by default. - ''; - }; + evaluation_interval = mkDefOpt types.str "1m" '' + How frequently to evaluate rules by default. + ''; - external_labels = mkOption { - type = types.attrsOf types.str; - description = '' - The labels to add to any time series or alerts when - communicating with external systems (federation, remote - storage, Alertmanager). - ''; - default = {}; - }; + external_labels = mkOpt (types.attrsOf types.str) '' + The labels to add to any time series or alerts when + communicating with external systems (federation, remote + storage, Alertmanager). + ''; }; }; @@ -96,129 +162,127 @@ let The job name assigned to scraped metrics by default. ''; }; - scrape_interval = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - How frequently to scrape targets from this job. Defaults to the - globally configured default. - ''; - }; - scrape_timeout = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Per-target timeout when scraping this job. Defaults to the - globally configured default. - ''; - }; - metrics_path = mkOption { - type = types.str; - default = "/metrics"; - description = '' - The HTTP resource path on which to fetch metrics from targets. - ''; - }; - honor_labels = mkOption { - type = types.bool; - default = false; - description = '' - Controls how Prometheus handles conflicts between labels - that are already present in scraped data and labels that - Prometheus would attach server-side ("job" and "instance" - labels, manually configured target labels, and labels - generated by service discovery implementations). + scrape_interval = mkOpt types.str '' + How frequently to scrape targets from this job. Defaults to the + globally configured default. + ''; - If honor_labels is set to "true", label conflicts are - resolved by keeping label values from the scraped data and - ignoring the conflicting server-side labels. + scrape_timeout = mkOpt types.str '' + Per-target timeout when scraping this job. Defaults to the + globally configured default. + ''; - If honor_labels is set to "false", label conflicts are - resolved by renaming conflicting labels in the scraped data - to "exported_<original-label>" (for example - "exported_instance", "exported_job") and then attaching - server-side labels. This is useful for use cases such as - federation, where all labels specified in the target should - be preserved. - ''; - }; - scheme = mkOption { - type = types.enum ["http" "https"]; - default = "http"; - description = '' - The URL scheme with which to fetch metrics from targets. - ''; - }; - params = mkOption { - type = types.attrsOf (types.listOf types.str); - default = {}; - description = '' - Optional HTTP URL parameters. - ''; - }; - basic_auth = mkOption { - type = types.nullOr (types.submodule { - options = { - username = mkOption { - type = types.str; - description = '' - HTTP username - ''; - }; - password = mkOption { - type = types.str; - description = '' - HTTP password - ''; - }; + metrics_path = mkDefOpt types.str "/metrics" '' + The HTTP resource path on which to fetch metrics from targets. + ''; + + honor_labels = mkDefOpt types.bool "false" '' + Controls how Prometheus handles conflicts between labels + that are already present in scraped data and labels that + Prometheus would attach server-side ("job" and "instance" + labels, manually configured target labels, and labels + generated by service discovery implementations). + + If honor_labels is set to "true", label conflicts are + resolved by keeping label values from the scraped data and + ignoring the conflicting server-side labels. + + If honor_labels is set to "false", label conflicts are + resolved by renaming conflicting labels in the scraped data + to "exported_<original-label>" (for example + "exported_instance", "exported_job") and then attaching + server-side labels. This is useful for use cases such as + federation, where all labels specified in the target should + be preserved. + ''; + + honor_timestamps = mkDefOpt types.bool "true" '' + honor_timestamps controls whether Prometheus respects the timestamps present + in scraped data. + + If honor_timestamps is set to true, the timestamps of the metrics exposed + by the target will be used. + + If honor_timestamps is set to false, the timestamps of the metrics exposed + by the target will be ignored. + ''; + + scheme = mkDefOpt (types.enum ["http" "https"]) "http" '' + The URL scheme with which to fetch metrics from targets. + ''; + + params = mkOpt (types.attrsOf (types.listOf types.str)) '' + Optional HTTP URL parameters. + ''; + + basic_auth = mkOpt (types.submodule { + options = { + username = mkOption { + type = types.str; + description = '' + HTTP username + ''; }; - }); - default = null; - apply = x: mapNullable _filter x; - description = '' - Optional http login credentials for metrics scraping. - ''; - }; - dns_sd_configs = mkOption { - type = types.listOf promTypes.dns_sd_config; - default = []; - apply = x: map _filter x; - description = '' - List of DNS service discovery configurations. - ''; - }; - consul_sd_configs = mkOption { - type = types.listOf promTypes.consul_sd_config; - default = []; - apply = x: map _filter x; - description = '' - List of Consul service discovery configurations. - ''; - }; - file_sd_configs = mkOption { - type = types.listOf promTypes.file_sd_config; - default = []; - apply = x: map _filter x; - description = '' - List of file service discovery configurations. - ''; - }; - static_configs = mkOption { - type = types.listOf promTypes.static_config; - default = []; - apply = x: map _filter x; - description = '' - List of labeled target groups for this job. - ''; - }; - relabel_configs = mkOption { - type = types.listOf promTypes.relabel_config; - default = []; - apply = x: map _filter x; - description = '' - List of relabel configurations. - ''; - }; + password = mkOption { + type = types.str; + description = '' + HTTP password + ''; + }; + }; + }) '' + Optional http login credentials for metrics scraping. + ''; + + bearer_token = mkOpt types.str '' + Sets the `Authorization` header on every scrape request with + the configured bearer token. It is mutually exclusive with + . + ''; + + bearer_token_file = mkOpt types.str '' + Sets the `Authorization` header on every scrape request with + the bearer token read from the configured file. It is mutually + exclusive with . + ''; + + tls_config = mkOpt promTypes.tls_config '' + Configures the scrape request's TLS settings. + ''; + + proxy_url = mkOpt types.str '' + Optional proxy URL. + ''; + + ec2_sd_configs = mkOpt (types.listOf promTypes.ec2_sd_config) '' + List of EC2 service discovery configurations. + ''; + + dns_sd_configs = mkOpt (types.listOf promTypes.dns_sd_config) '' + List of DNS service discovery configurations. + ''; + + consul_sd_configs = mkOpt (types.listOf promTypes.consul_sd_config) '' + List of Consul service discovery configurations. + ''; + + file_sd_configs = mkOpt (types.listOf promTypes.file_sd_config) '' + List of file service discovery configurations. + ''; + + static_configs = mkOpt (types.listOf promTypes.static_config) '' + List of labeled target groups for this job. + ''; + + relabel_configs = mkOpt (types.listOf promTypes.relabel_config) '' + List of relabel configurations. + ''; + + sample_limit = mkDefOpt types.int "0" '' + Per-scrape limit on number of scraped samples that will be accepted. + If more than this number of samples are present after metric relabelling + the entire scrape will be treated as failed. 0 means no limit. + ''; }; }; @@ -240,6 +304,72 @@ let }; }; + promTypes.ec2_sd_config = types.submodule { + options = { + region = mkOption { + type = types.str; + description = '' + The AWS Region. + ''; + }; + endpoint = mkOpt types.str '' + Custom endpoint to be used. + ''; + + access_key = mkOpt types.str '' + The AWS API key id. If blank, the environment variable + AWS_ACCESS_KEY_ID is used. + ''; + + secret_key = mkOpt types.str '' + The AWS API key secret. If blank, the environment variable + AWS_SECRET_ACCESS_KEY is used. + ''; + + profile = mkOpt types.str '' + Named AWS profile used to connect to the API. + ''; + + role_arn = mkOpt types.str '' + AWS Role ARN, an alternative to using AWS API keys. + ''; + + refresh_interval = mkDefOpt types.str "60s" '' + Refresh interval to re-read the instance list. + ''; + + port = mkDefOpt types.int "80" '' + The port to scrape metrics from. If using the public IP + address, this must instead be specified in the relabeling + rule. + ''; + + filters = mkOpt (types.listOf promTypes.filter) '' + Filters can be used optionally to filter the instance list by other criteria. + ''; + }; + }; + + promTypes.filter = types.submodule { + options = { + name = mkOption { + type = types.str; + description = '' + See this list + for the available filters. + ''; + }; + + value = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Value of the filter. + ''; + }; + }; + }; + promTypes.dns_sd_config = types.submodule { options = { names = mkOption { @@ -248,56 +378,63 @@ let A list of DNS SRV record names to be queried. ''; }; - refresh_interval = mkOption { - type = types.str; - default = "30s"; - description = '' - The time after which the provided names are refreshed. - ''; - }; + + refresh_interval = mkDefOpt types.str "30s" '' + The time after which the provided names are refreshed. + ''; }; }; promTypes.consul_sd_config = types.submodule { options = { - server = mkOption { - type = types.str; - description = "Consul server to query."; - }; - token = mkOption { - type = types.nullOr types.str; - description = "Consul token"; - }; - datacenter = mkOption { - type = types.nullOr types.str; - description = "Consul datacenter"; - }; - scheme = mkOption { - type = types.nullOr types.str; - description = "Consul scheme"; - }; - username = mkOption { - type = types.nullOr types.str; - description = "Consul username"; - }; - password = mkOption { - type = types.nullOr types.str; - description = "Consul password"; - }; + server = mkDefOpt types.str "localhost:8500" '' + Consul server to query. + ''; - services = mkOption { - type = types.listOf types.str; - description = '' - A list of services for which targets are retrieved. - ''; - }; - tag_separator = mkOption { - type = types.str; - default = ","; - description = '' - The string by which Consul tags are joined into the tag label. - ''; - }; + token = mkOpt types.str "Consul token"; + + datacenter = mkOpt types.str "Consul datacenter"; + + scheme = mkDefOpt types.str "http" "Consul scheme"; + + username = mkOpt types.str "Consul username"; + + password = mkOpt types.str "Consul password"; + + tls_config = mkOpt promTypes.tls_config '' + Configures the Consul request's TLS settings. + ''; + + services = mkOpt (types.listOf types.str) '' + A list of services for which targets are retrieved. + ''; + + tags = mkOpt (types.listOf types.str) '' + An optional list of tags used to filter nodes for a given + service. Services must contain all tags in the list. + ''; + + node_meta = mkOpt (types.attrsOf types.str) '' + Node metadata used to filter nodes for a given service. + ''; + + tag_separator = mkDefOpt types.str "," '' + The string by which Consul tags are joined into the tag label. + ''; + + allow_stale = mkOpt types.bool '' + Allow stale Consul results + (see ). + + Will reduce load on Consul. + ''; + + refresh_interval = mkDefOpt types.str "30s" '' + The time after which the provided names are refreshed. + + On large setup it might be a good idea to increase this value + because the catalog will change all the time. + ''; }; }; @@ -309,67 +446,74 @@ let Patterns for files from which target groups are extracted. Refer to the Prometheus documentation for permitted filename patterns and formats. + ''; + }; - ''; - }; - refresh_interval = mkOption { - type = types.str; - default = "30s"; - description = '' - Refresh interval to re-read the files. - ''; - }; + refresh_interval = mkDefOpt types.str "5m" '' + Refresh interval to re-read the files. + ''; }; }; promTypes.relabel_config = types.submodule { options = { - source_labels = mkOption { - type = with types; nullOr (listOf str); - default = null; - description = '' - The source labels select values from existing labels. Their content - is concatenated using the configured separator and matched against - the configured regular expression. - ''; - }; - separator = mkOption { - type = types.str; - default = ";"; - description = '' - Separator placed between concatenated source label values. - ''; - }; - target_label = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Label to which the resulting value is written in a replace action. - It is mandatory for replace actions. - ''; - }; - regex = mkOption { - type = types.str; - default = "(.*)"; - description = '' - Regular expression against which the extracted value is matched. - ''; - }; - replacement = mkOption { - type = types.str; - default = "$1"; - description = '' - Replacement value against which a regex replace is performed if the - regular expression matches. - ''; - }; - action = mkOption { - type = types.enum ["replace" "keep" "drop"]; - default = "replace"; - description = '' - Action to perform based on regex matching. - ''; - }; + source_labels = mkOpt (types.listOf types.str) '' + The source labels select values from existing labels. Their content + is concatenated using the configured separator and matched against + the configured regular expression. + ''; + + separator = mkDefOpt types.str ";" '' + Separator placed between concatenated source label values. + ''; + + target_label = mkOpt types.str '' + Label to which the resulting value is written in a replace action. + It is mandatory for replace actions. + ''; + + regex = mkDefOpt types.str "(.*)" '' + Regular expression against which the extracted value is matched. + ''; + + modulus = mkOpt types.int '' + Modulus to take of the hash of the source label values. + ''; + + replacement = mkDefOpt types.str "$1" '' + Replacement value against which a regex replace is performed if the + regular expression matches. + ''; + + action = mkDefOpt (types.enum ["replace" "keep" "drop"]) "replace" '' + Action to perform based on regex matching. + ''; + + }; + }; + + promTypes.tls_config = types.submodule { + options = { + ca_file = mkOpt types.str '' + CA certificate to validate API server certificate with. + ''; + + cert_file = mkOpt types.str '' + Certificate file for client cert authentication to the server. + ''; + + key_file = mkOpt types.str '' + Key file for client cert authentication to the server. + ''; + + server_name = mkOpt types.str '' + ServerName extension to indicate the name of the server. + http://tools.ietf.org/html/rfc4366#section-3.1 + ''; + + insecure_skip_verify = mkOpt types.bool '' + Disable validation of the server certificate. + ''; }; }; @@ -403,10 +547,21 @@ in { }; dataDir = mkOption { - type = types.path; - default = "/var/lib/prometheus"; + type = types.nullOr types.path; + default = null; description = '' Directory to store Prometheus metrics data. + This option is deprecated, please use . + ''; + }; + + stateDir = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Directory below ${stateDirBase} to store Prometheus metrics data. + This directory will be created automatically using systemd's StateDirectory mechanism. + Defaults to prometheus. ''; }; @@ -431,7 +586,6 @@ in { globalConfig = mkOption { type = promTypes.globalConfig; default = {}; - apply = _filter; description = '' Parameters that are valid in all configuration contexts. They also serve as defaults for other configuration sections @@ -457,7 +611,6 @@ in { scrapeConfigs = mkOption { type = types.listOf promTypes.scrape_config; default = []; - apply = x: map _filter x; description = '' A list of scrape configurations. ''; @@ -497,30 +650,199 @@ in { ''; }; }; - }; + services.prometheus2 = { - config = mkIf cfg.enable { - users.groups.${promGroup}.gid = config.ids.gids.prometheus; - users.users.${promUser} = { - description = "Prometheus daemon user"; - uid = config.ids.uids.prometheus; - group = promGroup; - home = cfg.dataDir; - createHome = true; - }; - systemd.services.prometheus = { - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - script = '' - #!/bin/sh - exec ${cfg.package}/bin/prometheus \ - ${concatStringsSep " \\\n " cmdlineArgs} - ''; - serviceConfig = { - User = promUser; - Restart = "always"; - WorkingDirectory = cfg.dataDir; + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the Prometheus 2 monitoring daemon. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.prometheus_2; + defaultText = "pkgs.prometheus_2"; + description = '' + The prometheus2 package that should be used. + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0:9090"; + description = '' + Address to listen on for the web interface, API, and telemetry. + ''; + }; + + stateDir = mkOption { + type = types.str; + default = "prometheus2"; + description = '' + Directory below ${stateDirBase} to store Prometheus metrics data. + This directory will be created automatically using systemd's StateDirectory mechanism. + Defaults to prometheus2. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching Prometheus 2. + ''; + }; + + configText = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + If non-null, this option defines the text that is written to + prometheus.yml. If null, the contents of prometheus.yml is generated + from the structured config options. + ''; + }; + + globalConfig = mkOption { + type = promTypes.globalConfig; + default = {}; + description = '' + Parameters that are valid in all configuration contexts. They + also serve as defaults for other configuration sections + ''; + }; + + rules = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Alerting and/or Recording rules to evaluate at runtime. + ''; + }; + + ruleFiles = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Any additional rules files to include in this configuration. + ''; + }; + + scrapeConfigs = mkOption { + type = types.listOf promTypes.scrape_config; + default = []; + description = '' + A list of scrape configurations. + ''; + }; + + alertmanagerURL = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of Alertmanager URLs to send notifications to. + ''; + }; + + alertmanagerNotificationQueueCapacity = mkOption { + type = types.int; + default = 10000; + description = '' + The capacity of the queue for pending alert manager notifications. + ''; + }; + + alertmanagerTimeout = mkOption { + type = types.int; + default = 10; + description = '' + Alert manager HTTP API timeout (in seconds). + ''; + }; + + webExternalUrl = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://example.com/"; + description = '' + The URL under which Prometheus is externally reachable (for example, + if Prometheus is served via a reverse proxy). + ''; }; }; - }; + }; + + config = mkMerge [ + (mkIf (cfg.enable || cfg2.enable) { + users.groups.${promGroup}.gid = config.ids.gids.prometheus; + users.users.${promUser} = { + description = "Prometheus daemon user"; + uid = config.ids.uids.prometheus; + group = promGroup; + }; + }) + (mkIf cfg.enable { + warnings = + optional (cfg.dataDir != null) '' + The option services.prometheus.dataDir is deprecated, please use + services.prometheus.stateDir. + ''; + assertions = [ + { + assertion = !(cfg.dataDir != null && cfg.stateDir != null); + message = + "The options services.prometheus.dataDir and services.prometheus.stateDir" + + " can't both be set at the same time! It's recommended to only set the latter" + + " since the former is deprecated."; + } + { + assertion = cfg.dataDir != null -> hasPrefix stateDirBase cfg.dataDir; + message = + "The option services.prometheus.dataDir should have ${stateDirBase} as a prefix!"; + } + { + assertion = cfg.stateDir != null -> !hasPrefix "/" cfg.stateDir; + message = + "The option services.prometheus.stateDir shouldn't be an absolute directory." + + " It should be a directory relative to ${stateDirBase}."; + } + { + assertion = cfg2.stateDir != null -> !hasPrefix "/" cfg2.stateDir; + message = + "The option services.prometheus2.stateDir shouldn't be an absolute directory." + + " It should be a directory relative to ${stateDirBase}."; + } + ]; + systemd.services.prometheus = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${cfg.package}/bin/prometheus" + + optionalString (length cmdlineArgs != 0) (" \\\n " + + concatStringsSep " \\\n " cmdlineArgs); + User = promUser; + Restart = "always"; + WorkingDirectory = workingDir; + StateDirectory = stateDir; + }; + }; + }) + (mkIf cfg2.enable { + systemd.services.prometheus2 = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${cfg2.package}/bin/prometheus" + + optionalString (length cmdlineArgs2 != 0) (" \\\n " + + concatStringsSep " \\\n " cmdlineArgs2); + User = promUser; + Restart = "always"; + WorkingDirectory = workingDir2; + StateDirectory = cfg2.stateDir; + }; + }; + }) + ]; } diff --git a/nixos/modules/services/monitoring/prometheus/pushgateway.nix b/nixos/modules/services/monitoring/prometheus/pushgateway.nix new file mode 100644 index 000000000000..f8fcc3eb97ef --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/pushgateway.nix @@ -0,0 +1,166 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.pushgateway; + + cmdlineArgs = + opt "web.listen-address" cfg.web.listen-address + ++ opt "web.telemetry-path" cfg.web.telemetry-path + ++ opt "web.external-url" cfg.web.external-url + ++ opt "web.route-prefix" cfg.web.route-prefix + ++ optional cfg.persistMetrics ''--persistence.file="/var/lib/${cfg.stateDir}/metrics"'' + ++ opt "persistence.interval" cfg.persistence.interval + ++ opt "log.level" cfg.log.level + ++ opt "log.format" cfg.log.format + ++ cfg.extraFlags; + + opt = k : v : optional (v != null) ''--${k}="${v}"''; + +in { + options = { + services.prometheus.pushgateway = { + enable = mkEnableOption "Prometheus Pushgateway"; + + package = mkOption { + type = types.package; + default = pkgs.prometheus-pushgateway; + defaultText = "pkgs.prometheus-pushgateway"; + description = '' + Package that should be used for the prometheus pushgateway. + ''; + }; + + web.listen-address = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Address to listen on for the web interface, API and telemetry. + + null will default to :9091. + ''; + }; + + web.telemetry-path = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path under which to expose metrics. + + null will default to /metrics. + ''; + }; + + web.external-url = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The URL under which Pushgateway is externally reachable. + ''; + }; + + web.route-prefix = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Prefix for the internal routes of web endpoints. + + Defaults to the path of + . + ''; + }; + + persistence.interval = mkOption { + type = types.nullOr types.str; + default = null; + example = "10m"; + description = '' + The minimum interval at which to write out the persistence file. + + null will default to 5m. + ''; + }; + + log.level = mkOption { + type = types.nullOr (types.enum ["debug" "info" "warn" "error" "fatal"]); + default = null; + description = '' + Only log messages with the given severity or above. + + null will default to info. + ''; + }; + + log.format = mkOption { + type = types.nullOr types.str; + default = null; + example = "logger:syslog?appname=bob&local=7"; + description = '' + Set the log target and format. + + null will default to logger:stderr. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the Pushgateway. + ''; + }; + + persistMetrics = mkOption { + type = types.bool; + default = false; + description = '' + Whether to persist metrics to a file. + + When enabled metrics will be saved to a file called + metrics in the directory + /var/lib/pushgateway. The directory below + /var/lib can be set using + . + ''; + }; + + stateDir = mkOption { + type = types.str; + default = "pushgateway"; + description = '' + Directory below /var/lib to store metrics. + + This directory will be created automatically using systemd's + StateDirectory mechanism when + + is enabled. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = !hasPrefix "/" cfg.stateDir; + message = + "The option services.prometheus.pushgateway.stateDir" + + " shouldn't be an absolute directory." + + " It should be a directory relative to /var/lib."; + } + ]; + systemd.services.pushgateway = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + Restart = "always"; + DynamicUser = true; + ExecStart = "${cfg.package}/bin/pushgateway" + + optionalString (length cmdlineArgs != 0) (" \\\n " + + concatStringsSep " \\\n " cmdlineArgs); + StateDirectory = if cfg.persistMetrics then cfg.stateDir else null; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 6ecb21d628de..fbded746a5f7 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.scollector; - collectors = pkgs.runCommand "collectors" {} + collectors = pkgs.runCommand "collectors" { preferLocalBuild = true; } '' mkdir -p $out ${lib.concatStringsSep diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix index 6bfcd7143e1c..d87867326682 100644 --- a/nixos/modules/services/monitoring/telegraf.nix +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -7,6 +7,7 @@ let configFile = pkgs.runCommand "config.toml" { buildInputs = [ pkgs.remarshal ]; + preferLocalBuild = true; } '' remarshal -if json -of toml \ < ${pkgs.writeText "config.json" (builtins.toJSON cfg.extraConfig)} \ diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix index b4d3a2640109..c0993f3bc2e7 100644 --- a/nixos/modules/services/monitoring/uptime.nix +++ b/nixos/modules/services/monitoring/uptime.nix @@ -4,7 +4,8 @@ let cfg = config.services.uptime; - configDir = pkgs.runCommand "config" {} (if cfg.configFile != null then '' + configDir = pkgs.runCommand "config" { preferLocalBuild = true; } + (if cfg.configFile != null then '' mkdir $out ext=`echo ${cfg.configFile} | grep -o \\..*` ln -sv ${cfg.configFile} $out/default$ext diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix index d9dde3f6bb67..86b1bb9160f1 100644 --- a/nixos/modules/services/network-filesystems/beegfs.nix +++ b/nixos/modules/services/network-filesystems/beegfs.nix @@ -102,7 +102,10 @@ let # wrappers to beegfs tools. Avoid typing path of config files utilWrappers = mapAttrsToList ( name: cfg: - ( pkgs.runCommand "beegfs-utils-${name}" { nativeBuildInputs = [ pkgs.makeWrapper ]; } '' + ( pkgs.runCommand "beegfs-utils-${name}" { + nativeBuildInputs = [ pkgs.makeWrapper ]; + preferLocalBuild = true; + } '' mkdir -p $out/bin makeWrapper ${pkgs.beegfs}/bin/beegfs-check-servers \ diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 602cd50d8f55..d4fa1eccdf3b 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -19,7 +19,7 @@ let "/var/lib/ipfs/.ipfs"; # Wrapping the ipfs binary with the environment variable IPFS_PATH set to dataDir because we can't set it in the user environment - wrapped = runCommand "ipfs" { buildInputs = [ makeWrapper ]; } '' + wrapped = runCommand "ipfs" { buildInputs = [ makeWrapper ]; preferLocalBuild = true; } '' mkdir -p "$out/bin" makeWrapper "${ipfs}/bin/ipfs" "$out/bin/ipfs" \ --set IPFS_PATH ${cfg.dataDir} \ diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix index 240c1392088f..93d2d7fcd975 100644 --- a/nixos/modules/services/network-filesystems/openafs/client.nix +++ b/nixos/modules/services/network-filesystems/openafs/client.nix @@ -15,7 +15,7 @@ let clientServDB = pkgs.writeText "client-cellServDB-${cfg.cellName}" (mkCellServDB cfg.cellName cfg.cellServDB); - afsConfig = pkgs.runCommand "afsconfig" {} '' + afsConfig = pkgs.runCommand "afsconfig" { preferLocalBuild = true; } '' mkdir -p $out echo ${cfg.cellName} > $out/ThisCell cat ${cellServDB} ${clientServDB} > $out/CellServDB @@ -198,7 +198,7 @@ in environment.etc = { clientCellServDB = { - source = pkgs.runCommand "CellServDB" {} '' + source = pkgs.runCommand "CellServDB" { preferLocalBuild = true; } '' cat ${cellServDB} ${clientServDB} > $out ''; target = "openafs/CellServDB"; diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index 534862a3c9e4..7d75eb286106 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -234,16 +234,19 @@ in Type = "simple"; PIDFile = pidfile; # Believe it or not, Tahoe is very brittle about the order of - # arguments to $(tahoe start). The node directory must come first, + # arguments to $(tahoe run). The node directory must come first, # and arguments which alter Twisted's behavior come afterwards. ExecStart = '' - ${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile} + ${settings.package}/bin/tahoe run ${lib.escapeShellArg nodedir} --pidfile=${lib.escapeShellArg pidfile} ''; }; preStart = '' if [ ! -d ${lib.escapeShellArg nodedir} ]; then mkdir -p /var/db/tahoe-lafs - tahoe create-introducer ${lib.escapeShellArg nodedir} + # See https://github.com/NixOS/nixpkgs/issues/25273 + tahoe create-introducer \ + --hostname="${config.networking.hostName}" \ + ${lib.escapeShellArg nodedir} fi # Tahoe has created a predefined tahoe.cfg which we must now @@ -334,10 +337,10 @@ in Type = "simple"; PIDFile = pidfile; # Believe it or not, Tahoe is very brittle about the order of - # arguments to $(tahoe start). The node directory must come first, + # arguments to $(tahoe run). The node directory must come first, # and arguments which alter Twisted's behavior come afterwards. ExecStart = '' - ${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile} + ${settings.package}/bin/tahoe run ${lib.escapeShellArg nodedir} --pidfile=${lib.escapeShellArg pidfile} ''; }; preStart = '' diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index fc30f50317fe..5051fc916d96 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.dnscache; - dnscache-root = pkgs.runCommand "dnscache-root" {} '' + dnscache-root = pkgs.runCommand "dnscache-root" { preferLocalBuild = true; } '' mkdir -p $out/{servers,ip} ${concatMapStrings (ip: '' diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index 6c43573851b2..ec702cdc6ff4 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -161,7 +161,10 @@ in { FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig; NODE_NAME = cfg.nodeName; }; - preStart = mkIf (cfg.storageBackend == "etcd") '' + preStart = '' + mkdir -p /run/flannel + touch /run/flannel/docker + '' + optionalString (cfg.storageBackend == "etcd") '' echo "setting network configuration" until ${pkgs.etcdctl.bin}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' do @@ -169,13 +172,11 @@ in { sleep 1 done ''; - postStart = '' - while [ ! -f /run/flannel/subnet.env ] - do - sleep 1 - done - ''; - serviceConfig.ExecStart = "${cfg.package}/bin/flannel"; + serviceConfig = { + ExecStart = "${cfg.package}/bin/flannel"; + Restart = "always"; + RestartSec = "10s"; + }; }; services.etcd.enable = mkDefault (cfg.storageBackend == "etcd" && cfg.etcd.endpoints == ["http://127.0.0.1:2379"]); diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix index 6a1db81413c5..178a832c166e 100644 --- a/nixos/modules/services/networking/gnunet.nix +++ b/nixos/modules/services/networking/gnunet.nix @@ -130,7 +130,7 @@ in group = "gnunet"; description = "GNUnet User"; home = homeDir; - createHome = true; + createHome = true; uid = config.ids.uids.gnunet; }; @@ -146,7 +146,7 @@ in wantedBy = [ "multi-user.target" ]; path = [ cfg.package pkgs.miniupnpc ]; environment.TMPDIR = "/tmp"; - serviceConfig.PrivateTemp = true; + serviceConfig.PrivateTmp = true; serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}"; serviceConfig.User = "gnunet"; serviceConfig.UMask = "0007"; diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 9f74e4963296..45ca72525aac 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: # TODO: # @@ -12,6 +12,8 @@ let cfg = config.services.hostapd; + escapedInterface = utils.escapeSystemdPath cfg.interface; + configFile = pkgs.writeText "hostapd.conf" '' interface=${cfg.interface} driver=${cfg.driver} @@ -157,8 +159,8 @@ in { description = "hostapd wireless AP"; path = [ pkgs.hostapd ]; - after = [ "sys-subsystem-net-devices-${cfg.interface}.device" ]; - bindsTo = [ "sys-subsystem-net-devices-${cfg.interface}.device" ]; + after = [ "sys-subsystem-net-devices-${escapedInterface}.device" ]; + bindsTo = [ "sys-subsystem-net-devices-${escapedInterface}.device" ]; requiredBy = [ "network-link-${cfg.interface}.service" ]; serviceConfig = diff --git a/nixos/modules/services/networking/hylafax/default.nix b/nixos/modules/services/networking/hylafax/default.nix index 4c63b822d165..d8ffa3fc04d2 100644 --- a/nixos/modules/services/networking/hylafax/default.nix +++ b/nixos/modules/services/networking/hylafax/default.nix @@ -26,4 +26,6 @@ }]; }; + meta.maintainers = [ lib.maintainers.yarny ]; + } diff --git a/nixos/modules/services/networking/hylafax/faxq-default.nix b/nixos/modules/services/networking/hylafax/faxq-default.nix index a2630ce66b71..9b634650cf79 100644 --- a/nixos/modules/services/networking/hylafax/faxq-default.nix +++ b/nixos/modules/services/networking/hylafax/faxq-default.nix @@ -4,7 +4,7 @@ { - ModemGroup = [ ''"any:.*"'' ]; + ModemGroup = [ ''"any:0:.*"'' ]; ServerTracing = "0x78701"; SessionTracing = "0x78701"; UUCPLockDir = "/var/lock"; diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix index 91d9c1a37da6..ef177e4be345 100644 --- a/nixos/modules/services/networking/hylafax/systemd.nix +++ b/nixos/modules/services/networking/hylafax/systemd.nix @@ -41,7 +41,7 @@ let "$out/config.${name}" ''; in - pkgs.runCommand "hylafax-config-modems" {} + pkgs.runCommand "hylafax-config-modems" { preferLocalBuild = true; } ''mkdir --parents "$out/" ${concatStringsSep "\n" (mapModems mkLine)}''; setupSpoolScript = pkgs.substituteAll { diff --git a/nixos/modules/services/networking/knot.nix b/nixos/modules/services/networking/knot.nix new file mode 100644 index 000000000000..1cc1dd3f2f62 --- /dev/null +++ b/nixos/modules/services/networking/knot.nix @@ -0,0 +1,95 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.knot; + + configFile = pkgs.writeText "knot.conf" cfg.extraConfig; + socketFile = "/run/knot/knot.sock"; + + knotConfCheck = file: pkgs.runCommand "knot-config-checked" + { buildInputs = [ cfg.package ]; } '' + ln -s ${configFile} $out + knotc --config=${configFile} conf-check + ''; + + knot-cli-wrappers = pkgs.stdenv.mkDerivation { + name = "knot-cli-wrappers"; + buildInputs = [ pkgs.makeWrapper ]; + buildCommand = '' + mkdir -p $out/bin + makeWrapper ${cfg.package}/bin/knotc "$out/bin/knotc" \ + --add-flags "--config=${configFile}" \ + --add-flags "--socket=${socketFile}" + makeWrapper ${cfg.package}/bin/keymgr "$out/bin/keymgr" \ + --add-flags "--config=${configFile}" + for executable in kdig khost kjournalprint knsec3hash knsupdate kzonecheck + do + ln -s "${cfg.package}/bin/$executable" "$out/bin/$executable" + done + mkdir -p "$out/share" + ln -s '${cfg.package}/share/man' "$out/share/" + ''; + }; +in { + options = { + services.knot = { + enable = mkEnableOption "Knot authoritative-only DNS server"; + + extraArgs = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of additional command line paramters for knotd + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra lines to be added verbatim to knot.conf + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.knot-dns; + description = '' + Which Knot DNS package to use + ''; + }; + }; + }; + + config = mkIf config.services.knot.enable { + systemd.services.knot = { + unitConfig.Documentation = "man:knotd(8) man:knot.conf(5) man:knotc(8) https://www.knot-dns.cz/docs/${cfg.package.version}/html/"; + description = cfg.package.meta.description; + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + after = ["network.target" ]; + + serviceConfig = { + Type = "notify"; + ExecStart = "${cfg.package}/bin/knotd --config=${knotConfCheck configFile} --socket=${socketFile} ${concatStringsSep " " cfg.extraArgs}"; + ExecReload = "${knot-cli-wrappers}/bin/knotc reload"; + CapabilityBoundingSet = "CAP_NET_BIND_SERVICE CAP_SETPCAP"; + AmbientCapabilities = "CAP_NET_BIND_SERVICE CAP_SETPCAP"; + NoNewPrivileges = true; + DynamicUser = "yes"; + RuntimeDirectory = "knot"; + StateDirectory = "knot"; + StateDirectoryMode = "0700"; + PrivateDevices = true; + RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; + SystemCallArchitectures = "native"; + Restart = "on-abort"; + }; + }; + + environment.systemPackages = [ knot-cli-wrappers ]; + }; +} + diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index ca34ff9df4ef..fc516c01230a 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -80,8 +80,11 @@ in # Syntax depends on being IPv6 or IPv4. (iface: if elem ":" (stringToCharacters iface) then "[${iface}]:53" else "${iface}:53") cfg.interfaces; - socketConfig.ListenDatagram = listenStreams; - socketConfig.FreeBind = true; + socketConfig = { + ListenDatagram = listenStreams; + FreeBind = true; + FileDescriptorName = "dns"; + }; }; systemd.sockets.kresd-tls = mkIf (cfg.listenTLS != []) rec { diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index e83cad949ae8..ca458d089dcc 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -31,6 +31,15 @@ in default = null; description = '' The path to the file used for signing derivation data. + Generate with: + + ``` + nix-store --generate-binary-cache-key key-name secret-key-file public-key-file + ``` + + Make sure user `nix-serve` has read access to the private key file. + + For more details see nix-store1. ''; }; diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix index f63f86496bee..c936417e68cb 100644 --- a/nixos/modules/services/networking/prayer.nix +++ b/nixos/modules/services/networking/prayer.nix @@ -25,7 +25,7 @@ let ${cfg.extraConfig} ''; - prayerCfg = pkgs.runCommand "prayer.cf" { } '' + prayerCfg = pkgs.runCommand "prayer.cf" { preferLocalBuild = true; } '' # We have to remove the http_port 80, or it will start a server there cat ${prayer}/etc/prayer.cf | grep -v http_port > $out cat ${prayerExtraCfg} >> $out diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix index 1ea676d0f929..f511a9af2562 100644 --- a/nixos/modules/services/networking/shout.nix +++ b/nixos/modules/services/networking/shout.nix @@ -6,7 +6,7 @@ let cfg = config.services.shout; shoutHome = "/var/lib/shout"; - defaultConfig = pkgs.runCommand "config.js" {} '' + defaultConfig = pkgs.runCommand "config.js" { preferLocalBuild = true; } '' EDITOR=true ${pkgs.shout}/bin/shout config --home $PWD mv config.js $out ''; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 95dc8a62a454..b9b5d40c4574 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -400,7 +400,10 @@ in sockets.sshd = { description = "SSH Socket"; wantedBy = [ "sockets.target" ]; - socketConfig.ListenStream = cfg.ports; + socketConfig.ListenStream = if cfg.listenAddresses != [] then + map (l: "${l.addr}:${toString (if l.port != null then l.port else 22)}") cfg.listenAddresses + else + cfg.ports; socketConfig.Accept = true; }; diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index a1c5d879f3cb..cc18f6d0064c 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.xrdp; - confDir = pkgs.runCommand "xrdp.conf" { } '' + confDir = pkgs.runCommand "xrdp.conf" { preferLocalBuild = true; } '' mkdir $out cp ${cfg.package}/etc/xrdp/{km-*,xrdp,sesman,xrdp_keyboard}.ini $out diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix index bce5b15a19ec..1ad8855b86db 100644 --- a/nixos/modules/services/networking/znc/default.nix +++ b/nixos/modules/services/networking/znc/default.nix @@ -151,7 +151,7 @@ in ''; description = '' Configuration for ZNC, see - https://wiki.znc.in/Configuration for details. The + for details. The Nix value declared here will be translated directly to the xml-like format ZNC expects. This is much more flexible than the legacy options under , but also can't do diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 3a43ebbb889c..72db9115fef6 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -11,8 +11,9 @@ let avahiEnabled = config.services.avahi.enable; polkitEnabled = config.security.polkit.enable; - additionalBackends = pkgs.runCommand "additional-cups-backends" { } - '' + additionalBackends = pkgs.runCommand "additional-cups-backends" { + preferLocalBuild = true; + } '' mkdir -p $out if [ ! -e ${cups.out}/lib/cups/backend/smb ]; then mkdir -p $out/lib/cups/backend @@ -59,6 +60,8 @@ let TempDir ${cfg.tempDir} + SetEnv PATH /var/lib/cups/path/lib/cups/filter:/var/lib/cups/path/bin + # User and group used to run external programs, including # those that actually send the job to the printer. Note that # Udev sets the group of printer devices to `lp', so we want @@ -75,8 +78,6 @@ let '') cfg.listenAddresses} Listen /var/run/cups/cups.sock - SetEnv PATH /var/lib/cups/path/lib/cups/filter:/var/lib/cups/path/bin - DefaultShared ${if cfg.defaultShared then "Yes" else "No"} Browsing ${if cfg.browsing then "Yes" else "No"} diff --git a/nixos/modules/services/search/elasticsearch-curator.nix b/nixos/modules/services/search/elasticsearch-curator.nix index 8cb1275284a3..9620c3e0b6d4 100644 --- a/nixos/modules/services/search/elasticsearch-curator.nix +++ b/nixos/modules/services/search/elasticsearch-curator.nix @@ -86,7 +86,7 @@ in { startAt = cfg.interval; serviceConfig = { ExecStart = - "${pkgs.python3Packages.elasticsearch-curator}/bin/curator" + + "${pkgs.elasticsearch-curator}/bin/curator" + " --config ${curatorConfig} ${curatorAction}"; }; }; diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index 3539b3ddb4f1..ba58630a467a 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -5,6 +5,9 @@ with lib; let cfg = config.services.kibana; + ge7 = builtins.compareVersions cfg.package.version "7" >= 0; + lt6_6 = builtins.compareVersions cfg.package.version "6.6" < 0; + cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON ( (filterAttrsRecursive (n: v: v != null) ({ server.host = cfg.listenAddress; @@ -16,6 +19,7 @@ let kibana.defaultAppId = cfg.defaultAppId; elasticsearch.url = cfg.elasticsearch.url; + elasticsearch.hosts = cfg.elasticsearch.hosts; elasticsearch.username = cfg.elasticsearch.username; elasticsearch.password = cfg.elasticsearch.password; @@ -67,9 +71,30 @@ in { elasticsearch = { url = mkOption { - description = "Elasticsearch url"; - default = "http://localhost:9200"; - type = types.str; + description = '' + Elasticsearch url. + + Defaults to "http://localhost:9200". + + Don't set this when using Kibana >= 7.0.0 because it will result in a + configuration error. Use + instead. + ''; + default = null; + type = types.nullOr types.str; + }; + + hosts = mkOption { + description = '' + The URLs of the Elasticsearch instances to use for all your queries. + All nodes listed here must be on the same cluster. + + Defaults to [ "http://localhost:9200" ]. + + This option is only valid when using kibana >= 6.6. + ''; + default = null; + type = types.nullOr (types.listOf types.str); }; username = mkOption { @@ -143,6 +168,19 @@ in { }; config = mkIf (cfg.enable) { + assertions = [ + { + assertion = ge7 -> cfg.elasticsearch.url == null; + message = + "The option services.kibana.elasticsearch.url has been removed when using kibana >= 7.0.0. " + + "Please use option services.kibana.elasticsearch.hosts instead."; + } + { + assertion = lt6_6 -> cfg.elasticsearch.hosts == null; + message = + "The option services.kibana.elasticsearch.hosts is only valid for kibana >= 6.6."; + } + ]; systemd.services.kibana = { description = "Kibana Service"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix index 8136a5c763a9..1b7a2ad13980 100644 --- a/nixos/modules/services/security/sks.nix +++ b/nixos/modules/services/security/sks.nix @@ -116,20 +116,22 @@ in { ${lib.optionalString (cfg.webroot != null) "ln -sfT \"${cfg.webroot}\" web"} mkdir -p dump - # Check that both database configs are symlinks before overwriting them - if [ -e KDB/DB_CONFIG ] && [ ! -L KBD/DB_CONFIG ]; then - echo "KDB/DB_CONFIG exists but is not a symlink." >&2 - exit 1 - fi - if [ -e PTree/DB_CONFIG ] && [ ! -L PTree/DB_CONFIG ]; then - echo "PTree/DB_CONFIG exists but is not a symlink." >&2 - exit 1 - fi - ln -sf ${dbConfig} KDB/DB_CONFIG - ln -sf ${dbConfig} PTree/DB_CONFIG ${sksPkg}/bin/sks build dump/*.gpg -n 10 -cache 100 || true #*/ ${sksPkg}/bin/sks cleandb || true ${sksPkg}/bin/sks pbuild -cache 20 -ptree_cache 70 || true + # Check that both database configs are symlinks before overwriting them + # TODO: The initial build will be without DB_CONFIG, but this will + # hopefully not cause any significant problems. It might be better to + # create both directories manually but we have to check that this does + # not affect the initial build of the DB. + for CONFIG_FILE in KDB/DB_CONFIG PTree/DB_CONFIG; do + if [ -e $CONFIG_FILE ] && [ ! -L $CONFIG_FILE ]; then + echo "$CONFIG_FILE exists but is not a symlink." >&2 + echo "Please remove $PWD/$CONFIG_FILE manually to continue." >&2 + exit 1 + fi + ln -sf ${dbConfig} $CONFIG_FILE + done ''; serviceConfig = { WorkingDirectory = "~"; diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index 3892cd5c72b8..25cec5b5b105 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -107,8 +107,6 @@ in { path = with pkgs; [ iptables ipset iproute systemd ]; postStart = '' - ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:ip family inet - ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:ip family inet6 ${pkgs.iptables}/bin/iptables -I INPUT -m set --match-set sshguard4 src -j DROP ${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP ''; diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index 82b6a51028e3..dc37f9bee4b3 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -82,7 +82,7 @@ in { X-RestartIfChanged=false ''; - systemd.units."autovt@.service".unit = pkgs.runCommand "unit" { } + systemd.units."autovt@.service".unit = pkgs.runCommand "unit" { preferLocalBuild = true; } '' mkdir -p $out ln -s ${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service $out/autovt@.service diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix index a0af28eac7cc..56e1de17e3c3 100644 --- a/nixos/modules/services/web-apps/codimd.nix +++ b/nixos/modules/services/web-apps/codimd.nix @@ -6,7 +6,7 @@ let cfg = config.services.codimd; prettyJSON = conf: - pkgs.runCommand "codimd-config.json" { } '' + pkgs.runCommand "codimd-config.json" { preferLocalBuild = true; } '' echo '${builtins.toJSON conf}' | ${pkgs.jq}/bin/jq \ '{production:del(.[]|nulls)|del(.[][]?|nulls)}' > $out ''; diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index ccaa2cff1c23..910e1d937bf3 100644 --- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -3,112 +3,18 @@ poolName = "icingaweb2"; phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; - formatBool = b: if b then "1" else "0"; - - configIni = let - config = cfg.generalConfig; - in '' - [global] - show_stacktraces = "${formatBool config.showStacktraces}" - show_application_state_messages = "${formatBool config.showApplicationStateMessages}" - module_path = "${pkgs.icingaweb2}/modules${optionalString (builtins.length config.modulePath > 0) ":${concatStringsSep ":" config.modulePath}"}" - config_backend = "${config.configBackend}" - ${optionalString (config.configBackend == "db") ''config_resource = "${config.configResource}"''} - - [logging] - log = "${config.log}" - ${optionalString (config.log != "none") ''level = "${config.logLevel}"''} - ${optionalString (config.log == "php" || config.log == "syslog") ''application = "${config.logApplication}"''} - ${optionalString (config.log == "syslog") ''facility = "${config.logFacility}"''} - ${optionalString (config.log == "file") ''file = "${config.logFile}"''} - - [themes] - default = "${config.themeDefault}" - disabled = "${formatBool config.themeDisabled}" - - [authentication] - ${optionalString (config.authDefaultDomain != null) ''default_domain = "${config.authDefaultDomain}"''} - ''; - - resourcesIni = concatStringsSep "\n" (mapAttrsToList (name: config: '' - [${name}] - type = "${config.type}" - ${optionalString (config.type == "db") '' - db = "${config.db}" - host = "${config.host}" - ${optionalString (config.port != null) ''port = "${toString config.port}"''} - username = "${config.username}" - password = "${config.password}" - dbname = "${config.dbname}" - ${optionalString (config.charset != null) ''charset = "${config.charset}"''} - use_ssl = "${formatBool config.useSSL}" - ${optionalString (config.sslCert != null) ''ssl_cert = "${config.sslCert}"''} - ${optionalString (config.sslKey != null) ''ssl_cert = "${config.sslKey}"''} - ${optionalString (config.sslCA != null) ''ssl_cert = "${config.sslCA}"''} - ${optionalString (config.sslCApath != null) ''ssl_cert = "${config.sslCApath}"''} - ${optionalString (config.sslCipher != null) ''ssl_cert = "${config.sslCipher}"''} - ''} - ${optionalString (config.type == "ldap") '' - hostname = "${config.host}" - ${optionalString (config.port != null) ''port = "${toString config.port}"''} - root_dn = "${config.rootDN}" - bind_dn = "${config.username}" - bind_pw = "${config.password}" - encryption = "${config.ldapEncryption}" - timeout = "${toString config.ldapTimeout}" - ''} - ${optionalString (config.type == "ssh") '' - user = "${config.username}" - private_key = "${config.sshPrivateKey}" - ''} - - '') cfg.resources); - - authenticationIni = concatStringsSep "\n" (mapAttrsToList (name: config: '' - [${name}] - backend = "${config.backend}" - ${optionalString (config.domain != null) ''domain = "${config.domain}"''} - ${optionalString (config.backend == "external" && config.externalStripRegex != null) ''strip_username_regexp = "${config.externalStripRegex}"''} - ${optionalString (config.backend != "external") ''resource = "${config.resource}"''} - ${optionalString (config.backend == "ldap" || config.backend == "msldap") '' - ${optionalString (config.ldapUserClass != null) ''user_class = "${config.ldapUserClass}"''} - ${optionalString (config.ldapUserNameAttr != null) ''user_name_attribute = "${config.ldapUserNameAttr}"''} - ${optionalString (config.ldapFilter != null) ''filter = "${config.ldapFilter}"''} - ''} - '') cfg.authentications); - - groupsIni = concatStringsSep "\n" (mapAttrsToList (name: config: '' - [${name}] - backend = "${config.backend}" - resource = "${config.resource}" - ${optionalString (config.backend != "db") '' - ${optionalString (config.ldapUserClass != null) ''user_class = "${config.ldapUserClass}"''} - ${optionalString (config.ldapUserNameAttr != null) ''user_name_attribute = "${config.ldapUserNameAttr}"''} - ${optionalString (config.ldapGroupClass != null) ''group_class = "${config.ldapGroupClass}"''} - ${optionalString (config.ldapGroupNameAttr != null) ''group_name_attribute = "${config.ldapGroupNameAttr}"''} - ${optionalString (config.ldapGroupFilter != null) ''group_filter = "${config.ldapGroupFilter}"''} - ''} - ${optionalString (config.backend == "msldap" && config.ldapNestedSearch) ''nested_group_search = "1"''} - '') cfg.groupBackends); - - rolesIni = let - optionalList = var: attribute: optionalString (builtins.length var > 0) ''${attribute} = "${concatStringsSep "," var}"''; - in concatStringsSep "\n" (mapAttrsToList (name: config: '' - [${name}] - ${optionalList config.users "users"} - ${optionalList config.groups "groups"} - ${optionalList config.permissions "permissions"} - ${optionalList config.permissions "permissions"} - ${concatStringsSep "\n" (mapAttrsToList (key: value: optionalList value key) config.extraAssignments)} - '') cfg.roles); - + defaultConfig = { + global = { + module_path = "${pkgs.icingaweb2}/modules${optionalString (builtins.length config.modulePath > 0) ":${concatStringsSep ":" config.modulePath}"}"; + }; + }; in { options.services.icingaweb2 = with types; { enable = mkEnableOption "the icingaweb2 web interface"; pool = mkOption { type = str; - default = "${poolName}"; + default = poolName; description = '' Name of existing PHP-FPM pool that is used to run Icingaweb2. If not specified, a pool will automatically created with default values. @@ -143,7 +49,7 @@ in { default = {}; example = literalExample '' { - "snow" = pkgs.icingaweb2Modules.theme-snow; + "snow" = icingaweb2Modules.theme-snow; } ''; description = '' @@ -153,394 +59,105 @@ in { ''; }; - generalConfig = { - mutable = mkOption { - type = bool; - default = false; - description = '' - Make config.ini mutable (e.g. via the web interface). - Not that you need to update module_path manually. - ''; + generalConfig = mkOption { + type = nullOr attrs; + default = null; + example = { + general = { + showStacktraces = 1; + config_resource = "icingaweb_db"; + }; + logging = { + log = "syslog"; + level = "CRITICAL"; + }; }; + description = '' + config.ini contents. + Will automatically be converted to a .ini file. + If you don't set global.module_path, the module will take care of it. - showStacktraces = mkOption { - type = bool; - default = true; - description = "Enable stack traces in the Web UI"; - }; - - showApplicationStateMessages = mkOption { - type = bool; - default = true; - description = "Enable application state messages in the Web UI"; - }; - - modulePath = mkOption { - type = listOf str; - default = []; - description = "List of additional module search paths"; - }; - - configBackend = mkOption { - type = enum [ "ini" "db" "none" ]; - default = "db"; - description = "Where to store user preferences"; - }; - - configResource = mkOption { - type = nullOr str; - default = null; - description = "Database resource where user preferences are stored (if they are stored in a database)"; - }; - - log = mkOption { - type = enum [ "syslog" "php" "file" "none" ]; - default = "syslog"; - description = "Logging target"; - }; - - logLevel = mkOption { - type = enum [ "ERROR" "WARNING" "INFO" "DEBUG" ]; - default = "ERROR"; - description = "Maximum logging level to emit"; - }; - - logApplication = mkOption { - type = str; - default = "icingaweb2"; - description = "Application name to log under (syslog and php log)"; - }; - - logFacility = mkOption { - type = enum [ "user" "local0" "local1" "local2" "local3" "local4" "local5" "local6" "local7" ]; - default = "user"; - description = "Syslog facility to log to"; - }; - - logFile = mkOption { - type = str; - default = "/var/log/icingaweb2/icingaweb2.log"; - description = "File to log to"; - }; - - themeDefault = mkOption { - type = str; - default = "Icinga"; - description = "Name of the default theme"; - }; - - themeDisabled = mkOption { - type = bool; - default = false; - description = "Disallow users to change the theme"; - }; - - authDefaultDomain = mkOption { - type = nullOr str; - default = null; - description = "Domain for users logging in without a qualified domain"; - }; - }; - - mutableResources = mkOption { - type = bool; - default = false; - description = "Make resources.ini mutable (e.g. via the web interface)"; + If the value is null, no config.ini is created and you can + modify it manually (e.g. via the web interface). + Note that you need to update module_path manually. + ''; }; resources = mkOption { - default = {}; - description = "Icingaweb 2 resources to define"; - type = attrsOf (submodule ({ name, ... }: { - options = { - name = mkOption { - visible = false; - default = name; - type = str; - description = "Name of this resource"; - }; - - type = mkOption { - type = enum [ "db" "ldap" "ssh" ]; - default = "db"; - description = "Type of this resouce"; - }; - - db = mkOption { - type = enum [ "mysql" "pgsql" ]; - default = "mysql"; - description = "Type of this database resource"; - }; - - host = mkOption { - type = str; - description = "Host to connect to"; - }; - - port = mkOption { - type = nullOr port; - default = null; - description = "Port to connect on"; - }; - - username = mkOption { - type = str; - description = "Database or SSH user or LDAP bind DN to connect with"; - }; - - password = mkOption { - type = str; - description = "Password for the database user or LDAP bind DN"; - }; - - dbname = mkOption { - type = str; - description = "Name of the database to connect to"; - }; - - charset = mkOption { - type = nullOr str; - default = null; - example = "utf8"; - description = "Database character set to connect with"; - }; - - useSSL = mkOption { - type = nullOr bool; - default = false; - description = "Whether to connect to the database using SSL"; - }; - - sslCert = mkOption { - type = nullOr str; - default = null; - description = "The file path to the SSL certificate. Only available for the mysql database."; - }; - - sslKey = mkOption { - type = nullOr str; - default = null; - description = "The file path to the SSL key. Only available for the mysql database."; - }; - - sslCA = mkOption { - type = nullOr str; - default = null; - description = "The file path to the SSL certificate authority. Only available for the mysql database."; - }; - - sslCApath = mkOption { - type = nullOr str; - default = null; - description = "The file path to the directory that contains the trusted SSL CA certificates in PEM format. Only available for the mysql database."; - }; - - sslCipher = mkOption { - type = nullOr str; - default = null; - description = "A list of one or more permissible ciphers to use for SSL encryption, in a format understood by OpenSSL. Only available for the mysql database."; - }; - - rootDN = mkOption { - type = str; - description = "Root object of the LDAP tree"; - }; - - ldapEncryption = mkOption { - type = enum [ "none" "starttls" "ldaps" ]; - default = "none"; - description = "LDAP encryption to use"; - }; - - ldapTimeout = mkOption { - type = ints.positive; - default = 5; - description = "Connection timeout for every LDAP connection"; - }; - - sshPrivateKey = mkOption { - type = str; - description = "The path to the private key of the user"; - }; + type = nullOr attrs; + default = null; + example = { + icingaweb_db = { + type = "db"; + db = "mysql"; + host = "localhost"; + username = "icingaweb2"; + password = "icingaweb2"; + dbname = "icingaweb2"; }; - })); - }; + }; + description = '' + resources.ini contents. + Will automatically be converted to a .ini file. - mutableAuthConfig = mkOption { - type = bool; - default = true; - description = "Make authentication.ini mutable (e.g. via the web interface)"; + If the value is null, no resources.ini is created and you can + modify it manually (e.g. via the web interface). + Note that if you set passwords here, they will go into the nix store. + ''; }; authentications = mkOption { - default = {}; - description = "Icingaweb 2 authentications to define"; - type = attrsOf (submodule ({ name, ... }: { - options = { - name = mkOption { - visible = false; - default = name; - type = str; - description = "Name of this authentication"; - }; - - backend = mkOption { - type = enum [ "external" "ldap" "msldap" "db" ]; - default = "db"; - description = "The type of this authentication backend"; - }; - - domain = mkOption { - type = nullOr str; - default = null; - description = "Domain for domain-aware authentication"; - }; - - externalStripRegex = mkOption { - type = nullOr str; - default = null; - description = "Regular expression to strip off specific user name parts"; - }; - - resource = mkOption { - type = str; - description = "Name of the database/LDAP resource"; - }; - - ldapUserClass = mkOption { - type = nullOr str; - default = null; - description = "LDAP user class"; - }; - - ldapUserNameAttr = mkOption { - type = nullOr str; - default = null; - description = "LDAP attribute which contains the username"; - }; - - ldapFilter = mkOption { - type = nullOr str; - default = null; - description = "LDAP search filter"; - }; + type = nullOr attrs; + default = null; + example = { + icingaweb = { + backend = "db"; + resource = "icingaweb_db"; }; - })); - }; + }; + description = '' + authentication.ini contents. + Will automatically be converted to a .ini file. - mutableGroupsConfig = mkOption { - type = bool; - default = true; - description = "Make groups.ini mutable (e.g. via the web interface)"; + If the value is null, no authentication.ini is created and you can + modify it manually (e.g. via the web interface). + ''; }; groupBackends = mkOption { - default = {}; - description = "Icingaweb 2 group backends to define"; - type = attrsOf (submodule ({ name, ... }: { - options = { - name = mkOption { - visible = false; - default = name; - type = str; - description = "Name of this group backend"; - }; - - backend = mkOption { - type = enum [ "ldap" "msldap" "db" ]; - default = "db"; - description = "The type of this group backend"; - }; - - resource = mkOption { - type = str; - description = "Name of the database/LDAP resource"; - }; - - ldapUserClass = mkOption { - type = nullOr str; - default = null; - description = "LDAP user class"; - }; - - ldapUserNameAttr = mkOption { - type = nullOr str; - default = null; - description = "LDAP attribute which contains the username"; - }; - - ldapGroupClass = mkOption { - type = nullOr str; - default = null; - description = "LDAP group class"; - }; - - ldapGroupNameAttr = mkOption { - type = nullOr str; - default = null; - description = "LDAP attribute which contains the groupname"; - }; - - ldapGroupFilter = mkOption { - type = nullOr str; - default = null; - description = "LDAP group search filter"; - }; - - ldapNestedSearch = mkOption { - type = bool; - default = false; - description = "Enable nested group search in Active Directory based on the user"; - }; + type = nullOr attrs; + default = null; + example = { + icingaweb = { + backend = "db"; + resource = "icingaweb_db"; }; - })); - }; + }; + description = '' + groups.ini contents. + Will automatically be converted to a .ini file. - mutableRolesConfig = mkOption { - type = bool; - default = true; - description = "Make roles.ini mutable (e.g. via the web interface)"; + If the value is null, no groups.ini is created and you can + modify it manually (e.g. via the web interface). + ''; }; roles = mkOption { - default = {}; - description = "Icingaweb 2 roles to define"; - type = attrsOf (submodule ({ name, ... }: { - options = { - name = mkOption { - visible = false; - default = name; - type = str; - description = "Name of this role"; - }; - - users = mkOption { - type = listOf str; - default = []; - description = "List of users that are assigned to the role"; - }; - - groups = mkOption { - type = listOf str; - default = []; - description = "List of groups that are assigned to the role"; - }; - - permissions = mkOption { - type = listOf str; - default = []; - example = [ "application/share/navigation" "config/*" ]; - description = "The permissions to grant"; - }; - - extraAssignments = mkOption { - type = attrsOf (listOf str); - default = {}; - example = { "monitoring/blacklist/properties" = [ "sla" "customer"]; }; - description = "Additional assignments of this role"; - }; + type = nullOr attrs; + default = null; + example = { + Administrators = { + users = "admin"; + permissions = "*"; }; - })); + }; + description = '' + roles.ini contents. + Will automatically be converted to a .ini file. + + If the value is null, no roles.ini is created and you can + modify it manually (e.g. via the web interface). + ''; }; }; @@ -598,7 +215,7 @@ in { # /etc/icingaweb2 environment.etc = let - doModule = name: optionalAttrs (cfg.modules."${name}".enable) (nameValuePair "icingaweb2/enabledModules/${name}" { source = "${pkgs.icingaweb2}/modules/${name}"; }); + doModule = name: optionalAttrs (cfg.modules."${name}".enable) { "icingaweb2/enabledModules/${name}".source = "${pkgs.icingaweb2}/modules/${name}"; }; in {} # Module packages // (mapAttrs' (k: v: nameValuePair "icingaweb2/enabledModules/${k}" { source = v; }) cfg.modulePackages) @@ -609,11 +226,11 @@ in { // doModule "test" // doModule "translation" # Configs - // optionalAttrs (!cfg.generalConfig.mutable) { "icingaweb2/config.ini".text = configIni; } - // optionalAttrs (!cfg.mutableResources) { "icingaweb2/resources.ini".text = resourcesIni; } - // optionalAttrs (!cfg.mutableAuthConfig) { "icingaweb2/authentication.ini".text = authenticationIni; } - // optionalAttrs (!cfg.mutableGroupsConfig) { "icingaweb2/groups.ini".text = groupsIni; } - // optionalAttrs (!cfg.mutableRolesConfig) { "icingaweb2/roles.ini".text = rolesIni; }; + // optionalAttrs (cfg.generalConfig != null) { "icingaweb2/config.ini".text = generators.toINI {} (defaultConfig // cfg.generalConfig); } + // optionalAttrs (cfg.resources != null) { "icingaweb2/resources.ini".text = generators.toINI {} cfg.resources; } + // optionalAttrs (cfg.authentications != null) { "icingaweb2/authentication.ini".text = generators.toINI {} cfg.authentications; } + // optionalAttrs (cfg.groupBackends != null) { "icingaweb2/groups.ini".text = generators.toINI {} cfg.groupBackends; } + // optionalAttrs (cfg.roles != null) { "icingaweb2/roles.ini".text = generators.toINI {} cfg.roles; }; # User and group users.groups.icingaweb2 = {}; diff --git a/nixos/modules/services/web-apps/matomo-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml index 20d2de9f4189..021a89be3f63 100644 --- a/nixos/modules/services/web-apps/matomo-doc.xml +++ b/nixos/modules/services/web-apps/matomo-doc.xml @@ -12,15 +12,15 @@ An automatic setup is not suported by Matomo, so you need to configure Matomo itself in the browser-based Matomo setup. -
Database Setup + You also need to configure a MariaDB or MySQL database and -user for Matomo yourself, 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'; CREATE DATABASE matomo; @@ -46,30 +46,32 @@ database is not on the same host.
-
Archive Processing + - This module comes with the systemd service matomo-archive-processing.service - and a timer that automatically triggers archive processing every hour. - This means that you can safely + This module comes with the systemd service + matomo-archive-processing.service and a timer that + automatically triggers archive processing every hour. This means that you + can safely - disable browser triggers for Matomo archiving - at Administration > System > General Settings. + disable browser triggers for Matomo archiving at + Administration > System > General Settings. + With automatic archive processing, you can now also enable to - delete old visitor logs - at Administration > System > Privacy, - but make sure that you run systemctl start matomo-archive-processing.service - at least once without errors if you have already collected data before, - so that the reports get archived before the source data gets deleted. + delete old visitor logs at Administration > System > + Privacy, but make sure that you run systemctl start + matomo-archive-processing.service at least once without errors if + you have already collected data before, so that the reports get archived + before the source data gets deleted.
-
Backup + You only need to take backups of your MySQL database and the /var/lib/matomo/config/config.ini.php file. Use a user @@ -78,9 +80,9 @@ .
-
Issues + @@ -97,7 +99,6 @@
-
Using other Web Servers than nginx diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index ee1354d6a997..c192ac4c5f31 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -5,14 +5,18 @@ with lib; let cfg = config.services.nextcloud; + phpPackage = pkgs.php73; + phpPackages = pkgs.php73Packages; + toKeyValue = generators.toKeyValue { mkKeyValue = generators.mkKeyValueDefault {} " = "; }; phpOptionsExtensions = '' - ${optionalString cfg.caching.apcu "extension=${cfg.phpPackages.apcu}/lib/php/extensions/apcu.so"} - ${optionalString cfg.caching.redis "extension=${cfg.phpPackages.redis}/lib/php/extensions/redis.so"} - ${optionalString cfg.caching.memcached "extension=${cfg.phpPackages.memcached}/lib/php/extensions/memcached.so"} + ${optionalString cfg.caching.apcu "extension=${phpPackages.apcu}/lib/php/extensions/apcu.so"} + ${optionalString cfg.caching.redis "extension=${phpPackages.redis}/lib/php/extensions/redis.so"} + ${optionalString cfg.caching.memcached "extension=${phpPackages.memcached}/lib/php/extensions/memcached.so"} + extension=${phpPackages.imagick}/lib/php/extensions/imagick.so zend_extension = opcache.so opcache.enable = 1 ''; @@ -28,7 +32,7 @@ let cd ${pkgs.nextcloud} exec /run/wrappers/bin/sudo -u nextcloud \ NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" \ - ${config.services.phpfpm.phpPackage}/bin/php \ + ${phpPackage}/bin/php \ -c ${pkgs.writeText "php.ini" phpOptionsStr}\ occ $* ''; @@ -45,6 +49,11 @@ in { default = "/var/lib/nextcloud"; description = "Storage path of nextcloud."; }; + logLevel = mkOption { + type = types.ints.between 0 4; + default = 2; + description = "Log level value between 0 (DEBUG) and 4 (FATAL)."; + }; https = mkOption { type = types.bool; default = false; @@ -89,18 +98,6 @@ in { ''; }; - phpPackages = mkOption { - type = types.attrs; - default = pkgs.php71Packages; - defaultText = "pkgs.php71Packages"; - description = '' - Overridable attribute of the PHP packages set to use. If any caching - module is enabled, it will be taken from here. Therefore it should - match the version of PHP given to - services.phpfpm.phpPackage. - ''; - }; - phpOptions = mkOption { type = types.attrsOf types.str; default = { @@ -218,6 +215,19 @@ in { services.nextcloud.hostname here. ''; }; + + overwriteProtocol = mkOption { + type = types.nullOr (types.enum [ "http" "https" ]); + default = null; + example = "https"; + + description = '' + Force Nextcloud to always use HTTPS i.e. for link generation. Nextcloud + uses the currently used protocol by default, but when behind a reverse-proxy, + it may use http for everything although Nextcloud + may be served via HTTPS. + ''; + }; }; caching = { @@ -247,6 +257,23 @@ in { ''; }; }; + autoUpdateApps = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Run regular auto update of all apps installed from the nextcloud app store. + ''; + }; + startAt = mkOption { + type = with types; either str (listOf str); + default = "05:00:00"; + example = "Sun 14:00:00"; + description = '' + When to run the update. See `systemd.services.<name>.startAt`. + ''; + }; + }; }; config = mkIf cfg.enable (mkMerge [ @@ -281,6 +308,8 @@ in { 'skeletondirectory' => '${cfg.skeletonDirectory}', ${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"} 'log_type' => 'syslog', + 'log_level' => '${builtins.toString cfg.logLevel}', + ${optionalString (cfg.config.overwriteProtocol != null) "'overwriteprotocol' => '${cfg.config.overwriteProtocol}',"} ]; ''; occInstallCmd = let @@ -348,19 +377,24 @@ in { environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; serviceConfig.Type = "oneshot"; serviceConfig.User = "nextcloud"; - serviceConfig.ExecStart = "${pkgs.php}/bin/php -f ${pkgs.nextcloud}/cron.php"; + serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${pkgs.nextcloud}/cron.php"; + }; + "nextcloud-update-plugins" = mkIf cfg.autoUpdateApps.enable { + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = "${occ}/bin/nextcloud-occ app:update --all"; + startAt = cfg.autoUpdateApps.startAt; }; }; services.phpfpm = { - phpOptions = phpOptionsExtensions; - phpPackage = pkgs.php71; pools.nextcloud = let phpAdminValues = (toKeyValue (foldr (a: b: a // b) {} (mapAttrsToList (k: v: { "php_admin_value[${k}]" = v; }) phpOptions))); in { + phpOptions = phpOptionsExtensions; + phpPackage = phpPackage; listen = "/run/phpfpm/nextcloud"; extraConfig = '' listen.owner = nginx @@ -401,7 +435,7 @@ in { }; "/" = { priority = 200; - extraConfig = "rewrite ^ /index.php$uri;"; + extraConfig = "rewrite ^ /index.php$request_uri;"; }; "~ ^/store-apps" = { priority = 201; @@ -415,19 +449,19 @@ in { priority = 210; extraConfig = "return 301 $scheme://$host/remote.php/dav;"; }; - "~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/" = { + "~ ^\\/(?:build|tests|config|lib|3rdparty|templates|data)\\/" = { priority = 300; extraConfig = "deny all;"; }; - "~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)" = { + "~ ^\\/(?:\\.|autotest|occ|issue|indie|db_|console)" = { priority = 300; extraConfig = "deny all;"; }; - "~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\\.php(?:$|/)" = { + "~ ^\\/(?:index|remote|public|cron|core/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|ocs-provider\\/.+|ocm-provider\\/.+)\\.php(?:$|\\/)" = { priority = 500; extraConfig = '' include ${config.services.nginx.package}/conf/fastcgi.conf; - fastcgi_split_path_info ^(.+\.php)(/.*)$; + fastcgi_split_path_info ^(.+\.php)(\\/.*)$; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param HTTPS ${if cfg.https then "on" else "off"}; fastcgi_param modHeadersAvailable true; @@ -438,22 +472,23 @@ in { fastcgi_read_timeout 120s; ''; }; - "~ ^/(?:updater|ocs-provider)(?:$|/)".extraConfig = '' + "~ ^\\/(?:updater|ocs-provider|ocm-provider)(?:$|\\/)".extraConfig = '' try_files $uri/ =404; index index.php; ''; - "~ \\.(?:css|js|woff|svg|gif)$".extraConfig = '' - try_files $uri /index.php$uri$is_args$args; + "~ \\.(?:css|js|woff2?|svg|gif)$".extraConfig = '' + try_files $uri /index.php$request_uri; add_header Cache-Control "public, max-age=15778463"; add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; add_header X-Robots-Tag none; add_header X-Download-Options noopen; add_header X-Permitted-Cross-Domain-Policies none; + add_header Referrer-Policy no-referrer; access_log off; ''; "~ \\.(?:png|html|ttf|ico|jpg|jpeg)$".extraConfig = '' - try_files $uri /index.php$uri$is_args$args; + try_files $uri /index.php$request_uri; access_log off; ''; }; @@ -463,10 +498,12 @@ in { add_header X-Robots-Tag none; add_header X-Download-Options noopen; add_header X-Permitted-Cross-Domain-Policies none; + add_header Referrer-Policy no-referrer; error_page 403 /core/templates/403.php; error_page 404 /core/templates/404.php; client_max_body_size ${cfg.maxUploadSize}; fastcgi_buffers 64 4K; + fastcgi_hide_header X-Powered-By; gzip on; gzip_vary on; gzip_comp_level 4; diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index 9600d1be7c88..92775938fda9 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -4,24 +4,26 @@ version="5.0" xml:id="module-services-nextcloud"> Nextcloud - - Nextcloud is an open-source, self-hostable cloud - platform. The server setup can be automated using - services.nextcloud. A desktop client is packaged - at pkgs.nextcloud-client. + Nextcloud is an open-source, + self-hostable cloud platform. The server setup can be automated using + services.nextcloud. A + desktop client is packaged at pkgs.nextcloud-client. -
Basic usage + Nextcloud is a PHP-based application which requires an HTTP server - (services.nextcloud optionally supports - services.nginx) and a database - (it's recommended to use services.postgresql). + (services.nextcloud + optionally supports + services.nginx) + and a database (it's recommended to use + services.postgresql). + - A very basic configuration may look like this: + A very basic configuration may look like this: { pkgs, ... }: { services.nextcloud = { @@ -55,45 +57,65 @@ networking.firewall.allowedTCPPorts = [ 80 443 ]; } + - The options hostName and nginx.enable are used internally to configure an - HTTP server using PHP-FPM and nginx. - The config attribute set is used for the config.php which is used - for the application's configuration. - Beware: this isn't entirely pure since the config is modified by the application's runtime! + The options hostName and nginx.enable + are used internally to configure an HTTP server using + PHP-FPM + and nginx. The config attribute set is + used for the config.php which is used for the + application's configuration. Beware: this isn't entirely pure + since the config is modified by the application's runtime! + - In case the application serves multiple hosts (those are checked with - $_SERVER['HTTP_HOST']) - those can be added using - services.nextcloud.config.extraTrustedDomains. + In case the application serves multiple hosts (those are checked with + $_SERVER['HTTP_HOST']) + those can be added using + services.nextcloud.config.extraTrustedDomains.
-
Pitfalls + - Unfortunately Nextcloud appears to be very stateful when it comes to managing its own configuration. The - config file lives in the home directory of the nextcloud user (by default - /var/lib/nextcloud/config/config.php) and is also used to track several - states of the application (e.g. whether installed or not). + Unfortunately Nextcloud appears to be very stateful when it comes to + managing its own configuration. The config file lives in the home directory + of the nextcloud user (by default + /var/lib/nextcloud/config/config.php) and is also used to + track several states of the application (e.g. whether installed or not). + - Right now changes to the services.nextcloud.config attribute set won't take effect - after the first install - (except services.nextcloud.config.extraTrustedDomains) since the actual configuration - file is generated by the NextCloud installer which also sets up critical parts such as the database - structure. + Right now changes to the services.nextcloud.config + attribute set won't take effect after the first install (except + services.nextcloud.config.extraTrustedDomains) + since the actual configuration file is generated by the NextCloud installer + which also sets up critical parts such as the database structure. + - Warning: don't delete config.php! This file tracks the application's state and a deletion can cause unwanted side-effects! + Warning: don't delete config.php! This file + tracks the application's state and a deletion can cause unwanted + side-effects! + - Warning: don't rerun nextcloud-occ maintenance:install! This command tries to install the application and can cause unwanted side-effects! + Warning: don't rerun nextcloud-occ + maintenance:install! This command tries to install the application + and can cause unwanted side-effects! + - The issues are known and reported in #49783, for now it's unfortunately necessary to manually work around these issues. + The issues are known and reported in + #49783, + for now it's unfortunately necessary to manually work around these issues. + + + + Right now app installation and configuration is done imperatively in the nextcloud web ui or via the nextcloud-occ command line utility. + You can activate auto updates for your apps via + services.nextcloud.autoUpdateApps.
- diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 3fd19d425c74..8f00f81b078c 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -217,7 +217,7 @@ let ) null ([ cfg ] ++ subservices); documentRoot = if maybeDocumentRoot != null then maybeDocumentRoot else - pkgs.runCommand "empty" {} "mkdir -p $out"; + pkgs.runCommand "empty" { preferLocalBuild = true; } "mkdir -p $out"; documentRootConf = '' DocumentRoot "${documentRoot}" @@ -426,6 +426,7 @@ let phpIni = pkgs.runCommand "php.ini" { options = concatStringsSep "\n" ([ mainCfg.phpOptions ] ++ (map (svc: svc.phpOptions) allSubservices)); + preferLocalBuild = true; } '' cat ${php}/etc/php.ini > $out @@ -704,10 +705,7 @@ in path = [ httpd pkgs.coreutils pkgs.gnugrep ] - ++ # Needed for PHP's mail() function. !!! Probably the - # ssmtp module should export the path to sendmail in - # some way. - optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp + ++ optional enablePHP pkgs.system-sendmail # Needed for PHP's mail() function. ++ concatMap (svc: svc.extraServerPath) allSubservices; environment = diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index e871ae6ff15a..6234478014ce 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -116,9 +116,10 @@ let ''; }; - mediawikiScripts = pkgs.runCommand "mediawiki-${config.id}-scripts" - { buildInputs = [ pkgs.makeWrapper ]; } - '' + mediawikiScripts = pkgs.runCommand "mediawiki-${config.id}-scripts" { + buildInputs = [ pkgs.makeWrapper ]; + preferLocalBuild = true; + } '' mkdir -p $out/bin for i in changePassword.php createAndPromote.php userOptions.php edit.php nukePage.php update.php; do makeWrapper ${php}/bin/php $out/bin/mediawiki-${config.id}-$(basename $i .php) \ diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 6c733f093ba8..1c9fbe048f84 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -44,7 +44,19 @@ let } '')); - configFile = pkgs.writeText "nginx.conf" '' + awkFormat = builtins.toFile "awkFormat-nginx.awk" '' + awk -f + {sub(/^[ \t]+/,"");idx=0} + /\{/{ctx++;idx=1} + /\}/{ctx--} + {id="";for(i=idx;i $out + ''); + + pre-configFile = pkgs.writeText "pre-nginx.conf" '' user ${cfg.user} ${cfg.group}; error_log ${cfg.logError}; daemon off; @@ -182,11 +194,12 @@ let then filter (x: x.ssl) defaultListen else defaultListen; - listenString = { addr, port, ssl, ... }: + listenString = { addr, port, ssl, extraParameters ? [], ... }: "listen ${addr}:${toString port} " + optionalString ssl "ssl " + optionalString (ssl && vhost.http2) "http2 " + optionalString vhost.default "default_server " + + optionalString (extraParameters != []) (concatStringsSep " " extraParameters) + ";"; redirectListen = filter (x: !x.ssl) defaultListen; @@ -479,8 +492,8 @@ in sslProtocols = mkOption { type = types.str; - default = "TLSv1.2"; - example = "TLSv1 TLSv1.1 TLSv1.2"; + default = "TLSv1.2 TLSv1.3"; + example = "TLSv1 TLSv1.1 TLSv1.2 TLSv1.3"; description = "Allowed TLS protocol versions."; }; diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 6a50d8ed5cd4..15b933c984a6 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -31,6 +31,7 @@ with lib; 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; }; + extraParameters = mkOption { type = listOf str; description = "Extra parameters of this listen directive."; default = []; example = [ "reuseport" "deferred" ]; }; }; }); default = []; example = [ diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 97c730061bd1..ffafbc5e92f2 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -39,6 +39,7 @@ let phpIni = pool: pkgs.runCommand "php.ini" { inherit (pool) phpPackage phpOptions; + preferLocalBuild = true; nixDefaults = '' sendmail_path = "/run/wrappers/bin/sendmail -t -i" ''; diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index 700202b1d28f..4674ed0177e6 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -8,6 +8,7 @@ let if cfg.configFile == null then pkgs.runCommand "config.toml" { buildInputs = [ pkgs.remarshal ]; + preferLocalBuild = true; } '' remarshal -if json -of toml \ < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \ diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 7544ba4638ac..6255dce8276f 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -15,7 +15,7 @@ let ''; }; - nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {} + nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } '' mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas cp -rf ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas @@ -151,6 +151,7 @@ in { services.colord.enable = mkDefault true; services.packagekit.enable = mkDefault true; hardware.bluetooth.enable = mkDefault true; + services.hardware.bolt.enable = mkDefault true; services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ]; systemd.packages = [ pkgs.gnome3.vino ]; diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 0f49439bf7c8..2c65fa5af351 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -70,8 +70,14 @@ in # Ensure lightdm is used when Pantheon is enabled # Without it screen locking will be nonfunctional because of the use of lightlocker + + warnings = optional (config.services.xserver.displayManager.lightdm.enable != true) + '' + Using Pantheon without LightDM as a displayManager will break screenlocking from the UI. + ''; + services.xserver.displayManager.lightdm.enable = mkDefault true; - services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true; + services.xserver.displayManager.lightdm.greeters.gtk.enable = mkDefault true; # If not set manually Pantheon session cannot be started # Known issue of https://github.com/NixOS/nixpkgs/pull/43992 @@ -108,25 +114,25 @@ in ([ pkgs.pantheon.switchboard-plug-power ]) (mkIf config.services.printing.enable ([pkgs.system-config-printer]) ) ]; - services.pantheon.contractor.enable = true; + services.pantheon.contractor.enable = mkDefault true; services.geoclue2.enable = mkDefault true; # pantheon has pantheon-agent-geoclue2 services.geoclue2.enableDemoAgent = false; services.gnome3.at-spi2-core.enable = true; services.gnome3.evolution-data-server.enable = true; - services.gnome3.file-roller.enable = true; + services.gnome3.file-roller.enable = mkDefault true; # TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully services.gnome3.gnome-keyring.enable = true; services.gnome3.gvfs.enable = true; - services.gnome3.rygel.enable = true; - services.gsignond.enable = true; + services.gnome3.rygel.enable = mkDefault true; + services.gsignond.enable = mkDefault true; services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ]; services.udev.packages = [ pkgs.pantheon.elementary-settings-daemon ]; services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; services.xserver.libinput.enable = mkDefault true; services.xserver.updateDbusEnvironment = true; - services.zeitgeist.enable = true; + services.zeitgeist.enable = mkDefault true; networking.networkmanager.enable = mkDefault true; networking.networkmanager.basePackages = @@ -151,19 +157,15 @@ in "/share" ]; - environment.systemPackages = pkgs.pantheon.artwork ++ pkgs.pantheon.desktop ++ pkgs.pantheon.services ++ cfg.sessionPath - ++ (pkgs.gnome3.removePackagesByName pkgs.pantheon.apps config.environment.pantheon.excludePackages) - ++ (with pkgs.gnome3; - [ - adwaita-icon-theme - dconf - epiphany + environment.systemPackages = + pkgs.pantheon.artwork ++ pkgs.pantheon.desktop ++ pkgs.pantheon.services ++ cfg.sessionPath + ++ (with pkgs; gnome3.removePackagesByName + ([ + gnome3.geary + gnome3.epiphany + gnome3.gnome-font-viewer evince - geary - gnome-bluetooth - gnome-font-viewer - gnome-power-manager - ]) + ] ++ pantheon.apps) config.environment.pantheon.excludePackages) ++ (with pkgs; [ adwaita-qt @@ -171,6 +173,8 @@ in glib glib-networking gnome-menus + gnome3.adwaita-icon-theme + gnome3.dconf gtk3.out hicolor-icon-theme lightlocker @@ -184,7 +188,9 @@ in fonts.fonts = with pkgs; [ opensans-ttf roboto-mono + pantheon.elementary-redacted-script # needed by screenshot-tool ]; + fonts.fontconfig.defaultFonts = { monospace = [ "Roboto Mono" ]; sansSerif = [ "Open Sans" ]; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 704cc78c1528..a9e55eb846ca 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -163,6 +163,8 @@ in libsForQt56.phonon-backend-gstreamer libsForQt5.phonon-backend-gstreamer + + xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ] ++ lib.optionals cfg.enableQt4Support [ pkgs.phonon-backend-gstreamer ] @@ -175,9 +177,9 @@ in ++ lib.optional config.services.colord.enable colord-kde ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]; - environment.pathsToLink = [ + environment.pathsToLink = [ # FIXME: modules should link subdirs of `/share` rather than relying on this - "/share" + "/share" ]; environment.etc = singleton { @@ -224,7 +226,29 @@ in security.pam.services.slim.enableKwallet = true; # Update the start menu for each user that is currently logged in - system.userActivationScripts.plasmaSetup = "${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5"; + system.userActivationScripts.plasmaSetup = '' + # The KDE icon cache is supposed to update itself + # automatically, but it uses the timestamp on the icon + # theme directory as a trigger. Since in Nix the + # timestamp is always the same, this doesn't work. So as + # a workaround, nuke the icon cache on login. This isn't + # perfect, since it may require logging out after + # installing new applications to update the cache. + # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html + rm -fv $HOME/.cache/icon-cache.kcache + + # xdg-desktop-settings generates this empty file but + # it makes kbuildsyscoca5 fail silently. To fix this + # remove that menu if it exists. + rm -fv $HOME/.config/menus/applications-merged/xdg-desktop-menu-dummy.menu + + # Remove the kbuildsyscoca5 cache. It will be regenerated + # immediately after. This is necessary for kbuildsyscoca5 to + # recognize that software that has been removed. + rm -fv $HOME/.cache/ksycoca* + + ${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5 + ''; }) ]; diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index dabf09418da7..6852154378d7 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -53,7 +53,7 @@ in # Supplies some abstract icons such as: # utilities-terminal, accessories-text-editor - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme hicolor-icon-theme tango-icon-theme diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 226fee7491c1..3edf7c8d9cab 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -208,76 +208,25 @@ in session optional pam_permit.so ''; - gdm.text = '' - auth requisite pam_nologin.so - auth required pam_env.so envfile=${config.system.build.pamEnvironment} - - auth required pam_succeed_if.so uid >= 1000 quiet - auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so - auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth - ${optionalString config.security.pam.enableEcryptfs - "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} - - ${optionalString (! config.security.pam.enableEcryptfs) - "auth required pam_deny.so"} - - account sufficient pam_unix.so - - password requisite pam_unix.so nullok sha512 - ${optionalString config.security.pam.enableEcryptfs - "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - - session required pam_env.so envfile=${config.system.build.pamEnvironment} - session required pam_unix.so - ${optionalString config.security.pam.enableEcryptfs - "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - session required pam_loginuid.so - session optional ${pkgs.systemd}/lib/security/pam_systemd.so - session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start - ''; - gdm-password.text = '' - auth requisite pam_nologin.so - auth required pam_env.so envfile=${config.system.build.pamEnvironment} - - auth required pam_succeed_if.so uid >= 1000 quiet - auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so - auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth - ${optionalString config.security.pam.enableEcryptfs - "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} - ${optionalString (! config.security.pam.enableEcryptfs) - "auth required pam_deny.so"} - - account sufficient pam_unix.so - - password requisite pam_unix.so nullok sha512 - ${optionalString config.security.pam.enableEcryptfs - "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - - session required pam_env.so envfile=${config.system.build.pamEnvironment} - session required pam_unix.so - ${optionalString config.security.pam.enableEcryptfs - "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - session required pam_loginuid.so - session optional ${pkgs.systemd}/lib/security/pam_systemd.so - session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start + auth substack login + account include login + password substack login + session include login ''; gdm-autologin.text = '' - auth requisite pam_nologin.so + auth requisite pam_nologin.so - auth required pam_succeed_if.so uid >= 1000 quiet - auth required pam_permit.so + auth required pam_succeed_if.so uid >= 1000 quiet + auth required pam_permit.so - account sufficient pam_unix.so + account sufficient pam_unix.so - password requisite pam_unix.so nullok sha512 + password requisite pam_unix.so nullok sha512 - session optional pam_keyinit.so revoke - session required pam_env.so envfile=${config.system.build.pamEnvironment} - session required pam_unix.so - session required pam_loginuid.so - session optional ${pkgs.systemd}/lib/security/pam_systemd.so + session optional pam_keyinit.so revoke + session include login ''; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix index 7c794b1ba175..de128809ce30 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix @@ -12,9 +12,10 @@ let # We need a few things in the environment for the greeter to run with # fonts/icons. - wrappedEnsoGreeter = pkgs.runCommand "lightdm-enso-os-greeter" - { buildInputs = [ pkgs.makeWrapper ]; } - '' + wrappedEnsoGreeter = pkgs.runCommand "lightdm-enso-os-greeter" { + buildInputs = [ pkgs.makeWrapper ]; + preferLocalBuild = true; + } '' # This wrapper ensures that we actually get themes makeWrapper ${pkgs.lightdm-enso-os-greeter}/bin/pantheon-greeter \ $out/greeter \ diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index efec943c0075..5b280b024233 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -18,9 +18,10 @@ let # The default greeter provided with this expression is the GTK greeter. # Again, we need a few things in the environment for the greeter to run with # fonts/icons. - wrappedGtkGreeter = pkgs.runCommand "lightdm-gtk-greeter" - { buildInputs = [ pkgs.makeWrapper ]; } - '' + wrappedGtkGreeter = pkgs.runCommand "lightdm-gtk-greeter" { + buildInputs = [ pkgs.makeWrapper ]; + preferLocalBuild = true; + } '' # This wrapper ensures that we actually get themes makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ @@ -95,8 +96,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.defaultIconTheme; - defaultText = "pkgs.gnome3.defaultIconTheme"; + default = pkgs.gnome3.adwaita-icon-theme; + defaultText = "pkgs.gnome3.adwaita-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; @@ -115,8 +116,8 @@ in cursorTheme = { package = mkOption { - default = pkgs.gnome3.defaultIconTheme; - defaultText = "pkgs.gnome3.defaultIconTheme"; + default = pkgs.gnome3.adwaita-icon-theme; + defaultText = "pkgs.gnome3.adwaita-icon-theme"; description = '' The package path that contains the cursor theme given in the name option. ''; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index 05011b999f2b..bfba174144a1 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -33,6 +33,13 @@ in config = mkIf (ldmcfg.enable && cfg.enable) { + warnings = [ + '' + The Pantheon greeter is suboptimal in NixOS and can possibly put you in + a situation where you cannot start a session when switching desktopManagers. + '' + ]; + services.xserver.displayManager.lightdm.greeters.gtk.enable = false; services.xserver.displayManager.lightdm.greeter = mkDefault { diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index 4e411c8ceb0b..124660a43f07 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -28,7 +28,7 @@ let # Unpack the SLiM theme, or use the default. slimThemesDir = let - unpackedTheme = pkgs.runCommand "slim-theme" {} + unpackedTheme = pkgs.runCommand "slim-theme" { preferLocalBuild = true; } '' mkdir -p $out cd $out diff --git a/nixos/modules/services/x11/gdk-pixbuf.nix b/nixos/modules/services/x11/gdk-pixbuf.nix index 58faa8e2f9df..2dc8eabd95a7 100644 --- a/nixos/modules/services/x11/gdk-pixbuf.nix +++ b/nixos/modules/services/x11/gdk-pixbuf.nix @@ -10,7 +10,7 @@ let # Generate the cache file by running gdk-pixbuf-query-loaders for each # package and concatenating the results. - loadersCache = pkgs.runCommand "gdk-pixbuf-loaders.cache" {} '' + loadersCache = pkgs.runCommand "gdk-pixbuf-loaders.cache" { preferLocalBuild = true; } '' ( for package in ${concatStringsSep " " effectivePackages}; do module_dir="$package/${pkgs.gdk_pixbuf.moduleDir}" diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix index a74bfce097de..7777913ce1e6 100644 --- a/nixos/modules/services/x11/window-managers/dwm.nix +++ b/nixos/modules/services/x11/window-managers/dwm.nix @@ -25,7 +25,7 @@ in { name = "dwm"; start = '' - ${pkgs.dwm}/bin/dwm & + dwm & waitPID=$! ''; }; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 34ae8c11a3f0..2d9d89194572 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -113,6 +113,7 @@ let { xfs = optionalString (cfg.useXFS != false) ''FontPath "${toString cfg.useXFS}"''; inherit (cfg) config; + preferLocalBuild = true; } '' echo 'Section "Files"' >> $out @@ -240,10 +241,10 @@ in videoDrivers = mkOption { type = types.listOf types.str; # !!! We'd like "nv" here, but it segfaults the X server. - default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ]; + default = [ "ati" "cirrus" "vesa" "vmware" "modesetting" ]; example = [ "ati_unfree" "amdgpu" "amdgpu-pro" - "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" + "nv" "nvidia" "nvidiaLegacy390" "nvidiaLegacy340" "nvidiaLegacy304" ]; # TODO(@oxij): think how to easily add the rest, like those nvidia things relatedPackages = concatLists @@ -256,6 +257,11 @@ in The names of the video drivers the configuration supports. They will be tried in order until one that supports your card is found. + Don't combine those with "incompatible" OpenGL implementations, + e.g. free ones (mesa-based) with proprietary ones. + + For unfree "nvidia*", the supported GPU lists are on + https://www.nvidia.com/object/unix.html ''; }; @@ -705,6 +711,7 @@ in system.extraDependencies = singleton (pkgs.runCommand "xkb-validated" { inherit (cfg) xkbModel layout xkbVariant xkbOptions; nativeBuildInputs = [ pkgs.xkbvalidate ]; + preferLocalBuild = true; } '' validate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions" touch "$out" diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index a1537ad3cedc..d3cf8b29bb46 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -8,13 +8,17 @@ let efi = config.boot.loader.efi; - realGrub = if cfg.version == 1 then pkgs.grub - else if cfg.zfsSupport then pkgs.grub2.override { zfsSupport = true; } + grubPkgs = + # Package set of targeted architecture + if cfg.forcei686 then pkgs.pkgsi686Linux else pkgs; + + realGrub = if cfg.version == 1 then grubPkgs.grub + else if cfg.zfsSupport then grubPkgs.grub2.override { zfsSupport = true; } else if cfg.trustedBoot.enable then if cfg.trustedBoot.isHPLaptop - then pkgs.trustedGrub-for-HP - else pkgs.trustedGrub - else pkgs.grub2; + then grubPkgs.trustedGrub-for-HP + else grubPkgs.trustedGrub + else grubPkgs.grub2; grub = # Don't include GRUB if we're only generating a GRUB menu (e.g., @@ -58,14 +62,10 @@ let version extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber extraEntriesBeforeNixOS extraPrepareConfig extraInitrd configurationLimit copyKernels default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios; - path = (makeBinPath ([ - pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs - pkgs.utillinux ] - ++ (optional (cfg.efiSupport && (cfg.version == 2)) pkgs.efibootmgr) - ++ (optionals cfg.useOSProber [pkgs.busybox pkgs.os-prober]) - )) + ":" + (makeSearchPathOutput "bin" "sbin" [ - pkgs.mdadm pkgs.utillinux - ]); + path = with pkgs; makeBinPath ( + [ coreutils gnused gnugrep findutils diffutils btrfs-progs utillinux mdadm ] + ++ optional (cfg.efiSupport && (cfg.version == 2)) efibootmgr + ++ optionals cfg.useOSProber [ busybox os-prober ]); font = if cfg.font == null then "" else (if lib.last (lib.splitString "." cfg.font) == "pf2" then cfg.font @@ -512,6 +512,15 @@ in ''; }; + forcei686 = mkOption { + default = false; + type = types.bool; + description = '' + Whether to force the use of a ia32 boot loader on x64 systems. Required + to install and run NixOS on 64bit x86 systems with 32bit (U)EFI. + ''; + }; + trustedBoot = { enable = mkOption { diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 6016a85ea061..f48a085ce57a 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -33,6 +33,15 @@ initrd {initrd} options {kernel_params} """ +# The boot loader entry for memtest86. +# +# TODO: This is hard-coded to use the 64-bit EFI app, but it could probably +# be updated to use the 32-bit EFI app on 32-bit systems. The 32-bit EFI +# app filename is BOOTIA32.efi. +MEMTEST_BOOT_ENTRY = """title MemTest86 +efi /efi/memtest86/BOOTX64.efi +""" + def write_loader_conf(profile, generation): with open("@efiSysMountPoint@/loader/loader.conf.tmp", 'w') as f: if "@timeout@" != "": @@ -124,7 +133,9 @@ def get_generations(profile=None): universal_newlines=True) gen_lines = gen_list.split('\n') gen_lines.pop() - return [ (profile, int(line.split()[0])) for line in gen_lines ] + + configurationLimit = @configurationLimit@ + return [ (profile, int(line.split()[0])) for line in gen_lines ][-configurationLimit:] def remove_old_entries(gens): rex_profile = re.compile("^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$") @@ -145,7 +156,7 @@ def remove_old_entries(gens): except ValueError: pass for path in glob.iglob("@efiSysMountPoint@/efi/nixos/*"): - if not path in known_paths: + if not path in known_paths and not os.path.isdir(path): os.unlink(path) def get_profiles(): @@ -199,6 +210,24 @@ def main(): if os.readlink(system_dir(*gen)) == args.default_config: write_loader_conf(*gen) + memtest_entry_file = "@efiSysMountPoint@/loader/entries/memtest86.conf" + if os.path.exists(memtest_entry_file): + os.unlink(memtest_entry_file) + shutil.rmtree("@efiSysMountPoint@/efi/memtest86", ignore_errors=True) + if "@memtest86@" != "": + mkdir_p("@efiSysMountPoint@/efi/memtest86") + for path in glob.iglob("@memtest86@/*"): + if os.path.isdir(path): + shutil.copytree(path, os.path.join("@efiSysMountPoint@/efi/memtest86", os.path.basename(path))) + else: + shutil.copy(path, "@efiSysMountPoint@/efi/memtest86/") + + memtest_entry_file = "@efiSysMountPoint@/loader/entries/memtest86.conf" + memtest_entry_file_tmp_path = "%s.tmp" % memtest_entry_file + with open(memtest_entry_file_tmp_path, 'w') as f: + f.write(MEMTEST_BOOT_ENTRY) + os.rename(memtest_entry_file_tmp_path, memtest_entry_file) + # Since fat32 provides little recovery facilities after a crash, # it can leave the system in an unbootable state, when a crash/outage # happens shortly after an update. To decrease the likelihood of this diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 9ad2a2779e18..99175ad9f850 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -22,9 +22,13 @@ let editor = if cfg.editor then "True" else "False"; + configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit; + inherit (cfg) consoleMode; inherit (efi) efiSysMountPoint canTouchEfiVariables; + + memtest86 = if cfg.memtest86.enable then pkgs.memtest86-efi else ""; }; in { @@ -55,6 +59,19 @@ in { ''; }; + configurationLimit = mkOption { + default = null; + example = 120; + type = types.nullOr types.int; + description = '' + Maximum number of latest generations in the boot menu. + Useful to prevent boot partition running out of disk space. + + null means no limit i.e. all generations + that were not garbage collected yet. + ''; + }; + consoleMode = mkOption { default = "keep"; @@ -86,6 +103,19 @@ in { ''; }; + + memtest86 = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Make MemTest86 available from the systemd-boot menu. MemTest86 is a + program for testing memory. MemTest86 is an unfree program, so + this requires allowUnfree to be set to + true. + ''; + }; + }; }; config = mkIf cfg.enable { diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 63a6f7fbe099..a83367acfc07 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -10,7 +10,7 @@ let checkLink = checkUnitConfig "Link" [ (assertOnlyFields [ - "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "Name" + "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "OriginalName" "MTUBytes" "BitsPerSecond" "Duplex" "AutoNegotiation" "WakeOnLan" "Port" "TCPSegmentationOffload" "TCP6SegmentationOffload" "GenericSegmentationOffload" "GenericReceiveOffload" "LargeReceiveOffload" "RxChannels" "TxChannels" diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 5e27b24ac447..9984a97bbdd2 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -196,9 +196,10 @@ let ''; # */ - udevRules = pkgs.runCommand "udev-rules" - { allowedReferences = [ extraUtils ]; } - '' + udevRules = pkgs.runCommand "udev-rules" { + allowedReferences = [ extraUtils ]; + preferLocalBuild = true; + } '' mkdir -p $out echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules @@ -298,9 +299,10 @@ let { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf; symlink = "/etc/mdadm.conf"; } - { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" - { src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; } - '' + { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { + src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; + preferLocalBuild = true; + } '' target=$out ${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out ''; diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix index 68a40377ee13..28ad4f121bbe 100644 --- a/nixos/modules/system/boot/systemd-lib.nix +++ b/nixos/modules/system/boot/systemd-lib.nix @@ -9,12 +9,11 @@ in rec { shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s); + mkPathSafeName = lib.replaceChars ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""]; + makeUnit = name: unit: - let - pathSafeName = lib.replaceChars ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""] name; - in if unit.enable then - pkgs.runCommand "unit-${pathSafeName}" + pkgs.runCommand "unit-${mkPathSafeName name}" { preferLocalBuild = true; allowSubstitutes = false; inherit (unit) text; @@ -24,7 +23,7 @@ in rec { echo -n "$text" > $out/${shellEscape name} '' else - pkgs.runCommand "unit-${pathSafeName}-disabled" + pkgs.runCommand "unit-${mkPathSafeName name}-disabled" { preferLocalBuild = true; allowSubstitutes = false; } diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 9fdef0251d70..18ee2ef1b8f5 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -593,7 +593,7 @@ in services.journald.forwardToSyslog = mkOption { default = config.services.rsyslogd.enable || config.services.syslog-ng.enable; - defaultText = "config.services.rsyslogd.enable || config.services.syslog-ng.enable"; + defaultText = "services.rsyslogd.enable || services.syslog-ng.enable"; type = types.bool; description = '' Whether to forward log messages to syslog. @@ -652,6 +652,7 @@ in services.logind.lidSwitchExternalPower = mkOption { default = config.services.logind.lidSwitch; + defaultText = "services.logind.lidSwitch"; example = "ignore"; type = logindHandlerType; @@ -759,7 +760,10 @@ in environment.etc = let # generate contents for /etc/systemd/system-generators from # systemd.generators and systemd.generator-packages - generators = pkgs.runCommand "system-generators" { packages = cfg.generator-packages; } '' + generators = pkgs.runCommand "system-generators" { + preferLocalBuild = true; + packages = cfg.generator-packages; + } '' mkdir -p $out for package in $packages do diff --git a/nixos/modules/tasks/filesystems/vboxsf.nix b/nixos/modules/tasks/filesystems/vboxsf.nix index 87f1984f084f..5497194f6a8d 100644 --- a/nixos/modules/tasks/filesystems/vboxsf.nix +++ b/nixos/modules/tasks/filesystems/vboxsf.nix @@ -6,7 +6,7 @@ let inInitrd = any (fs: fs == "vboxsf") config.boot.initrd.supportedFilesystems; - package = pkgs.runCommand "mount.vboxsf" {} '' + package = pkgs.runCommand "mount.vboxsf" { preferLocalBuild = true; } '' mkdir -p $out/bin cp ${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/mount.vboxsf $out/bin ''; diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index fbe42b8e8f04..6d34f897d189 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -15,6 +15,7 @@ let optimizedKeymap = pkgs.runCommand "keymap" { nativeBuildInputs = [ pkgs.buildPackages.kbd ]; LOADKEYS_KEYMAP_PATH = "${kbdEnv}/share/keymaps/**"; + preferLocalBuild = true; } '' loadkeys -b ${optionalString isUnicode "-u"} "${config.i18n.consoleKeyMap}" > $out ''; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 815523093dde..f9b0eb330bf8 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -995,7 +995,7 @@ in ''; environment.etc."hostid" = mkIf (cfg.hostId != null) - { source = pkgs.runCommand "gen-hostid" {} '' + { source = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } '' hi="${cfg.hostId}" ${if pkgs.stdenv.isBigEndian then '' echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 6f4f99caa6f1..d67790702f1f 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -31,6 +31,7 @@ in fileSystems."/" = { device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; autoResize = true; }; diff --git a/nixos/modules/virtualisation/cloudstack-config.nix b/nixos/modules/virtualisation/cloudstack-config.nix new file mode 100644 index 000000000000..81c545676277 --- /dev/null +++ b/nixos/modules/virtualisation/cloudstack-config.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + imports = [ + ../profiles/qemu-guest.nix + ]; + + config = { + fileSystems."/" = { + device = "/dev/disk/by-label/nixos"; + autoResize = true; + }; + + boot.growPartition = true; + boot.kernelParams = [ "console=tty0" ]; + boot.loader.grub.device = "/dev/vda"; + boot.loader.timeout = 0; + + # Allow root logins + services.openssh = { + enable = true; + permitRootLogin = "prohibit-password"; + }; + + # Cloud-init configuration. + services.cloud-init.enable = true; + # Wget is needed for setting password. This is of little use as + # root password login is disabled above. + environment.systemPackages = [ pkgs.wget ]; + # Only enable CloudStack datasource for faster boot speed. + environment.etc."cloud/cloud.cfg.d/99_cloudstack.cfg".text = '' + datasource: + CloudStack: {} + None: {} + datasource_list: ["CloudStack"] + ''; + }; +} diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 7c9909ae2787..88a3ccc655b7 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -36,8 +36,9 @@ let #! ${pkgs.runtimeShell} -e # Initialise the container side of the veth pair. - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || [ -n "$HOST_BRIDGE" ]; then - + if [ -n "$HOST_ADDRESS" ] || [ -n "$HOST_ADDRESS6" ] || + [ -n "$LOCAL_ADDRESS" ] || [ -n "$LOCAL_ADDRESS6" ] || + [ -n "$HOST_BRIDGE" ]; then ip link set host0 name eth0 ip link set dev eth0 up @@ -88,7 +89,8 @@ let extraFlags+=" --private-network" fi - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then + if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || + [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then extraFlags+=" --network-veth" fi @@ -159,7 +161,8 @@ let # Clean up existing machined registration and interfaces. machinectl terminate "$INSTANCE" 2> /dev/null || true - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then + if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || + [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then ip link del dev "ve-$INSTANCE" 2> /dev/null || true ip link del dev "vb-$INSTANCE" 2> /dev/null || true fi @@ -208,7 +211,8 @@ let ''; in '' - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then + if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || + [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then if [ -z "$HOST_BRIDGE" ]; then ifaceHost=ve-$INSTANCE ip link set dev $ifaceHost up @@ -249,6 +253,10 @@ let RestartForceExitStatus = "133"; SuccessExitStatus = "133"; + # Some containers take long to start + # especially when you automatically start many at once + TimeoutStartSec = cfg.timeoutStartSec; + Restart = "on-failure"; Slice = "machine.slice"; @@ -415,6 +423,7 @@ let { extraVeths = {}; additionalCapabilities = []; + timeoutStartSec = "15s"; allowedDevices = []; hostAddress = null; hostAddress6 = null; @@ -563,6 +572,18 @@ in ''; }; + timeoutStartSec = mkOption { + type = types.str; + default = "1min"; + description = '' + Time for the container to start. In case of a timeout, + the container processes get killed. + See systemd.time + 7 + for more information about the format. + ''; + }; + bindMounts = mkOption { type = with types; loaOf (submodule bindMountOpts); default = {}; diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index a1a32c1c59a1..4ee84c5268e6 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -52,6 +52,15 @@ in ''; }; + enableNvidia = + mkOption { + type = types.bool; + default = false; + description = '' + Enable nvidia-docker wrapper, supporting NVIDIA GPUs inside docker containers. + ''; + }; + liveRestore = mkOption { type = types.bool; @@ -140,7 +149,8 @@ in ###### implementation config = mkIf cfg.enable (mkMerge [{ - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ cfg.package ] + ++ optional cfg.enableNvidia pkgs.nvidia-docker; users.groups.docker.gid = config.ids.gids.docker; systemd.packages = [ cfg.package ]; @@ -157,6 +167,7 @@ in --log-driver=${cfg.logDriver} \ ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ ${optionalString cfg.liveRestore "--live-restore" } \ + ${optionalString cfg.enableNvidia "--add-runtime nvidia=${pkgs.nvidia-docker}/bin/nvidia-container-runtime" } \ ${cfg.extraOptions} '']; ExecReload=[ @@ -165,7 +176,8 @@ in ]; }; - path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); + path = [ pkgs.kmod ] ++ optional (cfg.storageDriver == "zfs") pkgs.zfs + ++ optional cfg.enableNvidia pkgs.nvidia-docker; }; systemd.sockets.docker = { @@ -179,7 +191,6 @@ in }; }; - systemd.services.docker-prune = { description = "Prune docker resources"; @@ -194,7 +205,15 @@ in startAt = optional cfg.autoPrune.enable cfg.autoPrune.dates; }; + + assertions = [ + { assertion = cfg.enableNvidia -> config.hardware.opengl.driSupport32Bit or false; + message = "Option enableNvidia requires 32bit support libraries"; + }]; } + (mkIf cfg.enableNvidia { + environment.etc."nvidia-container-runtime/config.toml".source = "${pkgs.nvidia-docker}/etc/config.toml"; + }) ]); imports = [ diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index aaea06bb9a63..f640bb21b133 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -274,5 +274,22 @@ let self = { "18.09".sa-east-1.hvm-ebs = "ami-0e4a8a47fd6db6112"; "18.09".ap-south-1.hvm-ebs = "ami-0880a678d3f555313"; - latest = self."18.09"; + # 19.03.172286.8ea36d73256 + "19.03".eu-west-1.hvm-ebs = "ami-0fe40176548ff0940"; + "19.03".eu-west-2.hvm-ebs = "ami-03a40fd3a02fe95ba"; + "19.03".eu-west-3.hvm-ebs = "ami-0436f9da0f20a638e"; + "19.03".eu-central-1.hvm-ebs = "ami-0022b8ea9efde5de4"; + "19.03".us-east-1.hvm-ebs = "ami-0efc58fb70ae9a217"; + "19.03".us-east-2.hvm-ebs = "ami-0abf711b1b34da1af"; + "19.03".us-west-1.hvm-ebs = "ami-07d126e8838c40ec5"; + "19.03".us-west-2.hvm-ebs = "ami-03f8a737546e47fb0"; + "19.03".ca-central-1.hvm-ebs = "ami-03f9fd0ef2e035ede"; + "19.03".ap-southeast-1.hvm-ebs = "ami-0cff66114c652c262"; + "19.03".ap-southeast-2.hvm-ebs = "ami-054c73a7f8d773ea9"; + "19.03".ap-northeast-1.hvm-ebs = "ami-00db62688900456a4"; + "19.03".ap-northeast-2.hvm-ebs = "ami-0485cdd1a5fdd2117"; + "19.03".sa-east-1.hvm-ebs = "ami-0c6a43c6e0ad1f4e2"; + "19.03".ap-south-1.hvm-ebs = "ami-0303deb1b5890f878"; + + latest = self."19.03"; }; in self diff --git a/nixos/modules/virtualisation/openstack-config.nix b/nixos/modules/virtualisation/openstack-config.nix index d5e862da0ea4..c2da5d0d2301 100644 --- a/nixos/modules/virtualisation/openstack-config.nix +++ b/nixos/modules/virtualisation/openstack-config.nix @@ -20,6 +20,7 @@ in config = { fileSystems."/" = { device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; autoResize = true; }; diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 60779579402c..6f7370181740 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -83,6 +83,8 @@ in }; config = mkIf cfg.enable (mkMerge [{ + warnings = mkIf (config.nixpkgs.config.virtualbox.enableExtensionPack or false) + ["'nixpkgs.virtualbox.enableExtensionPack' has no effect, please use 'virtualisation.virtualbox.host.enableExtensionPack'"]; boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; boot.extraModulePackages = [ kernelModules ]; environment.systemPackages = [ virtualbox ]; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 6c313f8dd3e4..b9a9515f94ef 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -64,6 +64,7 @@ in rec { #(all nixos.tests.containers) (all nixos.tests.containers-imperative) (all nixos.tests.containers-ipv4) + (all nixos.tests.containers-ipv6) nixos.tests.chromium.x86_64-linux or [] (all nixos.tests.firefox) (all nixos.tests.firewall) diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 4bfb9a423f7d..b5b09dc38d06 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -33,6 +33,7 @@ in rec { inherit (nixos'.tests) containers-imperative containers-ipv4 + containers-ipv6 firewall ipv6 login diff --git a/nixos/release.nix b/nixos/release.nix index df2c52ccd0b6..00d4bab07ccb 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -12,7 +12,7 @@ let version = fileContents ../.version; versionSuffix = - (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; + (if stableBranch then "." else "beta") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; # Run the tests for each platform. You can run a test by doing # e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently, diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3d8fea95a501..af5657046db9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -23,8 +23,10 @@ in { acme = handleTestOn ["x86_64-linux"] ./acme.nix {}; atd = handleTest ./atd.nix {}; + automysqlbackup = handleTest ./automysqlbackup.nix {}; avahi = handleTest ./avahi.nix {}; bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64 + beanstalkd = handleTest ./beanstalkd.nix {}; beegfs = handleTestOn ["x86_64-linux"] ./beegfs.nix {}; # beegfs is unsupported on aarch64 bind = handleTest ./bind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; @@ -115,6 +117,7 @@ in kernel-latest = handleTest ./kernel-latest.nix {}; kernel-lts = handleTest ./kernel-lts.nix {}; keymap = handleTest ./keymap.nix {}; + knot = handleTest ./knot.nix {}; kubernetes.dns = handleTestOn ["x86_64-linux"] ./kubernetes/dns.nix {}; # kubernetes.e2e should eventually replace kubernetes.rbac when it works #kubernetes.e2e = handleTestOn ["x86_64-linux"] ./kubernetes/e2e.nix {}; @@ -170,6 +173,7 @@ in osquery = handleTest ./osquery.nix {}; osrm-backend = handleTest ./osrm-backend.nix {}; ostree = handleTest ./ostree.nix {}; + overlayfs = handleTest ./overlayfs.nix {}; pam-oath-login = handleTest ./pam-oath-login.nix {}; pam-u2f = handleTest ./pam-u2f.nix {}; pantheon = handleTest ./pantheon.nix {}; @@ -185,6 +189,7 @@ in predictable-interface-names = handleTest ./predictable-interface-names.nix {}; printing = handleTest ./printing.nix {}; prometheus = handleTest ./prometheus.nix {}; + prometheus2 = handleTest ./prometheus-2.nix {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; prosody = handleTest ./prosody.nix {}; proxy = handleTest ./proxy.nix {}; @@ -202,6 +207,7 @@ in rxe = handleTest ./rxe.nix {}; samba = handleTest ./samba.nix {}; sddm = handleTest ./sddm.nix {}; + signal-desktop = handleTest ./signal-desktop.nix {}; simple = handleTest ./simple.nix {}; slim = handleTest ./slim.nix {}; slurm = handleTest ./slurm.nix {}; @@ -214,6 +220,7 @@ in switchTest = handleTest ./switch-test.nix {}; syncthing-relay = handleTest ./syncthing-relay.nix {}; systemd = handleTest ./systemd.nix {}; + systemd-confinement = handleTest ./systemd-confinement.nix {}; taskserver = handleTest ./taskserver.nix {}; telegraf = handleTest ./telegraf.nix {}; tomcat = handleTest ./tomcat.nix {}; @@ -223,6 +230,7 @@ in upnp = handleTest ./upnp.nix {}; vault = handleTest ./vault.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; + wireguard = handleTest ./wireguard {}; wordpress = handleTest ./wordpress.nix {}; xautolock = handleTest ./xautolock.nix {}; xdg-desktop-portal = handleTest ./xdg-desktop-portal.nix {}; diff --git a/nixos/tests/automysqlbackup.nix b/nixos/tests/automysqlbackup.nix new file mode 100644 index 000000000000..ada104a34de3 --- /dev/null +++ b/nixos/tests/automysqlbackup.nix @@ -0,0 +1,34 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +{ + name = "automysqlbackup"; + meta.maintainers = [ lib.maintainers.aanderse ]; + + machine = + { pkgs, ... }: + { + services.mysql.enable = true; + services.mysql.package = pkgs.mysql; + services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + + services.automysqlbackup.enable = true; + }; + + testScript = '' + startAll; + + # Need to have mysql started so that it can be populated with data. + $machine->waitForUnit("mysql.service"); + + # Wait for testdb to be fully populated (5 rows). + $machine->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"); + + # Do a backup and wait for it to start + $machine->startJob("automysqlbackup.service"); + $machine->waitForJob("automysqlbackup.service"); + + # wait for backup file and check that data appears in backup + $machine->waitForFile("/var/backup/mysql/daily/testdb"); + $machine->succeed("${pkgs.gzip}/bin/zcat /var/backup/mysql/daily/testdb/daily_testdb_*.sql.gz | grep hello"); + ''; +}) diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index dfb60998941b..56b21a401551 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -2,7 +2,7 @@ import ./make-test.nix ({ pkgs, ... } : { name = "avahi"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = let diff --git a/nixos/tests/beanstalkd.nix b/nixos/tests/beanstalkd.nix new file mode 100644 index 000000000000..fa2fbc2c92ab --- /dev/null +++ b/nixos/tests/beanstalkd.nix @@ -0,0 +1,45 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +let + pythonEnv = pkgs.python3.withPackages (p: [p.beanstalkc]); + + produce = pkgs.writeScript "produce.py" '' + #!${pythonEnv.interpreter} + import beanstalkc + + queue = beanstalkc.Connection(host='localhost', port=11300, parse_yaml=False); + queue.put(b'this is a job') + queue.put(b'this is another job') + ''; + + consume = pkgs.writeScript "consume.py" '' + #!${pythonEnv.interpreter} + import beanstalkc + + queue = beanstalkc.Connection(host='localhost', port=11300, parse_yaml=False); + + job = queue.reserve(timeout=0) + print(job.body.decode('utf-8')) + job.delete() + ''; + +in +{ + name = "beanstalkd"; + meta.maintainers = [ lib.maintainers.aanderse ]; + + machine = + { ... }: + { services.beanstalkd.enable = true; + }; + + testScript = '' + startAll; + + $machine->waitForUnit('beanstalkd.service'); + + $machine->succeed("${produce}"); + $machine->succeed("${consume}") eq "this is a job\n" or die; + $machine->succeed("${consume}") eq "this is another job\n" or die; + ''; +}) diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 27871f72b4e5..3b1169a1b7f2 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -23,7 +23,7 @@ in { name = "bittorrent"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow rob bobvanderlinden ]; + maintainers = [ domenkozar eelco rob bobvanderlinden ]; }; nodes = diff --git a/nixos/tests/common/webroot/news-rss.xml b/nixos/tests/common/webroot/news-rss.xml index 28e6fa7da1f3..b8099bf0364a 100644 --- a/nixos/tests/common/webroot/news-rss.xml +++ b/nixos/tests/common/webroot/news-rss.xml @@ -1,10 +1,18 @@ -NixOS Newshttps://nixos.orgNews for NixOS, the purely functional Linux distribution.NixOShttps://nixos.org/logo/nixos-logo-only-hires.pnghttps://nixos.org/ - NixOS 18.09 released - https://nixos.org/news.html - - 18.09 Jellyfish logo - + + + NixOS Newshttps://nixos.org + News for NixOS, the purely functional Linux distribution. + + NixOS + https://nixos.org/logo/nixos-logo-only-hires.pnghttps://nixos.org/ + + + NixOS 18.09 releasedhttps://nixos.org/news.html + + + 18.09 Jellyfish logo + NixOS 18.09 “Jellyfish” has been released, the tenth stable release branch. See the release notes for details. You can get NixOS 18.09 ISOs and VirtualBox appliances @@ -12,4 +20,8 @@ For information on how to upgrade from older release branches to 18.09, check out the manual section on upgrading. - Sat Oct 06 2018 00:00:00 GMT + + Sat Oct 06 2018 00:00:00 GMT + + + diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix index 0eae51433d20..38db64eb7931 100644 --- a/nixos/tests/containers-bridge.nix +++ b/nixos/tests/containers-bridge.nix @@ -10,7 +10,7 @@ in import ./make-test.nix ({ pkgs, ...} : { name = "containers-bridge"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ]; + maintainers = [ aristid aszlig eelco kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 782095a09dad..0c101037aa7f 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "containers-imperative"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ]; + maintainers = [ aristid aszlig eelco kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix index 5f83a33b1079..ace68ff2df8b 100644 --- a/nixos/tests/containers-ipv4.nix +++ b/nixos/tests/containers-ipv4.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "containers-ipv4"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ]; + maintainers = [ aristid aszlig eelco kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix index 5866e51b731d..a9499d192bd4 100644 --- a/nixos/tests/containers-ipv6.nix +++ b/nixos/tests/containers-ipv6.nix @@ -8,7 +8,7 @@ in import ./make-test.nix ({ pkgs, ...} : { name = "containers-ipv6"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ]; + maintainers = [ aristid aszlig eelco kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix index d2dda926fc0e..ec8e9629c21d 100644 --- a/nixos/tests/containers-portforward.nix +++ b/nixos/tests/containers-portforward.nix @@ -10,7 +10,7 @@ in import ./make-test.nix ({ pkgs, ...} : { name = "containers-portforward"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ianwookim ]; + maintainers = [ aristid aszlig eelco kampfschlaefer ianwookim ]; }; machine = diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 58f106314ab3..f948a1e7e24d 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -67,5 +67,18 @@ import ./make-test.nix ({ pkgs, ... }: { # Ensure building an image on top of a layered Docker images work $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-on-top}'"); $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-on-top.imageName}"); + + # Ensure layers are shared between images + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.another-layered-image}'"); + $docker->succeed("docker inspect ${pkgs.dockerTools.examples.layered-image.imageName} | ${pkgs.jq}/bin/jq -r '.[] | .RootFS.Layers | .[]' | sort > layers1.sha256"); + $docker->succeed("docker inspect ${pkgs.dockerTools.examples.another-layered-image.imageName} | ${pkgs.jq}/bin/jq -r '.[] | .RootFS.Layers | .[]' | sort > layers2.sha256"); + $docker->succeed('[ $(comm -1 -2 layers1.sha256 layers2.sha256 | wc -l) -ne 0 ]'); + + # Ensure order of layers is correct + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layersOrder}'"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layersOrder.imageName} cat /tmp/layer1 | grep -q layer1"); + # This is to be sure the order of layers of the parent image is preserved + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layersOrder.imageName} cat /tmp/layer2 | grep -q layer2"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layersOrder.imageName} cat /tmp/layer3 | grep -q layer3"); ''; }) diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index d787ac973005..95371ef44436 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -2,6 +2,8 @@ config ? {}, pkgs ? import ../.. { inherit system config; }, enableUnfree ? false + # To run the test on the unfree ELK use the folllowing command: + # NIXPKGS_ALLOW_UNFREE=1 nix-build nixos/tests/elk.nix -A ELK-6 --arg enableUnfree true }: with import ../lib/testing.nix { inherit system pkgs; }; @@ -10,14 +12,21 @@ with pkgs.lib; let esUrl = "http://localhost:9200"; - mkElkTest = name : elk : makeTest { + totalHits = message : + "curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' " + + ''-d '{\"query\" : { \"match\" : { \"message\" : \"${message}\"}}}' '' + + "| jq .hits.total"; + + mkElkTest = name : elk : + let elasticsearchGe7 = builtins.compareVersions elk.elasticsearch.version "7" >= 0; + in makeTest { inherit name; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow offline basvandijk ]; + maintainers = [ eelco offline basvandijk ]; }; nodes = { one = - { pkgs, ... }: { + { pkgs, lib, ... }: { # Not giving the machine at least 2060MB results in elasticsearch failing with the following error: # # OpenJDK 64-Bit Server VM warning: @@ -36,6 +45,26 @@ let environment.systemPackages = [ pkgs.jq ]; services = { + + journalbeat = let lt6 = builtins.compareVersions + elk.journalbeat.version "6" < 0; in { + enable = true; + package = elk.journalbeat; + extraConfig = mkOptionDefault ('' + logging: + to_syslog: true + level: warning + metrics.enabled: false + output.elasticsearch: + hosts: [ "127.0.0.1:9200" ] + ${optionalString lt6 "template.enabled: false"} + '' + optionalString (!lt6) '' + journalbeat.inputs: + - paths: [] + seek: cursor + ''); + }; + logstash = { enable = true; package = elk.logstash; @@ -67,11 +96,11 @@ let kibana = { enable = true; package = elk.kibana; - elasticsearch.url = esUrl; }; elasticsearch-curator = { - enable = true; + # The current version of curator (5.6) doesn't support elasticsearch >= 7.0.0. + enable = !elasticsearchGe7; actionYAML = '' --- actions: @@ -103,14 +132,19 @@ let testScript = '' startAll; + # Wait until elasticsearch is listening for connections. $one->waitForUnit("elasticsearch.service"); + $one->waitForOpenPort(9200); # Continue as long as the status is not "red". The status is probably # "yellow" instead of "green" because we are using a single elasticsearch # node which elasticsearch considers risky. # - # TODO: extend this test with multiple elasticsearch nodes and see if the status turns "green". - $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_cluster/health' | jq .status | grep -v red"); + # TODO: extend this test with multiple elasticsearch nodes + # and see if the status turns "green". + $one->waitUntilSucceeds( + "curl --silent --show-error '${esUrl}/_cluster/health' " . + "| jq .status | grep -v red"); # Perform some simple logstash tests. $one->waitForUnit("logstash.service"); @@ -119,16 +153,28 @@ let # See if kibana is healthy. $one->waitForUnit("kibana.service"); - $one->waitUntilSucceeds("curl --silent --show-error 'http://localhost:5601/api/status' | jq .status.overall.state | grep green"); + $one->waitUntilSucceeds( + "curl --silent --show-error 'http://localhost:5601/api/status' " . + "| jq .status.overall.state | grep green"); # See if logstash messages arive in elasticsearch. - $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0"); - $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0"); + $one->waitUntilSucceeds("${totalHits "flowers"} | grep -v 0"); + $one->waitUntilSucceeds("${totalHits "dragons"} | grep 0"); + # Test if a message logged to the journal + # is ingested by elasticsearch via journalbeat. + $one->waitForUnit("journalbeat.service"); + $one->execute("echo 'Supercalifragilisticexpialidocious' | systemd-cat"); + $one->waitUntilSucceeds( + "${totalHits "Supercalifragilisticexpialidocious"} | grep -v 0"); + + '' + optionalString (!elasticsearchGe7) '' # Test elasticsearch-curator. $one->systemctl("stop logstash"); $one->systemctl("start elasticsearch-curator"); - $one->waitUntilSucceeds("! curl --silent --show-error '${esUrl}/_cat/indices' | grep logstash | grep -q ^$1"); + $one->waitUntilSucceeds( + "! curl --silent --show-error '${esUrl}/_cat/indices' " . + "| grep logstash | grep -q ^$1"); ''; }; in mapAttrs mkElkTest { @@ -136,6 +182,7 @@ in mapAttrs mkElkTest { elasticsearch = pkgs.elasticsearch5; logstash = pkgs.logstash5; kibana = pkgs.kibana5; + journalbeat = pkgs.journalbeat5; }; "ELK-6" = if enableUnfree @@ -143,10 +190,26 @@ in mapAttrs mkElkTest { elasticsearch = pkgs.elasticsearch6; logstash = pkgs.logstash6; kibana = pkgs.kibana6; + journalbeat = pkgs.journalbeat6; } else { elasticsearch = pkgs.elasticsearch6-oss; logstash = pkgs.logstash6-oss; kibana = pkgs.kibana6-oss; + journalbeat = pkgs.journalbeat6; + }; + "ELK-7" = + if enableUnfree + then { + elasticsearch = pkgs.elasticsearch7; + logstash = pkgs.logstash7; + kibana = pkgs.kibana7; + journalbeat = pkgs.journalbeat7; + } + else { + elasticsearch = pkgs.elasticsearch7-oss; + logstash = pkgs.logstash7-oss; + kibana = pkgs.kibana7-oss; + journalbeat = pkgs.journalbeat7; }; } diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 58a80243ea9c..f5b946a08810 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ... }: { name = "firefox"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow shlevy ]; + maintainers = [ eelco shlevy ]; }; machine = diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix index 7207a880d8e2..fcf758910e00 100644 --- a/nixos/tests/firewall.nix +++ b/nixos/tests/firewall.nix @@ -3,7 +3,7 @@ import ./make-test.nix ( { pkgs, ... } : { name = "firewall"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index 28e6479e9cbe..cccf8c7cd44f 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -9,7 +9,7 @@ with pkgs.lib; { mysql = makeTest { name = "gitea-mysql"; - meta.maintainers = [ maintainers.aanderse ]; + meta.maintainers = with maintainers; [ aanderse kolaente ]; machine = { config, pkgs, ... }: @@ -45,7 +45,7 @@ with pkgs.lib; { services.gitea.enable = true; services.gitea.database.type = "postgres"; - services.gitea.database.password = "secret"; + services.gitea.database.passwordFile = pkgs.writeText "db-password" "secret"; }; testScript = '' diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 16e0dd723ecf..ac733461932d 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -1,5 +1,8 @@ # This test runs gitlab and checks if it works +let + initialRootPassword = "notproduction"; +in import ./make-test.nix ({ pkgs, lib, ...} : with lib; { name = "gitlab"; meta = with pkgs.stdenv.lib.maintainers; { @@ -27,7 +30,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; { services.gitlab = { enable = true; databasePassword = "dbPassword"; - initialRootPassword = "notproduction"; + inherit initialRootPassword; smtp.enable = true; secrets = { secret = "secret"; @@ -69,7 +72,27 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; { }; }; - testScript = '' + testScript = + let + auth = pkgs.writeText "auth.json" (builtins.toJSON { + grant_type = "password"; + username = "root"; + password = initialRootPassword; + }); + + createProject = pkgs.writeText "create-project.json" (builtins.toJSON { + name = "test"; + }); + + putFile = pkgs.writeText "put-file.json" (builtins.toJSON { + branch = "master"; + author_email = "author@example.com"; + author_name = "Firstname Lastname"; + content = "some content"; + commit_message = "create a new file"; + }); + in + '' $gitlab->start(); $gitlab->waitForUnit("gitaly.service"); $gitlab->waitForUnit("gitlab-workhorse.service"); @@ -78,6 +101,13 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; { $gitlab->waitForFile("/var/gitlab/state/tmp/sockets/gitlab.socket"); $gitlab->waitUntilSucceeds("curl -sSf http://gitlab/users/sign_in"); $gitlab->succeed("curl -isSf http://gitlab | grep -i location | grep -q http://gitlab/users/sign_in"); - $gitlab->succeed("${pkgs.sudo}/bin/sudo -u gitlab -H gitlab-rake gitlab:check 1>&2") + $gitlab->succeed("${pkgs.sudo}/bin/sudo -u gitlab -H gitlab-rake gitlab:check 1>&2"); + $gitlab->succeed("echo \"Authorization: Bearer \$(curl -X POST -H 'Content-Type: application/json' -d @${auth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers"); + $gitlab->succeed("curl -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createProject} http://gitlab/api/v4/projects"); + $gitlab->succeed("curl -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${putFile} http://gitlab/api/v4/projects/1/repository/files/some-file.txt"); + $gitlab->succeed("curl -H @/tmp/headers http://gitlab/api/v4/projects/1/repository/archive.tar.gz > /tmp/archive.tar.gz"); + $gitlab->succeed("curl -H @/tmp/headers http://gitlab/api/v4/projects/1/repository/archive.tar.bz2 > /tmp/archive.tar.bz2"); + $gitlab->succeed("test -s /tmp/archive.tar.gz"); + $gitlab->succeed("test -s /tmp/archive.tar.bz2"); ''; }) diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index 95694ea4828d..b58c9e5a0e32 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "gnome3"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow lethalman ]; + maintainers = [ domenkozar eelco lethalman ]; }; machine = diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index 07bd10963bab..614889c4d73c 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -30,6 +30,16 @@ import ./make-test.nix ({ pkgs, ...} : { '' $machine->waitForUnit("multi-user.target"); + subtest "apparmor-loaded", sub { + $machine->succeed("systemctl status apparmor.service"); + }; + + # AppArmor securityfs + subtest "apparmor-securityfs", sub { + $machine->succeed("mountpoint -q /sys/kernel/security"); + $machine->succeed("cat /sys/kernel/security/apparmor/profiles"); + }; + # Test loading out-of-tree modules subtest "extra-module-packages", sub { $machine->succeed("grep -Fq wireguard /proc/modules"); diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index a93360b252f6..8def0a6f9b9a 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -87,8 +87,8 @@ in { $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"on\"'"); # Toggle a binary sensor using hass-cli - $hass->succeed("${hassCli} --output json entity get binary_sensor.mqtt_binary_sensor | grep -qF '\"state\": \"on\"'"); - $hass->succeed("${hassCli} entity edit binary_sensor.mqtt_binary_sensor --json='{\"state\": \"off\"}'"); + $hass->succeed("${hassCli} --output json state get binary_sensor.mqtt_binary_sensor | grep -qF '\"state\": \"on\"'"); + $hass->succeed("${hassCli} state edit binary_sensor.mqtt_binary_sensor --json='{\"state\": \"off\"}'"); $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"off\"'"); # Print log to ease debugging diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix index 440049d95111..61201202204b 100644 --- a/nixos/tests/influxdb.nix +++ b/nixos/tests/influxdb.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "influxdb"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ chaoflow offline ]; + maintainers = [ offline ]; }; nodes = { diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix index 97f348a9beeb..14f24c29cfe2 100644 --- a/nixos/tests/ipv6.nix +++ b/nixos/tests/ipv6.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "ipv6"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index 4f2d2085cd1a..a6eec411ff28 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "jenkins"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ bjornfor coconnor domenkozar eelco chaoflow ]; + maintainers = [ bjornfor coconnor domenkozar eelco ]; }; nodes = { diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix index db596189d46d..b13b4131091f 100644 --- a/nixos/tests/kexec.nix +++ b/nixos/tests/kexec.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "kexec"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; machine = { ... }: diff --git a/nixos/tests/knot.nix b/nixos/tests/knot.nix new file mode 100644 index 000000000000..e46159836ccc --- /dev/null +++ b/nixos/tests/knot.nix @@ -0,0 +1,197 @@ +import ./make-test.nix ({ pkgs, lib, ...} : +let + common = { + networking.firewall.enable = false; + networking.useDHCP = false; + }; + exampleZone = pkgs.writeTextDir "example.com.zone" '' + @ SOA ns.example.com. noc.example.com. 2019031301 86400 7200 3600000 172800 + @ NS ns1 + @ NS ns2 + ns1 A 192.168.0.1 + ns1 AAAA fd00::1 + ns2 A 192.168.0.2 + ns2 AAAA fd00::2 + www A 192.0.2.1 + www AAAA 2001:DB8::1 + sub NS ns.example.com. + ''; + delegatedZone = pkgs.writeTextDir "sub.example.com.zone" '' + @ SOA ns.example.com. noc.example.com. 2019031301 86400 7200 3600000 172800 + @ NS ns1.example.com. + @ NS ns2.example.com. + @ A 192.0.2.2 + @ AAAA 2001:DB8::2 + ''; + + knotZonesEnv = pkgs.buildEnv { + name = "knot-zones"; + paths = [ exampleZone delegatedZone ]; + }; +in { + name = "knot"; + + nodes = { + master = { lib, ... }: { + imports = [ common ]; + networking.interfaces.eth1 = { + ipv4.addresses = lib.mkForce [ + { address = "192.168.0.1"; prefixLength = 24; } + ]; + ipv6.addresses = lib.mkForce [ + { address = "fd00::1"; prefixLength = 64; } + ]; + }; + services.knot.enable = true; + services.knot.extraArgs = [ "-v" ]; + services.knot.extraConfig = '' + server: + listen: 0.0.0.0@53 + listen: ::@53 + + acl: + - id: slave_acl + address: 192.168.0.2 + action: transfer + + remote: + - id: slave + address: 192.168.0.2@53 + + template: + - id: default + storage: ${knotZonesEnv} + notify: [slave] + acl: [slave_acl] + dnssec-signing: on + # Input-only zone files + # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-3 + # prevents modification of the zonefiles, since the zonefiles are immutable + zonefile-sync: -1 + zonefile-load: difference + journal-content: changes + # move databases below the state directory, because they need to be writable + journal-db: /var/lib/knot/journal + kasp-db: /var/lib/knot/kasp + timer-db: /var/lib/knot/timer + + zone: + - domain: example.com + file: example.com.zone + + - domain: sub.example.com + file: sub.example.com.zone + + log: + - target: syslog + any: info + ''; + }; + + slave = { lib, ... }: { + imports = [ common ]; + networking.interfaces.eth1 = { + ipv4.addresses = lib.mkForce [ + { address = "192.168.0.2"; prefixLength = 24; } + ]; + ipv6.addresses = lib.mkForce [ + { address = "fd00::2"; prefixLength = 64; } + ]; + }; + services.knot.enable = true; + services.knot.extraArgs = [ "-v" ]; + services.knot.extraConfig = '' + server: + listen: 0.0.0.0@53 + listen: ::@53 + + acl: + - id: notify_from_master + address: 192.168.0.1 + action: notify + + remote: + - id: master + address: 192.168.0.1@53 + + template: + - id: default + master: master + acl: [notify_from_master] + # zonefileless setup + # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-2 + zonefile-sync: -1 + zonefile-load: none + journal-content: all + # move databases below the state directory, because they need to be writable + journal-db: /var/lib/knot/journal + kasp-db: /var/lib/knot/kasp + timer-db: /var/lib/knot/timer + + zone: + - domain: example.com + file: example.com.zone + + - domain: sub.example.com + file: sub.example.com.zone + + log: + - target: syslog + any: info + ''; + }; + client = { lib, nodes, ... }: { + imports = [ common ]; + networking.interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.0.3"; prefixLength = 24; } + ]; + ipv6.addresses = [ + { address = "fd00::3"; prefixLength = 64; } + ]; + }; + environment.systemPackages = [ pkgs.knot-dns ]; + }; + }; + + testScript = { nodes, ... }: let + master4 = (lib.head nodes.master.config.networking.interfaces.eth1.ipv4.addresses).address; + master6 = (lib.head nodes.master.config.networking.interfaces.eth1.ipv6.addresses).address; + + slave4 = (lib.head nodes.slave.config.networking.interfaces.eth1.ipv4.addresses).address; + slave6 = (lib.head nodes.slave.config.networking.interfaces.eth1.ipv6.addresses).address; + in '' + startAll; + + $client->waitForUnit("network.target"); + $master->waitForUnit("knot.service"); + $slave->waitForUnit("knot.service"); + + sub assertResponse { + my ($knot, $query_type, $query, $expected) = @_; + my $out = $client->succeed("khost -t $query_type $query $knot"); + $client->log("$knot replies with: $out"); + chomp $out; + die "DNS query for $query ($query_type) against $knot gave '$out' instead of '$expected'" + if ($out !~ $expected); + } + + foreach ("${master4}", "${master6}", "${slave4}", "${slave6}") { + subtest $_, sub { + assertResponse($_, "SOA", "example.com", qr/start of authority.*?noc\.example\.com/); + assertResponse($_, "A", "example.com", qr/has no [^ ]+ record/); + assertResponse($_, "AAAA", "example.com", qr/has no [^ ]+ record/); + + assertResponse($_, "A", "www.example.com", qr/address 192.0.2.1$/); + assertResponse($_, "AAAA", "www.example.com", qr/address 2001:db8::1$/); + + assertResponse($_, "NS", "sub.example.com", qr/nameserver is ns\d\.example\.com.$/); + assertResponse($_, "A", "sub.example.com", qr/address 192.0.2.2$/); + assertResponse($_, "AAAA", "sub.example.com", qr/address 2001:db8::2$/); + + assertResponse($_, "RRSIG", "www.example.com", qr/RR set signature is/); + assertResponse($_, "DNSKEY", "example.com", qr/DNSSEC key is/); + }; + } + ''; +}) diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index 9d77be131751..ec1a75e74c41 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -10,7 +10,6 @@ let mkKubernetesBaseTest = { name, domain ? "my.zyx", test, machines , pkgs ? import { inherit system; } - , certs ? import ./certs.nix { inherit pkgs; externalDomain = domain; kubelets = attrNames machines; } , extraConfiguration ? null }: let masterName = head (filter (machineName: any (role: role == "master") machines.${machineName}.roles) (attrNames machines)); @@ -20,6 +19,10 @@ let ${master.ip} api.${domain} ${concatMapStringsSep "\n" (machineName: "${machines.${machineName}.ip} ${machineName}.${domain}") (attrNames machines)} ''; + kubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } '' + mkdir -p $out/bin + makeWrapper ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl --set KUBECONFIG "/etc/kubernetes/cluster-admin.kubeconfig" + ''; in makeTest { inherit name; @@ -27,6 +30,7 @@ let { config, pkgs, lib, nodes, ... }: mkMerge [ { + boot.postBootCommands = "rm -fr /var/lib/kubernetes/secrets /tmp/shared/*"; virtualisation.memorySize = mkDefault 1536; virtualisation.diskSize = mkDefault 4096; networking = { @@ -45,34 +49,25 @@ let }; }; programs.bash.enableCompletion = true; - environment.variables = { - ETCDCTL_CERT_FILE = "${certs.worker}/etcd-client.pem"; - ETCDCTL_KEY_FILE = "${certs.worker}/etcd-client-key.pem"; - ETCDCTL_CA_FILE = "${certs.worker}/ca.pem"; - ETCDCTL_PEERS = "https://etcd.${domain}:2379"; - }; + environment.systemPackages = [ kubectl ]; services.flannel.iface = "eth1"; - services.kubernetes.apiserver.advertiseAddress = master.ip; + services.kubernetes = { + addons.dashboard.enable = true; + + easyCerts = true; + inherit (machine) roles; + apiserver = { + securePort = 443; + advertiseAddress = master.ip; + }; + masterAddress = "${masterName}.${config.networking.domain}"; + }; } (optionalAttrs (any (role: role == "master") machine.roles) { networking.firewall.allowedTCPPorts = [ - 2379 2380 # etcd 443 # kubernetes apiserver ]; - services.etcd = { - enable = true; - certFile = "${certs.master}/etcd.pem"; - keyFile = "${certs.master}/etcd-key.pem"; - trustedCaFile = "${certs.master}/ca.pem"; - peerClientCertAuth = true; - listenClientUrls = ["https://0.0.0.0:2379"]; - listenPeerUrls = ["https://0.0.0.0:2380"]; - advertiseClientUrls = ["https://etcd.${config.networking.domain}:2379"]; - initialCluster = ["${masterName}=https://etcd.${config.networking.domain}:2380"]; - initialAdvertisePeerUrls = ["https://etcd.${config.networking.domain}:2380"]; - }; }) - (import ./kubernetes-common.nix { inherit (machine) roles; inherit pkgs config certs; }) (optionalAttrs (machine ? "extraConfiguration") (machine.extraConfiguration { inherit config pkgs lib nodes; })) (optionalAttrs (extraConfiguration != null) (extraConfiguration { inherit config pkgs lib nodes; })) ] diff --git a/nixos/tests/kubernetes/certs.nix b/nixos/tests/kubernetes/certs.nix deleted file mode 100644 index 85e92f6330c9..000000000000 --- a/nixos/tests/kubernetes/certs.nix +++ /dev/null @@ -1,219 +0,0 @@ -{ - pkgs ? import {}, - externalDomain ? "myawesomecluster.cluster.yourdomain.net", - serviceClusterIp ? "10.0.0.1", - kubelets, - ... -}: -let - runWithCFSSL = name: cmd: - let secrets = pkgs.runCommand "${name}-cfss.json" { - buildInputs = [ pkgs.cfssl pkgs.jq ]; - outputs = [ "out" "cert" "key" "csr" ]; - } - '' - ( - echo "${cmd}" - cfssl ${cmd} > tmp - cat tmp | jq -r .key > $key - cat tmp | jq -r .cert > $cert - cat tmp | jq -r .csr > $csr - - touch $out - ) 2>&1 | fold -w 80 -s - ''; - in { - key = secrets.key; - cert = secrets.cert; - csr = secrets.csr; - }; - - writeCFSSL = content: - pkgs.runCommand content.name { - buildInputs = [ pkgs.cfssl pkgs.jq ]; - } '' - mkdir -p $out - cd $out - - json=${pkgs.lib.escapeShellArg (builtins.toJSON content)} - - # for a given $field in the $json, treat the associated value as a - # file path and substitute the contents thereof into the $json - # object. - expandFileField() { - local field=$1 - if jq -e --arg field "$field" 'has($field)'; then - local path="$(echo "$json" | jq -r ".$field")" - json="$(echo "$json" | jq --arg val "$(cat "$path")" ".$field = \$val")" - fi - } - - expandFileField key - expandFileField ca - expandFileField cert - - echo "$json" | cfssljson -bare ${content.name} - ''; - - noCSR = content: pkgs.lib.filterAttrs (n: v: n != "csr") content; - noKey = content: pkgs.lib.filterAttrs (n: v: n != "key") content; - - writeFile = content: - if pkgs.lib.isDerivation content - then content - else pkgs.writeText "content" (builtins.toJSON content); - - createServingCertKey = { ca, cn, hosts? [], size ? 2048, name ? cn }: - noCSR ( - (runWithCFSSL name "gencert -ca=${writeFile ca.cert} -ca-key=${writeFile ca.key} -profile=server -config=${writeFile ca.config} ${writeFile { - CN = cn; - hosts = hosts; - key = { algo = "rsa"; inherit size; }; - }}") // { inherit name; } - ); - - createClientCertKey = { ca, cn, groups ? [], size ? 2048, name ? cn }: - noCSR ( - (runWithCFSSL name "gencert -ca=${writeFile ca.cert} -ca-key=${writeFile ca.key} -profile=client -config=${writeFile ca.config} ${writeFile { - CN = cn; - names = map (group: {O = group;}) groups; - hosts = [""]; - key = { algo = "rsa"; inherit size; }; - }}") // { inherit name; } - ); - - createSigningCertKey = { C ? "xx", ST ? "x", L ? "x", O ? "x", OU ? "x", CN ? "ca", emailAddress ? "x", expiry ? "43800h", size ? 2048, name ? CN }: - (noCSR (runWithCFSSL CN "genkey -initca ${writeFile { - key = { algo = "rsa"; inherit size; }; - names = [{ inherit C ST L O OU CN emailAddress; }]; - }}")) // { - inherit name; - config.signing = { - default.expiry = expiry; - profiles = { - server = { - inherit expiry; - usages = [ - "signing" - "key encipherment" - "server auth" - ]; - }; - client = { - inherit expiry; - usages = [ - "signing" - "key encipherment" - "client auth" - ]; - }; - peer = { - inherit expiry; - usages = [ - "signing" - "key encipherment" - "server auth" - "client auth" - ]; - }; - }; - }; - }; - - ca = createSigningCertKey {}; - - kube-apiserver = createServingCertKey { - inherit ca; - cn = "kube-apiserver"; - hosts = ["kubernetes.default" "kubernetes.default.svc" "localhost" "api.${externalDomain}" serviceClusterIp]; - }; - - kubelet = createServingCertKey { - inherit ca; - cn = "kubelet"; - hosts = ["*.${externalDomain}"]; - }; - - service-accounts = createServingCertKey { - inherit ca; - cn = "kube-service-accounts"; - }; - - etcd = createServingCertKey { - inherit ca; - cn = "etcd"; - hosts = ["etcd.${externalDomain}"]; - }; - - etcd-client = createClientCertKey { - inherit ca; - cn = "etcd-client"; - }; - - kubelet-client = createClientCertKey { - inherit ca; - cn = "kubelet-client"; - groups = ["system:masters"]; - }; - - apiserver-client = { - kubelet = hostname: createClientCertKey { - inherit ca; - name = "apiserver-client-kubelet-${hostname}"; - cn = "system:node:${hostname}.${externalDomain}"; - groups = ["system:nodes"]; - }; - - kube-proxy = createClientCertKey { - inherit ca; - name = "apiserver-client-kube-proxy"; - cn = "system:kube-proxy"; - groups = ["system:kube-proxy" "system:nodes"]; - }; - - kube-controller-manager = createClientCertKey { - inherit ca; - name = "apiserver-client-kube-controller-manager"; - cn = "system:kube-controller-manager"; - groups = ["system:masters"]; - }; - - kube-scheduler = createClientCertKey { - inherit ca; - name = "apiserver-client-kube-scheduler"; - cn = "system:kube-scheduler"; - groups = ["system:kube-scheduler"]; - }; - - admin = createClientCertKey { - inherit ca; - cn = "admin"; - groups = ["system:masters"]; - }; - }; -in { - master = pkgs.buildEnv { - name = "master-keys"; - paths = [ - (writeCFSSL (noKey ca)) - (writeCFSSL kube-apiserver) - (writeCFSSL kubelet-client) - (writeCFSSL apiserver-client.kube-controller-manager) - (writeCFSSL apiserver-client.kube-scheduler) - (writeCFSSL service-accounts) - (writeCFSSL etcd) - ]; - }; - - worker = pkgs.buildEnv { - name = "worker-keys"; - paths = [ - (writeCFSSL (noKey ca)) - (writeCFSSL kubelet) - (writeCFSSL apiserver-client.kube-proxy) - (writeCFSSL etcd-client) - ] ++ map (hostname: writeCFSSL (apiserver-client.kubelet hostname)) kubelets; - }; - - admin = writeCFSSL apiserver-client.admin; -} diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index f25ea5b9ed84..46bcb01a5265 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -71,17 +71,17 @@ let base = { name = "dns"; - inherit domain certs extraConfiguration; + inherit domain extraConfiguration; }; singleNodeTest = { test = '' # prepare machine1 for test $machine1->waitUntilSucceeds("kubectl get node machine1.${domain} | grep -w Ready"); - $machine1->execute("docker load < ${redisImage}"); + $machine1->waitUntilSucceeds("docker load < ${redisImage}"); $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}"); $machine1->waitUntilSucceeds("kubectl create -f ${redisService}"); - $machine1->execute("docker load < ${probeImage}"); + $machine1->waitUntilSucceeds("docker load < ${probeImage}"); $machine1->waitUntilSucceeds("kubectl create -f ${probePod}"); # check if pods are running @@ -99,13 +99,16 @@ let multiNodeTest = { test = '' + # Node token exchange + $machine1->waitUntilSucceeds("cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret"); + $machine2->waitUntilSucceeds("cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join"); + # prepare machines for test - $machine1->waitUntilSucceeds("kubectl get node machine1.${domain} | grep -w Ready"); $machine1->waitUntilSucceeds("kubectl get node machine2.${domain} | grep -w Ready"); - $machine2->execute("docker load < ${redisImage}"); + $machine2->waitUntilSucceeds("docker load < ${redisImage}"); $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}"); $machine1->waitUntilSucceeds("kubectl create -f ${redisService}"); - $machine2->execute("docker load < ${probeImage}"); + $machine2->waitUntilSucceeds("docker load < ${probeImage}"); $machine1->waitUntilSucceeds("kubectl create -f ${probePod}"); # check if pods are running diff --git a/nixos/tests/kubernetes/kubernetes-common.nix b/nixos/tests/kubernetes/kubernetes-common.nix deleted file mode 100644 index 87c65b883659..000000000000 --- a/nixos/tests/kubernetes/kubernetes-common.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ roles, config, pkgs, certs }: -with pkgs.lib; -let - base = { - inherit roles; - flannel.enable = true; - addons.dashboard.enable = true; - - caFile = "${certs.master}/ca.pem"; - apiserver = { - tlsCertFile = "${certs.master}/kube-apiserver.pem"; - tlsKeyFile = "${certs.master}/kube-apiserver-key.pem"; - kubeletClientCertFile = "${certs.master}/kubelet-client.pem"; - kubeletClientKeyFile = "${certs.master}/kubelet-client-key.pem"; - serviceAccountKeyFile = "${certs.master}/kube-service-accounts.pem"; - }; - etcd = { - servers = ["https://etcd.${config.networking.domain}:2379"]; - certFile = "${certs.worker}/etcd-client.pem"; - keyFile = "${certs.worker}/etcd-client-key.pem"; - }; - kubeconfig = { - server = "https://api.${config.networking.domain}"; - }; - kubelet = { - tlsCertFile = "${certs.worker}/kubelet.pem"; - tlsKeyFile = "${certs.worker}/kubelet-key.pem"; - hostname = "${config.networking.hostName}.${config.networking.domain}"; - kubeconfig = { - certFile = "${certs.worker}/apiserver-client-kubelet-${config.networking.hostName}.pem"; - keyFile = "${certs.worker}/apiserver-client-kubelet-${config.networking.hostName}-key.pem"; - }; - }; - controllerManager = { - serviceAccountKeyFile = "${certs.master}/kube-service-accounts-key.pem"; - kubeconfig = { - certFile = "${certs.master}/apiserver-client-kube-controller-manager.pem"; - keyFile = "${certs.master}/apiserver-client-kube-controller-manager-key.pem"; - }; - }; - scheduler = { - kubeconfig = { - certFile = "${certs.master}/apiserver-client-kube-scheduler.pem"; - keyFile = "${certs.master}/apiserver-client-kube-scheduler-key.pem"; - }; - }; - proxy = { - kubeconfig = { - certFile = "${certs.worker}/apiserver-client-kube-proxy.pem"; - keyFile = "${certs.worker}//apiserver-client-kube-proxy-key.pem"; - }; - }; - }; - -in { - services.kubernetes = base; -} diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix index 226808c4b263..3ce7adcd0d71 100644 --- a/nixos/tests/kubernetes/rbac.nix +++ b/nixos/tests/kubernetes/rbac.nix @@ -96,7 +96,7 @@ let test = '' $machine1->waitUntilSucceeds("kubectl get node machine1.my.zyx | grep -w Ready"); - $machine1->execute("docker load < ${kubectlImage}"); + $machine1->waitUntilSucceeds("docker load < ${kubectlImage}"); $machine1->waitUntilSucceeds("kubectl apply -f ${roServiceAccount}"); $machine1->waitUntilSucceeds("kubectl apply -f ${roRole}"); @@ -105,7 +105,7 @@ let $machine1->waitUntilSucceeds("kubectl get pod kubectl | grep Running"); - $machine1->succeed("kubectl exec -ti kubectl -- kubectl get pods"); + $machine1->waitUntilSucceeds("kubectl exec -ti kubectl -- kubectl get pods"); $machine1->fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json"); $machine1->fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl"); ''; @@ -113,10 +113,13 @@ let multinode = base // { test = '' - $machine1->waitUntilSucceeds("kubectl get node machine1.my.zyx | grep -w Ready"); + # Node token exchange + $machine1->waitUntilSucceeds("cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret"); + $machine2->waitUntilSucceeds("cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join"); + $machine1->waitUntilSucceeds("kubectl get node machine2.my.zyx | grep -w Ready"); - $machine2->execute("docker load < ${kubectlImage}"); + $machine2->waitUntilSucceeds("docker load < ${kubectlImage}"); $machine1->waitUntilSucceeds("kubectl apply -f ${roServiceAccount}"); $machine1->waitUntilSucceeds("kubectl apply -f ${roRole}"); @@ -125,7 +128,7 @@ let $machine1->waitUntilSucceeds("kubectl get pod kubectl | grep Running"); - $machine1->succeed("kubectl exec -ti kubectl -- kubectl get pods"); + $machine1->waitUntilSucceeds("kubectl exec -ti kubectl -- kubectl get pods"); $machine1->fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json"); $machine1->fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl"); ''; diff --git a/nixos/tests/ldap.nix b/nixos/tests/ldap.nix index b3fd42e75886..fe859876ed25 100644 --- a/nixos/tests/ldap.nix +++ b/nixos/tests/ldap.nix @@ -28,20 +28,19 @@ let users.ldap.daemon = { enable = useDaemon; rootpwmoddn = "cn=admin,${dbSuffix}"; - rootpwmodpw = "/etc/nslcd.rootpwmodpw"; + rootpwmodpwFile = "/etc/nslcd.rootpwmodpw"; }; - # NOTE: password stored in clear in Nix's store, but this is a test. - environment.etc."nslcd.rootpwmodpw".source = pkgs.writeText "rootpwmodpw" dbAdminPwd; users.ldap.loginPam = true; users.ldap.nsswitch = true; users.ldap.server = "ldap://server"; users.ldap.base = "ou=posix,${dbSuffix}"; users.ldap.bind = { distinguishedName = "cn=admin,${dbSuffix}"; - password = "/etc/ldap/bind.password"; + passwordFile = "/etc/ldap/bind.password"; }; - # NOTE: password stored in clear in Nix's store, but this is a test. + # NOTE: passwords stored in clear in Nix's store, but this is a test. environment.etc."ldap/bind.password".source = pkgs.writeText "password" dbAdminPwd; + environment.etc."nslcd.rootpwmodpw".source = pkgs.writeText "rootpwmodpw" dbAdminPwd; }; in diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index 3dbb494b6895..9844ad492e88 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: { name = "login"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; machine = diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 3ad55651b112..ca28bc31cf1c 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { name = "misc"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; foo = pkgs.writeText "foo" "Hello World"; diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index 8146453bfd55..dadd16fd9a0c 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -9,7 +9,7 @@ in { name = "mumble"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ thoughtpolice eelco chaoflow ]; + maintainers = [ thoughtpolice eelco ]; }; nodes = { diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 95cecf17b8cc..31374aaf77e7 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "munin"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow ]; + maintainers = [ domenkozar eelco ]; }; nodes = { diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix index 84d70cf35246..c75a862106f6 100644 --- a/nixos/tests/mysql-replication.nix +++ b/nixos/tests/mysql-replication.nix @@ -8,7 +8,7 @@ in { name = "mysql-replication"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow shlevy ]; + maintainers = [ eelco shlevy ]; }; nodes = { diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index 7251c4a86499..6a9412dbebcf 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -1,24 +1,38 @@ import ./make-test.nix ({ pkgs, ...} : { name = "mysql"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow shlevy ]; + maintainers = [ eelco shlevy ]; }; nodes = { - master = + mysql = { pkgs, ... }: { services.mysql.enable = true; services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; - services.mysql.package = pkgs.mysql; + services.mysql.package = pkgs.mysql57; }; + + mariadb = + { pkgs, ... }: + + { + services.mysql.enable = true; + services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + services.mysql.package = pkgs.mariadb; + }; + }; testScript = '' startAll; - $master->waitForUnit("mysql"); - $master->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4"); + $mysql->waitForUnit("mysql"); + $mysql->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4"); + $mysql->shutdown; + $mariadb->waitForUnit("mysql"); + $mariadb->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4"); + $mariadb->shutdown; ''; }) diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 34229e913110..51d9cf166bb6 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -24,7 +24,7 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, name = "nat" + (if withFirewall then "WithFirewall" else "Standalone") + (lib.optionalString withConntrackHelpers "withConntrackHelpers"); meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow rob ]; + maintainers = [ eelco rob ]; }; nodes = diff --git a/nixos/tests/ndppd.nix b/nixos/tests/ndppd.nix index 9f24eb6d9d45..c53ff93a91f9 100644 --- a/nixos/tests/ndppd.nix +++ b/nixos/tests/ndppd.nix @@ -37,8 +37,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : { }; services.ndppd = { enable = true; - interface = "eth1"; - network = "fd42::/112"; + proxies."eth1".rules."fd42::/112" = {}; }; containers.client = { autoStart = true; diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index c3b710f0f904..bfb97ec3f230 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -22,6 +22,10 @@ in { # Don't inherit adminuser since "root" is supposed to be the default inherit adminpass; }; + autoUpdateApps = { + enable = true; + startAt = "20:00"; + }; }; }; }; diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index ce1717018933..2f655336e757 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -20,7 +20,7 @@ in { name = "nfs"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index c66b90b802d5..8b9e2170f150 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -5,7 +5,7 @@ let inherit (import ./ssh-keys.nix pkgs) in { name = "openssh"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aszlig eelco chaoflow ]; + maintainers = [ aszlig eelco ]; }; nodes = { @@ -34,6 +34,24 @@ in { ]; }; + server_localhost_only = + { ... }: + + { + services.openssh = { + enable = true; listenAddresses = [ { addr = "127.0.0.1"; port = 22; } ]; + }; + }; + + server_localhost_only_lazy = + { ... }: + + { + services.openssh = { + enable = true; startWhenNeeded = true; listenAddresses = [ { addr = "127.0.0.1"; port = 22; } ]; + }; + }; + client = { ... }: { }; @@ -77,5 +95,10 @@ in { " server_lazy true"); }; + + subtest "localhost-only", sub { + $server_localhost_only->succeed("ss -nlt | grep '127.0.0.1:22'"); + $server_localhost_only_lazy->succeed("ss -nlt | grep '127.0.0.1:22'"); + } ''; }) diff --git a/nixos/tests/overlayfs.nix b/nixos/tests/overlayfs.nix new file mode 100644 index 000000000000..99bb6b0f5531 --- /dev/null +++ b/nixos/tests/overlayfs.nix @@ -0,0 +1,57 @@ +import ./make-test.nix ({ pkgs, ... }: { + name = "overlayfs"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ bachp ]; + + machine = { pkgs, ... }: { + virtualisation.emptyDiskImages = [ 512 ]; + networking.hostId = "deadbeef"; + environment.systemPackages = with pkgs; [ parted ]; + }; + + testScript = '' + $machine->succeed("ls /dev"); + + $machine->succeed("mkdir -p /tmp/mnt"); + + # Test ext4 + overlayfs + $machine->succeed( + + "mkfs.ext4 -F -L overlay-ext4 /dev/vdb", + "mount -t ext4 /dev/vdb /tmp/mnt", + + "mkdir -p /tmp/mnt/upper /tmp/mnt/lower /tmp/mnt/work /tmp/mnt/merged", + + # Setup some existing files + "echo 'Replace' > /tmp/mnt/lower/replace.txt", + "echo 'Append' > /tmp/mnt/lower/append.txt", + "echo 'Overwrite' > /tmp/mnt/lower/overwrite.txt", + + "mount -t overlay overlay -o lowerdir=/tmp/mnt/lower,upperdir=/tmp/mnt/upper,workdir=/tmp/mnt/work /tmp/mnt/merged", + + # Test new + "echo 'New' > /tmp/mnt/merged/new.txt", + "[[ \"\$(cat /tmp/mnt/merged/new.txt)\" == \"New\" ]]", + + # Test replace + "[[ \"\$(cat /tmp/mnt/merged/replace.txt)\" == \"Replace\" ]]", + "echo 'Replaced' > /tmp/mnt/merged/replace-tmp.txt", + "mv /tmp/mnt/merged/replace-tmp.txt /tmp/mnt/merged/replace.txt", + "[[ \"\$(cat /tmp/mnt/merged/replace.txt)\" == \"Replaced\" ]]", + + # Overwrite + "[[ \"\$(cat /tmp/mnt/merged/overwrite.txt)\" == \"Overwrite\" ]]", + "echo 'Overwritten' > /tmp/mnt/merged/overwrite.txt", + "[[ \"\$(cat /tmp/mnt/merged/overwrite.txt)\" == \"Overwritten\" ]]", + + # Test append + "[[ \"\$(cat /tmp/mnt/merged/append.txt)\" == \"Append\" ]]", + "echo 'ed' >> /tmp/mnt/merged/append.txt", + #"cat /tmp/mnt/merged/append.txt && exit 1", + "[[ \"\$(cat /tmp/mnt/merged/append.txt)\" == \"Append\ned\" ]]", + + "umount /tmp/mnt/merged", + "umount /tmp/mnt", + "udevadm settle" + ); + ''; +}) diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix index 20b3b838aba8..db23331842cb 100644 --- a/nixos/tests/phabricator.nix +++ b/nixos/tests/phabricator.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ... }: { name = "phabricator"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ chaoflow ]; + maintainers = [ ]; }; nodes = { diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix index 8306abb8c42f..85047f66f23c 100644 --- a/nixos/tests/predictable-interface-names.nix +++ b/nixos/tests/predictable-interface-names.nix @@ -20,8 +20,7 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: { testScript = '' print $machine->succeed("ip link"); - $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}"); - $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}"); + $machine->${if predictable then "fail" else "succeed"}("ip link show eth0 "); ''; }; }) [[true false] [true false]]) diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 7026637ead11..caa8131a4b4c 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({pkgs, ... }: { name = "printing"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow jgeerds ]; + maintainers = [ domenkozar eelco jgeerds ]; }; nodes = { diff --git a/nixos/tests/prometheus-2.nix b/nixos/tests/prometheus-2.nix new file mode 100644 index 000000000000..d7035d49ad4d --- /dev/null +++ b/nixos/tests/prometheus-2.nix @@ -0,0 +1,67 @@ +import ./make-test.nix { + name = "prometheus-2"; + + nodes = { + one = { pkgs, ... }: { + environment.systemPackages = [ pkgs.jq ]; + services.prometheus2 = { + enable = true; + scrapeConfigs = [ + { + job_name = "prometheus"; + static_configs = [ + { + targets = [ "127.0.0.1:9090" ]; + labels = { instance = "localhost"; }; + } + ]; + } + { + job_name = "pushgateway"; + scrape_interval = "1s"; + static_configs = [ + { + targets = [ "127.0.0.1:9091" ]; + } + ]; + } + ]; + rules = [ + '' + groups: + - name: test + rules: + - record: testrule + expr: count(up{job="prometheus"}) + '' + ]; + }; + services.prometheus.pushgateway = { + enable = true; + persistMetrics = true; + persistence.interval = "1s"; + stateDir = "prometheus-pushgateway"; + }; + }; + }; + + testScript = '' + startAll; + $one->waitForUnit("prometheus2.service"); + $one->waitForOpenPort(9090); + $one->succeed("curl -s http://127.0.0.1:9090/metrics"); + + # Let's test if pushing a metric to the pushgateway succeeds + # and whether that metric gets ingested by prometheus. + $one->waitForUnit("pushgateway.service"); + $one->succeed( + "echo 'some_metric 3.14' | " . + "curl --data-binary \@- http://127.0.0.1:9091/metrics/job/some_job"); + $one->waitUntilSucceeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=some_metric' " . + "| jq '.data.result[0].value[1]' | grep '\"3.14\"'"); + + # Let's test if the pushgateway persists metrics to the configured location. + $one->waitUntilSucceeds("test -e /var/lib/prometheus-pushgateway/metrics"); + ''; +} diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix index 181953120282..1f39e903cddb 100644 --- a/nixos/tests/proxy.nix +++ b/nixos/tests/proxy.nix @@ -16,7 +16,7 @@ in { name = "proxy"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index 75c82cca63f5..fbb798515e1a 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -22,7 +22,7 @@ in rec { name = "quake3"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow ]; + maintainers = [ domenkozar eelco ]; }; # TODO: lcov doesn't work atm diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index 34ab05787867..bb5932c36417 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ... }: { name = "rabbitmq"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow offline ]; + maintainers = [ eelco offline ]; }; nodes = { diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix index 396cd5b67d81..0cc94728f80a 100644 --- a/nixos/tests/rspamd.nix +++ b/nixos/tests/rspamd.nix @@ -52,8 +52,18 @@ in machine = { services.rspamd = { enable = true; - bindSocket = [ "/run/rspamd.sock mode=0600 user=root group=root" ]; - bindUISocket = [ "/run/rspamd-worker.sock mode=0666 user=root group=root" ]; + workers.normal.bindSockets = [{ + socket = "/run/rspamd.sock"; + mode = "0600"; + owner = "root"; + group = "root"; + }]; + workers.controller.bindSockets = [{ + socket = "/run/rspamd-worker.sock"; + mode = "0666"; + owner = "root"; + group = "root"; + }]; }; }; @@ -235,7 +245,7 @@ in services.rspamd = { enable = true; postfix.enable = true; - workers.rspamd_proxy.type = "proxy"; + workers.rspamd_proxy.type = "rspamd_proxy"; }; }; testScript = '' diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix new file mode 100644 index 000000000000..605b9c3e1301 --- /dev/null +++ b/nixos/tests/signal-desktop.nix @@ -0,0 +1,37 @@ +import ./make-test.nix ({ pkgs, ...} : + +{ + name = "signal-desktop"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ flokli ]; + }; + + machine = { ... }: + + { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + services.xserver.enable = true; + services.xserver.displayManager.auto.user = "alice"; + environment.systemPackages = [ pkgs.signal-desktop ]; + }; + + enableOCR = true; + + testScript = { nodes, ... }: let + user = nodes.machine.config.users.users.alice; + in '' + startAll; + $machine->waitForX; + + # start signal desktop + $machine->execute("su - alice -c signal-desktop &"); + + # wait for the "Link your phone to Signal Desktop" message + $machine->waitForText(qr/Link your phone to Signal Desktop/); + $machine->screenshot("signal_desktop"); + ''; +}) diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix index 6175155cdfc9..e7b99b10602a 100644 --- a/nixos/tests/subversion.nix +++ b/nixos/tests/subversion.nix @@ -34,7 +34,7 @@ in { name = "subversion"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = diff --git a/nixos/tests/systemd-confinement.nix b/nixos/tests/systemd-confinement.nix new file mode 100644 index 000000000000..b7b10fb36aac --- /dev/null +++ b/nixos/tests/systemd-confinement.nix @@ -0,0 +1,168 @@ +import ./make-test.nix { + name = "systemd-confinement"; + + machine = { pkgs, lib, ... }: let + testServer = pkgs.writeScript "testserver.sh" '' + #!${pkgs.stdenv.shell} + export PATH=${lib.escapeShellArg "${pkgs.coreutils}/bin"} + ${lib.escapeShellArg pkgs.stdenv.shell} 2>&1 + echo "exit-status:$?" + ''; + + testClient = pkgs.writeScriptBin "chroot-exec" '' + #!${pkgs.stdenv.shell} -e + output="$(echo "$@" | nc -NU "/run/test$(< /teststep).sock")" + ret="$(echo "$output" | sed -nre '$s/^exit-status:([0-9]+)$/\1/p')" + echo "$output" | head -n -1 + exit "''${ret:-1}" + ''; + + mkTestStep = num: { description, config ? {}, testScript }: { + systemd.sockets."test${toString num}" = { + description = "Socket for Test Service ${toString num}"; + wantedBy = [ "sockets.target" ]; + socketConfig.ListenStream = "/run/test${toString num}.sock"; + socketConfig.Accept = true; + }; + + systemd.services."test${toString num}@" = { + description = "Confined Test Service ${toString num}"; + confinement = (config.confinement or {}) // { enable = true; }; + serviceConfig = (config.serviceConfig or {}) // { + ExecStart = testServer; + StandardInput = "socket"; + }; + } // removeAttrs config [ "confinement" "serviceConfig" ]; + + __testSteps = lib.mkOrder num '' + subtest '${lib.escape ["\\" "'"] description}', sub { + $machine->succeed('echo ${toString num} > /teststep'); + ${testScript} + }; + ''; + }; + + in { + imports = lib.imap1 mkTestStep [ + { description = "chroot-only confinement"; + config.confinement.mode = "chroot-only"; + testScript = '' + $machine->succeed( + 'test "$(chroot-exec ls -1 / | paste -sd,)" = bin,nix', + 'test "$(chroot-exec id -u)" = 0', + 'chroot-exec chown 65534 /bin', + ); + ''; + } + { description = "full confinement with APIVFS"; + testScript = '' + $machine->fail( + 'chroot-exec ls -l /etc', + 'chroot-exec ls -l /run', + 'chroot-exec chown 65534 /bin', + ); + $machine->succeed( + 'test "$(chroot-exec id -u)" = 0', + 'chroot-exec chown 0 /bin', + ); + ''; + } + { description = "check existence of bind-mounted /etc"; + config.serviceConfig.BindReadOnlyPaths = [ "/etc" ]; + testScript = '' + $machine->succeed('test -n "$(chroot-exec cat /etc/passwd)"'); + ''; + } + { description = "check if User/Group really runs as non-root"; + config.serviceConfig.User = "chroot-testuser"; + config.serviceConfig.Group = "chroot-testgroup"; + testScript = '' + $machine->succeed('chroot-exec ls -l /dev'); + $machine->succeed('test "$(chroot-exec id -u)" != 0'); + $machine->fail('chroot-exec touch /bin/test'); + ''; + } + (let + symlink = pkgs.runCommand "symlink" { + target = pkgs.writeText "symlink-target" "got me\n"; + } "ln -s \"$target\" \"$out\""; + in { + description = "check if symlinks are properly bind-mounted"; + config.confinement.packages = lib.singleton symlink; + testScript = '' + $machine->fail('chroot-exec test -e /etc'); + $machine->succeed('chroot-exec cat ${symlink} >&2'); + $machine->succeed('test "$(chroot-exec cat ${symlink})" = "got me"'); + ''; + }) + { description = "check if StateDirectory works"; + config.serviceConfig.User = "chroot-testuser"; + config.serviceConfig.Group = "chroot-testgroup"; + config.serviceConfig.StateDirectory = "testme"; + testScript = '' + $machine->succeed('chroot-exec touch /tmp/canary'); + $machine->succeed('chroot-exec "echo works > /var/lib/testme/foo"'); + $machine->succeed('test "$(< /var/lib/testme/foo)" = works'); + $machine->succeed('test ! -e /tmp/canary'); + ''; + } + { description = "check if /bin/sh works"; + testScript = '' + $machine->succeed( + 'chroot-exec test -e /bin/sh', + 'test "$(chroot-exec \'/bin/sh -c "echo bar"\')" = bar', + ); + ''; + } + { description = "check if suppressing /bin/sh works"; + config.confinement.binSh = null; + testScript = '' + $machine->succeed( + 'chroot-exec test ! -e /bin/sh', + 'test "$(chroot-exec \'/bin/sh -c "echo foo"\')" != foo', + ); + ''; + } + { description = "check if we can set /bin/sh to something different"; + config.confinement.binSh = "${pkgs.hello}/bin/hello"; + testScript = '' + $machine->succeed( + 'chroot-exec test -e /bin/sh', + 'test "$(chroot-exec /bin/sh -g foo)" = foo', + ); + ''; + } + { description = "check if only Exec* dependencies are included"; + config.environment.FOOBAR = pkgs.writeText "foobar" "eek\n"; + testScript = '' + $machine->succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" != eek'); + ''; + } + { description = "check if all unit dependencies are included"; + config.environment.FOOBAR = pkgs.writeText "foobar" "eek\n"; + config.confinement.fullUnit = true; + testScript = '' + $machine->succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" = eek'); + ''; + } + ]; + + options.__testSteps = lib.mkOption { + type = lib.types.lines; + description = "All of the test steps combined as a single script."; + }; + + config.environment.systemPackages = lib.singleton testClient; + + config.users.groups.chroot-testgroup = {}; + config.users.users.chroot-testuser = { + description = "Chroot Test User"; + group = "chroot-testgroup"; + }; + }; + + testScript = { nodes, ... }: '' + $machine->waitForUnit('multi-user.target'); + ${nodes.machine.config.__testSteps} + ''; +} diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix index af63c7ee8e02..8e7b886dd302 100644 --- a/nixos/tests/tomcat.nix +++ b/nixos/tests/tomcat.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "tomcat"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = { diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix index 4599885acde6..8ec11ebda2cf 100644 --- a/nixos/tests/trac.nix +++ b/nixos/tests/trac.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ... }: { name = "trac"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; nodes = { diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix index 8bbbe286efcf..dcf869908d82 100644 --- a/nixos/tests/udisks2.nix +++ b/nixos/tests/udisks2.nix @@ -12,7 +12,7 @@ in { name = "udisks2"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; + maintainers = [ eelco ]; }; machine = diff --git a/nixos/tests/wireguard/default.nix b/nixos/tests/wireguard/default.nix new file mode 100644 index 000000000000..b0797b963235 --- /dev/null +++ b/nixos/tests/wireguard/default.nix @@ -0,0 +1,97 @@ +let + wg-snakeoil-keys = import ./snakeoil-keys.nix; +in + +import ../make-test.nix ({ pkgs, ...} : { + name = "wireguard"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + nodes = { + peer0 = { lib, ... }: { + boot.kernel.sysctl = { + "net.ipv6.conf.all.forwarding" = "1"; + "net.ipv6.conf.default.forwarding" = "1"; + "net.ipv4.ip_forward" = "1"; + }; + + networking.useDHCP = false; + networking.interfaces.eth1 = { + ipv4.addresses = lib.singleton { + address = "192.168.0.1"; + prefixLength = 24; + }; + ipv6.addresses = lib.singleton { + address = "fd00::1"; + prefixLength = 64; + }; + }; + + networking.firewall.allowedUDPPorts = [ 23542 ]; + networking.wireguard.interfaces.wg0 = { + ips = [ "10.23.42.1/32" "fc00::1/128" ]; + listenPort = 23542; + + inherit (wg-snakeoil-keys.peer0) privateKey; + + peers = lib.singleton { + allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ]; + + inherit (wg-snakeoil-keys.peer1) publicKey; + }; + }; + }; + + peer1 = { pkgs, lib, ... }: { + boot.kernel.sysctl = { + "net.ipv6.conf.all.forwarding" = "1"; + "net.ipv6.conf.default.forwarding" = "1"; + "net.ipv4.ip_forward" = "1"; + }; + + networking.useDHCP = false; + networking.interfaces.eth1 = { + ipv4.addresses = lib.singleton { + address = "192.168.0.2"; + prefixLength = 24; + }; + ipv6.addresses = lib.singleton { + address = "fd00::2"; + prefixLength = 64; + }; + }; + + networking.wireguard.interfaces.wg0 = { + ips = [ "10.23.42.2/32" "fc00::2/128" ]; + listenPort = 23542; + allowedIPsAsRoutes = false; + + inherit (wg-snakeoil-keys.peer1) privateKey; + + peers = lib.singleton { + allowedIPs = [ "0.0.0.0/0" "::/0" ]; + endpoint = "192.168.0.1:23542"; + persistentKeepalive = 25; + + inherit (wg-snakeoil-keys.peer0) publicKey; + }; + + postSetup = let inherit (pkgs) iproute; in '' + ${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0 + ${iproute}/bin/ip route replace fc00::1/128 dev wg0 + ''; + }; + }; + }; + + testScript = '' + startAll; + + $peer0->waitForUnit("wireguard-wg0.service"); + $peer1->waitForUnit("wireguard-wg0.service"); + + $peer1->succeed("ping -c5 fc00::1"); + $peer1->succeed("ping -c5 10.23.42.1") + ''; +}) diff --git a/nixos/tests/wireguard/snakeoil-keys.nix b/nixos/tests/wireguard/snakeoil-keys.nix new file mode 100644 index 000000000000..55ad582d4059 --- /dev/null +++ b/nixos/tests/wireguard/snakeoil-keys.nix @@ -0,0 +1,11 @@ +{ + peer0 = { + privateKey = "OPuVRS2T0/AtHDp3PXkNuLQYDiqJaBEEnYe42BSnJnQ="; + publicKey = "IujkG119YPr2cVQzJkSLYCdjpHIDjvr/qH1w1tdKswY="; + }; + + peer1 = { + privateKey = "uO8JVo/sanx2DOM0L9GUEtzKZ82RGkRnYgpaYc7iXmg="; + publicKey = "Ks9yRJIi/0vYgRmn14mIOQRwkcUGBujYINbMpik2SBI="; + }; +} diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index 47717e8cf7d9..12d8a050d47b 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "xfce"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow shlevy ]; + maintainers = [ eelco shlevy ]; }; machine = diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix index 1e9192bc6e40..78ce074eafd3 100644 --- a/pkgs/applications/altcoins/freicoin.nix +++ b/pkgs/applications/altcoins/freicoin.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1v1qwv4x5agjba82s1vknmdgq67y26wzdwbmwwqavv7f7y3y860h"; }; + enableParallelBuilding = false; + qmakeFlags = ["USE_UPNP=-"]; # I think that openssl and zlib are required, but come through other diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index ad1ccbf496cf..1e16eb78cef1 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -1,8 +1,9 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, libobjc, IOKit }: +{ stdenv, buildGoPackage, fetchFromGitHub, libobjc, IOKit, fetchpatch }: buildGoPackage rec { - name = "go-ethereum-${version}"; - version = "1.8.21"; + pname = "go-ethereum"; + version = "1.8.27"; + goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -12,17 +13,28 @@ buildGoPackage rec { # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) hardeningDisable = [ "fortify" ]; + # Apply ethereum/go-ethereum#19183 to fix the aarch64 build failure. + # + # TODO Remove this patch when upstream (https://github.com/ethereum/go-ethereum) + # fix this problem in the future release. + patches = [ + (fetchpatch { + url = "https://github.com/ethereum/go-ethereum/commit/39bd2609.patch"; + sha256 = "1a362hzvcjk505hicv25kziy3c6s5an4j7rk4jibcxwgvygb3mz5"; + }) + ]; + src = fetchFromGitHub { owner = "ethereum"; - repo = "go-ethereum"; + repo = pname; rev = "v${version}"; - sha256 = "1p4qfxa90l26s9q4hddyb93gdf7vb0sb46z9n26ijiqlxdq3z7v2"; + sha256 = "1640y7lqy7bvjjgx6wp0cnbw632ls5fj4ixclr819lfz4p5dfhx1"; }; meta = with stdenv.lib; { homepage = https://ethereum.github.io/go-ethereum/; description = "Official golang implementation of the Ethereum protocol"; license = with licenses; [ lgpl3 gpl3 ]; - maintainers = [ maintainers.adisbladis maintainers.lionello ]; + maintainers = with maintainers; [ adisbladis asymmetric lionello ]; }; } diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 331ef6b92a4f..f597d6b6527c 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -2,8 +2,8 @@ , makeWrapper, makeDesktopItem , qtbase, qmake, qtmultimedia, qttools , qtgraphicaleffects, qtdeclarative -, qtlocation, qtquickcontrols2, qtwebchannel -, qtwebengine, qtx11extras, qtxmlpatterns +, qtlocation, qtquickcontrols, qtquickcontrols2 +, qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns , monero, unbound, readline, boost, libunwind , libsodium, pcsclite, zeromq, cppzmq, pkgconfig , hidapi @@ -11,22 +11,35 @@ with stdenv.lib; +let + qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}"; + + qml2ImportPath = concatMapStringsSep ":" qmlPath [ + qtbase.bin qtmultimedia.bin qtgraphicaleffects + qtdeclarative.bin qtlocation.bin + qtquickcontrols qtquickcontrols2.bin + qtwebchannel.bin qtwebengine.bin qtxmlpatterns + ]; + +in + stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.13.0.4"; + version = "0.14.0.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "142yj5s15bhm300dislq3x5inw1f37shnrd5vyj78jjcvry3wymw"; + sha256 = "1l4kx2vidr7bpds43jdbwyaz0q1dy7sricpz061ff1fkappbxdh8"; }; nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qtmultimedia qtgraphicaleffects - qtdeclarative qtlocation qtquickcontrols2 + qtdeclarative qtlocation + qtquickcontrols qtquickcontrols2 qtwebchannel qtwebengine qtx11extras qtxmlpatterns monero unbound readline boost libunwind libsodium pcsclite zeromq @@ -81,6 +94,11 @@ stdenv.mkDerivation rec { cp $src/images/appicons/$size.png \ $out/share/icons/hicolor/$size/apps/monero.png done; + + # wrap runtime dependencies + wrapProgram $out/bin/monero-wallet-gui \ + --set QML2_IMPORT_PATH "${qml2ImportPath}" \ + --set QT_PLUGIN_PATH "${qtbase.bin}/${qtbase.qtPluginPrefix}" ''; meta = { diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch index 74f817d81350..ae733151622d 100644 --- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch +++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -13,15 +13,17 @@ index 79223c0..e80b317 100644 parser.addHelpOption(); parser.process(app); diff --git a/Logger.cpp b/Logger.cpp -index 660bafc..dae24d4 100644 +index 6b1daba..c357762 100644 --- a/Logger.cpp +++ b/Logger.cpp -@@ -15,7 +15,7 @@ static const QString default_name = "monero-wallet-gui.log"; - #elif defined(Q_OS_MAC) - static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs"; +@@ -28,8 +28,8 @@ static const QString defaultLogName = "monero-wallet-gui.log"; + static const QString appFolder = "Library/Logs"; #else // linux + bsd + //HomeLocation = "~" - static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0); +- static const QString appFolder = ".bitmonero"; + static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0); ++ static const QString appFolder = "bitmonero"; #endif - + diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 3a962458632e..94c277f63eb0 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.13.0.4"; + version = "0.14.0.2"; src = fetchgit { url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "1ambgakapijhsi1pd70vw8vvnlwa3nid944lqkbfq3wl25lmc70d"; + sha256 = "1471iy6c8dfdqcmcwcp0m7fp9xl74dcm5hqlfdfi217abhawfs8k"; }; nativeBuildInputs = [ cmake pkgconfig git ]; diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix index 62e725928741..58ab367c020f 100644 --- a/pkgs/applications/altcoins/nano-wallet/default.nix +++ b/pkgs/applications/altcoins/nano-wallet/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "nano-wallet-${version}"; - version = "16.3"; + version = "18.0"; src = fetchFromGitHub { owner = "nanocurrency"; repo = "raiblocks"; rev = "V${version}"; - sha256 = "1rhq7qzfd8li33pmzcjxrhbbgdklxlcijam62s385f8yqjwy80dz"; + sha256 = "03f9g1x7rs7vic9yzsjxsh5ddx9ys78rssbfghbccfw9qrwylh3y"; fetchSubmodules = true; }; diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index 591f6ffa86cb..19ab52ebc22e 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.3.1"; - sha256 = "13y3gczqb0rb6v17j63j1zp11cnykbv9c674hrk1i6jb3y4am4lv"; + version = "2.3.2"; + sha256 = "1063n7lkcfkywi0a06pxkw0wkq3qyq4lr53fv584mlbnh2hj8gpm"; cargoSha256 = "1pj5hzy7k1l9bbw1qpz80vvk89qz4qz4rnnkcvn2rkbmq382gxwy"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index f62e3d5cfdd0..b8b67836f061 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.2.8"; - sha256 = "1l2bxra4fkbh8gnph9wnc24ddmzfdclsgcjbx8q6fflhcg6r9hf1"; + version = "2.2.9"; + sha256 = "0n9zk25ni4asfdqc4xh0gqp2446vxacqz7qcrmsngf8swvayvi16"; cargoSha256 = "10lg0vzikzlj927hpn59x1dz9dvhcaqsl8nz14vj2iz42vfkcm7p"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 1bb1e404b5c4..30a4e052d77c 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { patchShebangs ./tools/ ''; - configureFlags = [ + wafConfigureFlags = [ "--optimize" "--docs" "--with-backends=jack,alsa,dummy" diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 19cb55d93c98..68660b5d054b 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext glib gtk3 libmowgli dbus-glib libxml2 - xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2 + xorg.libXcomposite gnome3.adwaita-icon-theme alsaLib libjack2 libpulseaudio fluidsynth libmad libogg libvorbis libcdio libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile libmodplug libsamplerate soxr lirc curl wavpack neon faad2 diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index fc32eb799cf9..3b12ffe3463f 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.0"; + version = "2.3.1"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "0pi7ksm8hfvwbn580z4kkc55sbaylrrr7v08s04dmdgfvil7y4ip"; + sha256 = "089kz6hgqg0caz33sps19wpkfnza5gf7brdq2p9y6bnwkipw1w9f"; }; preConfigure = /* we prefer system-wide libs */ '' diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index b7b8a4410b7f..5823e3c390cd 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -24,6 +24,11 @@ python3Packages.buildPythonApplication rec { pname = "cozy"; version = "0.6.7"; + # Temporary fix + # See https://github.com/NixOS/nixpkgs/issues/57029 + # and https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + src = fetchFromGitHub { owner = "geigi"; repo = pname; @@ -43,7 +48,7 @@ python3Packages.buildPythonApplication rec { gtk3 cairo gettext - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-good diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix new file mode 100644 index 000000000000..df0fcb0ee9cd --- /dev/null +++ b/pkgs/applications/audio/csound/csound-manual/default.nix @@ -0,0 +1,44 @@ +{ + stdenv, fetchFromGitHub, docbook_xsl, + docbook_xml_dtd_45, python, pygments, + libxslt +}: + +stdenv.mkDerivation rec { + pname = "csound-manual"; + version = "unstable-2019-02-22"; + + src = fetchFromGitHub { + owner = "csound"; + repo = "manual"; + rev = "3b0bdc83f9245261b4b85a57c3ed636d5d924a4f"; + sha256 = "074byjhaxraapyg54dxgg7hi1d4978aa9c1rmyi50p970nsxnacn"; + }; + + prePatch = '' + substituteInPlace manual.xml \ + --replace "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ + "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd" + ''; + + nativeBuildInputs = [ libxslt.bin ]; + + buildInputs = [ docbook_xsl python pygments ]; + + buildPhase = '' + make XSL_BASE_PATH=${docbook_xsl}/share/xml/docbook-xsl html-dist + ''; + + installPhase = '' + mkdir -p $out/share/doc/csound + cp -r ./html $out/share/doc/csound + ''; + + meta = { + description = "The Csound Canonical Reference Manual"; + homepage = "https://github.com/csound/manual"; + license = stdenv.lib.licenses.fdl12Plus; + maintainers = [ stdenv.lib.maintainers.hlolli ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index fd5cc4a416e2..49ecf670f324 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "02j10khl3wd17z0wfs3crr55wv7h9f0qhhg90xg0kvrxvw83vzy9"; + sha256 = "1azzwqgrrr4zr509sib2jvigfvz5bkwnx82chdadxdwfarai8586"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index e61b9d8b290d..c6fb7c67d584 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac - gsettings-desktop-schemas gnome3.defaultIconTheme + gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; doCheck = false; # fails 1 out of 9 tests diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix index 00e10a2ff1e2..37c95430627f 100644 --- a/pkgs/applications/audio/elisa/default.nix +++ b/pkgs/applications/audio/elisa/default.nix @@ -1,26 +1,28 @@ { mkDerivation, fetchFromGitHub, lib , extra-cmake-modules, kdoctools, wrapGAppsHook , qtmultimedia, qtquickcontrols2, qtwebsockets -, kconfig, kcmutils, kcrash, kdeclarative, kfilemetadata, kinit -, baloo +, kconfig, kcmutils, kcrash, kdeclarative, kfilemetadata, kinit, kirigami2 +, baloo, vlc }: mkDerivation rec { - name = "elisa-${version}"; - version = "0.3.0"; + pname = "elisa"; + version = "0.4.2"; src = fetchFromGitHub { owner = "KDE"; repo = "elisa"; rev = "v${version}"; - sha256 = "0bpkr5rp9nfa2wzm6w3xkhsfgf5dbgxbmhckjh9wkxal3mncpkg4"; + sha256 = "0q098zaajwbpkrarrsdzpjhpsq2nxkqaxwzhr2gjlg08j9vqkpfm"; }; + buildInputs = [ vlc ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; propagatedBuildInputs = [ qtmultimedia qtquickcontrols2 qtwebsockets - kconfig kcmutils kcrash kdeclarative kfilemetadata kinit + kconfig kcmutils kcrash kdeclarative kfilemetadata kinit kirigami2 baloo ]; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 4266b8c69bb8..efb832ae625f 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -8,13 +8,13 @@ in stdenv.mkDerivation rec { name = "freewheeling-${version}"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "free-wheeling"; repo = "freewheeling"; rev = "v${version}"; - sha256 = "1xflbbnjdibjmyxb1zq8liylaw5k03nnl1z3272jh204pqh17ri9"; + sha256 = "1gjii2kndffj9iqici4vb9zrkrdqj1hs9q43x7jv48wv9872z78r"; }; nativeBuildInputs = [ pkgconfig autoreconfHook libtool ]; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 2544be383e5d..9a3ad5e0bc3e 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gobject-introspection - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; checkInputs = with python3Packages; [ diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index 0434b00c7053..b653ae5ca588 100644 --- a/pkgs/applications/audio/gtklick/default.nix +++ b/pkgs/applications/audio/gtklick/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { pyGtkGlade ]; - buildInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; propagatedBuildInputs = [ klick ]; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index c40f84348de1..0727ab56f7de 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl gettext flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf - gdl gnome3.defaultIconTheme gnome3.anjuta + gdl gnome3.adwaita-icon-theme gnome3.anjuta ] ++ (with perlPackages; [ perl XMLParser ]); patchPhase = '' diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index bc4c18aab085..465544e7c6ac 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { zita-resampler curl ]; - configureFlags = [ + wafConfigureFlags = [ "--shared-lib" "--no-desktop-update" "--enable-nls" diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix deleted file mode 100644 index d2ef7434c4db..000000000000 --- a/pkgs/applications/audio/lastwatch/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchgit, python2Packages }: - -python2Packages.buildPythonApplication rec { - pname = "lastwatch"; - version = "0.4.1"; - - src = fetchgit { - url = "git://github.com/aszlig/LastWatch.git"; - rev = "refs/tags/v${version}"; - sha256 = "0nlng3595j5jvnikk8i5hb915zak5zsmfn2306cc4gfcns9xzjwp"; - }; - - propagatedBuildInputs = with python2Packages; [ - pyinotify - pylast - mutagen - ]; - - meta = { - 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/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 03d27177656a..63ed3525ec0f 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchgit, meson, ninja, pkgconfig , python3, gtk3, gst_all_1, libsecret, libsoup , appstream-glib, desktop-file-utils, totem-pl-parser -, gobject-introspection, wrapGAppsHook }: +, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "0.9.915"; + version = "0.9.921"; format = "other"; doCheck = false; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "133qmqb015ghif4d4zh6sf8585fpfgbq00rv6qdj5xn13wziipwh"; + sha256 = "0a79qnci93yicd58r6kr6yinpqz67s39h0xk5qkzlsplpbawvf3y"; }; nativeBuildInputs = [ @@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = with gst_all_1; [ + gobject-introspection gst-libav gst-plugins-bad gst-plugins-base @@ -35,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-ugly gstreamer gtk3 + hicolor-icon-theme libsecret libsoup totem-pl-parser diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 3e89101e0420..b8ae2d4a8998 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.32.5"; + version = "3.33.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0vs8x26zcakk6c31sc774h2lcdw3syp236vyymmx1jnfsh1jaqpn"; + sha256 = "0g00rjkmsnza4gjjdm0cwrpw3gqvmjj58157dvrh7f8k7j0gdvdm"; }; propagatedBuildInputs = [ @@ -14,14 +14,10 @@ pythonPackages.buildPythonApplication rec { mopidy-local-images ] ++ (with pythonPackages; [ configobj - pylast - spotipy - raven + requests tornado_4 ]); - postPatch = "sed -i /tornado/d setup.py"; - # no tests implemented doCheck = false; diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix new file mode 100644 index 000000000000..ccfc6fdfc4a4 --- /dev/null +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, fetchFromGitHub +, audiofile +, libvorbis +, fltk +, fftw +, fftwFloat +, minixml +, pkgconfig +, libmad +, libjack2 +, portaudio +, libsamplerate +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "paulstretch"; + version = "2.2-2"; + + meta = with stdenv.lib; + { description = "Produces high quality extreme sound stretching"; + longDescription = '' + This is a program for stretching the audio. It is suitable only for + extreme sound stretching of the audio (like 50x) and for applying + special effects by "spectral smoothing" the sounds. + It can transform any sound/music to a texture. + ''; + homepage = http://hypermammut.sourceforge.net/paulstretch/; + platforms = platforms.linux; + license = licenses.gpl2; + }; + + src = fetchFromGitHub { + owner = "paulnasca"; + repo = "paulstretch_cpp"; + rev = "7f5c3993abe420661ea0b808304b0e2b4b0048c5"; + sha256 = "06dy03dbz1yznhsn0xvsnkpc5drzwrgxbxdx0hfpsjn2xcg0jrnc"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + audiofile + libvorbis + fltk + fftw + fftwFloat + minixml + libmad + libjack2 + portaudio + libsamplerate + ]; + + buildPhase = '' + bash compile_linux_fftw_jack.sh + ''; + + installPhase = '' + install -Dm555 ./paulstretch $out/bin/paulstretch + ''; +} diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 06398324491b..4d9b856499aa 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 915b7d0cbb50..421c9eaac372 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec { sha256 = "1p2bvfzby0nk1vh04yfmsvjcldgkj6m6s1hcv9v13hc8q1cbdfk5"; }; - buildInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; propagatedBuildInputs = with pythonPackages; [ pyqt5 diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 26adc6394349..b146513d7350 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,23 +1,17 @@ -{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qtbase, qttools, qtx11extras, cmake, pkgconfig }: +{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qt5, autoconf, pkgconfig }: stdenv.mkDerivation rec { name = "qsynth-${version}"; - version = "0.5.2"; + version = "0.5.6"; src = fetchurl { url = "mirror://sourceforge/qsynth/${name}.tar.gz"; - sha256 = "1rfkaxq1pyc4hv3l0i6wicianbcbm1wp53kh9i5d4jsljgisd1dv"; + sha256 = "0h4hhja8qbyzd6v24flw9wr4mwl03nplryx1gyrppn7sg13l1sx6"; }; - # cmake is looking for qsynth.desktop.in and fails if it doesn't find it - # seems like a bug and can presumable go in the next version after 0.5.2 - postPatch = '' - mv src/qsynth.desktop src/qsynth.desktop.in - ''; + nativeBuildInputs = [ autoconf pkgconfig ]; - nativeBuildInputs = [ cmake pkgconfig ]; - - buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ]; + buildInputs = [ alsaLib fluidsynth libjack2 qt5.qtbase qt5.qttools qt5.qtx11extras ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 9e0abac5ce47..9ba225e8c58a 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,21 +1,24 @@ -{ alsaLib, autoconf, automake, dssi, fetchurl, gtk2, libjack2 +{ alsaLib, autoconf, automake, dssi, fetchurl, libjack2 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile -, libtool, libvorbis, lilv, lv2, pkgconfig, qt4, rubberband, serd +, libtool, libvorbis, lilv, lv2, pkgconfig, qttools, qtbase, rubberband, serd , sord, sratom, stdenv, suil }: stdenv.mkDerivation rec { - version = "0.6.7"; - name = "qtractor-${version}"; + pname = "qtractor"; + version = "0.9.4"; src = fetchurl { - url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "0h5nblfkl4s412c9f02b40nb8c8jq8ypz67z2qn3hkvhx6i9yxsg"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "05xrzr48b19mghbpbzjqw5fy6pl9140bm5m929lrsi4rq5hp3xgg"; }; + nativeBuildInputs = [ + autoconf automake libtool pkgconfig qttools + ]; buildInputs = - [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH + [ alsaLib dssi libjack2 ladspaH ladspaPlugins liblo libmad libsamplerate libsndfile libtool - libvorbis lilv lv2 pkgconfig qt4 rubberband serd sord sratom + libvorbis lilv lv2 qtbase rubberband serd sord sratom suil ]; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index a1d85ac91e85..d457f25e3162 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ]; - buildInputs = [ gnome3.defaultIconTheme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] + buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] ++ (if xineBackend then [ xineLib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index e540016ac81c..eab50c904795 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { gtk3 gnome3.libpeas totem-pl-parser - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 012270905cc8..5c22e3e77510 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook +{ stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook , python3Packages, gnome3, gtk3, gobject-introspection}: let @@ -16,10 +16,10 @@ in buildPythonApplication rec { disabled = !isPy3k; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ intltool wrapGAppsHook - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 686b27223a6f..303532aca63d 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ - glib gtk3 brasero libcanberra-gtk3 gnome3.defaultIconTheme + glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix new file mode 100644 index 000000000000..df5806b50b9e --- /dev/null +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -0,0 +1,97 @@ +# currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery +{ + mkDerivation, fetchFromGitHub, lib, makeWrapper, + cmake, extra-cmake-modules, pkgconfig, + libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui, + qtbase, phonon, + taglib, + # optional backends + withCD ? true, cdparanoia, + withFlac ? true, flac, + withMidi ? true, fluidsynth, timidity, + withSpeex ? false, speex, + withVorbis ? true, vorbis-tools, vorbisgain, + withMp3 ? true, lame, mp3gain, + withAac ? true, faad2, aacgain, + withUnfreeAac ? false, faac, + withFfmpeg ? true, ffmpeg-full, + withMplayer ? false, mplayer, + withSox ? true, sox, + withOpus ? true, opusTools, + withTwolame ? false, twolame, + withApe ? false, mac, + withWavpack ? false, wavpack +}: + +assert withAac -> withFfmpeg || withUnfreeAac; +assert withUnfreeAac -> withAac; + +let runtimeDeps = [] + ++ lib.optional withCD cdparanoia + ++ lib.optional withFlac flac + ++ lib.optional withSpeex speex + ++ lib.optional withFfmpeg ffmpeg-full + ++ lib.optional withMplayer mplayer + ++ lib.optional withSox sox + ++ lib.optional withOpus opusTools + ++ lib.optional withTwolame twolame + ++ lib.optional withApe mac + ++ lib.optional withWavpack wavpack + ++ lib.optional withUnfreeAac faac + ++ lib.optionals withMidi [ fluidsynth timidity ] + ++ lib.optionals withVorbis [ vorbis-tools vorbisgain ] + ++ lib.optionals withMp3 [ lame mp3gain ] + ++ lib.optionals withAac [ faad2 aacgain ]; + +in +mkDerivation rec { + name = "soundkonverter"; + version = "3.0.1"; + src = fetchFromGitHub { + owner = "dfaust"; + repo = "soundkonverter"; + rev = "v" + version; + sha256 = "1g2khdsjmsi4zzynkq8chd11cbdhjzmi37r9jhpal0b730nq9x7l"; + }; + enableParallelBuilding = true; + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ]; + propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon]; + buildInputs = [ taglib ] ++ runtimeDeps; + # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5 + cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ]; + sourceRoot = "source/src"; + # add runt-time deps to PATH + postInstall = '' + wrapProgram $out/bin/soundkonverter --prefix PATH : ${lib.makeBinPath runtimeDeps } + ''; + meta = { + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.schmittlauch ]; + description = "Audio file converter, CD ripper and Replay Gain tool"; + longDescription = '' + soundKonverter is a frontend to various audio converters. + + The key features are: + - Audio file conversion + - Replay Gain calculation + - CD ripping + + soundKonverter supports reading and writing tags and covers for many formats, so they are preserved when converting files. + + It is extendable by plugins and supports many backends including: + + - Audio file conversion + Backends: faac, faad, ffmpeg, flac, lame, mplayer, neroaac, timidity, fluidsynth, vorbistools, opustools, sox, twolame, + flake, mac, shorten, wavpack and speex + Formats: ogg vorbis, mp3, flac, wma, aac, ac3, opus, alac, mp2, als, amr nb, amr wb, ape, speex, m4a, mp1, musepack shorten, + tta, wavpack, ra, midi, mod, 3gp, rm, avi, mkv, ogv, mpeg, mov, mp4, flv, wmv and rv + + - Replay Gain calculation + Backends: aacgain, metaflac, mp3gain, vorbisgain, wvgain, mpcgain + Formats: aac, mp3, flac, ogg vorbis, wavpack, musepack + + - CD ripping + Backends: cdparanoia + ''; + }; +} diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix index f22340b69412..64ae9491535a 100644 --- a/pkgs/applications/audio/spotifywm/default.nix +++ b/pkgs/applications/audio/spotifywm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, spotify, xorg }: +{ stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }: stdenv.mkDerivation rec { name = "spotifywm-unstable-${version}"; version = "2016-11-28"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ spotify ]; installPhase = '' - echo "#!${stdenv.shell}" > spotifywm + echo "#!${runtimeShell}" > spotifywm echo "LD_PRELOAD="$out/lib/spotifywm.so" ${spotify}/bin/spotify \$*" >> spotifywm install -Dm644 spotifywm.so $out/lib/spotifywm.so install -Dm755 spotifywm $out/bin/spotifywm diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 20f6271c7adf..3184f89ced95 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -1,20 +1,26 @@ { stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, mpg123 }: stdenv.mkDerivation { - name = "squeezelite-git-2016-05-27"; + name = "squeezelite-git-2018-08-14"; src = fetchFromGitHub { - owner = "ralph-irving"; - repo = "squeezelite"; - rev = "e37ed17fed9e11a7346cbe9f1e1deeccc051f42e"; - sha256 = "15ihx2dbp4kr6k6r50g9q5npqad5zyv8nqf5cr37bhg964syvbdm"; + owner = "ralph-irving"; + repo = "squeezelite"; + rev = "ecb6e3696a42113994640e5345d0b5ca2e77d28b"; + sha256 = "0di3d5qy8fhawijq6bxy524fgffvzl08dprrws0fs2j1a70fs0fh"; }; buildInputs = [ alsaLib faad2 flac libmad libvorbis mpg123 ]; + enableParallelBuilding = true; + installPhase = '' - mkdir -p $out/bin - cp squeezelite $out/bin + runHook preInstall + + install -Dm755 -t $out/bin squeezelite + install -Dm644 -t $out/share/doc/squeezelite *.txt *.md + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 49e11aee0a12..c89fe9ef26e9 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -1,41 +1,59 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, pantheon, gtk3, libxml2, webkitgtk, clutter-gtk -, clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobject-introspection, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, cmake +, ninja +, pkgconfig +, pantheon +, gtk3 +, glib +, libxml2 +, webkitgtk +, clutter-gtk +, clutter-gst +, libunity +, libnotify +, sqlite +, gst_all_1 +, libsoup +, json-glib +, libgee +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "vocal"; - version = "2.3.0"; - - name = "${pname}-${version}"; + version = "2.4.1"; src = fetchFromGitHub { owner = "needle-and-thread"; repo = pname; rev = version; - sha256 = "1wkkyai14in4yk3q4qq23wk3l49px2xi8z819y3glna236qsq6qp"; + sha256 = "0jz72nmc6qmadsvcpk339x1fm4wg6yx9r1bagr7mcgnz3x5papnr"; }; nativeBuildInputs = [ cmake - gobject-introspection libxml2 ninja - pkgconfig pantheon.vala + pkgconfig wrapGAppsHook ]; buildInputs = with gst_all_1; [ clutter-gst clutter-gtk - pantheon.elementary-icon-theme - gnome3.libgee - pantheon.granite + glib gst-plugins-base gst-plugins-good gstreamer + gtk3 json-glib + libgee libnotify libunity + pantheon.elementary-icon-theme + pantheon.granite sqlite webkitgtk ]; diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix index 7a7f6f2ac496..a9647b11eeea 100644 --- a/pkgs/applications/backup/areca/default.nix +++ b/pkgs/applications/backup/areca/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { substituteInPlace bin/areca_run.sh --replace "/usr/java" "${jre}/lib/openjdk" substituteInPlace bin/areca_run.sh --replace "/usr/lib/java/swt.jar" "${swt}/jars/swt.jar" + # Fix for NixOS/nixpkgs/issues/53716 + sed -i -e 's;^;#include ;' jni/com_myJava_file_metadata_posix_jni_wrapper_FileAccessWrapper.c + substituteInPlace jni/com_myJava_file_metadata_posix_jni_wrapper_FileAccessWrapper.c --replace attr/xattr.h sys/xattr.h + sed -i "s#^PROGRAM_DIR.*#PROGRAM_DIR=$out#g" bin/areca_run.sh sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=$out/lib:${stdenv.lib.makeLibraryPath [ swt acl ]}#g" bin/areca_run.sh diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index a965ff4c8bb0..650bab334333 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pam, pkgconfig, autoconf, automake, libtool, libxcb , glib, libXdmcp, itstool, intltool, libxklavier, libgcrypt, audit, busybox -, polkit, accountsservice, gtk-doc, gnome3, gobject-introspection, vala +, polkit, accountsservice, gtk-doc, gnome3, gobject-introspection, vala, fetchpatch , withQt4 ? false, qt4 , withQt5 ? false, qtbase }: @@ -49,7 +49,14 @@ stdenv.mkDerivation rec { ] ++ optional withQt4 qt4 ++ optional withQt5 qtbase; - patches = [ ./run-dir.patch ]; + patches = [ + ./run-dir.patch + # Adds option to disable writing dmrc files + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/lightdm/raw/4cf0d2bed8d1c68970b0322ccd5dbbbb7a0b12bc/f/lightdm-1.25.1-disable_dmrc.patch"; + sha256 = "06f7iabagrsiws2l75sx2jyljknr9js7ydn151p3qfi104d1541n"; + }) + ]; preConfigure = "NOCONFIGURE=1 ./autogen.sh"; @@ -58,11 +65,12 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--disable-tests" "--disable-static" + "--disable-dmrc" ] ++ optional withQt4 "--enable-liblightdm-qt" ++ optional withQt5 "--enable-liblightdm-qt5"; installFlags = [ - "sysconfdir=\${out}/etc" + "sysconfdir=${placeholder ''out''}/etc" "localstatedir=\${TMPDIR}" ]; @@ -76,7 +84,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/CanonicalLtd/lightdm; - description = "A cross-desktop display manager."; + description = "A cross-desktop display manager"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ ocharles worldofpeace ]; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 3de4067f55d5..b5d32493003d 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.18.0"; + version = "0.18.1"; in mkDerivation rec { name = "sddm-${version}"; @@ -13,7 +13,7 @@ in mkDerivation rec { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "16xnm02iqgy4hydzd6my0widq981glbazbhxnihhclgsaczh8mfq"; + sha256 = "0an1zafz0yhxd9jgd3gzdwmaw5f9vs4c924q56lp2yxxddbmzjcq"; }; patches = [ @@ -41,11 +41,11 @@ in mkDerivation rec { # not supported anyway. "-DUID_MIN=1000" "-DUID_MAX=29999" - ]; - preConfigure = '' - export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/$qtQmlPrefix -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system" - ''; + "-DQT_IMPORTS_DIR=${placeholder "out"}/${qtbase.qtQmlPrefix}" + "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" + "-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system" + ]; postInstall = '' # remove empty scripts diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index cb0aa393380f..91abf2128a84 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,14 +13,14 @@ let sha256Hash = "0fghqkc8pkb7waxclm0qq4nlnsvmv9d3fcj5nnvgbfkjyw032q42"; }; betaVersion = { - version = "3.4.0.13"; # "Android Studio 3.4 Beta 4" - build = "183.5304277"; - sha256Hash = "01x7xba0f5js213wgw0h1vw297vwz5q7dprnilcdydfjxwqsbr8f"; + version = "3.4.0.14"; # "Android Studio 3.4 Beta 5" + build = "183.5310756"; + sha256Hash = "0np8600qvqpw9kcmgp04i1nak1339ck1iidkzr75kigp5rgdl2bq"; }; latestVersion = { # canary & dev - version = "3.5.0.3"; # "Android Studio 3.5 Canary 4" - build = "183.5290690"; - sha256Hash = "0d1cl78b25pksaj0scv3hxb14bjxk3591zbc0v7dykk1gf4pvxd1"; + version = "3.5.0.4"; # "Android Studio 3.5 Canary 5" + build = "183.5320907"; + sha256Hash = "1i56r58kcwrllx3a85dhsz9m0amb7xj9ybqfkdf1a8ipv1hdqs1g"; }; in rec { # Old alias (TODO @primeos: Remove after 19.03 is branched off): diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index e5a71b134f1b..63b322b06abf 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -3,14 +3,14 @@ let versions = { atom = { - version = "1.34.0"; - sha256 = "16hrjymrc43izg7frcrk7cwjwwrclcxzcwb5iw2llzjc6iadzlkb"; + version = "1.36.0"; + sha256 = "1ljg39h5xjigk2njvxyinb1gd3sbja21v47c7va6vl9hjr5xb3fr"; }; atom-beta = { - version = "1.35.0"; + version = "1.37.0"; beta = 0; - sha256 = "0gm5k573dq1hhnyw3719f5k1c6rsz872mhzg8q53n89y0g2r5xmw"; + sha256 = "0aq8r5vfgq7r31qajjgcg4n5a57a2m8fvq6fzy9vq5gawkvmaxxx"; }; }; diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 1c2e3a425782..f78f7fbf9148 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.defaultIconTheme gtk libxml2 + buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2 enchant gucharmap python ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 1065564f7b4c..ce9f10f39c41 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf -, cups, libgcrypt_1_5, systemd, dbus }: +, cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }: with stdenv.lib; let bracketsLibs = makeLibraryPath [ - gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd + gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd libXdamage expat ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 389608ad8249..6ae9eb078e26 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.eclipse.org/; inherit description; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 55bbc778e3ae..3fa46fc4d927 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -11,7 +11,14 @@ assert stdenv ? glibc; # http://download.eclipse.org/eclipse/downloads/ is the main place to # find the downloads needed for new versions -rec { +let + platform_major = "4"; + platform_minor = "10"; + year = "2018"; + month = "12"; + timestamp = "201812060815"; + +in rec { buildEclipse = import ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib @@ -21,133 +28,43 @@ rec { ### Eclipse CPP - eclipse-cpp = eclipse-cpp-47; # always point to latest - - eclipse-cpp-47 = buildEclipse { - name = "eclipse-cpp-4.7.0"; + eclipse-cpp = buildEclipse { + name = "eclipse-cpp-${platform_major}.${platform_minor}"; description = "Eclipse IDE for C/C++ Developers, Oxygen release"; src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk-x86_64.tar.gz; - sha512 = "813c791e739d7d0e2ab242a5bacadca135bbeee20ef97aa830353cd90f63fa6e9c89cfcc6aadf635c742befe035bd6e3f15103013f63c419f6144e86ebde3ed1"; - } - else if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk.tar.gz; - sha512 = "2b50f4a00306a89cda1aaaa606e62285cacbf93464a9dd3f3319dca3e2c578b802e685de6f78e5e617d269e21271188effe73d41f491a6de946e28795d82db8a"; - } - else throw "Unsupported system: ${stdenv.hostPlatform.system}"; + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "1f5yr7cydz4iw8c14yn713d44f1g1wkiqiwmb4ikdfx4l70rc5xxsdxv9b4mhm89b02cqnxdh9p5hivkssmnzg0km3ab5bx9mvzgzx7"; + }; }; - eclipse-cpp-37 = buildEclipse { - name = "eclipse-cpp-3.7"; - description = "Eclipse IDE for C/C++ Developers"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk-x86_64.tar.gz; - sha256 = "14ppc9g9igzvj1pq7jl01vwhzb66nmzbl9wsdl1sf3xnwa9wnqk3"; - } - else - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk.tar.gz; - sha256 = "1cvg1vgyazrkinwzlvlf0dpl197p4784752srqybqylyj5psdi3b"; - }; - }; - eclipse_cpp_37 = eclipse-cpp-37; # backward compatibility, added 2016-01-30 - ### Eclipse Modeling - eclipse-modeling = eclipse-modeling-47; # always point to latest - - eclipse-modeling-47 = buildEclipse { - name = "eclipse-modeling-4.7"; + eclipse-modeling = buildEclipse { + name = "eclipse-modeling-${platform_major}.${platform_minor}"; description = "Eclipse Modeling Tools"; src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk-x86_64.tar.gz; - sha512 = "3b9a7ad4b5d6b77fbdd64e8d323e0adb6c2904763ad042b374b4d87cef8607408cb407e395870fc755d58c0c800e20818adcf456ebe193d76cede16c5fe12271"; - } - else - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk.tar.gz; - sha512 = "b8597c1dec117e69c72a5e1a53e09b1f81a7c9de86ed7e71a9d007664603202df301745f186ded02b2e76410345863e80a2ba40867d6848e5375601289999206"; - }; + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "18psh1lgqg21dmndyc0yr6rz7piqyk861j9mlhgv9xaq8nz11fb6lil594sk64yyv0qbgi98vp03f1p06zvhgs37k9rjkfjmzl7n97k"; + }; }; - eclipse-modeling-36 = buildEclipse { - name = "eclipse-modeling-3.6.2"; - description = "Eclipse Modeling Tools (includes Incubating components)"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk-x86_64.tar.gz; - sha1 = "e96f5f006298f68476f4a15a2be8589158d5cc61"; - } - else - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk.tar.gz; - sha1 = "696377895bb26445de39d82a916b7e69edb1d939"; - }; - }; - eclipse_modeling_36 = eclipse-modeling-36; # backward compatibility, added 2016-01-30 - ### Eclipse Platform - eclipse-platform = eclipse-platform-49; # always point to latest - - eclipse-platform-47 = buildEclipse { - name = "eclipse-platform-4.7.3a"; - description = "Eclipse Platform Oxygen"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz; - sha512 = "caf86cd6efaf66258c75434f1adf552587a7395d57dba4cfd20f86196308cf942866d931f4b352f9d39a6fbf14444fcd2167e6bfd146a28c96c229bb9988156a"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk.tar.gz; - sha512 = "c633da467774e4ab40f8d51d07b8e7d8403f26f23365c3c3ceeaeec1039b8c23c7508cee1f786bf52db64c7b84e0f91cb31a2848a74ac8271f8504934407bd5c"; - }; - }; - }; - - eclipse-platform-48 = buildEclipse { - name = "eclipse-platform-4.8"; - description = "Eclipse Platform Photon"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk-x86_64.tar.gz; - sha512 = "ccce2b954938479e42ef3f9b78f74b24ae4cae7499546fa4f9a55ec1849e1acfd06315d4529b11474a8b3d1142c9409c581edfa571baaf1342ab062f02467af2"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk.tar.gz; - sha512 = "f5f407727e22b848931cf38f71b1a0c30a9778aa227c3df137dcceec2fba2ecc309cbfa8b4a660b814d2edb60f65110381497b4325781cab4d6402784139e32b"; - }; - }; - }; - - eclipse-platform-49 = buildEclipse { - name = "eclipse-platform-4.9"; - description = "Eclipse Platform 2018-09"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-platform-4.9-linux-gtk-x86_64.tar.gz; - sha512 = "875714bb411145c917fccedf2f7c4fd2757640b2debf4a18f775604233abd6f0da893b350cc03da44413d7ec6fae3f773ef08634e632058e4b705e6cda2893eb"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-platform-4.9-linux-gtk.tar.gz; - sha512 = "758bc0de30fa5c4b76b343ea0325611d87b6928ef5002244f2f1ba2a9fa937de89b2a94ce2c8d33d79344fd574d6e8a72c5d127fe416d785f48600e9e85fce86"; - }; - }; + eclipse-platform = buildEclipse { + name = "eclipse-platform-${platform_major}.${platform_minor}"; + description = "Eclipse Platform ${year}-${month}"; + src = + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; + sha512 = "2zdvbjk05a00lbcad9v30rcr93j03d2pycdhpwrvrakr8z4yrxs6svamq9s294ry1w3lw04pgsnqklw6zjx6iil1kp51f374lkfpxn7"; + }; }; ### Eclipse Scala SDK - eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest - - eclipse-scala-sdk-441 = buildEclipse { + eclipse-scala-sdk = buildEclipse { name = "eclipse-scala-sdk-4.4.1"; description = "Eclipse IDE for Scala Developers"; src = @@ -165,88 +82,26 @@ rec { ### Eclipse SDK - eclipse-sdk = eclipse-sdk-49; # always point to latest - - eclipse-sdk-47 = buildEclipse { - name = "eclipse-sdk-4.7.3a"; - description = "Eclipse Oxygen Classic"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk-x86_64.tar.gz; - sha512 = "d77e42aca16d26526cef32e363d038258bb8a4616d9dbe6e76dd3656dc2217369436390a82555bde4566bbbdb631813bbaca08602f7bb885cb30e8a26a14873f"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk.tar.gz; - sha512 = "b0b936fd4142ae86ec5c30535cd5e4caf6fe313d814ae5b16f300635e4163a79b748b1eee11792a135114f2265678a74821ec80c2bfd69872769b6d0ccbcde3a"; - }; - }; + eclipse-sdk = buildEclipse { + name = "eclipse-sdk-${platform_major}.${platform_minor}"; + description = "Eclipse ${year}-${month} Classic"; + src = + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; + sha512 = "1kq14vhzcngfhl8kjs722rshny81gxv6wcgln46x7lnpg2274sb9dprhns62fpq97l0355cmg8mnny6fsd1nqibrw09xq932v86cfm8"; + }; }; - eclipse-sdk-48 = buildEclipse { - name = "eclipse-sdk-4.8"; - description = "Eclipse Photon Classic"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk-x86_64.tar.gz; - sha512 = "357ea9e7f426c68ced693f1c7b76eae23f9e3c7893de1f12d17994ec17b447896b5daa7292d5fbf6d9c4e5b7fd637ca5b2a6ba8ce40a2a7c2fe06f2124d31b75"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk.tar.gz; - sha512 = "c7cae7baa3978d48477090bb9941e85b4c7484021ece9c5c77a7e859e57e5c1f13556262f92b561cfb11f828b934bad7a6018be7b8fd9454e3991e8d5cae9917"; - }; - }; - }; - - eclipse-sdk-49 = buildEclipse { - name = "eclipse-sdk-4.9"; - description = "Eclipse 2018-09 Classic"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-SDK-4.9-linux-gtk-x86_64.tar.gz; - sha512 = "5e74a0411f56b3973b7c6d8c3727392297d55ad458a814b4cc3f2f6a57dbeebc64852d1a6a958db5c3b08c620093bfb5bcc0d2c6a400f5594b82c2ef5d5fa9fb"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-SDK-4.9-linux-gtk.tar.gz; - sha512 = "b1861bd99c8e43f1d04247226584246aa7844af5e2da820fe98a51018dbe8ff4c25dbb9fa655f56e103f95c0696f40a65dcce13430c63aa080f786738e70eb8b"; - }; - }; - }; - - eclipse-sdk-37 = buildEclipse { - name = "eclipse-sdk-3.7"; - description = "Eclipse Classic"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk-x86_64.tar.gz; - sha256 = "0nf4nv7awhp1k8b1hjb7chpjyjrqnyszsjbc4dlk9phpjv3j4wg5"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk.tar.gz; - sha256 = "1isn7i45l9kyn2yx6vm88jl1gnxph8ynank0aaa218cg8kdygk7j"; - }; - }; - }; - eclipse_sdk_37 = eclipse-sdk-37; # backward compatibility, added 2016-01-30 - ### Eclipse Java - eclipse-java = eclipse-java-49; - - eclipse-java-49 = buildEclipse { - name = "eclipse-java-4.9.0"; + eclipse-java = buildEclipse { + name = "eclipse-java-${platform_major}.${platform_minor}"; description = "Eclipse IDE for Java Developers"; src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/2018-09/R/eclipse-java-2018-09-linux-gtk-x86_64.tar.gz; - sha512 = "9dac5d040cdabf779de3996de87290e352130c7e860c1d0a98772f41da828ad45f90748b68e0a8a4f8d1ebbbbe5fdfe6401b7d871b93af34103d4a81a041c6a5"; - } - else if stdenv.system == "i686-linux" then - fetchurl { - url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/2018-09/R/eclipse-java-2018-09-linux-gtk.tar.gz; - sha512 = "24208e95b972e848d6b65ed8108d9e81584cf051397f2f43fb6269f5a625b8d7552ad77c7980a1a5653c87f06776e2926fd85607aae44e44657b4f6cc9b3e2e3"; - } - else throw "Unsupported system: ${stdenv.system}"; + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "2xd5q7kg3aly7jnz2fijn06ljmnnd7ggwwzmndfhqwfzxpyjg1lnlln76pcd6chx7gnwdrl7khg0fs566ddabfjv17c46dj5fpw9y6j"; + }; }; ### Environments diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 8a5991cc7cd7..4dc4aebe8fd9 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -254,12 +254,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; - version = "9.0.1"; + version = "9.6.0"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.0/${name}.zip"; - sha256 = "0vdx0j9ci533wnk7y17qjvjyqx38hlrdw67z6pi05vfv3r6ys39x"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.6/${name}/${name}.zip"; + sha256 = "08rk3b1va57jcy4s161fx0xmb8dn47akhhxd2f28hspq6i2jqicm"; }; meta = with stdenv.lib; { @@ -497,12 +497,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.9"; + version = "4.10"; src = fetchzip { stripRoot = false; - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/org.eclipse.jdt-4.9.zip; - sha256 = "144rqrw0crxd2v862dqxm2p5y60n4pbzdryv709xnhcw54rycm7n"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.10-201812060815/org.eclipse.jdt-4.10.zip; + sha256 = "1h11w3zd6xy5w4sk6xnyb2a27wxwhp83qfx67ji7bzdrwbvljqkz"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix index 091635feda6f..b8c61bb97af6 100644 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ chaoflow ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ]; + 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 884d1724ef8d..17cf213a799d 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -2,28 +2,28 @@ let modules = [ - { name = "icicles.el"; sha256 = "0wxak7wh0rrb3h77ay2vypbb53skcfbrv71xkajhax0w12q6zpaj"; } - { name = "icicles-chg.el"; sha256 = "0qavq9vy566l3qi9n8akrqjcgy8n6k0j8d7vsc7p1jhqvvq812gh"; } - { name = "icicles-cmd1.el"; sha256 = "0lgk6ngl9090iqvvw1c227q7p37mr73cc6ap3ky6b0nv3ql8rkyi"; } - { name = "icicles-cmd2.el"; sha256 = "15swxk7fr7wsqpf26xzbvyk12ikkvfcyh9w8wmnpc38dmpyq79rb"; } + { name = "icicles.el"; sha256 = "1744n5g2kmv3r261ipa0fhrgnapl0chxz57bbbls3bp30cnnfrs7"; } + { name = "icicles-chg.el"; sha256 = "058sxa8wh3vqr3zy677q6m2lfx4n477rnb8921s1p6wgs55v7dp4"; } + { name = "icicles-cmd1.el"; sha256 = "064hyy8nxvlg298s5qnmk7aczbasfpddhx57jxaldyyzkca3n2h5"; } + { name = "icicles-cmd2.el"; sha256 = "0a77fx0pxyfrg9nxvqvzz247v6cljjfz9dnfs7lc8qgdvksxs261"; } { name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; } { name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; } { name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; } - { name = "icicles-fn.el"; sha256 = "05v7sc2k2mjm1mbnlkpi01aaxnxnb40540y7g70dg534scjd7w36"; } - { name = "icicles-mac.el"; sha256 = "0nhbwswz6xz7q4g8flszgx12q4gi4nx1d3n4jgz6svr2kk2vmlb4"; } - { name = "icicles-mcmd.el"; sha256 = "05dniz6337v9r15w8r2zad0n2h6jlygzjp7vw75vvq8mds0acmia"; } + { name = "icicles-fn.el"; sha256 = "02vwa9dx9393d7kxrf443r1lj7y9ihkh25cmd418pwfgmw2yd5s7"; } + { name = "icicles-mac.el"; sha256 = "13nxgg9k5w39lga90jwn1c7v756dqlfln2qh312vfaxfjfijfv9r"; } + { name = "icicles-mcmd.el"; sha256 = "17d4zlf3r09wmarwyc1cbjv0pyklg4cdhwh3h643d4v8mhs5hnil"; } { name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; } - { name = "icicles-opt.el"; sha256 = "10n4p999ylkapirs75y5fh33lpiyx42i3ajzl2zjfwyr1zksg1iz"; } - { name = "icicles-var.el"; sha256 = "1r5gb01zg8nf2qryq9saxfpnzlymmppsk7w1g09lac35c87vh8yl"; } + { name = "icicles-opt.el"; sha256 = "154mgcd1ksnmlyb4ijy2njqq75i8cj4k47phplxsi648pzqnda77"; } + { name = "icicles-var.el"; sha256 = "0f94299q1z0va4v1s5ijpksaqlaz88ay1qbmlzq0i2wnxnsliys8"; } ]; forAll = f: map f modules; in stdenv.mkDerivation rec { - version = "2018-07-02"; + version = "2019-02-22"; name = "icicles-${version}"; - srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); + srcs = forAll ({name, sha256}: fetchurl { url = "https://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); buildInputs = [ emacs ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/"; meta = { - homepage = http://www.emacswiki.org/emacs/Icicles; + homepage = https://www.emacswiki.org/emacs/Icicles; description = "Enhance Emacs minibuffer input with cycling and powerful completion"; license = stdenv.lib.licenses.gpl2Plus; platforms = emacs.meta.platforms; diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index bfc6c26ea09a..636e24464f87 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -60583,7 +60583,7 @@ owner = "immerrr"; repo = "lua-mode"; rev = "99312b8d6c500ba3067da6d81efcfbbea05a1cbd"; - sha256 = "04m9njcpdmar3njjz4x2qq26xk0k6qprcfzx8whlmvapqf8w19iz"; + sha256 = "1gi8k2yydwm1knq4pgmn6dp92g97av4ncb6acrnz07iba2r34dyn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -107584,4 +107584,4 @@ license = lib.licenses.free; }; }) {}; - } \ No newline at end of file + } diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index 99ecddcb2648..a8250ead7b48 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; + maintainers = with stdenv.lib.maintainers; [ pSub ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix index d9f0b211f159..852faeb7918b 100644 --- a/pkgs/applications/editors/emacs/25.nix +++ b/pkgs/applications/editors/emacs/25.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { description = "The extensible, customizable GNU text editor"; homepage = https://www.gnu.org/software/emacs/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ]; + maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 4a48cde571ae..0d13bb516961 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, libXcursor -, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif +{ stdenv, lib, fetchpatch, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm +, Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO, m17n_lib, libotf , systemd ? null @@ -43,6 +43,13 @@ stdenv.mkDerivation rec { patches = [ ./clean-env.patch ./tramp-detect-wrapped-gvfsd.patch + + # should drop this at next package update + (fetchpatch { + name = "support-hunspell-1.7.0-in-ispell.el.patch"; + url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=2925ce5a7ec1424cfaea9f2f86bd3cab27832584"; + sha256 = "0w7cgw6zgr7phbivb98innps1rlqf5q2lhwkrwdmai8sbca5bd11"; + }) ]; postPatch = lib.optionalString srcRepo '' @@ -133,7 +140,7 @@ stdenv.mkDerivation rec { description = "The extensible, customizable GNU text editor"; homepage = https://www.gnu.org/software/emacs/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ]; + maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index f656f874151a..ce553fa8b288 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "focuswriter-${version}"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "0ny0bri9yp6wcsj9s8vd0j4mzx44yw57axjx5piv44q2jgsgz401"; + sha256 = "1qsfcrscm3s0h7wcl6qn8zi0irr70zdacjxsdk73kpk1dhl2j85k"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 71d0f9450f2d..ff6439c8654e 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wrapGAppsHook +{ stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: let version = "3.30.2"; @@ -21,9 +21,9 @@ in stdenv.mkDerivation { intltool ]; - buildInputs = with gnome3; [ + buildInputs = [ amtk - defaultIconTheme + gnome3.adwaita-icon-theme glib gsettings-desktop-schemas gspell diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 08a8b28117e7..34f4eadc737b 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.3.4"; /* updated by script */ + version = "2019.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 = "1zglpw9vc3ybdmwymi0c2m6anhcmx9jcqi69gnn06n9f4x1v6gwn"; /* updated by script */ + sha256 = "1rlqnnv6b7lg18si31zd97ixnslwp8j6imkkjq0j5n9sydsr8xzj"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2018.3.2"; /* updated by script */ + version = "2018.3.4"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0vj1cgmg33626i38x9wmh5hqr1lf0x3m23gzq30rp4q4cbi38806"; /* updated by script */ + sha256 = "10sw41kkf2k60xjpwgc73i182y7px3dmqz2awnrl4gffdb9jgzmy"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2019.1"; /* 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 = "065z8084xkv6w8m7pq98rgls1avzrqm23mrxdq5172rs5p1c5r9f"; /* updated by script */ + sha256 = "0aq3x5aixh86h1zvvwrbr2f1nnqdpfvlsadd2ckmf5s5kghvg5r9"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.3.4"; /* updated by script */ + version = "2019.1"; /* 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 = "0j5yc7n04jlyyghmwllpfvcd2g6k1syjp07xb1ljyx7rm4jcf8q6"; /* updated by script */ + sha256 = "0zyw88dd2v4igp080l99cyq6h0bmyri8a50fjp69ripiz9qaawx1"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.3.4"; /* updated by script */ + version = "2019.1"; /* 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 = "0s3r3h1zcwkfqhsfb224fgy62fdhnd4gjgk2h6pyhq1frnh3x5bg"; /* updated by script */ + url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; + sha256 = "0fsdf090cwwrsq3azknc9rpwwsl71cvsx4flivnqwfakb6rh4f1j"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2019.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 = "0znhw83h46a3haspwcin5xjf3ask8ijxla778p9vdbi9xs0zqx39"; /* updated by script */ + sha256 = "1bv2a16wsc9j82w14qfrfjgszwkihk0jwp8bp8z9618q04c8vmgf"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.3.4"; /* updated by script */ + version = "2019.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "11kzzwkp206l466ii6vm6iqmhpx0s594vh37x2lwwsgmg6qzz6vq"; /* updated by script */ + sha256 = "173qm2g6pjga2jlw8sa59bxw543b56r56ikqwv2wp0jq5z61v26f"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -341,12 +341,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.3.4"; /* updated by script */ + version = "2019.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1m8lzghs6g57fwcv6bpmnf21d4w2k10gsmi0i2wv2j8ff4hcy7ij"; /* updated by script */ + sha256 = "0gjphdzdxgvflkzaakf3c1wnig86lxhxyx6xk6rg40yj6f2hzi47"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -354,12 +354,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2018.3.2"; /* updated by script */ + version = "2018.3.4"; /* 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/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1ffzbp2xca2z8g0wlkvmqr0j2f2dnqafpnvzk9zd5asfhhbyrhg5"; /* updated by script */ + sha256 = "1klmg8wgj3shp4s0n2nn7n39zsk1mch6g9ifhwn5cgywpbzgam4p"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2018.3.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 = "1zjcdsr91y07dhqmhqy2yq6c0rhsxg2m52fz14hhmphddlwvhzny"; /* updated by script */ + sha256 = "1gykag8fsfqxv0d6fipn18hhpdvn4qxva2kkb0v330vp73wm2i2w"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.3.4"; /* updated by script */ + version = "2019.1"; /* 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 = "11l39yy8qdrr89y9x3i9acp0am4xb86z6v7wg1kc9fd5p13jr2xs"; /* updated by script */ + sha256 = "0r6a9g8ydnxf805gn2wajnwkcyfn0xksbsrs8wq6j4ghipkhscxj"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 532bb99e7d8e..6fd8cb4726d6 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -1,15 +1,12 @@ { stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: -let - pname = "kdev-php"; - version = "5.3.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "kdev-php"; + version = "5.3.3"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1xiz4v6w30dsa7l4nk3jw3hxpkx71b0yaaj2k8s7xzgjif824bgl"; + sha256 = "0nn3yfbi60h7p7p1w2pvgg098qplbds79rk2iadyvhvl3sjd77wf"; }; cmakeFlags = [ @@ -23,7 +20,7 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; description = "PHP support for KDevelop"; - homepage = https://www.kdevelop.org; + homepage = "https://www.kdevelop.org"; license = [ licenses.gpl2 ]; }; } diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index be27e10f42a1..45f1d7432839 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -1,15 +1,12 @@ { stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: -let - pname = "kdev-python"; - version = "5.3.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "kdev-python"; + version = "5.3.3"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "11hf8n6vrlaz31c0p3xbnf0df2q5j6ykgc9ip0l5g33kadwn5b9j"; + sha256 = "0bqsny2jgi6wi1cz65i2j9r1hiwna2x10mzy7vdk8bz7b4z766yg"; }; cmakeFlags = [ @@ -24,7 +21,7 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; description = "Python support for KDevelop"; - homepage = https://www.kdevelop.org; + homepage = "https://www.kdevelop.org"; license = [ licenses.gpl2 ]; }; } diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 98154b4a5eb5..3913b2b19940 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -8,16 +8,15 @@ }: let - pname = "kdevelop"; - version = "5.3.1"; qtVersion = "5.${lib.versions.minor qtbase.version}"; in mkDerivation rec { - name = "${pname}-${version}"; + pname = "kdevelop"; + version = "5.3.3"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1098ra7qpal6578hsv20kvxc63v47sp85wjhqr5rgzr2fm7jf6fr"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; + sha256 = "0778587qvi268ab2fgggfl40cv2swgr8q891q1paflp3m1xirpff"; }; nativeBuildInputs = [ @@ -76,7 +75,7 @@ mkDerivation rec { programing languages. It is based on KDevPlatform, KDE and Qt libraries and is under development since 1998. ''; - homepage = https://www.kdevelop.org; + homepage = "https://www.kdevelop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; }; } diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index ee7a79517850..9f67fde8c41c 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv +{ stdenv, fetchFromGitHub, fetchpatch, cmake, gettext, msgpack, libtermkey, libiconv , libuv, lua, ncurses, pkgconfig , unibilium, xsel, gperf , libvterm-neovim @@ -35,6 +35,13 @@ in # necessary so that nix can handle `UpdateRemotePlugins` for the plugins # it installs. See https://github.com/neovim/neovim/issues/9413. ./system_rplugin_manifest.patch + + # Arbitrary code execution fix + # https://github.com/numirias/security/blob/cf4f74e0c6c6e4bbd6b59823aa1b85fa913e26eb/doc/2019-06-04_ace-vim-neovim.md + (fetchpatch { + url = "https://github.com/neovim/neovim/pull/10082.patch"; + sha256 = "0g4knlpaabbq6acqgqm765b1knqv981nk2gf84fmknqnv4sgbsq2"; + }) ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index a95ced76371d..6a3f581c4e81 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,10 +1,10 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.2.4) + msgpack (1.2.6) multi_json (1.13.1) - neovim (0.7.0) - msgpack (~> 1.0) + neovim (0.8.0) + msgpack (~> 1.1) multi_json (~> 1.0) PLATFORMS @@ -14,4 +14,4 @@ DEPENDENCIES neovim BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index af887161ea6c..28a53cc590f6 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -2,10 +2,10 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.6"; }; multi_json = { source = { @@ -19,9 +19,9 @@ dependencies = ["msgpack" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b487dzz41im8cwzvfjqgf8kkrp6mpkvcbzhazrmqqw8gxyvfbq4"; + sha256 = "07scrdfk7pyn5jgx5m2yajdqpbdv42833vbw568qqag6xp99j3yk"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.0"; }; } diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 9edac16507c4..82bcc403164c 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -1,39 +1,36 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, meson, ninja, python3 , gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon -, gnome3, discount, gobject-introspection, wrapGAppsHook }: +, libgee, discount, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "quilter"; - version = "1.6.8"; - - name = "${pname}-${version}"; + version = "1.7.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "07i9pivpddgixn1wzbr15gvzf0n5pklx0gkjjaa35kvj2z8k31x5"; + sha256 = "0dqji6zwpn0k89mpmh10rq59hzrq8kqr30dz1hp06ygk8rlnv2ys"; }; nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja + pantheon.vala pkgconfig python3 - pantheon.vala wrapGAppsHook ]; buildInputs = [ discount - pantheon.elementary-icon-theme - pantheon.granite - gnome3.libgee gtk3 gtksourceview gtkspell3 + libgee + pantheon.elementary-icon-theme + pantheon.granite webkitgtk ]; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 0787250fecea..454b7ad554ba 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,7 +1,7 @@ -{ stdenv, appimage-run, fetchurl }: +{ stdenv, appimage-run, fetchurl, runtimeShell }: let - version = "2.3.12"; + version = "3.0.6"; plat = { "i386-linux" = "i386"; @@ -9,8 +9,8 @@ let }.${stdenv.hostPlatform.system}; sha256 = { - "i386-linux" = "0q7izk20r14kxn3n4pn92jgnynfnlnylg55brz8n1lqxc0dc3v24"; - "x86_64-linux" = "0myg4qv0vrwh8s9sckb12ld9f86ymx4yypvpy0w5qn1bxk5hbafc"; + "i386-linux" = "0czhlbacjks9x8y2w46nzlvk595psqhqw0vl0bvsq7sz768dk0ni"; + "x86_64-linux" = "0haji9h8rrm9yvqdv6i2y6xdd0yhsssjjj83hmf6cb868lwyigsf"; }.${stdenv.hostPlatform.system}; in @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{bin,share} cp $src $out/share/standardNotes.AppImage - echo "#!${stdenv.shell}" > $out/bin/standardnotes + echo "#!${runtimeShell}" > $out/bin/standardnotes echo "${appimage-run}/bin/appimage-run $out/share/standardNotes.AppImage" >> $out/bin/standardnotes chmod +x $out/bin/standardnotes $out/share/standardNotes.AppImage ''; diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 71bd3544febb..937764f0ab8b 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -1,6 +1,6 @@ {buildVersion, x32sha256, x64sha256}: -{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, +{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, runtimeShell, pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, gksuSupport ? false, gksu, unzip, zip, bash}: @@ -115,7 +115,7 @@ in stdenv.mkDerivation (rec { mkdir -p $out/bin cat > $out/bin/subl <<-EOF - #!${stdenv.shell} + #!${runtimeShell} exec $sublime/sublime_text "\$@" EOF chmod +x $out/bin/subl diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index ebd7c77f678c..deb4974a9b14 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -1,32 +1,44 @@ -{ stdenv, fetchurl, makeWrapper, electron_3, dpkg, gtk3, glib, gnome3, wrapGAppsHook }: +{ stdenv, fetchurl, makeWrapper, electron_3, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "typora"; - version = "0.9.64"; + version = "0.9.68"; src = fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "0dffydc11ys2i38gdy8080ph1xlbbzhcdcc06hyfv0dr0nf58a09"; + sha256 = "09hkmnh9avzb7nc8i67vhbv6nc1v90kk88aq01mpmyibpdqp03zp"; }; - nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ + dpkg + makeWrapper + wrapGAppsHook + ]; - buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas ]; + buildInputs = [ + glib + gsettings-desktop-schemas + gtk3 + ]; unpackPhase = "dpkg-deb -x $src ."; dontWrapGApps = true; installPhase = '' - mkdir -p $out/bin $out/share/typora + runHook preInstall + + mkdir -p $out/bin $out/share { cd usr - mv share/typora/resources/app/* $out/share/typora - mv share/applications $out/share - mv share/icons $out/share - mv share/doc $out/share + mv share/typora/resources/app $out/share/typora + mv share/{applications,icons,doc} $out/share/ } + runHook postInstall + ''; + + postFixup = '' makeWrapper ${electron_3}/bin/electron $out/bin/typora \ --add-flags $out/share/typora \ "''${gappsWrapperArgs[@]}" \ @@ -37,7 +49,7 @@ stdenv.mkDerivation rec { description = "A minimal Markdown reading & writing app"; homepage = https://typora.io; license = licenses.unfree; - maintainers = with maintainers; [ jensbin ]; + maintainers = with maintainers; [ jensbin worldofpeace ]; inherit (electron_3.meta) platforms; }; } diff --git a/pkgs/applications/editors/vim/0001-source-command-doesnt-check-for-the-sandbox-5357552.patch b/pkgs/applications/editors/vim/0001-source-command-doesnt-check-for-the-sandbox-5357552.patch new file mode 100644 index 000000000000..06d9971de9e4 --- /dev/null +++ b/pkgs/applications/editors/vim/0001-source-command-doesnt-check-for-the-sandbox-5357552.patch @@ -0,0 +1,31 @@ +From 53575521406739cf20bbe4e384d88e7dca11f040 Mon Sep 17 00:00:00 2001 +From: Bram Moolenaar +Date: Wed, 22 May 2019 22:38:25 +0200 +Subject: [PATCH] patch 8.1.1365: source command doesn't check for the sandbox + +Problem: Source command doesn't check for the sandbox. (Armin Razmjou) +Solution: Check for the sandbox when sourcing a file. +--- + src/getchar.c | 6 ++++++ + src/testdir/test_source.vim | 9 +++++++++ + src/version.c | 2 ++ + 3 files changed, 17 insertions(+) + +diff --git a/src/getchar.c b/src/getchar.c +index 9379a6a8d4..debad7efd2 100644 +--- a/src/getchar.c ++++ b/src/getchar.c +@@ -1407,6 +1407,12 @@ openscript( + emsg(_(e_nesting)); + return; + } ++ ++ // Disallow sourcing a file in the sandbox, the commands would be executed ++ // later, possibly outside of the sandbox. ++ if (check_secure()) ++ return; ++ + #ifdef FEAT_EVAL + if (ignore_script) + /* Not reading from script, also don't open one. Warning message? */ +diff --git a/src/testdir/test_source.vim b/src/testdir/test_source.vim diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index e0ac32c54ec5..6c5a21be40f6 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -13,6 +13,12 @@ rec { hardeningDisable = [ "fortify" ]; + patches = [ + # Arbitrary code execution fix + # https://github.com/numirias/security/blob/cf4f74e0c6c6e4bbd6b59823aa1b85fa913e26eb/doc/2019-06-04_ace-vim-neovim.md + ./0001-source-command-doesnt-check-for-the-sandbox-5357552.patch + ]; + postPatch = # Use man from $PATH; escape sequences are still problematic. '' diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 7ee28adfa47f..64930cb2b0e0 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -7,6 +7,7 @@ , vimPlugins , makeWrapper , wrapGAppsHook +, runtimeShell # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private @@ -75,7 +76,9 @@ in stdenv.mkDerivation rec { "default" = common.src; # latest release }; - patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch; + patches = common.patches or [] + ++ [ ./cflags-prune.diff ] + ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch; configureFlags = [ "--enable-gui=${guiSupport}" @@ -157,22 +160,22 @@ in stdenv.mkDerivation rec { rewrap () { rm -f "$out/bin/$1" - echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1" + echo -e '#!${runtimeShell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1" chmod a+x "$out/bin/$1" } - rewrap ex -e - rewrap view -R - rewrap gvim -g - rewrap gex -eg - rewrap gview -Rg - rewrap rvim -Z - rewrap rview -RZ - rewrap rgvim -gZ + rewrap ex -e + rewrap view -R + rewrap gvim -g + rewrap gex -eg + rewrap gview -Rg + rewrap rvim -Z + rewrap rview -RZ + rewrap rgvim -gZ rewrap rgview -RgZ rewrap evim -y rewrap eview -yR - rewrap vimdiff -d + rewrap vimdiff -d rewrap gvimdiff -gd ''; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 2f34a6ddeb6b..b448c7057f94 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { name = "vim-${version}"; - inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; + inherit (common) version src patches postPatch hardeningDisable enableParallelBuilding meta; nativeBuildInputs = [ gettext pkgconfig ]; buildInputs = [ ncurses ] diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/generic.nix similarity index 63% rename from pkgs/applications/editors/vscode/default.nix rename to pkgs/applications/editors/vscode/generic.nix index 78d7d96d3961..10a981f59bfe 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -2,38 +2,18 @@ , unzip, libsecret, libXScrnSaver, wrapGAppsHook , gtk2, atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig -, isInsiders ? false }: + +# Attributes inherit from specific versions +, version, src, meta, sourceRoot +, executableName, longName, shortName, pname +}: let - executableName = "code" + lib.optionalString isInsiders "-insiders"; - longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; - shortName = "Code" + lib.optionalString isInsiders " - Insiders"; - inherit (stdenv.hostPlatform) system; - - plat = { - "i686-linux" = "linux-ia32"; - "x86_64-linux" = "linux-x64"; - "x86_64-darwin" = "darwin"; - }.${system}; - - sha256 = { - "i686-linux" = "04kbx1cx40lsy9irxy1arp1rixzk49ldhg34w3llmfbx63a4hchf"; - "x86_64-linux" = "1plvx0mjcbizl6iffib95p5224r9frf0mn6c5xp14p3qnrp32jhm"; - "x86_64-darwin" = "14h9gs6jpxydgd1h16ybq3ifw5jc7k83yg22pw3sk6vhy7hx7pxr"; - }.${system}; - - archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; in stdenv.mkDerivation rec { - name = "vscode-${version}"; - version = "1.31.1"; - src = fetchurl { - name = "VSCode_${version}_${plat}.${archive_fmt}"; - url = "https://vscode-update.azurewebsites.net/${version}/${plat}/stable"; - inherit sha256; - }; + inherit pname version src sourceRoot; passthru = { inherit executableName; @@ -108,28 +88,15 @@ in mkdir -p $out/share/pixmaps cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png + + # Override the previously determined VSCODE_PATH with the one we know to be correct + sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName} + grep -q "VSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName} # check if sed succeeded ''; preFixup = lib.optionalString (system == "i686-linux" || system == "x86_64-linux") '' gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ systemd fontconfig ]}) ''; - meta = with stdenv.lib; { - description = '' - Open source source code editor developed by Microsoft for Windows, - Linux and macOS - ''; - longDescription = '' - Open source source code editor developed by Microsoft for Windows, - 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 - ''; - homepage = https://code.visualstudio.com/; - downloadPage = https://code.visualstudio.com/Updates; - license = licenses.unfree; - maintainers = with maintainers; [ eadwu ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - }; + inherit meta; } diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix new file mode 100644 index 000000000000..902ff6c389dc --- /dev/null +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -0,0 +1,55 @@ +{ stdenv, lib, callPackage, fetchurl, fetchpatch, isInsiders ? false }: + +let + inherit (stdenv.hostPlatform) system; + + plat = { + "i686-linux" = "linux-ia32"; + "x86_64-linux" = "linux-x64"; + "x86_64-darwin" = "darwin"; + }.${system}; + + archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; + + sha256 = { + "i686-linux" = "0345pxad3fkcmn5z2r55fnvx8ybvfpwydxv2h21rd99grhwh8dk4"; + "x86_64-linux" = "1g6cib1c9mikg8cv940xk5g8dh0q5v6vlrgj78rr161hz1lrrv09"; + "x86_64-darwin" = "0krihhr57hnsc9qc1l2ncg70vz7nmrvlqrjbgdnihlrpf71d09hp"; + }.${system}; +in + callPackage ./generic.nix rec { + + version = "1.35.1"; + pname = "vscode"; + + executableName = "code" + lib.optionalString isInsiders "-insiders"; + longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; + shortName = "Code" + lib.optionalString isInsiders " - Insiders"; + + src = fetchurl { + name = "VSCode_${version}_${plat}.${archive_fmt}"; + url = "https://vscode-update.azurewebsites.net/${version}/${plat}/stable"; + inherit sha256; + }; + + sourceRoot = ""; + + meta = with stdenv.lib; { + description = '' + Open source source code editor developed by Microsoft for Windows, + Linux and macOS + ''; + longDescription = '' + Open source source code editor developed by Microsoft for Windows, + 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 + ''; + homepage = https://code.visualstudio.com/; + downloadPage = https://code.visualstudio.com/Updates; + license = licenses.unfree; + maintainers = with maintainers; [ eadwu synthetica ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + }; + } diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix new file mode 100644 index 000000000000..4d4316e43f72 --- /dev/null +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, callPackage, fetchurl, fetchpatch }: + +let + inherit (stdenv.hostPlatform) system; + + plat = { + "i686-linux" = "linux-ia32"; + "x86_64-linux" = "linux-x64"; + "x86_64-darwin" = "darwin"; + }.${system}; + + archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; + + sha256 = { + "i686-linux" = "0i572kxc7h63jxl6mw5k3gv08m9padqkky5k1f3w0d638hxhfl23"; + "x86_64-linux" = "0577lqpfrjgwbj27hm59kflb558mkl2nx00ys0hwndayqv0bfnvg"; + "x86_64-darwin" = "047sj0j9k74fvw9fc1ripqk2vy4v17jw488m7r95nf0cyyk08xg0"; + }.${system}; +in + callPackage ./generic.nix rec { + + version = "1.35.1"; + pname = "vscodium"; + + executableName = "codium"; + longName = "VSCodium"; + shortName = "Codium"; + + src = fetchurl { + url = "https://github.com/VSCodium/vscodium/releases/download/${version}/VSCodium-${plat}-${version}.${archive_fmt}"; + inherit sha256; + }; + + sourceRoot = "."; + + meta = with stdenv.lib; { + description = '' + Open source source code editor developed by Microsoft for Windows, + Linux and macOS (VS Code without MS branding/telemetry/licensing) + ''; + longDescription = '' + Open source source code editor developed by Microsoft for Windows, + 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 + ''; + homepage = https://github.com/VSCodium/vscodium; + downloadPage = https://github.com/VSCodium/vscodium/releases; + license = licenses.mit; + maintainers = with maintainers; []; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + }; + } diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 61061a6d6721..0c76a489f13b 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,94 +1,27 @@ -{ stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl -, qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper -, qjson, qca2, txt2tags, openssl, darwin, pkgconfig -, withGrass ? true, grass, saga, IOKit, ApplicationServices +{ stdenv, lib, makeWrapper, symlinkJoin +, qgis-unwrapped, extraPythonPackages ? (ps: [ ]) }: +with lib; +symlinkJoin rec { + inherit (qgis-unwrapped) version; + name = "qgis-${version}"; -stdenv.mkDerivation rec { - name = "qgis-2.18.28"; + paths = [ qgis-unwrapped ]; - buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla - fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig - saga ] - ++ - (stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]) - ++ - (stdenv.lib.optional withGrass grass) ++ - (stdenv.lib.optional (stdenv.isDarwin && withGrass) darwin.apple_sdk.libs.utmp) ++ - (with python2Packages; [ jinja2 numpy psycopg2 pygments requests python2Packages.qscintilla sip ]); + nativeBuildInputs = [ makeWrapper qgis-unwrapped.python3Packages.wrapPython ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + # extend to add to the python environment of QGIS without rebuilding QGIS application. + pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.python3Packages); - # `make -f src/providers/wms/CMakeFiles/wmsprovider_a.dir/build.make src/providers/wms/CMakeFiles/wmsprovider_a.dir/qgswmssourceselect.cpp.o`: - # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory - enableParallelBuilding = false; + postBuild = '' + # unpackPhase - preConfigure = '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libspatialindex)" + buildPythonPath "$pythonInputs" + + wrapProgram $out/bin/qgis \ + --prefix PATH : $program_PATH \ + --set PYTHONPATH $program_PYTHONPATH ''; - # To handle the lack of 'local' RPATH; required, as they call one of - # their built binaries requiring their libs, in the build process. - preBuild = '' - export LD_LIBRARY_PATH=`pwd`/output/lib:${stdenv.lib.makeLibraryPath [ openssl ]}:$LD_LIBRARY_PATH - ''; - - src = fetchurl { - url = "https://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "18pijqls1isd2bpg0mkrw07jqvdfaiwwb9mvz7p2xrgqcjx7dxsq"; - }; - - patches = [ - # already merged upstream in QGIS-3.*, but needs to be backported to QGIS-2 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/qgis/QGIS/pull/7263.patch"; - name = "Ensure_qgis.db_is_writable_when_copied_from_RO_source"; - sha256 = "19wr2kz0x8x6p2n0ylzd4lqrdmbkxyxr0zpwf2vl9hdp92rdjxbv"; - }) - ]; - - # CMAKE_FIND_FRAMEWORK=never stops the installer choosing system - # installed frameworks - # QGIS_MACAPP_BUNDLE=0 stops the installer copying the Qt binaries into the - # installation which causes havoc - # Building RelWithDebInfo allows QGIS_DEBUG to print debugging information - cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}" - ++ stdenv.lib.optional stdenv.isDarwin - (["-DCMAKE_FIND_FRAMEWORK=never"] - ++ ["-DQGIS_MACAPP_BUNDLE=0"]); -# ++ ["-DCMAKE_BUILD_TYPE=RelWithDebInfo"]; - - - - postInstall = - (stdenv.lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/qgis \ - --set PYTHONPATH $PYTHONPATH \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} - '') + - (stdenv.lib.optionalString stdenv.isDarwin '' - # Necessary for QGIS to find the correct default GRASS path - # Plugins look for gdal tools like deminfo on the PATH - ${stdenv.lib.optionalString withGrass "ln -sf ${grass} $out/QGIS.app/Contents/MacOS/grass"} - # Necessary for QGIS to find the right SAGA installation - ln -sf ${saga}/bin/saga_cmd $out/QGIS.app/Contents/MacOS/bin/saga_cmd - for file in $(find $out -type f -name "QGIS"); do - wrapProgram "$file" \ - --prefix DYLD_LIBRARY_PATH : "${qwt}/lib" \ - --prefix DYLD_LIBRARY_PATH : "${qscintilla}/lib" \ - --prefix PATH : "${gdal}/bin" \ - ${stdenv.lib.optionalString withGrass "--prefix PATH : ${grass}/bin"} \ - --set PYTHONPATH $PYTHONPATH - done - mkdir -p $out/bin - ln -s $out/QGIS.app/Contents/MacOS/QGIS $out/bin/qgis - ''); - - meta = { - description = "User friendly Open Source Geographic Information System"; - homepage = http://www.qgis.org; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; unix; - maintainers = with stdenv.lib.maintainers; [mpickering]; - }; + meta = qgis-unwrapped.meta; } diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix new file mode 100644 index 000000000000..be67b1c3a802 --- /dev/null +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchurl, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl +, qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql +, txt2tags, openssl, libzip, hdf5, netcdf +, qtbase, qtwebkit, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns +, withGrass ? true, grass +}: +with lib; +let + pythonBuildInputs = with python3Packages; + [ qscintilla-qt5 gdal jinja2 numpy psycopg2 + chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; +in stdenv.mkDerivation rec { + version = "3.4.10"; + name = "qgis-unwrapped-${version}"; + + src = fetchurl { + url = "http://qgis.org/downloads/qgis-${version}.tar.bz2"; + sha256 = "1pmy4b0bc2dvi8dwhsrym7h15lhzzw5mxgdbpnzhqw7gljhy0vmw"; + }; + + passthru = { + inherit pythonBuildInputs; + inherit python3Packages; + }; + + buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt + fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf + qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++ + (stdenv.lib.optional withGrass grass) ++ pythonBuildInputs; + + nativeBuildInputs = [ cmake flex bison ninja ]; + + # Force this pyqt_sip_dir variable to point to the sip dir in PyQt5 + # + # TODO: Correct PyQt5 to provide the expected directory and fix + # build to use PYQT5_SIP_DIR consistently. + postPatch = '' + substituteInPlace cmake/FindPyQt5.py \ + --replace 'pyqtcfg.pyqt_sip_dir' '"${python3Packages.pyqt5}/share/sip/PyQt5"' + ''; + + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5" + "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ] ++ + stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; + + meta = { + description = "A Free and Open Source Geographic Information System"; + homepage = http://www.qgis.org; + license = stdenv.lib.licenses.gpl2Plus; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ lsix ]; + }; +} diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 30223658f535..09664889f35b 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre}: +{ stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { name = "alchemy-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share cp -a . $out/share/alchemy cat >> $out/bin/alchemy << EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/alchemy ${jre}/bin/java -jar Alchemy.jar "$@" EOF diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 2e7435b48bbb..0257a109568e 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -4,19 +4,19 @@ }: let - gitRev = "60a58688e552f12501980c4bdab034ab0f2ba059"; + gitRev = "c0038e3ea82fec6119de364bcbc3370955ed46a2"; gitBranch = "develop"; gitTag = "0.9.3"; in stdenv.mkDerivation rec { name = "antimony-${version}"; - version = "2018-07-17"; + version = "2018-10-20"; src = fetchFromGitHub { owner = "mkeeter"; repo = "antimony"; rev = gitRev; - sha256 = "0pgf6kr23xw012xsil56j5gq78mlirmrlqdm09m5wlgcf4vr6xnl"; + sha256 = "01cjcjppbb0gvh6npcsaidzpfcfzrqhhi07z4v0jkfyi0fl125v4"; }; patches = [ ./paths-fix.patch ]; diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 7af7c8986f2f..cc08dce906c3 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, callPackage, libpng12, imagemagick, - autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin }: +{ stdenv, fetchurl, callPackage, libpng12, imagemagick +, autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin +, runtimeShell }: # TODO: Figure out why the resultant binary is somehow linked against # libpng16.so.16 rather than libpng12. @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { # pstoedit-config no longer exists, it was replaced with pkg-config mkdir wrappers cat >wrappers/pstoedit-config <<'EOF' - #!${stdenv.shell} + #!${runtimeShell} # replace --version with --modversion for pkg-config args=''${@/--version/--modversion} exec pkg-config pstoedit "''${args[@]}" diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 7777be918975..962940d076ba 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2"; }; - libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [ + libPath = stdenv.lib.makeLibraryPath (with xorg; [ stdenv.cc.cc.lib gdk_pixbuf glib diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 2b0dde210c58..d90fb41c03ba 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AGL ]; passthru = { - mozillaPlugin = "/lib/netscape/plugins"; + mozillaPlugin = "/lib/mozilla/plugins"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index d45d6c3a62e3..cf5ecfdd043f 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591"; sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; }; - buildInputs = with pythonPackages; [ pytest responses ]; + checkInputs = with pythonPackages; [ pytest responses ]; propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ]; disabled = pythonPackages.pythonOlder "3.3"; diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix new file mode 100644 index 000000000000..87c161b9aee8 --- /dev/null +++ b/pkgs/applications/graphics/fondo/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, glib, gsettings-desktop-schemas, gtk3, libgee, json-glib, glib-networking, libsoup, libunity, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "fondo"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "calo001"; + repo = pname; + rev = version; + sha256 = "0xczqkkq54gjay7wdl8mpil7klfrpvcw2a0n1brq7qrfhsmhc7pc"; + }; + + nativeBuildInputs = [ + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + glib-networking + gsettings-desktop-schemas + gtk3 + json-glib + libgee + libsoup + libunity + pantheon.granite + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Find the most beautiful wallpapers for your desktop"; + homepage = https://github.com/calo001/fondo; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch b/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch new file mode 100644 index 000000000000..91eacecbf8c6 --- /dev/null +++ b/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch @@ -0,0 +1,42 @@ +# reduced version of commit f30492f40f78d867b43422215057dd21de4ba447 +# from upstream hg repository: +RegisterPNGImage(): Pass correct size value to strlcat(). + +diff -r 95c4711e8bee -r f30492f40f78 coders/png.c +--- a/coders/png.c Mon Jun 17 07:24:30 2019 -0500 ++++ b/coders/png.c Mon Jun 17 18:54:43 2019 -0500 +@@ -6427,26 +6427,26 @@ + + *version='\0'; + #if defined(PNG_LIBPNG_VER_STRING) +- (void) strlcat(version,"libpng ",MaxTextExtent); +- (void) strlcat(version,PNG_LIBPNG_VER_STRING,MaxTextExtent); ++ (void) strlcat(version,"libpng ",sizeof(version)); ++ (void) strlcat(version,PNG_LIBPNG_VER_STRING,sizeof(version)); + #if (PNG_LIBPNG_VER > 10005) + if (LocaleCompare(PNG_LIBPNG_VER_STRING,png_get_header_ver(NULL)) != 0) + { +- (void) strlcat(version,",",MaxTextExtent); +- (void) strlcat(version,png_get_libpng_ver(NULL),MaxTextExtent); ++ (void) strlcat(version,",",sizeof(version)); ++ (void) strlcat(version,png_get_libpng_ver(NULL),sizeof(version)); + } + #endif + #endif + + #if defined(ZLIB_VERSION) + if (*version != '\0') +- (void) strlcat(version,", ",MaxTextExtent); +- (void) strlcat(version,"zlib ",MaxTextExtent); +- (void) strlcat(version,ZLIB_VERSION,MaxTextExtent); ++ (void) strlcat(version,", ",sizeof(version)); ++ (void) strlcat(version,"zlib ",sizeof(version)); ++ (void) strlcat(version,ZLIB_VERSION,sizeof(version)); + if (LocaleCompare(ZLIB_VERSION,zlib_version) != 0) + { +- (void) strlcat(version,",",MaxTextExtent); +- (void) strlcat(version,zlib_version,MaxTextExtent); ++ (void) strlcat(version,",",sizeof(version)); ++ (void) strlcat(version,zlib_version,sizeof(version)); + } + #endif diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index c93b4fe958d5..84d1450da823 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -4,15 +4,16 @@ stdenv.mkDerivation rec { name = "graphicsmagick-${version}"; - version = "1.3.31"; + version = "1.3.32"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0y22740f25qxsqqqg26xqlfp920dm57b7hrgaqmx7azksrcvnsq9"; + sha256 = "1qclp9i31idpcbbqswmnq2q11lmv0a7cvdb1y72xcky8sshaahmq"; }; patches = [ ./disable-popen.patch + ./1.3.32-darwin-png-strlcat-fix.patch ]; configureFlags = [ diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index e8f831a21c20..e88c9222b87c 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool, exiv2, libjpeg, libtiff, gst_all_1, libraw, libsoup, libsecret, + glib, gtk3, gsettings-desktop-schemas, libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison, flex, wrapGAppsHook, shared-mime-info }: @@ -16,10 +17,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ]; - buildInputs = with gnome3; [ - glib gtk gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base + buildInputs = [ + glib gtk3 gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base exiv2 libjpeg libtiff libraw libsoup libsecret libchamplain - librsvg libwebp json-glib webkitgtk lcms2 defaultIconTheme + librsvg libwebp json-glib webkitgtk lcms2 gnome3.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 140227eb9eca..d30f8c209c54 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz"; - sha256 = "0rm31kvyg30452bz12yi49bkhdmi4bjdx6zann5cdlbi0pvmx7xh"; + sha256 = "0gw45d0albrsa0pbc5g4w3fmmjfxrdbpzyc7723ncbhncdyda01h"; }; sourceRoot = "${name}/src"; diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 4b3a423a8ce2..25abcd9d41d7 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # lrelease command: LRELEASECOMMAND = lrelease # qcollectiongenerator command: - #QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator + QCOLLECTIONGENERATORCOMMAND = qhelpgenerator # TikZ documentation default file path: TIKZ_DOCUMENTATION_DEFAULT = @out@/share/doc/texmf/pgf/pgfmanual.pdf.gz diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index 515b834b41ea..c06a79727094 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -11,6 +11,8 @@ pythonPackages.buildPythonApplication rec { doCheck = false; + nativeBuildInputs = [ gettext ]; + buildInputs = [ stdenv libX11 gettext ]; patchPhase = '' diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 03cac9114afe..354e9725a43e 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas libraw json-glib glib gdk_pixbuf librsvg gnome3.rest - gcr gnome3.defaultIconTheme libgdata + gcr gnome3.adwaita-icon-theme libgdata ]; postPatch = '' diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index ac3de4a4e141..d0f2a48c589d 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, unzip, jre }: +{ stdenv, fetchurl, makeDesktopItem, unzip, jre, runtimeShell }: stdenv.mkDerivation rec { name = "swingsane-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = let execWrapper = '' - #!${stdenv.shell} + #!${runtimeShell} exec ${jre}/bin/java -jar $out/share/java/swingsane/swingsane-${version}.jar "$@" ''; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 63d35cc54531..b399dd2d2284 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 , libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig -, imagemagick, intltool, autoreconfHook, which, defaultIconTheme +, imagemagick, intltool, autoreconfHook, which, gnome3 }: let @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { buildInputs = [ ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 - synfig which defaultIconTheme + synfig which gnome3.adwaita-icon-theme ]; postInstall = '' diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index e790ef49acbf..5fc7e309f4df 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead -, hicolor-icon-theme, defaultIconTheme +, hicolor-icon-theme, gnome3 # Test requirements , dbus, xvfb_run, xdotool @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ''; checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; - buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ]; + buildInputs = [ hicolor-icon-theme gnome3.adwaita-icon-theme librsvg ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; makeWrapperArgs = [ diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index e27f074b21ba..891f3586fa59 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, erlang, cl, libGL, libGLU }: +{ fetchurl, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: stdenv.mkDerivation rec { name = "wings-2.2.1"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp ebin/* $out/lib/${name}/ebin cp -R textures shaders plugins $out/lib/$name cat << EOF > $out/bin/wings - #!${stdenv.shell} + #!${runtimeShell} ${erlang}/bin/erl \ -pa $out/lib/${name}/ebin -run wings_start start_halt "$@" EOF @@ -43,4 +43,3 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib.platforms; linux; }; } - diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix new file mode 100644 index 000000000000..30a8907275b0 --- /dev/null +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch + +, cmake +, gettext +, wrapGAppsHook +, pkgconfig + +, glib +, gsettings-desktop-schemas +, gtk3 +, hicolor-icon-theme +, libsndfile +, libxml2 +, pcre +, poppler +, portaudio +, zlib + +# Plugins don't appear to be working in this version, so disable them by not +# building with Lua support by default. In a future version, try switching this +# to 'true' and seeing if the top-level Plugin menu appears. +, withLua ? false, lua +}: + +stdenv.mkDerivation rec { + name = "xournalpp-${version}"; + version = "1.0.8"; + + src = fetchFromGitHub { + owner = "xournalpp"; + repo = "xournalpp"; + rev = version; + sha256 = "01q84xjp9z1krna10gjj562km6i3wdq8cg7paxax1k6bh52ryvf6"; + }; + + patches = [ + # This patch removes the unused 'xopp-recording.sh' file which breaks the + # cmake build; this patch isn't in a release yet, and should be removed at + # or after 1.0.9 is released. + (fetchpatch { + name = "remove-xopp-recording.sh.patch"; + url = "https://github.com/xournalpp/xournalpp/commit/a17a3f2c80c607a22d0fdeb66d38358bea7e4d85.patch"; + sha256 = "10pcpvklm6kr0lv2xrsbpg2037ni9j6dmxgjf56p466l3gz60iwy"; + }) + ]; + + nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ]; + buildInputs = + [ glib + gsettings-desktop-schemas + gtk3 + hicolor-icon-theme + libsndfile + libxml2 + pcre + poppler + portaudio + zlib + ] + ++ lib.optional withLua lua; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; + homepage = https://github.com/xournalpp/xournalpp; + license = licenses.gpl2; + maintainers = with maintainers; [ andrew-d ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 7267e9bc4857..799ceef1beda 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yEd-${version}"; - version = "3.18.2"; + version = "3.19"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${name}.zip"; - sha256 = "1csj19j9mfx4jfc949sz672h8lnfj217nn32d54cxj8llks82ycy"; + sha256 = "0l70pc7wl2ghfkjab9w2mbx7crwha7xwkrpmspsi5c6q56dw7s33"; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index c60d4b7b904d..ac3d303a7a60 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre, unzip}: +{ stdenv, fetchurl, jre, unzip, runtimeShell }: stdenv.mkDerivation rec { version = "0.9.0"; pname = "zgrviewer"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp -r target/* "$out/share/java/zvtm/" - echo '#!${stdenv.shell}' > "$out/bin/zgrviewer" + echo '#!${runtimeShell}' > "$out/bin/zgrviewer" echo "${jre}/lib/openjdk/jre/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer" chmod a+x "$out/bin/zgrviewer" ''; diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch index 9fa3c8a14141..fcbbbbb72eb3 100644 --- a/pkgs/applications/kde/akonadi/akonadi-paths.patch +++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch @@ -31,10 +31,10 @@ index be1cc4afb..6d0c1d7e5 100644 } return true; diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp -index 8b057b459..3fa4548ad 100644 +index dfff6fc29..419e54a5b 100644 --- a/src/server/storage/dbconfigmysql.cpp +++ b/src/server/storage/dbconfigmysql.cpp -@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -82,7 +82,6 @@ bool DbConfigMysql::init(QSettings &settings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -42,7 +42,7 @@ index 8b057b459..3fa4548ad 100644 QString defaultCleanShutdownCommand; #ifndef Q_OS_WIN -@@ -71,25 +70,7 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -90,16 +89,7 @@ bool DbConfigMysql::init(QSettings &settings) #endif const bool defaultInternalServer = true; @@ -51,38 +51,29 @@ index 8b057b459..3fa4548ad 100644 - defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE); - } -#endif -- const QStringList mysqldSearchPath = QStringList() -- << QStringLiteral("/usr/bin") -- << QStringLiteral("/usr/sbin") -- << QStringLiteral("/usr/local/sbin") -- << QStringLiteral("/usr/local/libexec") -- << QStringLiteral("/usr/libexec") -- << QStringLiteral("/opt/mysql/libexec") -- << QStringLiteral("/opt/local/lib/mysql5/bin") -- << QStringLiteral("/opt/mysql/sbin"); - if (defaultServerPath.isEmpty()) { -- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("mysqld"), mysqldSearchPath); +- defaultServerPath = findExecutable(QStringLiteral("mysqld")); - } - -- const QString mysqladminPath = QStandardPaths::findExecutable(QStringLiteral("mysqladmin"), mysqldSearchPath); +- const QString mysqladminPath = findExecutable(QStringLiteral("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") -@@ -99,10 +80,10 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -109,10 +99,10 @@ bool DbConfigMysql::init(QSettings &settings) #endif } -- mMysqlInstallDbPath = QStandardPaths::findExecutable(QStringLiteral("mysql_install_db"), mysqldSearchPath); +- mMysqlInstallDbPath = findExecutable(QStringLiteral("mysql_install_db")); + mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB); qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath; -- mMysqlCheckPath = QStandardPaths::findExecutable(QStringLiteral("mysqlcheck"), mysqldSearchPath); +- mMysqlCheckPath = findExecutable(QStringLiteral("mysqlcheck")); + mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK); qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); -@@ -119,7 +100,7 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -129,7 +119,7 @@ bool DbConfigMysql::init(QSettings &settings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -91,7 +82,7 @@ index 8b057b459..3fa4548ad 100644 mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); settings.endGroup(); -@@ -129,9 +110,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -139,9 +129,6 @@ bool DbConfigMysql::init(QSettings &settings) // intentionally not namespaced as we are the only one in this db instance when using internal mode mDatabaseName = QStringLiteral("akonadi"); } @@ -101,7 +92,7 @@ index 8b057b459..3fa4548ad 100644 qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; -@@ -140,9 +118,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -150,9 +137,6 @@ bool DbConfigMysql::init(QSettings &settings) settings.setValue(QStringLiteral("Name"), mDatabaseName); settings.setValue(QStringLiteral("Host"), mHostName); settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -111,7 +102,7 @@ index 8b057b459..3fa4548ad 100644 settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); settings.sync(); -@@ -196,7 +171,7 @@ bool DbConfigMysql::startInternalServer() +@@ -206,7 +190,7 @@ bool DbConfigMysql::startInternalServer() #endif // generate config file @@ -189,3 +180,6 @@ index 6b50ae50e..f94a8c5eb 100644 settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); +-- +2.18.1 + diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 0822e65c7c0c..b9b318e75c3e 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -124,6 +124,7 @@ let kmbox = callPackage ./kmbox.nix {}; kmime = callPackage ./kmime.nix {}; kmix = callPackage ./kmix.nix {}; + kmplot = callPackage ./kmplot.nix {}; kolourpaint = callPackage ./kolourpaint.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 6f6acd1e8bb8..e06c7f0d14aa 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/18.12.1/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/18.12.3/ ) diff --git a/pkgs/applications/kde/kmplot.nix b/pkgs/applications/kde/kmplot.nix new file mode 100644 index 000000000000..c0c00f213400 --- /dev/null +++ b/pkgs/applications/kde/kmplot.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools +, kcrash, kguiaddons, ki18n, kparts, kwidgetsaddons, kdbusaddons +}: + +mkDerivation { + name = "kmplot"; + meta = { + license = with lib.licenses; [ gpl2Plus fdl12 ]; + maintainers = [ lib.maintainers.orivej ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcrash kguiaddons ki18n kparts kwidgetsaddons kdbusaddons + ]; +} diff --git a/pkgs/applications/kde/ktouch.nix b/pkgs/applications/kde/ktouch.nix index 75e72c0ba180..64179f2e64dc 100644 --- a/pkgs/applications/kde/ktouch.nix +++ b/pkgs/applications/kde/ktouch.nix @@ -3,7 +3,7 @@ , kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n , kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons , kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts -, qtx11extras, qtgraphicaleffects, xorg +, qtx11extras, qtgraphicaleffects, qtxmlpatterns, xorg }: @@ -19,7 +19,8 @@ kconfig kconfigwidgets kcoreaddons kdeclarative ki18n kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts - qtx11extras qtgraphicaleffects xorg.libxkbfile xorg.libxcb + qtx11extras qtgraphicaleffects qtxmlpatterns + xorg.libxkbfile xorg.libxcb ]; enableParallelBuilding = true; diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 1efdd3e61235..416273d719fe 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1723 +3,1723 @@ { akonadi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-18.12.1.tar.xz"; - sha256 = "141j1wicfl8lgwdgs8yh0mcs4gw004wz8ck21pz55xc1mi4yh9cx"; - name = "akonadi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-18.12.3.tar.xz"; + sha256 = "f930deaade1cac1488b8af05cc28f4a78a441c34dbe875b673af3423f8a14658"; + name = "akonadi-18.12.3.tar.xz"; }; }; akonadi-calendar = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-calendar-18.12.1.tar.xz"; - sha256 = "108ax9bpng5qp3cbn3f2x096l9jsv0x3d8xckcfvd4a3svgap1ri"; - name = "akonadi-calendar-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-calendar-18.12.3.tar.xz"; + sha256 = "19f92642ba4d62dfccca19ac3ced94495e9137d60a77a672c5443585f30cdaee"; + name = "akonadi-calendar-18.12.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-calendar-tools-18.12.1.tar.xz"; - sha256 = "0a54jka0szi3d2dv4kr7s78lbm1sx6a47mccjzc2rp1w2x8dkagl"; - name = "akonadi-calendar-tools-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-calendar-tools-18.12.3.tar.xz"; + sha256 = "636ea364bea079cae0b899204add76b0d1d9a80d1955c914bc1dad3a6fc731ed"; + name = "akonadi-calendar-tools-18.12.3.tar.xz"; }; }; akonadiconsole = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadiconsole-18.12.1.tar.xz"; - sha256 = "06mhpk66ck37k6bfi83cmnjv39lwvm245m0climh1idfi6mn08wk"; - name = "akonadiconsole-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadiconsole-18.12.3.tar.xz"; + sha256 = "d052084ecc1665976f7db08d11a15609f017b0803dd30b71b5d1dccc60ac6ed0"; + name = "akonadiconsole-18.12.3.tar.xz"; }; }; akonadi-contacts = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-contacts-18.12.1.tar.xz"; - sha256 = "1lnqq2qalvzq6g4dwfnlgvrz9wpnl4g64is8ylrb6jf4bvfg3kvq"; - name = "akonadi-contacts-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-contacts-18.12.3.tar.xz"; + sha256 = "6ad8e352744c258b66a0c6155322681fa4ec50422c81fe4248414b0834e645cc"; + name = "akonadi-contacts-18.12.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-import-wizard-18.12.1.tar.xz"; - sha256 = "09r5nspv1l8i1ipjxn5xwi6swkggy10hsa8p5bj0qqclsf17ip5j"; - name = "akonadi-import-wizard-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-import-wizard-18.12.3.tar.xz"; + sha256 = "a74ca212ab05706d5beb94696a933cb46dfd83d5ebd6723de97f7ce4efbe6104"; + name = "akonadi-import-wizard-18.12.3.tar.xz"; }; }; akonadi-mime = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-mime-18.12.1.tar.xz"; - sha256 = "0fyxls0qhvqcbhpw17vhr8m4h94s2d69c8bpf45k19f005gbb6dk"; - name = "akonadi-mime-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-mime-18.12.3.tar.xz"; + sha256 = "ff7d91c77b629bba6b93ee6b15c0ebee08aa37368aa8bcae48ecbbacf64bc1b4"; + name = "akonadi-mime-18.12.3.tar.xz"; }; }; akonadi-notes = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-notes-18.12.1.tar.xz"; - sha256 = "1m2v3qj06pbpdncxcb37131q6xhbsrwp6qv72rmlwlj0cj7xyfl4"; - name = "akonadi-notes-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-notes-18.12.3.tar.xz"; + sha256 = "ac2f5ef0a3f4621d6af6fef028d641334212d940a1fc3ffc1e3cc6534ca6be60"; + name = "akonadi-notes-18.12.3.tar.xz"; }; }; akonadi-search = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-search-18.12.1.tar.xz"; - sha256 = "1wwv92kmk4kwr8dj7y34nb2337s80hwnjblnfz4kl3z3ka782gd6"; - name = "akonadi-search-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-search-18.12.3.tar.xz"; + sha256 = "6436a0f71229cf7917cb4f269f34a2046c24860ecfc03e7018b9d2a7f9e66346"; + name = "akonadi-search-18.12.3.tar.xz"; }; }; akregator = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akregator-18.12.1.tar.xz"; - sha256 = "0zjc6vgf5pdbmj7b3kl15aqkamg5slaxd5n4092pf7nf3v3r74r9"; - name = "akregator-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akregator-18.12.3.tar.xz"; + sha256 = "d3a4f0f4b677825d1b3e1461a020c17a36abe458d7e3ab40389627e2d8163ea1"; + name = "akregator-18.12.3.tar.xz"; }; }; analitza = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/analitza-18.12.1.tar.xz"; - sha256 = "0iwlkxcqj62l25ldpa325ymkvhim2mm152h3jqh3z1sc683hc1kv"; - name = "analitza-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/analitza-18.12.3.tar.xz"; + sha256 = "c241b6a3d849534ccd50601c0aebd5cd785220bb7957ed7f6b1d3db35ba0f925"; + name = "analitza-18.12.3.tar.xz"; }; }; ark = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ark-18.12.1.tar.xz"; - sha256 = "1pcaaq8qdj3w15f0zqfwy7xwknpmb70yc7g4nmj4p48ahq5s2r86"; - name = "ark-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ark-18.12.3.tar.xz"; + sha256 = "ecf781b5d3691bb967c9170938c1133e2972ee97d71aab2de65487a952700722"; + name = "ark-18.12.3.tar.xz"; }; }; artikulate = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/artikulate-18.12.1.tar.xz"; - sha256 = "17msfgq83iy5dfl5qkmj4f89aa2gbk7p00f7bwiz2fnlg642wyq1"; - name = "artikulate-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/artikulate-18.12.3.tar.xz"; + sha256 = "f40cc532dd1093d53ab4f825716ea4f4f4d7f954ac6c58ef412b63323a76c278"; + name = "artikulate-18.12.3.tar.xz"; }; }; audiocd-kio = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/audiocd-kio-18.12.1.tar.xz"; - sha256 = "0kv03d2w0vf9fpp89ymnkizzyhckz9pjj8fcqwbacb78k6p52g6p"; - name = "audiocd-kio-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/audiocd-kio-18.12.3.tar.xz"; + sha256 = "c15ebda9330688c0304be36999f4900ccd7c0b1ce11e19c296975414dafe53c8"; + name = "audiocd-kio-18.12.3.tar.xz"; }; }; baloo-widgets = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/baloo-widgets-18.12.1.tar.xz"; - sha256 = "0axgx1zrbaki20vh9j9bd0h3qvn0ws4cza8smlgvlzx7fkbidmw3"; - name = "baloo-widgets-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/baloo-widgets-18.12.3.tar.xz"; + sha256 = "b8475ba1a74f8ebc6a36029b60ac803ab0d2c81c253b8c16bd05b6249454c3e3"; + name = "baloo-widgets-18.12.3.tar.xz"; }; }; blinken = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/blinken-18.12.1.tar.xz"; - sha256 = "0ka47snqj1xwf8m1qqa1vxgjwm151dzlk22zg07yh987qgc6fbj2"; - name = "blinken-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/blinken-18.12.3.tar.xz"; + sha256 = "2b6a11fa56b8837618e157a4a974eb1dff956cfb8b93e6cb0601bda66a234579"; + name = "blinken-18.12.3.tar.xz"; }; }; bomber = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/bomber-18.12.1.tar.xz"; - sha256 = "0a5vvb2ka08lyvybr12gm3lfgvfj3r99kqw1prhr9n97w7f8yc1d"; - name = "bomber-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/bomber-18.12.3.tar.xz"; + sha256 = "5b8e24aba4fb14ffc72313f9754315d6a7d98a3e00ee118a2551ac3357ead771"; + name = "bomber-18.12.3.tar.xz"; }; }; bovo = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/bovo-18.12.1.tar.xz"; - sha256 = "19w4xfqx6bxs8fr8vkma57ibl5b1jdqfjax240fg81qyqzkx4xsp"; - name = "bovo-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/bovo-18.12.3.tar.xz"; + sha256 = "7fc7ff304cf5b5bf2049fdd53fbb4a819bddefc77fde94702c5118240403d972"; + name = "bovo-18.12.3.tar.xz"; }; }; calendarsupport = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/calendarsupport-18.12.1.tar.xz"; - sha256 = "0hpq85wh94dlmrfabh1k76xdc9xqavfccjnfy20i71q2ml92gx4p"; - name = "calendarsupport-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/calendarsupport-18.12.3.tar.xz"; + sha256 = "e3c23c152a3e339628e79b168e56c22c5c2610600013f3aa8706168569cacfa5"; + name = "calendarsupport-18.12.3.tar.xz"; }; }; cantor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/cantor-18.12.1.tar.xz"; - sha256 = "132zlpcqkbjdb1vrcy6innf6qmxlqibzpf0bgdi33q797vw63drc"; - name = "cantor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/cantor-18.12.3.tar.xz"; + sha256 = "2537b8e8a9e5b72a2b3bf2b08d24c4978f52ef18ced61cdcfd2a09069f670398"; + name = "cantor-18.12.3.tar.xz"; }; }; cervisia = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/cervisia-18.12.1.tar.xz"; - sha256 = "02ka1crhkb3dka3qp82vs624fz3hcwydm559x5dq0cdbibdmhqx7"; - name = "cervisia-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/cervisia-18.12.3.tar.xz"; + sha256 = "a5e4034b0d1ee07c2efaef6e8eef17b48a340e9d046cd23efceaf67f07ab5a85"; + name = "cervisia-18.12.3.tar.xz"; }; }; dolphin = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/dolphin-18.12.1.tar.xz"; - sha256 = "1d3m2h8czxqmgpd060lnj05f0r4bqirqibvbakrl1sv2xxafz8qq"; - name = "dolphin-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/dolphin-18.12.3.tar.xz"; + sha256 = "c4921759bdfec9a96201a5d76a67869f867ec7e3caf92f8e46fa5d853a0741b1"; + name = "dolphin-18.12.3.tar.xz"; }; }; dolphin-plugins = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/dolphin-plugins-18.12.1.tar.xz"; - sha256 = "0j2cj91732p2wh0g73xxjghbbivlva4mr91vdjrp6dkc4b2vjxh8"; - name = "dolphin-plugins-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/dolphin-plugins-18.12.3.tar.xz"; + sha256 = "1bff5f828f11e9b9a527b59f12ec16745fa19fb09392ca1872d6b0c909212427"; + name = "dolphin-plugins-18.12.3.tar.xz"; }; }; dragon = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/dragon-18.12.1.tar.xz"; - sha256 = "0ffxpl30xdm5vgrfc6b1k2gzfp3jwakn6my4zq0zfrrlf75hbgkm"; - name = "dragon-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/dragon-18.12.3.tar.xz"; + sha256 = "115d60bfdef498ea75bc077a7091fb738615b399b03ec2a76a4bf34f19b407f3"; + name = "dragon-18.12.3.tar.xz"; }; }; eventviews = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/eventviews-18.12.1.tar.xz"; - sha256 = "0qvndqj8jhrn9p1g4d4p3l54d7hz9zzkkg92yfjcajcrnl2i0fn1"; - name = "eventviews-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/eventviews-18.12.3.tar.xz"; + sha256 = "994ddea6894fd73eeb851b04083bc886288e4531aa770c0b2e5d8e1740bbe4d0"; + name = "eventviews-18.12.3.tar.xz"; }; }; ffmpegthumbs = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ffmpegthumbs-18.12.1.tar.xz"; - sha256 = "0j9vwqgsb9pz8hpacsmm4pxss25q7622fr7gq1n2dxf19f1zwxki"; - name = "ffmpegthumbs-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ffmpegthumbs-18.12.3.tar.xz"; + sha256 = "4db8ab905d80863f898b6a3ea8cd0cc7baad91ad953d6b65df230079be04b338"; + name = "ffmpegthumbs-18.12.3.tar.xz"; }; }; filelight = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/filelight-18.12.1.tar.xz"; - sha256 = "1p9k1ajyjlb001mz8w8jli3ha84z91sc43721xdpngcshz7i8i6f"; - name = "filelight-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/filelight-18.12.3.tar.xz"; + sha256 = "9090bc7c7ac2586e857cdc246a94621c1453e7f65c6d491f2f374f43d3e4af1a"; + name = "filelight-18.12.3.tar.xz"; }; }; granatier = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/granatier-18.12.1.tar.xz"; - sha256 = "02lmap2axki56d3kfhmx7h6ibqjnx5ga73vsvvx1w4fjikgzm2rn"; - name = "granatier-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/granatier-18.12.3.tar.xz"; + sha256 = "ad065e488f9a751423d571f51449e766c625e88ca7d3c30d21ff3b9027fc04af"; + name = "granatier-18.12.3.tar.xz"; }; }; grantlee-editor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/grantlee-editor-18.12.1.tar.xz"; - sha256 = "0r85wirr4dcvja5cynjb0n51lmlijkffg35czqpjvnf2xv1claj4"; - name = "grantlee-editor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/grantlee-editor-18.12.3.tar.xz"; + sha256 = "d46831a589815581bce45c3954eb12fcbb1692fb407f566952a39e3e8c546b9c"; + name = "grantlee-editor-18.12.3.tar.xz"; }; }; grantleetheme = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/grantleetheme-18.12.1.tar.xz"; - sha256 = "1c4n27abzpynh6nykfw9z2rhxlmmicvvw0081gsm9h7w1r8n4flc"; - name = "grantleetheme-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/grantleetheme-18.12.3.tar.xz"; + sha256 = "7853075503f2a19713ce43ba077dde8036f892dee7f41e64ebc9af06b4005402"; + name = "grantleetheme-18.12.3.tar.xz"; }; }; gwenview = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/gwenview-18.12.1.tar.xz"; - sha256 = "01iraiynpsacp8hnmdc9cxlk6qakbbypdck939kcij6j7gm5l2fm"; - name = "gwenview-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/gwenview-18.12.3.tar.xz"; + sha256 = "0b4ff869fc09140e258e894f5169fc6c96f1126891b8ed1a391d4624d6ab0c35"; + name = "gwenview-18.12.3.tar.xz"; }; }; incidenceeditor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/incidenceeditor-18.12.1.tar.xz"; - sha256 = "1h1da8vg9x450hm9g936rms6n9d5ddqdl7jrwah3khbzihjpkgvz"; - name = "incidenceeditor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/incidenceeditor-18.12.3.tar.xz"; + sha256 = "b0fa13390b31a24a8bca99f20b132841849d95dba9de3b8a4c9ae979d226ec02"; + name = "incidenceeditor-18.12.3.tar.xz"; }; }; juk = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/juk-18.12.1.tar.xz"; - sha256 = "14zlpac1z3gaym83d5vmr7vvqwdzxhfscydwb2qv4ng947lrrs1n"; - name = "juk-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/juk-18.12.3.tar.xz"; + sha256 = "8755710f551b3173561ebfcc996f32b3fd8de78d5574584f8e37015541a9fdca"; + name = "juk-18.12.3.tar.xz"; }; }; k3b = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/k3b-18.12.1.tar.xz"; - sha256 = "1f5l8jyi30qm225nxp0sahm7lwdk9r2gqzbdrrzhadx6gfm80a4s"; - name = "k3b-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/k3b-18.12.3.tar.xz"; + sha256 = "cee825ff0c058cc1cbe3bf47a7acbe3889949460ba383ffae3756b67b418362e"; + name = "k3b-18.12.3.tar.xz"; }; }; kaccounts-integration = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kaccounts-integration-18.12.1.tar.xz"; - sha256 = "1mb9rfp7vw9bkndlbwh5ayd9m3znwrl1i6kr0s5872sscmhx2giz"; - name = "kaccounts-integration-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kaccounts-integration-18.12.3.tar.xz"; + sha256 = "6e7e4d7aac270f605a5fd4ec9efea8c13807ccb67c11fd3412c1d794ab09e6ce"; + name = "kaccounts-integration-18.12.3.tar.xz"; }; }; kaccounts-providers = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kaccounts-providers-18.12.1.tar.xz"; - sha256 = "0pjk7wsqbgibx8racd4qikv3i1j4iqgnbp81mm5nss7hilrnv1vi"; - name = "kaccounts-providers-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kaccounts-providers-18.12.3.tar.xz"; + sha256 = "4d084ffdac10a8a8cc8b79a9b17116893c023288c9e29d1cbabe3d28cd0ba5f6"; + name = "kaccounts-providers-18.12.3.tar.xz"; }; }; kaddressbook = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kaddressbook-18.12.1.tar.xz"; - sha256 = "0n4abjcq2iana9xyzkghgrs6h9nr0k2vxqrxghnh5iqahn2766ak"; - name = "kaddressbook-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kaddressbook-18.12.3.tar.xz"; + sha256 = "81d3ba7d5e8ed14b0cc32825f1efbdccbf9f79ffe4e1f8c888179c3d04b5bd28"; + name = "kaddressbook-18.12.3.tar.xz"; }; }; kajongg = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kajongg-18.12.1.tar.xz"; - sha256 = "11c1iyfwqjqihyb3lqvnrb9jsrah0wl1kbrbm2lbmaqf0qnqqr8a"; - name = "kajongg-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kajongg-18.12.3.tar.xz"; + sha256 = "e3fba4ddb19e8dfd43f917d737bf13c2391a3042c6941181ab81f4bcd66096f9"; + name = "kajongg-18.12.3.tar.xz"; }; }; kalarm = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kalarm-18.12.1.tar.xz"; - sha256 = "1z2rf30ad2rlkcc9ki09pkrvdd8b9f60vsjzvsqfgxx8i87z1lil"; - name = "kalarm-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kalarm-18.12.3.tar.xz"; + sha256 = "5c116221e78755b8afd80287885cb50380c2136acd25aa615d3f6041cc0fbeb3"; + name = "kalarm-18.12.3.tar.xz"; }; }; kalarmcal = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kalarmcal-18.12.1.tar.xz"; - sha256 = "0wykbg24llympx7m9bkf4aciv6pli359nnnzpli7rh4q58vbnfn7"; - name = "kalarmcal-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kalarmcal-18.12.3.tar.xz"; + sha256 = "2658b2d8055558878cf84d50daf333a5f694a586800b9ccfd3eded3304af8ef8"; + name = "kalarmcal-18.12.3.tar.xz"; }; }; kalgebra = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kalgebra-18.12.1.tar.xz"; - sha256 = "09g4v4f2xlilqrf2aqsz7zbjqnnrndhhlkkwbrypn148gdnxngs4"; - name = "kalgebra-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kalgebra-18.12.3.tar.xz"; + sha256 = "a93b319c6a3fab3d3a12923f8153a6f38281887e176fffaa37ca6cc677a280b5"; + name = "kalgebra-18.12.3.tar.xz"; }; }; kalzium = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kalzium-18.12.1.tar.xz"; - sha256 = "1c5li3dhrfiw7kpjv6kfby2c2pq22sraqb3vc0s4nz1h9jnjcah7"; - name = "kalzium-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kalzium-18.12.3.tar.xz"; + sha256 = "100f63b0c1624c10ce7bb54a6a8fa6dfaf6800f580bfc0889745e171fe135fef"; + name = "kalzium-18.12.3.tar.xz"; }; }; kamera = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kamera-18.12.1.tar.xz"; - sha256 = "177lgyhc5klrpssbk2bsdwmg5hnk92mbjwb7s39kl9h53kw0jmzj"; - name = "kamera-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kamera-18.12.3.tar.xz"; + sha256 = "5e0e5a710cffd95019279d68daa27fdd4fba1401450673efa757ffc8a7ca495f"; + name = "kamera-18.12.3.tar.xz"; }; }; kamoso = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kamoso-18.12.1.tar.xz"; - sha256 = "1j467cpga2shvibwx3df4vxksfkp5q1hp6az8kcky6gljcmxy06p"; - name = "kamoso-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kamoso-18.12.3.tar.xz"; + sha256 = "ed62bbdf8eeefb85605113c3a916b01eec16846825cffe9b0b0c1f5a4580feb3"; + name = "kamoso-18.12.3.tar.xz"; }; }; kanagram = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kanagram-18.12.1.tar.xz"; - sha256 = "0ybn3aal51p29g28daalwmpm85306ivgl8rkxhccq7pzfwaww1bx"; - name = "kanagram-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kanagram-18.12.3.tar.xz"; + sha256 = "dcc06543830ab06066f2f37eba6722f5cb0893355e30cee8d522085ed5fb2204"; + name = "kanagram-18.12.3.tar.xz"; }; }; kapman = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kapman-18.12.1.tar.xz"; - sha256 = "117fkqhn0mg3z14sl64vmkz26rclfrjarf7kvxicvbw0x8s3vsgj"; - name = "kapman-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kapman-18.12.3.tar.xz"; + sha256 = "ad4a6377d260df76d000631ab4c95e5cb82ce47d031edc9801b6ed92d856305c"; + name = "kapman-18.12.3.tar.xz"; }; }; kapptemplate = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kapptemplate-18.12.1.tar.xz"; - sha256 = "1q52d30zz1ip6x8z56i25ll8hgzd6fp4pckfgr6byh82ymck8kxa"; - name = "kapptemplate-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kapptemplate-18.12.3.tar.xz"; + sha256 = "dd4e34e1ed60f4cb03836576dfd5d306ec1890cd0fe583b516bf49c628f1078f"; + name = "kapptemplate-18.12.3.tar.xz"; }; }; kate = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kate-18.12.1.tar.xz"; - sha256 = "0p9j9r2ffqh6p5pdxhk1pi8km1ypdsjs1h0g4ncnzwpvkir1rhk7"; - name = "kate-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kate-18.12.3.tar.xz"; + sha256 = "f7f2cba41a4c88b65885532db6b6161c66055a6697d20ee88adb70f302d387e1"; + name = "kate-18.12.3.tar.xz"; }; }; katomic = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/katomic-18.12.1.tar.xz"; - sha256 = "0pxj8vgx3ijvyznn5gvhv2scwbqhaqc2pmq2897b190vsx9mvkh6"; - name = "katomic-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/katomic-18.12.3.tar.xz"; + sha256 = "0e18087d0de067282023a98b800807632dd6a91bab51cf0d43d53bffba9b33f1"; + name = "katomic-18.12.3.tar.xz"; }; }; kbackup = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kbackup-18.12.1.tar.xz"; - sha256 = "0x42d7zssddhxdsx7vpvk4630c69pvllpfz40dqk2n3hghx9xvsw"; - name = "kbackup-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kbackup-18.12.3.tar.xz"; + sha256 = "7b42f7fff48f4cf735e27603d0e44ecd13d5c85474680f8d24850eaadd4f13bf"; + name = "kbackup-18.12.3.tar.xz"; }; }; kblackbox = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kblackbox-18.12.1.tar.xz"; - sha256 = "1wlwdfh23h175gsflmfmr63myds9vz3cs5dp8gr2zlxssdhc2s1p"; - name = "kblackbox-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kblackbox-18.12.3.tar.xz"; + sha256 = "d88b2906de45b129f1706b3d250b80f86acb0cc926a3cee679265b86c8934a9b"; + name = "kblackbox-18.12.3.tar.xz"; }; }; kblocks = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kblocks-18.12.1.tar.xz"; - sha256 = "1fzsyr8g536k54j3lgqr52a1cmcdmv85z11afhkz2186smnc63pa"; - name = "kblocks-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kblocks-18.12.3.tar.xz"; + sha256 = "e981107096893a8078ab978c429f367432a74de1bdeffe8fb628ccc397701332"; + name = "kblocks-18.12.3.tar.xz"; }; }; kblog = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kblog-18.12.1.tar.xz"; - sha256 = "0zdqjgan05049md0483l4c27gfwqdzmmx7wv3bziy91kd9bmfv0x"; - name = "kblog-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kblog-18.12.3.tar.xz"; + sha256 = "cd84b34312f6c5a9cf56322614caafcf434a800aeff66173a2c6f7cccc0fd2cc"; + name = "kblog-18.12.3.tar.xz"; }; }; kbounce = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kbounce-18.12.1.tar.xz"; - sha256 = "1209x02jip17n63ilvbi5knz4584k16c6zbrp8rg982qcabny355"; - name = "kbounce-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kbounce-18.12.3.tar.xz"; + sha256 = "c62cb68b4246c1aef73efb04ea883599384afbd977e8da93893346cbd835f343"; + name = "kbounce-18.12.3.tar.xz"; }; }; kbreakout = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kbreakout-18.12.1.tar.xz"; - sha256 = "0myh4qncrvm2kd2gwvl7v2078cvv66czl9zsiava8lzq588wddwq"; - name = "kbreakout-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kbreakout-18.12.3.tar.xz"; + sha256 = "23e1cc935eab6a2520e683185cb223243c71553b1ef6059a21f09d72e8fe00af"; + name = "kbreakout-18.12.3.tar.xz"; }; }; kbruch = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kbruch-18.12.1.tar.xz"; - sha256 = "0jlq08c6zjmdalhbgh2fy5qghj65l12jn7wvr0j2h0s6fqck1djh"; - name = "kbruch-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kbruch-18.12.3.tar.xz"; + sha256 = "e98f79865c4d095d7682ab97b0e4e7d23715e402be676d66f184cfbe3eff598d"; + name = "kbruch-18.12.3.tar.xz"; }; }; kcachegrind = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcachegrind-18.12.1.tar.xz"; - sha256 = "0w7fdsflqmkisap6mr805b6knf83nrjrr6bxi1snrl43ipy5ls29"; - name = "kcachegrind-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcachegrind-18.12.3.tar.xz"; + sha256 = "48011190a0ef28998e6c96b9d644e3d06b68606b7d1467c84a8d176eeebb9adf"; + name = "kcachegrind-18.12.3.tar.xz"; }; }; kcalc = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcalc-18.12.1.tar.xz"; - sha256 = "0ffafikh53yfwrsaiyxr4qxy01v8lv02y4xvj56qmhi429j9ax93"; - name = "kcalc-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcalc-18.12.3.tar.xz"; + sha256 = "10b3ebb5efab3731e9f12a8632546685281179881b03aae98f96a2cdbd21f02f"; + name = "kcalc-18.12.3.tar.xz"; }; }; kcalcore = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcalcore-18.12.1.tar.xz"; - sha256 = "1383zmpw8nzx1fs3d55k38f3znbdc7rs21yrka6fmymgh5c3jkki"; - name = "kcalcore-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcalcore-18.12.3.tar.xz"; + sha256 = "d6d6ce1bbdea4eac352b74bcc4bee77da107fdbafab47440b6be5fc3f9d90452"; + name = "kcalcore-18.12.3.tar.xz"; }; }; kcalutils = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcalutils-18.12.1.tar.xz"; - sha256 = "0w6kc39j3m5db8s47q4wh4wm0szl9vwr455i26d99vv8jay6mbpp"; - name = "kcalutils-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcalutils-18.12.3.tar.xz"; + sha256 = "715c48c46cd62f773da4e804e66cdb97eae7c4832a7fe058db2fca61dc4111f9"; + name = "kcalutils-18.12.3.tar.xz"; }; }; kcharselect = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcharselect-18.12.1.tar.xz"; - sha256 = "1p4ap7vs1nd9gr4z71h6cx6fz99k1lliz28ibbky9a60wvnlfim6"; - name = "kcharselect-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcharselect-18.12.3.tar.xz"; + sha256 = "e24e0268c5810cd3cf733dd8fcc8a9e04a111b761d4c1351d9976b3888278dcb"; + name = "kcharselect-18.12.3.tar.xz"; }; }; kcolorchooser = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcolorchooser-18.12.1.tar.xz"; - sha256 = "1lhnnywpfb4v1hwlc8h71lrvb145pc7wcaz7f7wf2kyh5pjkfbzn"; - name = "kcolorchooser-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcolorchooser-18.12.3.tar.xz"; + sha256 = "8defdb9450922b675dc80561a0f4bb119e621a85dd73661fc4caacef8db91228"; + name = "kcolorchooser-18.12.3.tar.xz"; }; }; kcontacts = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcontacts-18.12.1.tar.xz"; - sha256 = "0d32l8hhggcy6dyyps5im74k0psnxrwxa6yni5bmj8m0z7f298ba"; - name = "kcontacts-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcontacts-18.12.3.tar.xz"; + sha256 = "ba244937e36456065ec4c40fd1b44d011df487a940756ddc0ddd761f58454dd3"; + name = "kcontacts-18.12.3.tar.xz"; }; }; kcron = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcron-18.12.1.tar.xz"; - sha256 = "0211xs7zwii5a93827rsnp1gkay78h2hs49lvdc2kah9ccsh0kzn"; - name = "kcron-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcron-18.12.3.tar.xz"; + sha256 = "ba1d7e3ed5453a4867b4900deb957f1020f1533bdadfc36a1c6f83921bfd6ca3"; + name = "kcron-18.12.3.tar.xz"; }; }; kdav = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdav-18.12.1.tar.xz"; - sha256 = "0kr07p4gnxyzrgnbj7vkh93wmqwnvv8sc06i2yardr8qp6jhpg77"; - name = "kdav-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdav-18.12.3.tar.xz"; + sha256 = "3ce99c65573d6374e91abff50b3a738515da07371f07c1b6e4b1800069a77c23"; + name = "kdav-18.12.3.tar.xz"; }; }; kdebugsettings = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdebugsettings-18.12.1.tar.xz"; - sha256 = "1wbi0f82dwd7a8s6szg0yc2mraiinng9a5wjw8xjacgkyyjpqbr3"; - name = "kdebugsettings-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdebugsettings-18.12.3.tar.xz"; + sha256 = "680eeec77314d23ca3a40c803b4c22a1800dc982fa81cba9f44dbfa9222539f7"; + name = "kdebugsettings-18.12.3.tar.xz"; }; }; kde-dev-scripts = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kde-dev-scripts-18.12.1.tar.xz"; - sha256 = "1k0xjlwpmdl2qpj4x04q9x299wmva2ds4y2wpayah865knvx91j3"; - name = "kde-dev-scripts-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kde-dev-scripts-18.12.3.tar.xz"; + sha256 = "c62f05b86615a810beb2573ee2106bc68fc8be586b66bcdde62d3ba4e4c16fb4"; + name = "kde-dev-scripts-18.12.3.tar.xz"; }; }; kde-dev-utils = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kde-dev-utils-18.12.1.tar.xz"; - sha256 = "06k01z2ljkcsdzz4zsdp8hr3flss552h0jgy25qv7y1izggk05dj"; - name = "kde-dev-utils-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kde-dev-utils-18.12.3.tar.xz"; + sha256 = "f53b896b62b7d2267b78d23fb24cf495932c4c8b552d8bf56c722a49acc54be6"; + name = "kde-dev-utils-18.12.3.tar.xz"; }; }; kdeedu-data = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdeedu-data-18.12.1.tar.xz"; - sha256 = "1pnjydj3g768z5zxwbfwvxvlhdbg9rscr3vd1dw4srs338lp0maq"; - name = "kdeedu-data-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdeedu-data-18.12.3.tar.xz"; + sha256 = "cebaa135b21cba27015b1679e02a6625b9b444828ec7595e1a46f53dd7ae3999"; + name = "kdeedu-data-18.12.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdegraphics-mobipocket-18.12.1.tar.xz"; - sha256 = "1bv3981nsy61m8shlwbry9yb37218s2q1k9fas3xgv1260rjmmfq"; - name = "kdegraphics-mobipocket-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdegraphics-mobipocket-18.12.3.tar.xz"; + sha256 = "69ae8b6f45b8c9ec3a73e636f7a779257ebbd6f8016d24294bec844a51f2cc52"; + name = "kdegraphics-mobipocket-18.12.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdegraphics-thumbnailers-18.12.1.tar.xz"; - sha256 = "1rz578dz6nr3m23kd4njdcx01nmjgskxlla4zqgd33gg08kppmvj"; - name = "kdegraphics-thumbnailers-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdegraphics-thumbnailers-18.12.3.tar.xz"; + sha256 = "9bc36ea2eb8a177899bf81b1cdc63a92b8e5dae12308f3e71046a63e58aafec0"; + name = "kdegraphics-thumbnailers-18.12.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdenetwork-filesharing-18.12.1.tar.xz"; - sha256 = "1zxkbcdndbr3sygwpiiw70pxb71hil1x8zj7lgq2yyw968ianah4"; - name = "kdenetwork-filesharing-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdenetwork-filesharing-18.12.3.tar.xz"; + sha256 = "296c71526de0e51b4385962c76c2870cfe344b9dafdd2f5f2fba81801350d503"; + name = "kdenetwork-filesharing-18.12.3.tar.xz"; }; }; kdenlive = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdenlive-18.12.1.tar.xz"; - sha256 = "189p0sqlmfkaxsdiy1mh0mmskw6ha4zi64fx99w7wnbid8x52bjf"; - name = "kdenlive-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdenlive-18.12.3.tar.xz"; + sha256 = "fcfe2474bc271e730ed95edb21ae46e93c1ce773ed036f63c9fb2db02cbc7e64"; + name = "kdenlive-18.12.3.tar.xz"; }; }; kdepim-addons = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdepim-addons-18.12.1.tar.xz"; - sha256 = "1gz6rqg39vl2arzs64srpr7xn1syxxiznz58gdss40152gz0hlsp"; - name = "kdepim-addons-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdepim-addons-18.12.3.tar.xz"; + sha256 = "450a3f257e998e733b69703a1a813abab93c571c602702cbb4d9ab4ac25e8ce5"; + name = "kdepim-addons-18.12.3.tar.xz"; }; }; kdepim-apps-libs = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdepim-apps-libs-18.12.1.tar.xz"; - sha256 = "06q306m09666jh4cx3w0bif81x424hxlvsf31wjhfzdp737xfq3i"; - name = "kdepim-apps-libs-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdepim-apps-libs-18.12.3.tar.xz"; + sha256 = "40a6fb24fc262f5340fda4aed453c5d515976aea745765e83cf8053b44d60164"; + name = "kdepim-apps-libs-18.12.3.tar.xz"; }; }; kdepim-runtime = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdepim-runtime-18.12.1.tar.xz"; - sha256 = "1vb9rqzyjww7lkc3g2aw43ks7is1bg1nx2mbn8wvmc7cgga66nbc"; - name = "kdepim-runtime-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdepim-runtime-18.12.3.tar.xz"; + sha256 = "f3a5da19bb0f60e148d071cf07fd9fd4e6ea116f6125567c767c03b98ea844c3"; + name = "kdepim-runtime-18.12.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdesdk-kioslaves-18.12.1.tar.xz"; - sha256 = "05bds4r70ys4mygmjl5x5hcrygds57mqqmzfv79zq9hcfp2b0g69"; - name = "kdesdk-kioslaves-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdesdk-kioslaves-18.12.3.tar.xz"; + sha256 = "1f1951eca1c4081277782e80ef6b7c6768b2bb5a7d1830d69954f2fec27462ad"; + name = "kdesdk-kioslaves-18.12.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdesdk-thumbnailers-18.12.1.tar.xz"; - sha256 = "1584qy2aa8q7zzgf2zxqw7p2h2l2xfgsa2mrmxaa36xaxbglcvkb"; - name = "kdesdk-thumbnailers-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdesdk-thumbnailers-18.12.3.tar.xz"; + sha256 = "a4694da94bd671a1395a32a527c919fb2207e8a959ceff32a11488e2015a784b"; + name = "kdesdk-thumbnailers-18.12.3.tar.xz"; }; }; kdf = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdf-18.12.1.tar.xz"; - sha256 = "0zr6k8di9fvzmgvh4s8ji81zdynpkg5yrnddlc9mgid0w9czaw11"; - name = "kdf-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdf-18.12.3.tar.xz"; + sha256 = "a8a9e8a4c2bdc1855078383f10720b4b3a388c678dee148494dc18ba5019a6ae"; + name = "kdf-18.12.3.tar.xz"; }; }; kdialog = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdialog-18.12.1.tar.xz"; - sha256 = "0i4c2kjyp0dix12vxhj078h7vbylcqxgqx10hzwaszx3wlrycwa2"; - name = "kdialog-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdialog-18.12.3.tar.xz"; + sha256 = "8b17013ced4b02ceaf89ed3d3fdcfa4fce06fac54d54041fb1e47169f2def212"; + name = "kdialog-18.12.3.tar.xz"; }; }; kdiamond = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdiamond-18.12.1.tar.xz"; - sha256 = "0j5g1gh267q528k0947brc8nvgq81690hqp7mrf90wxg8qp4ysm4"; - name = "kdiamond-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdiamond-18.12.3.tar.xz"; + sha256 = "b3d959cc195b924ca877df2762c3e8ef115ac41c2355f34efbbcaabe9b02b500"; + name = "kdiamond-18.12.3.tar.xz"; }; }; keditbookmarks = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/keditbookmarks-18.12.1.tar.xz"; - sha256 = "0fnxmgfgnh8d6sg7g7ai53xywa22qv4pn4xxj503rjs4a3fsm3j1"; - name = "keditbookmarks-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/keditbookmarks-18.12.3.tar.xz"; + sha256 = "8d1f1a6ffa3b68d318ac6eb72707e5e5bb4f6f43ebb25c0475121469a71f6a8d"; + name = "keditbookmarks-18.12.3.tar.xz"; }; }; kfind = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kfind-18.12.1.tar.xz"; - sha256 = "1vhi66syjhmc5i64ffgpilyxw9y10qb7633p3gx7vsnbjhvfx45b"; - name = "kfind-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kfind-18.12.3.tar.xz"; + sha256 = "ad123b24f88e1ade5a845c16a84a483835cce31b92741107d8dbd02f462d4cd9"; + name = "kfind-18.12.3.tar.xz"; }; }; kfloppy = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kfloppy-18.12.1.tar.xz"; - sha256 = "1fx40gb7h0z832qidn635jj7caipxcrzxmrbdfnj8ji2sczs1hyq"; - name = "kfloppy-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kfloppy-18.12.3.tar.xz"; + sha256 = "d68af7c572591a1a297cc823c1cb16a8a15973983c31f2e598d75dcc09ae2363"; + name = "kfloppy-18.12.3.tar.xz"; }; }; kfourinline = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kfourinline-18.12.1.tar.xz"; - sha256 = "1dwa4nw6998ljbppr4bhwpdg201djk5rjrzjgfs5xv0pynamph0g"; - name = "kfourinline-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kfourinline-18.12.3.tar.xz"; + sha256 = "cd3c3129c50502d9fe35f2382fcb1a512519626eb1b776600fdac2190390b9ce"; + name = "kfourinline-18.12.3.tar.xz"; }; }; kgeography = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kgeography-18.12.1.tar.xz"; - sha256 = "02xir13p0r67vx3csdra9nza82a25k807cjl3w2pq3dqcg9grrcf"; - name = "kgeography-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kgeography-18.12.3.tar.xz"; + sha256 = "ae019c4fc6c2b52344466266a19c6047e5dc414a92461a21d0e9c003dd4433c9"; + name = "kgeography-18.12.3.tar.xz"; }; }; kget = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kget-18.12.1.tar.xz"; - sha256 = "0jlpih49rifpqzxzgjc4kv3hv7y42v6pcamyvrmk6q1768lqp7nb"; - name = "kget-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kget-18.12.3.tar.xz"; + sha256 = "3386c07c61f072df4259f83895be43c64559c059c24df1b31ca66c4f2b599f86"; + name = "kget-18.12.3.tar.xz"; }; }; kgoldrunner = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kgoldrunner-18.12.1.tar.xz"; - sha256 = "19qdw319lzfhmmmmawdpb0dlkz9k1iz6imkwf1qndfv89b6wklba"; - name = "kgoldrunner-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kgoldrunner-18.12.3.tar.xz"; + sha256 = "1d54b485ccb81106853d5229422c753a5b0bbd2f9239a17b1c44f737a32d93b6"; + name = "kgoldrunner-18.12.3.tar.xz"; }; }; kgpg = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kgpg-18.12.1.tar.xz"; - sha256 = "1rar3hj3wc9vpxc81h0ly1mi87m9cdx17j58k9n02q91jqb8892y"; - name = "kgpg-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kgpg-18.12.3.tar.xz"; + sha256 = "05d70923f4c9d068b339dc0a3d3f28890cafe1fbef9820dd6157c1f5fd8f19e8"; + name = "kgpg-18.12.3.tar.xz"; }; }; khangman = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/khangman-18.12.1.tar.xz"; - sha256 = "10wk0xdrs6pldg8j5bnsbdx835isxrapb1gm9gx4vjj49riq062q"; - name = "khangman-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/khangman-18.12.3.tar.xz"; + sha256 = "1a7cdd27abf229603965ff6b3392bd7935f7f5a2d6418b23f802cfae45f74013"; + name = "khangman-18.12.3.tar.xz"; }; }; khelpcenter = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/khelpcenter-18.12.1.tar.xz"; - sha256 = "143f61ngvljm4046q4allwxhx6fis0hd92xdqk8955xwdf42fq6y"; - name = "khelpcenter-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/khelpcenter-18.12.3.tar.xz"; + sha256 = "5b4a9ed17d0898c74cf7fd1612e2d055086d5e04148b3b17df5977255fc240b8"; + name = "khelpcenter-18.12.3.tar.xz"; }; }; kidentitymanagement = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kidentitymanagement-18.12.1.tar.xz"; - sha256 = "1pl8yzrhfvkxcxasywzklhpx2477whn662s13c5mp6yhpxyxl5xq"; - name = "kidentitymanagement-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kidentitymanagement-18.12.3.tar.xz"; + sha256 = "4e8cac86c2ecfe6325bbf8fb7e50a026f6af978be3809f327eddfed7b3aed662"; + name = "kidentitymanagement-18.12.3.tar.xz"; }; }; kig = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kig-18.12.1.tar.xz"; - sha256 = "0cc093gwq2cr4ir3rdfkhijjsjvjddw4n7hvrxbshv7pqmnbrjgc"; - name = "kig-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kig-18.12.3.tar.xz"; + sha256 = "abba87c3569e571e6d1761dc2e6c0e32969ea09eba6d9c0462cb4dc7bd62d7a2"; + name = "kig-18.12.3.tar.xz"; }; }; kigo = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kigo-18.12.1.tar.xz"; - sha256 = "07m3p9r59c4qfwpgipb024mzxi4safiidpypm8gmx87vbsqc99f2"; - name = "kigo-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kigo-18.12.3.tar.xz"; + sha256 = "fa767319c3ac3e2dea48a5b09284e47e5f0c5d1862af813258758773998d1484"; + name = "kigo-18.12.3.tar.xz"; }; }; killbots = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/killbots-18.12.1.tar.xz"; - sha256 = "12jbvqmi0cx5ma7lai67qamml7qig269vhvjrcvm7jwlg0qx8v43"; - name = "killbots-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/killbots-18.12.3.tar.xz"; + sha256 = "4efb4fcd4f34f1843b990a92e5b0309c196071f0778cdc8376eff5eef405deb9"; + name = "killbots-18.12.3.tar.xz"; }; }; kimagemapeditor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kimagemapeditor-18.12.1.tar.xz"; - sha256 = "1mqzd3ja27c4askz9cxfaf6g8wcwlasjka79h4dmvjrw4rkqs4y4"; - name = "kimagemapeditor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kimagemapeditor-18.12.3.tar.xz"; + sha256 = "addaaf257c35e8169288a8e7a50a1628f3ceeb6a2a845c3d260dfe94662438c6"; + name = "kimagemapeditor-18.12.3.tar.xz"; }; }; kimap = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kimap-18.12.1.tar.xz"; - sha256 = "1v1qd91pr4xx0wsvvqlg8pcsbyi0n7c90ki0pz8v8z2vay5fagnm"; - name = "kimap-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kimap-18.12.3.tar.xz"; + sha256 = "00aed701a3bdcc218902998e63e7c587549f77a1aa0d1bd7dad4a1837adc9992"; + name = "kimap-18.12.3.tar.xz"; }; }; kio-extras = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kio-extras-18.12.1.tar.xz"; - sha256 = "17y5awdyck2zjrgb9l2s4rdyvp1pqc6jrdyjv5vhchjdkfb91vw3"; - name = "kio-extras-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kio-extras-18.12.3.tar.xz"; + sha256 = "f8879abaea6fcf31ee0bd4a55d0c24a5fded6d61abed1b059f704f797793aef2"; + name = "kio-extras-18.12.3.tar.xz"; }; }; kirigami-gallery = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kirigami-gallery-18.12.1.tar.xz"; - sha256 = "1wrvhpdg2qk6ri1hjhdbk6w6rzyxamn6hxfl4mjcaip9gamjlbr0"; - name = "kirigami-gallery-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kirigami-gallery-18.12.3.tar.xz"; + sha256 = "64da8da506718e6b7b62e04a9d2fc40ec73f909f9a6b5afd29b4c81c20053e39"; + name = "kirigami-gallery-18.12.3.tar.xz"; }; }; kiriki = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kiriki-18.12.1.tar.xz"; - sha256 = "1sxn7qvhyaaf4681hx1hgv2mmfhn64qn6q0rad9vps69cb1rx7pz"; - name = "kiriki-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kiriki-18.12.3.tar.xz"; + sha256 = "0b67b5069625fe04f6ffaa65d0d4abcf86f2f067483b4db15508d2b5ee9742ac"; + name = "kiriki-18.12.3.tar.xz"; }; }; kiten = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kiten-18.12.1.tar.xz"; - sha256 = "1d964cc7bkr1vgsbbnm9c8na2nls3kmfk9wfkrzdgnj2643dl947"; - name = "kiten-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kiten-18.12.3.tar.xz"; + sha256 = "0e0bc0b0b2609a7872b45647976c87ec92ccb068d05113b8dc58e43c6eb1facf"; + name = "kiten-18.12.3.tar.xz"; }; }; kitinerary = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kitinerary-18.12.1.tar.xz"; - sha256 = "14bkyi4xj00i8bzjq6z68y67iyylix0c1n8wr1nz0s05pmlg8sws"; - name = "kitinerary-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kitinerary-18.12.3.tar.xz"; + sha256 = "f45ef90cb3fb53d83a30837c304b9f7cfa5dbf2953421233d97c101d66a81f35"; + name = "kitinerary-18.12.3.tar.xz"; }; }; kjumpingcube = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kjumpingcube-18.12.1.tar.xz"; - sha256 = "0i7lj2qi3mdvghpxyhwiakivxsd85ahy427d418sdykh7dfmn9ih"; - name = "kjumpingcube-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kjumpingcube-18.12.3.tar.xz"; + sha256 = "6409a3bb398ab90959afc24fa42b01b6e544526b1dab6f36bb700703fa794993"; + name = "kjumpingcube-18.12.3.tar.xz"; }; }; kldap = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kldap-18.12.1.tar.xz"; - sha256 = "117w3jk4i77p8a7dvj03kgxqlhgbkmhyl7w282gl38kxyr7z8hbn"; - name = "kldap-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kldap-18.12.3.tar.xz"; + sha256 = "dc5c8f33aad9e82f0cee65c6fc530f6bd9b82ec9cc21d1ce904f0fe9bdf5140e"; + name = "kldap-18.12.3.tar.xz"; }; }; kleopatra = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kleopatra-18.12.1.tar.xz"; - sha256 = "1njgfigld774r9xyckip118svxrkylh0a5ib5y8976zb0v71m5mj"; - name = "kleopatra-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kleopatra-18.12.3.tar.xz"; + sha256 = "ea165519846d70206e951d8d904bc02d17ed724db100638e657f7c930c4c490b"; + name = "kleopatra-18.12.3.tar.xz"; }; }; klettres = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/klettres-18.12.1.tar.xz"; - sha256 = "0xxrkx468wx2f3gb3d77i648xxmy6bq6q0nq121fk2apgdp2dzqk"; - name = "klettres-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/klettres-18.12.3.tar.xz"; + sha256 = "4ca89a54858d1f8ac43e8cb485b80a3bb5ead501d39e7e30d8c9b6b8d2d7fd93"; + name = "klettres-18.12.3.tar.xz"; }; }; klickety = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/klickety-18.12.1.tar.xz"; - sha256 = "14jvifvm47q0ca7jq7d152l53nswhbwggs0q067n3chmf07g2izy"; - name = "klickety-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/klickety-18.12.3.tar.xz"; + sha256 = "45ed455fd9628aaf081bfa6b672199fbb6913c7dc5d5c04ad9df206a3bd962a5"; + name = "klickety-18.12.3.tar.xz"; }; }; klines = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/klines-18.12.1.tar.xz"; - sha256 = "1bs7vaqs67232msmsrsfi9avbqrzvyjihsakzxpkn976xwql3zxf"; - name = "klines-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/klines-18.12.3.tar.xz"; + sha256 = "6d93e5bee1135f4eeb67e7f845a4fd658be7e5fb33f42c0ad6320200bc86fd80"; + name = "klines-18.12.3.tar.xz"; }; }; kmag = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmag-18.12.1.tar.xz"; - sha256 = "1ig9fbnza2xvxvd1adh9riv3zmrdmm0km8jpqjmh124i8g416qpw"; - name = "kmag-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmag-18.12.3.tar.xz"; + sha256 = "04f1357e46bb3e32c85f08c9d5655cde6351c6efd27824a17019ea8562e8d5ba"; + name = "kmag-18.12.3.tar.xz"; }; }; kmahjongg = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmahjongg-18.12.1.tar.xz"; - sha256 = "0ajml6xy4ljmrn5qbvy08mcf5v5jqzmclsbr6811rrxqxb5fqbqd"; - name = "kmahjongg-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmahjongg-18.12.3.tar.xz"; + sha256 = "188a8d921b72965d4ed0f6490048cde7b9d5606cca7d3cea12463dc71a90ccf6"; + name = "kmahjongg-18.12.3.tar.xz"; }; }; kmail = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmail-18.12.1.tar.xz"; - sha256 = "1wakrrlxp3v0k93hx2c8p136a3hd746l8fxks0g3cwvhl1immxw7"; - name = "kmail-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmail-18.12.3.tar.xz"; + sha256 = "9dd9865d4a463ac552c25126ecaee662b83548091c5abef168bdc7a6d2fb5c76"; + name = "kmail-18.12.3.tar.xz"; }; }; kmail-account-wizard = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmail-account-wizard-18.12.1.tar.xz"; - sha256 = "0v3lwgk3b30ggv6573r6k5z09lcpfzspp5znnsn4650fgrrzg2j3"; - name = "kmail-account-wizard-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmail-account-wizard-18.12.3.tar.xz"; + sha256 = "102a4170cb4f80c7a9ba3aec7a4d34a3e6a8ca18c975b5c0ea33cf7bac9e21df"; + name = "kmail-account-wizard-18.12.3.tar.xz"; }; }; kmailtransport = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmailtransport-18.12.1.tar.xz"; - sha256 = "1ybaps485ic2m8nfy63kw6x7f3l2l67lhyy5zsm7rjipbaqgi2vm"; - name = "kmailtransport-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmailtransport-18.12.3.tar.xz"; + sha256 = "8aaa6045f29195074c61fd58112ca7dfbe594df66cac91bac7b246ab2ab9fad1"; + name = "kmailtransport-18.12.3.tar.xz"; }; }; kmbox = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmbox-18.12.1.tar.xz"; - sha256 = "0anh25klbgb67ynl9mlcny2mrawsd98mzyffvgsd8xkback684zf"; - name = "kmbox-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmbox-18.12.3.tar.xz"; + sha256 = "13a88db1ab0d628a3053a0d6ab5d89cd2f6cbadb3082b52e5dc7048516a10841"; + name = "kmbox-18.12.3.tar.xz"; }; }; kmime = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmime-18.12.1.tar.xz"; - sha256 = "05kjfqaadkflyh1vabzgbx33vr3c70sm2nkp8r9dsa7kg3wij0n2"; - name = "kmime-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmime-18.12.3.tar.xz"; + sha256 = "a09b0757e6ba663bf52d9bb8f7f104f3f19f734a858f6d532a6a20888ebcd274"; + name = "kmime-18.12.3.tar.xz"; }; }; kmines = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmines-18.12.1.tar.xz"; - sha256 = "0dq1jirzb6ljhb7wdrrkyxvmlwg84xzhfikcn9v6nmz9f3pbliwi"; - name = "kmines-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmines-18.12.3.tar.xz"; + sha256 = "40c16b57614098555c32252c75e3890922b62d7005b9059f6ae92e11c96d980f"; + name = "kmines-18.12.3.tar.xz"; }; }; kmix = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmix-18.12.1.tar.xz"; - sha256 = "1ra7jmi5xlq9gbh7csv40sxr20lv8dz659m1jx4ixkzppcj42s73"; - name = "kmix-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmix-18.12.3.tar.xz"; + sha256 = "4edf31a36a5d700cc190ba7a5a0d76789729069d48324a22bda7977cb4ed081a"; + name = "kmix-18.12.3.tar.xz"; }; }; kmousetool = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmousetool-18.12.1.tar.xz"; - sha256 = "07ywyxkm510faaqzywp5rw0lr2x1djhyhkjwyv8l42iw7231bn8x"; - name = "kmousetool-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmousetool-18.12.3.tar.xz"; + sha256 = "34f6bb6f69c284e9cc88d8a31d59c16f003310c33e1e1affd5c363d18f8a91a8"; + name = "kmousetool-18.12.3.tar.xz"; }; }; kmouth = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmouth-18.12.1.tar.xz"; - sha256 = "1g82shlrfm70ddfy2zfv12gv8hwzavz47q4qsyblyzq329kwgww5"; - name = "kmouth-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmouth-18.12.3.tar.xz"; + sha256 = "89b83fb8b4a5eb3c7a6409cd25c730a8bc3be72983c1a75f5e3d3abf01064486"; + name = "kmouth-18.12.3.tar.xz"; }; }; kmplot = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmplot-18.12.1.tar.xz"; - sha256 = "0xl913pajyrhadld2ij9y0ai2w558wa60qfx1y1xwsjfm8124qgf"; - name = "kmplot-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmplot-18.12.3.tar.xz"; + sha256 = "2dd6eec34088b5d3b591091cce41616ee310a66aa2d16e5800db56044d60dd7b"; + name = "kmplot-18.12.3.tar.xz"; }; }; knavalbattle = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/knavalbattle-18.12.1.tar.xz"; - sha256 = "1p03c980w4d10mkmvm01imi7vg6cp3wqz0wvw2d5vz47i0jhm2w8"; - name = "knavalbattle-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/knavalbattle-18.12.3.tar.xz"; + sha256 = "bce9294830a55e96b234c93fa20eb7d7ae963223e724ab0211ec472c79d35fa3"; + name = "knavalbattle-18.12.3.tar.xz"; }; }; knetwalk = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/knetwalk-18.12.1.tar.xz"; - sha256 = "0x5794f91b84l4d8hgkqi33rdqa7s1plhprhmbfvsi4grpms6c0c"; - name = "knetwalk-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/knetwalk-18.12.3.tar.xz"; + sha256 = "75ed9859ebb0c40d4efadaf1724b50c1a0436a5d3cd7cb540031cf5535794e3f"; + name = "knetwalk-18.12.3.tar.xz"; }; }; knights = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/knights-18.12.1.tar.xz"; - sha256 = "17n7zi100q62wjavfr87369yqp2mjxqz0lyqalagjp25d80z18l2"; - name = "knights-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/knights-18.12.3.tar.xz"; + sha256 = "9472ffa7800bd79a84dd0c36e3058d3f6e0813b5695aeffeb73bccb801870990"; + name = "knights-18.12.3.tar.xz"; }; }; knotes = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/knotes-18.12.1.tar.xz"; - sha256 = "12n40znf9vczvbf5xfj4zsxwbj2rdj7l1iasmiiil2md8iyjs6dz"; - name = "knotes-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/knotes-18.12.3.tar.xz"; + sha256 = "4cd3a4e5064211f3df6ebf4711c2f4e01b09c77580493de9070c9ee842059578"; + name = "knotes-18.12.3.tar.xz"; }; }; kolf = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kolf-18.12.1.tar.xz"; - sha256 = "072nmvsxm8ky1nz2pp6ri74ms3rql0qqg004mzbbq061dil4k63i"; - name = "kolf-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kolf-18.12.3.tar.xz"; + sha256 = "330cd299702e282a8b248b81cd50ee7ff60a6f512967029730ab87bedb69652f"; + name = "kolf-18.12.3.tar.xz"; }; }; kollision = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kollision-18.12.1.tar.xz"; - sha256 = "0idjjfgj8fk0c0l5i6x80cg20p1rpq6kab8z9rh2izvg1v6h7qvl"; - name = "kollision-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kollision-18.12.3.tar.xz"; + sha256 = "17376f73da0ea5e05998a4f9f0ccb6c0e41461007b8815637ac1980673e9a856"; + name = "kollision-18.12.3.tar.xz"; }; }; kolourpaint = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kolourpaint-18.12.1.tar.xz"; - sha256 = "0h454h5rzk0wki8lbmz57xx3859c27sy9vk1mwawfj963785f2nd"; - name = "kolourpaint-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kolourpaint-18.12.3.tar.xz"; + sha256 = "450b714f0d73b59d31c4ceda142a3496d14e51d84b8c8968548a15e05c138f98"; + name = "kolourpaint-18.12.3.tar.xz"; }; }; kompare = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kompare-18.12.1.tar.xz"; - sha256 = "099fkxmk7g19l07lf2v3hmqrgfd17fbsv4m5cxdjci8alizw8pp9"; - name = "kompare-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kompare-18.12.3.tar.xz"; + sha256 = "7a132a0aced98079fdec37188e9a46f5399e7584ab9d39801d7f0f8176623285"; + name = "kompare-18.12.3.tar.xz"; }; }; konqueror = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/konqueror-18.12.1.tar.xz"; - sha256 = "08j4x2xi1iv5661gjpcakp2dmdhvhw3jad98kq3xj9989s7phpfy"; - name = "konqueror-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/konqueror-18.12.3.tar.xz"; + sha256 = "d9eb2bb4cd121f9967c6d6e7275dfb56bd41aec03c2b9d903d543b330ca4666a"; + name = "konqueror-18.12.3.tar.xz"; }; }; konquest = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/konquest-18.12.1.tar.xz"; - sha256 = "0mlk2vm53nc9dc7ca9ah3ly9qs94md24pi2gmv68pz1ysr51i483"; - name = "konquest-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/konquest-18.12.3.tar.xz"; + sha256 = "3698253f8e873819680ed99f377a679bacf5351f3fadc92c07fbaa0f6b269172"; + name = "konquest-18.12.3.tar.xz"; }; }; konsole = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/konsole-18.12.1.tar.xz"; - sha256 = "15w1jizs4q6mivv7qjkf0gkqlz0jnrz7b2i59r3kx2fvwwwl18rg"; - name = "konsole-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/konsole-18.12.3.tar.xz"; + sha256 = "01ff3245d755a6e38207e58e50e5f82e5c681ead2ad7176d46aec00a8a562e08"; + name = "konsole-18.12.3.tar.xz"; }; }; kontact = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kontact-18.12.1.tar.xz"; - sha256 = "0bqn9vh75wpkks1l9hd2bm33k1im356x2091xlnnzs70m4gjxhag"; - name = "kontact-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kontact-18.12.3.tar.xz"; + sha256 = "81426545a958d6d71210040f5ede6407048a16d320ea90c405318cdd7e8e9315"; + name = "kontact-18.12.3.tar.xz"; }; }; kontactinterface = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kontactinterface-18.12.1.tar.xz"; - sha256 = "0khba3wnpwji4mm5n56bcnffd1v9w4a1b1r7lhlz88dqkakqyb61"; - name = "kontactinterface-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kontactinterface-18.12.3.tar.xz"; + sha256 = "4895e884c93ebff36a721f5161386105e729925dbbbf6fafb94c75ba4b291e41"; + name = "kontactinterface-18.12.3.tar.xz"; }; }; kopete = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kopete-18.12.1.tar.xz"; - sha256 = "12q62nj287qc4gz8q66spk1d0xykrwkphwaxrh2i3sd07bjmyzqs"; - name = "kopete-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kopete-18.12.3.tar.xz"; + sha256 = "8ca7a41e39be23ca6802deade7b5edb88b7e3000bc8e6fb2f68efbc15c2c8d3b"; + name = "kopete-18.12.3.tar.xz"; }; }; korganizer = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/korganizer-18.12.1.tar.xz"; - sha256 = "1g8wjrghzxgx9xhqf98z9xlq5svl2v931ifczsfkvs9d3smx2zsg"; - name = "korganizer-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/korganizer-18.12.3.tar.xz"; + sha256 = "6a63e60b60af6cb95c78382da15e9e3cf04f936689ce12b62fe38968fad75a9c"; + name = "korganizer-18.12.3.tar.xz"; }; }; kpat = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kpat-18.12.1.tar.xz"; - sha256 = "1ami2bssnjm01k3i6bqqciszablkw6975hac2d8zzvg2bz8g4a2a"; - name = "kpat-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kpat-18.12.3.tar.xz"; + sha256 = "62c31d6f7a9bb49c09725722bea472811d897b149e29558ca6e248b5d2a41377"; + name = "kpat-18.12.3.tar.xz"; }; }; kpimtextedit = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kpimtextedit-18.12.1.tar.xz"; - sha256 = "13ki9gjgakyqcxx4hvs0plqgw0rqx0z95dnyaqv1safqkwrr76hb"; - name = "kpimtextedit-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kpimtextedit-18.12.3.tar.xz"; + sha256 = "54586fc97eb863eaa57e589d4461dd9cfbc4d12e58425afadcd22d64ba8a570d"; + name = "kpimtextedit-18.12.3.tar.xz"; }; }; kpkpass = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kpkpass-18.12.1.tar.xz"; - sha256 = "1sw3gpvai71lliq4y1snxrhzi9jhl1vxkimlxl2nmhg951nzd4xx"; - name = "kpkpass-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kpkpass-18.12.3.tar.xz"; + sha256 = "cd70809ab7a052e0ca2a18266ec5564bde16ac917988798290e3f01e428bd84f"; + name = "kpkpass-18.12.3.tar.xz"; }; }; kqtquickcharts = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kqtquickcharts-18.12.1.tar.xz"; - sha256 = "0i8qww267q797pxk3k66d09b0dp7ixbxf92p5bsqf7z4p2graayl"; - name = "kqtquickcharts-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kqtquickcharts-18.12.3.tar.xz"; + sha256 = "739859dc261856cf253ac67e2273b20dee476735b4107ece991d7146d45c1bbe"; + name = "kqtquickcharts-18.12.3.tar.xz"; }; }; krdc = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/krdc-18.12.1.tar.xz"; - sha256 = "1smdav92rfr92mxk8q7wcmmvrf746vn2xyw36hyszq561ycgwwrx"; - name = "krdc-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/krdc-18.12.3.tar.xz"; + sha256 = "c01896b73ab058a20f4c3d8997c28cbb81a7000f5aec346592a9315412c10666"; + name = "krdc-18.12.3.tar.xz"; }; }; kreversi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kreversi-18.12.1.tar.xz"; - sha256 = "171w76xv9dbhy7pxs9swq7xknrwkjk5ndgq4waj6m5dh0109qmx4"; - name = "kreversi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kreversi-18.12.3.tar.xz"; + sha256 = "818ef2ded02caacf2ccf3c012e992070c3b898db319682e8a42cf5726d56b3fc"; + name = "kreversi-18.12.3.tar.xz"; }; }; krfb = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/krfb-18.12.1.tar.xz"; - sha256 = "0bhhlp4ask2xqzq9igw0akxr0gb0iilaljwqrcw91fx36sxq46p4"; - name = "krfb-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/krfb-18.12.3.tar.xz"; + sha256 = "9596adfe7135930c6c9c8ecd05035e401d80a5e2cd532ba343b7d4c0f57a799b"; + name = "krfb-18.12.3.tar.xz"; }; }; kross-interpreters = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kross-interpreters-18.12.1.tar.xz"; - sha256 = "0k57qprmpspp9b8vb124h1whgyskmwd6q7l60vswqizc64xa2src"; - name = "kross-interpreters-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kross-interpreters-18.12.3.tar.xz"; + sha256 = "ce2231b2faa9accc6342a37024651b988eefbcb9b3968025ffa4752d0cbdc70c"; + name = "kross-interpreters-18.12.3.tar.xz"; }; }; kruler = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kruler-18.12.1.tar.xz"; - sha256 = "1wfxapw6grx860wa6fyya8fnvlrpmdzsz64fnx64h0mky09j21r6"; - name = "kruler-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kruler-18.12.3.tar.xz"; + sha256 = "1b347c552648caca99364a0524945d0849cd84b29e4d07f62ee518ec07a98e33"; + name = "kruler-18.12.3.tar.xz"; }; }; kshisen = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kshisen-18.12.1.tar.xz"; - sha256 = "0wz4jfrqqvzz2p5f6hwyj7rpijsnhbzmm2m7jhjrljjl5lfdqd3x"; - name = "kshisen-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kshisen-18.12.3.tar.xz"; + sha256 = "00c5de16c335262287bab37b07822b6fd2997abcec25a0ad0a7d1ece6769060f"; + name = "kshisen-18.12.3.tar.xz"; }; }; ksirk = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksirk-18.12.1.tar.xz"; - sha256 = "108bw284jsff3qgg98vzs93m6dl8wjfkmbrkjgij03w00jb47bqf"; - name = "ksirk-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksirk-18.12.3.tar.xz"; + sha256 = "cb8f3cc98fe861b0f4ebff77aeeffa12905b98b6db0c8800525f4fb052be4e7a"; + name = "ksirk-18.12.3.tar.xz"; }; }; ksmtp = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksmtp-18.12.1.tar.xz"; - sha256 = "0zj4gpfz2njrdnfbjy7s9xci0il7qmmzargkszgj9jdzpm5qlaas"; - name = "ksmtp-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksmtp-18.12.3.tar.xz"; + sha256 = "90578b1b3ac1ce14bf4f34799b1b400b06734c72f3fecd41f5f07aed37ed3b74"; + name = "ksmtp-18.12.3.tar.xz"; }; }; ksnakeduel = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksnakeduel-18.12.1.tar.xz"; - sha256 = "1l0gfh5vfcfnk3sdl8wsqbc2vcmsdf9frpngfacv4ndm4xc371ql"; - name = "ksnakeduel-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksnakeduel-18.12.3.tar.xz"; + sha256 = "5d55e4c11baecbd77b94dd004b490a7f73870a383e0bf3ad0381f22d36a27a36"; + name = "ksnakeduel-18.12.3.tar.xz"; }; }; kspaceduel = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kspaceduel-18.12.1.tar.xz"; - sha256 = "01pcnqpzbrnwxavmfpdib78kc44am9in711012j2621cccx2r9cw"; - name = "kspaceduel-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kspaceduel-18.12.3.tar.xz"; + sha256 = "f40d0a7c578f461875efaf9e25d2b061486a21f750ce8bc922db4aed6fed1f11"; + name = "kspaceduel-18.12.3.tar.xz"; }; }; ksquares = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksquares-18.12.1.tar.xz"; - sha256 = "1gyd7qipp821jzn94yrw4b0d46ays0hs26q17hxnbx07hyfj3kcb"; - name = "ksquares-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksquares-18.12.3.tar.xz"; + sha256 = "82a90b7fe5ca8e46950a0de1742783c522fcd85bbc3aabe5955834865bc36b7d"; + name = "ksquares-18.12.3.tar.xz"; }; }; ksudoku = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksudoku-18.12.1.tar.xz"; - sha256 = "1cm5r4fkc7ha0c3mbcank9h2fhym7qc8k1q69lpmzrbm9hw2kgrs"; - name = "ksudoku-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksudoku-18.12.3.tar.xz"; + sha256 = "4a44248f2bde9c66c911fe7ed7bd54e31956053dac18e29217a355ad2b3a05e1"; + name = "ksudoku-18.12.3.tar.xz"; }; }; ksystemlog = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksystemlog-18.12.1.tar.xz"; - sha256 = "1s5b4j67q6nm7r4b1ibvypsd5z9la7cri7z1r7hzihv4nry8pk5c"; - name = "ksystemlog-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksystemlog-18.12.3.tar.xz"; + sha256 = "93f276698b74af654f3ed147d5c025162bd919ec6c79a7c7dd7678051c307e52"; + name = "ksystemlog-18.12.3.tar.xz"; }; }; kteatime = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kteatime-18.12.1.tar.xz"; - sha256 = "01p4d61d16k2pppf51sz52y0w4qc1dyqnmhjlnr5w75rfmwvvivg"; - name = "kteatime-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kteatime-18.12.3.tar.xz"; + sha256 = "24b3e51edc9d6625ca5b3542bd5edd1d42d79142f2c30f886e1b9515dcdfac6d"; + name = "kteatime-18.12.3.tar.xz"; }; }; ktimer = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktimer-18.12.1.tar.xz"; - sha256 = "0wqkfvbdcnwh1jzn2ac7k4pa8amr51ajhljc95mvps03m9d92rsf"; - name = "ktimer-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktimer-18.12.3.tar.xz"; + sha256 = "b3808fa9821c3a624b880b9a5607c8e12287cd38418ff06dd9af8345f324fe7e"; + name = "ktimer-18.12.3.tar.xz"; }; }; ktnef = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktnef-18.12.1.tar.xz"; - sha256 = "0id7hkmgr5zc12zfrj5ydxyhgdrlx4ip1dsw301i27id104fqb69"; - name = "ktnef-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktnef-18.12.3.tar.xz"; + sha256 = "7633f86514d01a1e3709f6854b3b9c859fa1905043bb53240c1ae53f3b76a6ec"; + name = "ktnef-18.12.3.tar.xz"; }; }; ktouch = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktouch-18.12.1.tar.xz"; - sha256 = "0v3lhxx45l41bw14wi7n4k29d1c9xmacrscjyj84fmy09nlyyaa5"; - name = "ktouch-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktouch-18.12.3.tar.xz"; + sha256 = "194f308a114c89873ee88eb069ecda88d5d1e1ad97c150e2d61cf248719b4bb6"; + name = "ktouch-18.12.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-accounts-kcm-18.12.1.tar.xz"; - sha256 = "1aswmp7504kpwlb37rvxx514ac5256h5lhwj9xl479vyxgaazxsn"; - name = "ktp-accounts-kcm-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-accounts-kcm-18.12.3.tar.xz"; + sha256 = "ab6ab0f6cb438ec68b110158f7c6555572f04ad69da04f5e1d144cfc4a8ee8cb"; + name = "ktp-accounts-kcm-18.12.3.tar.xz"; }; }; ktp-approver = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-approver-18.12.1.tar.xz"; - sha256 = "1jr5kxlj2229rknxhi5jsgdjgx9n0n5jx7lc4aa2c96kd843n2ah"; - name = "ktp-approver-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-approver-18.12.3.tar.xz"; + sha256 = "0616fcad79fdeae5f2a58b167419f1745e94cea21950faa535e7b5a6c2e53cf6"; + name = "ktp-approver-18.12.3.tar.xz"; }; }; ktp-auth-handler = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-auth-handler-18.12.1.tar.xz"; - sha256 = "1fwcibz8dh94xaprpyybn0dlh1fyd6rsx9zsx8cyxqhx96fq8v28"; - name = "ktp-auth-handler-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-auth-handler-18.12.3.tar.xz"; + sha256 = "91d6e0148c9006117bc67969012f7a12405e186fc8ffd4011732dc3e7c16a4be"; + name = "ktp-auth-handler-18.12.3.tar.xz"; }; }; ktp-call-ui = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-call-ui-18.12.1.tar.xz"; - sha256 = "1f63w374d9smz7147lax9zqfvikqhl2hllvnlb03zl49kh13s8h3"; - name = "ktp-call-ui-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-call-ui-18.12.3.tar.xz"; + sha256 = "3558b9ef7a2a000f6b49454c4477dcd9700168a1f2c060267b24c78725097571"; + name = "ktp-call-ui-18.12.3.tar.xz"; }; }; ktp-common-internals = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-common-internals-18.12.1.tar.xz"; - sha256 = "1frnzsql9mk78bjfc2kpwmsf8nkx1ybhm1snq125kkzayqipvdkp"; - name = "ktp-common-internals-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-common-internals-18.12.3.tar.xz"; + sha256 = "3913a515d98f74940e0db6b85fc5c6c128c68cffb427c93164052be437634740"; + name = "ktp-common-internals-18.12.3.tar.xz"; }; }; ktp-contact-list = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-contact-list-18.12.1.tar.xz"; - sha256 = "13aiy156372qapwddr2i3nf1jkzbj9905rvd55akwpa8sy70m3kw"; - name = "ktp-contact-list-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-contact-list-18.12.3.tar.xz"; + sha256 = "8f858371ec3760bc042dbf6f022ba834ca5b9ae43997e67bf395978df603d0c1"; + name = "ktp-contact-list-18.12.3.tar.xz"; }; }; ktp-contact-runner = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-contact-runner-18.12.1.tar.xz"; - sha256 = "1grpgg3fgyzf97n60jmpjgviz5194awmrl6yfaal7hd1cdkfrs34"; - name = "ktp-contact-runner-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-contact-runner-18.12.3.tar.xz"; + sha256 = "886d561952ac1a8a5fa50ffdff8699358480d18d58cbaec217ed865d2047f0a9"; + name = "ktp-contact-runner-18.12.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-desktop-applets-18.12.1.tar.xz"; - sha256 = "0iikcp7rvvrn7189kdzj1i4qzhkgh06gzr8hm49gy29qxqk36ykn"; - name = "ktp-desktop-applets-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-desktop-applets-18.12.3.tar.xz"; + sha256 = "439dca1046beba0d2579918f2e409e6629e5063da6eeb1001bcd65ff3edb32c4"; + name = "ktp-desktop-applets-18.12.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-filetransfer-handler-18.12.1.tar.xz"; - sha256 = "04dnh7yb0jajs79xh1wyq9d48nklvldc7lnk1lp194iz8yydvylx"; - name = "ktp-filetransfer-handler-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-filetransfer-handler-18.12.3.tar.xz"; + sha256 = "898c7f4ffc8d8bec691cc9744fb356722cf7957f39d2d855138492b647542231"; + name = "ktp-filetransfer-handler-18.12.3.tar.xz"; }; }; ktp-kded-module = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-kded-module-18.12.1.tar.xz"; - sha256 = "0kmw8pifb4xry3zqpq671rh39ziaka8zx60p5xzs10rl17rmxwzs"; - name = "ktp-kded-module-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-kded-module-18.12.3.tar.xz"; + sha256 = "ebbd02a1441caf8e9ced851c8f814255ac4b9e75485a4bc59026f647d3fd4854"; + name = "ktp-kded-module-18.12.3.tar.xz"; }; }; ktp-send-file = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-send-file-18.12.1.tar.xz"; - sha256 = "01i059vsaydw410sv15vzwysgxcy2n9wm3qcnal4fx7wgw5xx163"; - name = "ktp-send-file-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-send-file-18.12.3.tar.xz"; + sha256 = "0015551c42d66f14ae508eee76f138584bbec3b77a4aff4a003255b52d8414f2"; + name = "ktp-send-file-18.12.3.tar.xz"; }; }; ktp-text-ui = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-text-ui-18.12.1.tar.xz"; - sha256 = "14smhdcvy0v1s1rbkss1g6jyzfm6y1nqjp8a9wcbygbzh88g0bjy"; - name = "ktp-text-ui-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-text-ui-18.12.3.tar.xz"; + sha256 = "6a37a26b0b226d5d30b298a4d6d85f8dcfe9f39cbc35e1b6322651678815a34e"; + name = "ktp-text-ui-18.12.3.tar.xz"; }; }; ktuberling = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktuberling-18.12.1.tar.xz"; - sha256 = "0h0w2knfs97bzxaja3dkc78fjfymic09b6zid41kxd4mi41lngkk"; - name = "ktuberling-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktuberling-18.12.3.tar.xz"; + sha256 = "b69815f3553f843c30ab9d026ca7da97e62e66b58851111d1e4d29e57d67bd04"; + name = "ktuberling-18.12.3.tar.xz"; }; }; kturtle = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kturtle-18.12.1.tar.xz"; - sha256 = "0b2505gmys2p11ryj7bqr60zgh0ydp16xidhkv6hhykmrmp2bsm1"; - name = "kturtle-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kturtle-18.12.3.tar.xz"; + sha256 = "4677335b4f8a3e363425652815d19ae13e9f8942b01051553b485100c4996253"; + name = "kturtle-18.12.3.tar.xz"; }; }; kubrick = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kubrick-18.12.1.tar.xz"; - sha256 = "0vq8djk5xc00cz4a2inbw62x9pigxxjcxi92h8qayigi7cf9xrll"; - name = "kubrick-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kubrick-18.12.3.tar.xz"; + sha256 = "0deb9022a028a6c068203e5bf20820b5561c92b5117735e8a58f212c2ba460e3"; + name = "kubrick-18.12.3.tar.xz"; }; }; kwalletmanager = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kwalletmanager-18.12.1.tar.xz"; - sha256 = "1d3kdxc53n2ss73r9ld6rr5w9zhvkglrcbw8whq2hsam79mh0vsn"; - name = "kwalletmanager-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kwalletmanager-18.12.3.tar.xz"; + sha256 = "78232285c08241dc06cd6da88dcdce0d850417dd73f0d07034ec6d9a6f97f478"; + name = "kwalletmanager-18.12.3.tar.xz"; }; }; kwave = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kwave-18.12.1.tar.xz"; - sha256 = "150lqffzzyb2ajyg97sprzbm6zq1iq4psl6vics51lw7sybwj4m3"; - name = "kwave-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kwave-18.12.3.tar.xz"; + sha256 = "4ca9a15ecd06b96e013855f8109b52fcd4a848652438b2e7a2f55a8fcb1d1c48"; + name = "kwave-18.12.3.tar.xz"; }; }; kwordquiz = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kwordquiz-18.12.1.tar.xz"; - sha256 = "1da9jjdk2avdmdm16s63h0hk5swml37afwdnsd777ilj2x8a5ndf"; - name = "kwordquiz-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kwordquiz-18.12.3.tar.xz"; + sha256 = "e609d6b7f93abe0ca7ba844c51dff8d89d435daa9d0a6be68e789b70370459cc"; + name = "kwordquiz-18.12.3.tar.xz"; }; }; libgravatar = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libgravatar-18.12.1.tar.xz"; - sha256 = "1a7b46zqv5m7c9arfmcxhrcnrkcligz3ryygxv801zfa7277l8j6"; - name = "libgravatar-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libgravatar-18.12.3.tar.xz"; + sha256 = "c44c139fbaffda352f0fe461065622cff65b6f1cc13cee8a0137acb27de143ee"; + name = "libgravatar-18.12.3.tar.xz"; }; }; libkcddb = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkcddb-18.12.1.tar.xz"; - sha256 = "1k9rbkf12g1hsn23nyhc65zrppkikk8xplm7l321kxpnq2prm155"; - name = "libkcddb-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkcddb-18.12.3.tar.xz"; + sha256 = "38bffd551b82628a25b46bd598c257927855b77c6b6b73a9b69ac7bf538afc29"; + name = "libkcddb-18.12.3.tar.xz"; }; }; libkcompactdisc = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkcompactdisc-18.12.1.tar.xz"; - sha256 = "0v7fh9s9qbljgfjyi3bd9w7wp69y4qjg0jj8cmn11snrsd8zzaac"; - name = "libkcompactdisc-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkcompactdisc-18.12.3.tar.xz"; + sha256 = "a464ebfdd1a2834c2597e7ffd1b0d946ddfda348eea5ac8d1d42b46d6c478926"; + name = "libkcompactdisc-18.12.3.tar.xz"; }; }; libkdcraw = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkdcraw-18.12.1.tar.xz"; - sha256 = "1g58cpzqzl6vl62lbrqd8fyscxspqypxq4lyj3d2k9b0b66hjc6c"; - name = "libkdcraw-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkdcraw-18.12.3.tar.xz"; + sha256 = "c4b6541419b2ebee15d24744d10e67c9a137e616766e765c13e5056c2a37ef99"; + name = "libkdcraw-18.12.3.tar.xz"; }; }; libkdegames = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkdegames-18.12.1.tar.xz"; - sha256 = "0iksk5gnl860xcmpaj56wxaamhm9zhjnyszj4nssppssn8kr1r65"; - name = "libkdegames-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkdegames-18.12.3.tar.xz"; + sha256 = "7c833fe476043f0492a09a52af60ee7652805cccbbb72e5f473a9d35abff9ed9"; + name = "libkdegames-18.12.3.tar.xz"; }; }; libkdepim = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkdepim-18.12.1.tar.xz"; - sha256 = "1qvzj68p630mzafwyv7f3q1fd615yca7amc0q7kp2cs08fnv67fp"; - name = "libkdepim-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkdepim-18.12.3.tar.xz"; + sha256 = "1c53148dd9f477b1ca2ea622b25100eab95531115e9798264d3e65d28183e640"; + name = "libkdepim-18.12.3.tar.xz"; }; }; libkeduvocdocument = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkeduvocdocument-18.12.1.tar.xz"; - sha256 = "0zgl0dw8sb5lffzv580nql04i0n31ma8569wrhh75kg12qb5yd7w"; - name = "libkeduvocdocument-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkeduvocdocument-18.12.3.tar.xz"; + sha256 = "907076104f445f22fa31c2fa5ecfdabbb8b18faab52fc10c879a53d6245aaad4"; + name = "libkeduvocdocument-18.12.3.tar.xz"; }; }; libkexiv2 = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkexiv2-18.12.1.tar.xz"; - sha256 = "1jgk14dgf30czsah0mjrs7lsll0s4aks2075pfmvrnsl71vfbsj3"; - name = "libkexiv2-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkexiv2-18.12.3.tar.xz"; + sha256 = "1d14ff63af42ab7e19e2039648a95ea5dc946afbe3e3df52c17ce1618a02ebdc"; + name = "libkexiv2-18.12.3.tar.xz"; }; }; libkgapi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkgapi-18.12.1.tar.xz"; - sha256 = "1g5mzdw4mrlqhi9zby51m1sgkq1gjmkd7smja287kjf7whdx0sn3"; - name = "libkgapi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkgapi-18.12.3.tar.xz"; + sha256 = "de0314fd83d8fa8f88e6a355c4725047d2e507e0d40f1950c8ae083c2bc21924"; + name = "libkgapi-18.12.3.tar.xz"; }; }; libkgeomap = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkgeomap-18.12.1.tar.xz"; - sha256 = "0ijf71ss8qirrgx45x4wnry049d2bllgnlzm8gll4mj1hv9jhjdz"; - name = "libkgeomap-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkgeomap-18.12.3.tar.xz"; + sha256 = "2c4459e61e471f0344d03cfa5f00fe2a1890cd2c1501323ceed26d522496c47b"; + name = "libkgeomap-18.12.3.tar.xz"; }; }; libkipi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkipi-18.12.1.tar.xz"; - sha256 = "1372kmqni0vb8bryv0h30pljikabjdq44v1fjpgg81f4v1n4pfxv"; - name = "libkipi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkipi-18.12.3.tar.xz"; + sha256 = "96abf4552d535cf101c76ff5b1cb0198eccfd4bdfb7dc192b66bf709af037a31"; + name = "libkipi-18.12.3.tar.xz"; }; }; libkleo = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkleo-18.12.1.tar.xz"; - sha256 = "1p1bw0wzwg2zccgkqs50j92rzkpvcspjdj85zanmryg568mz9r1x"; - name = "libkleo-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkleo-18.12.3.tar.xz"; + sha256 = "e528ed366352404d48313a8c154f56c672470bf06524ea7a150a726d3eb87d69"; + name = "libkleo-18.12.3.tar.xz"; }; }; libkmahjongg = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkmahjongg-18.12.1.tar.xz"; - sha256 = "1q590f7l10a1zjcg3dv3ns1003xrnr7zlmff03zg3a9zcqj11kwv"; - name = "libkmahjongg-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkmahjongg-18.12.3.tar.xz"; + sha256 = "25e5cea50b6c96f18efa8d013ab58abfaac7845edb969b8e63e0c297482a6be4"; + name = "libkmahjongg-18.12.3.tar.xz"; }; }; libkomparediff2 = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkomparediff2-18.12.1.tar.xz"; - sha256 = "0ik6bclbipp01gfy3zfkijvl5m0y3z2dfxr76jvzmi53ypm7g0xn"; - name = "libkomparediff2-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkomparediff2-18.12.3.tar.xz"; + sha256 = "f70bf7470f67419a7071a4df23d929c4c4ed80d588b3096d48486ee0f27d890c"; + name = "libkomparediff2-18.12.3.tar.xz"; }; }; libksane = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libksane-18.12.1.tar.xz"; - sha256 = "15dgc5dshs6yzv03wvc5xvqfz70gqy51a0r54qzbr5fc9s6pywr8"; - name = "libksane-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libksane-18.12.3.tar.xz"; + sha256 = "40bf814cebac7ef00dc18fbdeabb2f9fd786c9144d787d5dc36a58fe18c33034"; + name = "libksane-18.12.3.tar.xz"; }; }; libksieve = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libksieve-18.12.1.tar.xz"; - sha256 = "0kcg94bsww3vlc3vpybw20c4iax0bfkamicy7hwyyyzwgx38dvd1"; - name = "libksieve-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libksieve-18.12.3.tar.xz"; + sha256 = "ce18756940d86dff8eafd77883d202ab90e3d8273f5248ffd97627b974211754"; + name = "libksieve-18.12.3.tar.xz"; }; }; lokalize = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/lokalize-18.12.1.tar.xz"; - sha256 = "1spzi7zbckvxy3izmcqjnslmqf4vgr7zrwa0idmqi4q59dcsgw9g"; - name = "lokalize-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/lokalize-18.12.3.tar.xz"; + sha256 = "cce11b9384d27006855a141d2241a67d05679baa7096db2311c49a78bd642fed"; + name = "lokalize-18.12.3.tar.xz"; }; }; lskat = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/lskat-18.12.1.tar.xz"; - sha256 = "0603lxw1fxz9vpawy59z3qga0f1bvvgv9yqk29b16fmp5hf5qgxm"; - name = "lskat-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/lskat-18.12.3.tar.xz"; + sha256 = "d81d3af26b9f23abc40f1e2f97410d662c11d4641b67c32d427846a561f0b1e2"; + name = "lskat-18.12.3.tar.xz"; }; }; mailcommon = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/mailcommon-18.12.1.tar.xz"; - sha256 = "0l1b115vnxfl2ykwnj09ikv7vlfa5bvfzlii6jj2znkmspi9y7r2"; - name = "mailcommon-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/mailcommon-18.12.3.tar.xz"; + sha256 = "789d89fad58af80202dfcc41f7c7435871a60309d1d46f93cabcb37dd6ae97e1"; + name = "mailcommon-18.12.3.tar.xz"; }; }; mailimporter = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/mailimporter-18.12.1.tar.xz"; - sha256 = "1k8gqjabcvafcvsqwclvz58r15k1bpz52wnnnbwcp0y27ab08a98"; - name = "mailimporter-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/mailimporter-18.12.3.tar.xz"; + sha256 = "1c0e583fa36fc1b87154367cbe02cf1ec68d9f36d8a37bd6b220e9d9aadfcfa3"; + name = "mailimporter-18.12.3.tar.xz"; }; }; marble = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/marble-18.12.1.tar.xz"; - sha256 = "0hamj04ma9qycfisjv48myxj1427rz7g0lmw7pwanzghg610fgwy"; - name = "marble-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/marble-18.12.3.tar.xz"; + sha256 = "0bfd7ae576e42ebbddadc8c83c2fec5edaf462bcf284642b1002d36d751b24ee"; + name = "marble-18.12.3.tar.xz"; }; }; mbox-importer = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/mbox-importer-18.12.1.tar.xz"; - sha256 = "1h2abj7v6v3rmvsv9bb1wj7sabhh9f35bx1yfk2hhfzf6l4r5f2n"; - name = "mbox-importer-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/mbox-importer-18.12.3.tar.xz"; + sha256 = "a220ca69dd6f78cf18c3d8cb1bb293dc2ab2ff45f2a25df72cad8df78f581201"; + name = "mbox-importer-18.12.3.tar.xz"; }; }; messagelib = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/messagelib-18.12.1.tar.xz"; - sha256 = "1hfk54w0dhp82fxa4q19d4224pjnw5f8m7ap4gwlrqdj350liqd8"; - name = "messagelib-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/messagelib-18.12.3.tar.xz"; + sha256 = "0064a8df62a08d0dfb06af28d4aff8a645a0e8bb01d91ab23647b3d26d3af7d8"; + name = "messagelib-18.12.3.tar.xz"; }; }; minuet = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/minuet-18.12.1.tar.xz"; - sha256 = "160wq3j7vcf1k0ayd8axg37ghj5ymn56g7znaz4gzc8ar1q5nccz"; - name = "minuet-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/minuet-18.12.3.tar.xz"; + sha256 = "9244ec364d031c73f9aed9568012a28b847ec4dceca61040324af7afd3d64009"; + name = "minuet-18.12.3.tar.xz"; }; }; okular = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/okular-18.12.1.tar.xz"; - sha256 = "1k1srr2434j665v6m89vl7x42361pqxaw45dc5b4bhw8q2xfipyl"; - name = "okular-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/okular-18.12.3.tar.xz"; + sha256 = "d7ef9b59acb5746ebc64399f4c1a99faf0c1530bf6a818b3bfd34b73476d90ab"; + name = "okular-18.12.3.tar.xz"; }; }; palapeli = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/palapeli-18.12.1.tar.xz"; - sha256 = "0pwflnnnbfxf185m3r4vdw5jpd5jld0wm0qnwk2gl41v2ahb5pqd"; - name = "palapeli-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/palapeli-18.12.3.tar.xz"; + sha256 = "b28fa1cf7a763125a09baa8f4e7562e17892475444d3907e566281328502e593"; + name = "palapeli-18.12.3.tar.xz"; }; }; parley = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/parley-18.12.1.tar.xz"; - sha256 = "1yv4m9f4jhc36ffnrxd6rq5117rj163hs6835mkkzja7z13csn6z"; - name = "parley-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/parley-18.12.3.tar.xz"; + sha256 = "289bc5aa88d7a33fdf0d668b45412f163d74e86d3deb9492db53a11f7c6a7f75"; + name = "parley-18.12.3.tar.xz"; }; }; picmi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/picmi-18.12.1.tar.xz"; - sha256 = "0dmhvxy0g4jjbxk53bz1g1r8vqdzhzbcwg0f1ck85gz7f5g67b7v"; - name = "picmi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/picmi-18.12.3.tar.xz"; + sha256 = "0691c70d746aa9d444559970e002561a1123963d617b36ceef4a8c3ee4730f49"; + name = "picmi-18.12.3.tar.xz"; }; }; pimcommon = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/pimcommon-18.12.1.tar.xz"; - sha256 = "09av3zdr463gjc877ipa5vz84yf4qpj2ixs9x4ajmfmsmb5m6w7z"; - name = "pimcommon-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/pimcommon-18.12.3.tar.xz"; + sha256 = "f4a0bf8146d1140c0252a5315baa826651968352a828c004d91b06e0e98c6b9e"; + name = "pimcommon-18.12.3.tar.xz"; }; }; pim-data-exporter = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/pim-data-exporter-18.12.1.tar.xz"; - sha256 = "111n4l9z3dazz7qhv67k00s88p515r8ai2sm419pbyfdn6wxpzmb"; - name = "pim-data-exporter-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/pim-data-exporter-18.12.3.tar.xz"; + sha256 = "7deb5baf5a36b96f1414e0b67192cd1ad48f396fb3cb5f5eb2fc90a312d74941"; + name = "pim-data-exporter-18.12.3.tar.xz"; }; }; pim-sieve-editor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/pim-sieve-editor-18.12.1.tar.xz"; - sha256 = "0i0jrmz4cyjcpapga89ixfqx7xg0nyk3r75ymfzw891fyhm7ns67"; - name = "pim-sieve-editor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/pim-sieve-editor-18.12.3.tar.xz"; + sha256 = "6e755ec258b0a75e4e83adb82551c1779c2ab7766aef26d2f1c9c00f3809deb5"; + name = "pim-sieve-editor-18.12.3.tar.xz"; }; }; poxml = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/poxml-18.12.1.tar.xz"; - sha256 = "0hrpvpsy3mbyrikj68lr2af9m162w3nzhcpdqgrhsv5ji3j0bpqb"; - name = "poxml-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/poxml-18.12.3.tar.xz"; + sha256 = "6714e371957d175b859894149a3791acb3b8ef62b653b7b09f34819e92c8eaf7"; + name = "poxml-18.12.3.tar.xz"; }; }; print-manager = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/print-manager-18.12.1.tar.xz"; - sha256 = "01kk592gi2rrqwaxmfd1fycnya0rvjafxxv6lrk3rs0nm4g9phxr"; - name = "print-manager-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/print-manager-18.12.3.tar.xz"; + sha256 = "917ea500bcd11d2ca3cc1e7de1b38d7ef72f1d397182aaac2c6a31cd338f387d"; + name = "print-manager-18.12.3.tar.xz"; }; }; rocs = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/rocs-18.12.1.tar.xz"; - sha256 = "0d34bv8ya5lrdrbqqlc927x4cdfjwyr8q2xbmx4c1vaw8w29glw9"; - name = "rocs-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/rocs-18.12.3.tar.xz"; + sha256 = "6b007b0b11a8128787c316f055a99dde83619dd35287e04867949e84661c2b11"; + name = "rocs-18.12.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/signon-kwallet-extension-18.12.1.tar.xz"; - sha256 = "018vyzd3rspfsqansxfbv4q0izgj7dfpmzjj04x8pffg1w0x902n"; - name = "signon-kwallet-extension-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/signon-kwallet-extension-18.12.3.tar.xz"; + sha256 = "9a6c25cf19a382cbfd219c043838ad691c4c53ae8c3bc9f4b59f9f6f98bd3a4f"; + name = "signon-kwallet-extension-18.12.3.tar.xz"; }; }; spectacle = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/spectacle-18.12.1.tar.xz"; - sha256 = "1r9iapwi1lp1p7x0dimblpmsizv1ys9708vdlzrk8q4m8rwn7ld9"; - name = "spectacle-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/spectacle-18.12.3.tar.xz"; + sha256 = "8abf85b85de7844c503ef84182303c47cf425f5c14d71e723e3c887ee87ce06e"; + name = "spectacle-18.12.3.tar.xz"; }; }; step = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/step-18.12.1.tar.xz"; - sha256 = "1gn8l09r5rllz1mypsw2wfjhijy0i0bi4lspp271dinms6ryx6p4"; - name = "step-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/step-18.12.3.tar.xz"; + sha256 = "35abaf0a4597e141f4db08ad91ebcefafe43609b986a93a11e5f3ec19165c755"; + name = "step-18.12.3.tar.xz"; }; }; svgpart = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/svgpart-18.12.1.tar.xz"; - sha256 = "06rvbav94ysifha47lp52pvpc77y33p4zq4yfbmyh1pqkiw5db2s"; - name = "svgpart-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/svgpart-18.12.3.tar.xz"; + sha256 = "675ab3b652b0d2619abb305ce7c00beb8a80067416e4ea7e216cfa201a7ff8ef"; + name = "svgpart-18.12.3.tar.xz"; }; }; sweeper = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/sweeper-18.12.1.tar.xz"; - sha256 = "0bp0my9gf4n5p7v3g0q390lf9q4lh42mg2zngwadqcvrsi2w4av4"; - name = "sweeper-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/sweeper-18.12.3.tar.xz"; + sha256 = "8007da0f4d835e376fb049d539ca9fd6840ef7196f25b62cf652374a645fc6e0"; + name = "sweeper-18.12.3.tar.xz"; }; }; umbrello = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/umbrello-18.12.1.tar.xz"; - sha256 = "12kk04frx8fxcih22nv5c1765wawlf7wpiscaqmzlmrpa611x65r"; - name = "umbrello-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/umbrello-18.12.3.tar.xz"; + sha256 = "2ab53b33cf1fcaea470c01b2421e911d4287b1d0421fa33e0b60043fe6943cc7"; + name = "umbrello-18.12.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/zeroconf-ioslave-18.12.1.tar.xz"; - sha256 = "1gzr50kqlwd2d47yc2k6yz2v0w2gp10c7glhb61jpdzsqy7r7cvp"; - name = "zeroconf-ioslave-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/zeroconf-ioslave-18.12.3.tar.xz"; + sha256 = "b3adcaec0ebd89ddaf839954fb387e59791683d98f93da0c3dacb0266cd02a12"; + name = "zeroconf-ioslave-18.12.3.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index ef0b49f8d7ba..a9394116b9e1 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -17,6 +17,8 @@ libXrandr, libGL, xclip, + wayland, + libxkbcommon, # Darwin Frameworks cf-private, AppKit, @@ -40,6 +42,9 @@ let libXrandr libGL libXi + ] ++ lib.optionals stdenv.isLinux [ + wayland + libxkbcommon ]; in buildRustPackage rec { name = "alacritty-${version}"; @@ -113,6 +118,6 @@ in buildRustPackage rec { homepage = https://github.com/jwilm/alacritty; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ mic92 ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index 2f38307ca1e5..2dd151c1a6c1 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { description = "Automatically convert your existing AutoScaling groups to up to 90% cheaper spot instances with minimal configuration changes"; license = licenses.free; maintainers = [ maintainers.costrouc ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 1144d5152847..4227b4155acf 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: +{ stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: stdenv.mkDerivation rec { name = "avrdudess-2.2.20140102"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { unzip "$src" -d "$out/avrdudess" cat >> "$out/bin/avrdudess" << __EOF__ - #!${stdenv.shell} + #!${runtimeShell} export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix index 3245a56e9de3..9c99dcee2b3c 100644 --- a/pkgs/applications/misc/bitcoinarmory/default.nix +++ b/pkgs/applications/misc/bitcoinarmory/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages , pkgconfig, autoreconfHook, rsync -, swig, qt4, fcgi +, swig, qt48Full, fcgi , bitcoin, procps, utillinux }: let @@ -16,7 +16,6 @@ in buildPythonApplication { owner = "goatpig"; repo = "BitcoinArmory"; rev = "v${version}"; - #sha256 = "023c7q1glhrkn4djz3pf28ckd1na52lsagv4iyfgchqvw7qm7yx2"; sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true; }; @@ -25,14 +24,18 @@ in buildPythonApplication { # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that. #patches = [ ./shutdown-fix.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ + nativeBuildInputs = [ autoreconfHook + pkgconfig swig - qt4 - fcgi + pyqt4 + qt48Full rsync # used by silly install script (TODO patch upstream) ]; + buildInputs = [ + qt48Full + fcgi + ]; propagatedBuildInputs = [ pyqt4 diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 0a1275cb17a2..bde8fab81441 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -69,7 +69,7 @@ with python3.pkgs; buildPythonApplication rec { homepage = https://github.com/jarun/Buku; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ infinisil ]; + maintainers = with maintainers; [ matthiasbeyer infinisil ]; }; } diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index fd65fcd22606..e6dafe4d08af 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "calcurse-${version}"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { url = "https://calcurse.org/files/${name}.tar.gz"; - sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i"; + sha256 = "0vw2xi6a2lrhrb8n55zq9lv4mzxhby4xdf3hmi1vlfpyrpdwkjzd"; }; buildInputs = [ ncurses gettext python3 ]; diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index f2aac4326cbf..e48b32a783d7 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { 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 = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 7aecc8f823ee..e0d284c838e3 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/dpayne/cli-visualizer; description = "CLI based audio visualizer"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 23d76afff0ce..e1fcbbfe13c2 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { The interface is inspired by htop and shortcut keys are inspired by vim. ''; homepage = https://cointop.sh; - platforms = stdenv.lib.platforms.linux; # cannot test others + platforms = stdenv.lib.platforms.unix; # cannot test others maintainers = [ ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index f8927319a011..0123e0c38d74 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = http://ctodo.apakoh.dk/; description = "A simple ncurses-based task list manager"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix index 1ea106d6a18b..4e620425d5c3 100644 --- a/pkgs/applications/misc/curabydagoma/default.nix +++ b/pkgs/applications/misc/curabydagoma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, python, pythonPackages, unzip }: +{ stdenv, runtimeShell, lib, fetchurl, python, pythonPackages, unzip }: # This package uses a precompiled "binary" distribution of CuraByDagoma, # distributed by the editor. @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { mkdir $out/bin cat > $out/bin/curabydago </dev/null ''; - meta = with stdenv.lib; { - description = "A lightweight Bitcoin wallet"; + meta = with lib; { + description = "A Bitcoin Cash SPV Wallet"; longDescription = '' - An easy-to-use Bitcoin client featuring wallets generated from + An easy-to-use Bitcoin Cash client featuring wallets generated from mnemonic seeds (in addition to other, more advanced, wallet options) and the ability to perform transactions without downloading a copy of the blockchain. ''; homepage = https://www.electroncash.org/; platforms = platforms.linux; - maintainers = with maintainers; [ lassulus ]; + maintainers = with maintainers; [ lassulus nyanloutre ]; license = licenses.mit; }; } diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 5f252d97d867..efa6e64fb61a 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }: +{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }: let + version = "3.3.7"; + qdarkstyle = python3Packages.buildPythonPackage rec { pname = "QDarkStyle"; version = "2.5.4"; @@ -10,19 +12,35 @@ let }; doCheck = false; # no tests }; + + # Not provided in official source releases, which are what upstream signs. + tests = fetchFromGitHub { + owner = "spesmilo"; + repo = "electrum"; + rev = version; + sha256 = "1g2kbbsi6k105q6s0la20h12gz8dzka5kdcjbdhs12jqsjfx3lr0"; + + extraPostFetch = '' + mv $out ./all + mv ./all/electrum/tests $out + ''; + }; in python3Packages.buildPythonApplication rec { pname = "electrum"; - version = "3.3.4"; + inherit version; - src = fetchFromGitHub { - owner = "spesmilo"; - repo = "electrum"; - rev = version; - sha256 = "0yxdpc602jnd14xz3px85ka0b6db98zwbgfi9a3vj8p1k3mmiwaj"; + src = fetchurl { + url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; + sha256 = "13ahc4zqpgzmck2r663sqqgz86xsd83r5qqi26mh2vazy1i6pykz"; }; + postUnpack = '' + # can't symlink, tests get confused + cp -ar ${tests} $sourceRoot/electrum/tests + ''; + propagatedBuildInputs = with python3Packages; [ aiorpcx aiohttp @@ -64,7 +82,10 @@ python3Packages.buildPythonApplication rec { rm -rf $out/${python3.sitePackages}/nix substituteInPlace $out/share/applications/electrum.desktop \ - --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" + --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"' \ + "Exec=$out/bin/electrum %u" \ + --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \ + "Exec=$out/bin/electrum --testnet %u" ''; checkInputs = with python3Packages; [ pytest ]; diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 45c448804626..a5e4bd74a6eb 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -4,7 +4,7 @@ }: python3Packages.buildPythonApplication rec { - name = "electrum-ltc-${version}"; + pname = "electrum-ltc"; version = "3.1.3.1"; src = fetchurl { @@ -12,6 +12,8 @@ python3Packages.buildPythonApplication rec { sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7"; }; + nativeBuildInputs = with python3Packages; [ pyqt5 ]; + propagatedBuildInputs = with python3Packages; [ pyaes ecdsa diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index bf97cff5030d..da5cf83c02c1 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { sqlite librsvg gnome3.gtk - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; patches = [ ./correct-post-install.patch ]; diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index f05514f3fc58..739df59b31c5 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gammu-${version}"; - version = "1.39.0"; + version = "1.40.0"; src = fetchFromGitHub { owner = "gammu"; repo = "gammu"; rev = version; - sha256 = "1hr053z2l5mjgip83fsxnd1rqsp5gwywzagzrgdg243apn1nz0gs"; + sha256 = "1jjaa9r3x6i8gv3yn1ngg815s6gsxblsw4wb5ddm77kamn2qyvpf"; }; patches = [ ./bashcomp-dir.patch ./systemd.patch ]; diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index 0cac0e6fd3f5..8432ddee0073 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -1,12 +1,12 @@ { stdenv, writeScript, fetchFromGitHub , libGL, libX11, libXext, python3, libXrandr, libXrender, libpulseaudio, libXcomposite -, enableGlfw ? false, glfw }: +, enableGlfw ? false, glfw, runtimeShell }: let inherit (stdenv.lib) optional makeLibraryPath; wrapperScript = writeScript "glava" '' - #!${stdenv.shell} + #!${runtimeShell} case "$1" in --copy-config) # The binary would symlink it, which won't work in Nix because the diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 154af4efc9b7..1cf6f547c30b 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -13,7 +13,7 @@ , glib , libsoup , gnome-online-accounts -, rest +, librest , json-glib , gnome-autoar , gspell @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { glib libsoup gnome-online-accounts - rest + librest json-glib gnome-autoar gspell diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index f5420a0c9449..724707d0be5f 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ glib gtk3 libgtop gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 libgtop gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x build-aux/meson/postinstall.sh diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index e6c66cba1e06..6cd77318754c 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -29,15 +29,15 @@ GEM sanitize (~> 2.1.1, >= 2.1.1) stringex (~> 2.6) twitter-text (= 1.14.7) - json (2.1.0) + json (2.2.0) kramdown (1.9.0) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) - mini_portile2 (2.3.0) + mime-types-data (3.2019.0331) + mini_portile2 (2.4.0) mustache (0.99.8) - nokogiri (1.8.4) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.4) + mini_portile2 (~> 2.4.0) posix-spawn (0.3.13) rack (1.6.11) rack-protection (1.5.5) @@ -49,13 +49,13 @@ GEM rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - stringex (2.8.4) - tilt (2.0.8) + stringex (2.8.5) + tilt (2.0.9) twitter-text (1.14.7) unf (~> 0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.5) + unf_ext (0.0.7.6) useragent (0.16.10) PLATFORMS @@ -65,4 +65,4 @@ DEPENDENCIES gollum BUNDLED WITH - 1.16.4 + 1.17.2 diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index bb105805ca8e..f9bdf94db179 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -1,5 +1,7 @@ { charlock_holmes = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; @@ -8,6 +10,8 @@ version = "0.7.6"; }; diff-lcs = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; @@ -17,6 +21,8 @@ }; gemojione = { dependencies = ["json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; @@ -25,6 +31,8 @@ version = "3.3.0"; }; github-markup = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp"; @@ -34,6 +42,8 @@ }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4"; @@ -43,6 +53,8 @@ }; gollum = { dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ik1b0f73lcxfwfml1h84dp6br79g0z9v6x54wvl46n9d1ndrhl7"; @@ -52,6 +64,8 @@ }; gollum-grit_adapter = { dependencies = ["gitlab-grit"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; @@ -61,6 +75,8 @@ }; gollum-lib = { dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex" "twitter-text"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1699wiir6f2a8yawk3qg0xn3zdc10mz783v53ri1ivfnzdrm3dvf"; @@ -69,14 +85,18 @@ version = "4.2.10"; }; json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; kramdown = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "12sral2xli39mnr4b9m2sxdlgam4ni0a1mkxawc5311z107zj3p0"; @@ -86,6 +106,8 @@ }; mime-types = { dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; @@ -94,22 +116,28 @@ version = "3.2.2"; }; mime-types-data = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; + sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; type = "gem"; }; - version = "3.2018.0812"; + version = "3.2019.0331"; }; mini_portile2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; mustache = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; @@ -119,14 +147,18 @@ }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.8.4"; + version = "1.10.4"; }; posix-spawn = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw"; @@ -135,6 +167,8 @@ version = "0.3.13"; }; rack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; @@ -144,6 +178,8 @@ }; rack-protection = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; @@ -152,6 +188,8 @@ version = "1.5.5"; }; rouge = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs"; @@ -161,6 +199,8 @@ }; sanitize = { dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "12ip1d80r0dgc621qn7c32bk12xxgkkg3w6q21s1ckxivcd7r898"; @@ -170,6 +210,8 @@ }; sinatra = { dependencies = ["rack" "rack-protection" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; @@ -178,23 +220,29 @@ version = "1.4.8"; }; stringex = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1"; + sha256 = "15ns7j5smw04w6w7bqd5mm2qcl7w9lhwykyb974i4isgg9yc23ys"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; tilt = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; + sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; type = "gem"; }; - version = "2.0.8"; + version = "2.0.9"; }; twitter-text = { dependencies = ["unf"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg"; @@ -204,6 +252,8 @@ }; unf = { dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; @@ -212,14 +262,18 @@ version = "0.1.4"; }; unf_ext = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; + sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf"; type = "gem"; }; - version = "0.0.7.5"; + version = "0.0.7.6"; }; useragent = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fv5kvq494swy0p17h9qya9r50w15xsi9zmvhzb8gh55kq6ki50p"; diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 5131e0739e73..9313199efb82 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.17"; + name = "gphoto2-2.5.20"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0kslwclyyzvnxjw3gdzhlagj7l5f8lba833ipr9s0s0c4hwi0mxa"; + sha256 = "1xj80abkzvqrd6g1j1q946lhbp03gyapyxdwbhc0y14g1ash6vx3"; }; nativeBuildInputs = [ pkgconfig gettext libtool ]; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index db18ff73412c..e9026ded4702 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3, - pango, gobject-introspection, wrapGAppsHook, + pango, gobject-introspection, wrapGAppsHook, gettext, # Optional packages: enableOSM ? true, osm-gps-map, enableGraphviz ? true, graphviz, @@ -12,7 +12,7 @@ in buildPythonApplication rec { version = "5.0.1"; name = "gramps-${version}"; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gettext ]; buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 0541468345e9..1e2c57a34691 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -14,6 +14,11 @@ in python3.pkgs.buildPythonApplication rec { sha256 = "1j38z968ha8ij6wrgbwvr8ad930nvhybm9g7pf4s4zv6d3vln0vm"; }; + # Strict deps breaks guake + # See https://github.com/NixOS/nixpkgs/issues/59930 + # and https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + nativeBuildInputs = [ gettext gobject-introspection wrapGAppsHook python3.pkgs.pip glibcLocales ]; buildInputs = [ gtk3 keybinder3 libnotify python3 vte ]; diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 6c84f3cbd326..1e237923d054 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; preConfigure = '' diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index 453d95694eb0..9360e220ab6a 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -18,9 +18,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g"; }; - nativeBuildInputs = [ wafHook ]; + nativeBuildInputs = [ wafHook intltool ]; buildInputs = [ - docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme + docbook2x libxslt gnome-doc-utils dbus-glib hicolor-icon-theme ]; propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ]; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index e09e65738e5d..7353078600d1 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -38,7 +38,7 @@ buildPythonApplication rec { homepage = https://github.com/donnemartin/haxor-news; description = "Browse Hacker News like a haxor"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix index c055bddec694..1647a09edfd6 100644 --- a/pkgs/applications/misc/hello-unfree/default.nix +++ b/pkgs/applications/misc/hello-unfree/default.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ stdenv, runtimeShell }: stdenv.mkDerivation rec { name = "example-unfree-package-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cat > $out/bin/hello-unfree << EOF - #!${stdenv.shell} + #!${runtimeShell} echo "Hello, you are running an unfree system!" EOF chmod +x $out/bin/hello-unfree diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 6b0926db0476..2fd56e3c5552 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/LuRsT/hr; description = "A horizontal bar for your terminal"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 026cf9ecc14a..1eae8c57fc4e 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { 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 = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux; # Cannot test others }; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 22badfc8cdd1..8473e997e7af 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.50"; + version = "0.54.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "1shrw7pxwrz9g5x9bq6k5qvhn3fqmwznadpw7i07msh97p8b3dyn"; + sha256 = "01grfbr3kpd4qf5cbcmzc6yfq34cm0nkak4pqzgrn46r254y0ymv"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index d5c24d69048a..d3d300db85b3 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -1,5 +1,23 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ - + { + goPackagePath = "github.com/gobuffalo/envy"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/envy"; + rev = "v1.6.8"; + "sha256" = "1xh26j9bji8c4hr05f89kbc4fhqniba00bdcic4gs5xfnp2vj7gk"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "v1.3.0"; + "sha256" = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; + }; + } { goPackagePath = "github.com/BurntSushi/locker"; fetch = { @@ -9,7 +27,6 @@ sha256 = "1xak4aync4klswq5217qvw191asgla51jr42y94vp109lirm5dzg"; }; } - { goPackagePath = "github.com/BurntSushi/toml"; fetch = { @@ -19,7 +36,6 @@ sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; }; } - { goPackagePath = "github.com/PuerkitoBio/purell"; fetch = { @@ -29,7 +45,6 @@ sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; }; } - { goPackagePath = "github.com/PuerkitoBio/urlesc"; fetch = { @@ -39,7 +54,6 @@ sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; }; } - { goPackagePath = "github.com/alecthomas/assert"; fetch = { @@ -49,17 +63,15 @@ sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; }; } - { goPackagePath = "github.com/alecthomas/chroma"; fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "v0.5.0"; - sha256 = "150jv4vhsdi1gj3liwkgicdrwnzgv5qkq2fwznlnzf64vmfb0b9f"; + rev = "v0.6.2"; + sha256 = "1bcppy1s148iikr78qjm0akahn01ywh83a8pw544prr9yc16jvmz"; }; } - { goPackagePath = "github.com/alecthomas/colour"; fetch = { @@ -69,17 +81,33 @@ sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; }; } - + { + goPackagePath = "github.com/alecthomas/kong"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kong"; + rev = "v0.1.15"; + sha256 = "1llxabcdzlb2hard0h931knqkdnyjyz8dp3k0nli0m0mags7l31b"; + }; + } { goPackagePath = "github.com/alecthomas/repr"; fetch = { type = "git"; url = "https://github.com/alecthomas/repr"; - rev = "117648cd9897"; - sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; + rev = "d37bc2a10ba1"; + sha256 = "0jnx1ypdl4zi010ds2z857ajkr5cx51wkx950rfqb126hvql7svx"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "eb2c6b5be1b6"; + sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; }; } - { goPackagePath = "github.com/bep/debounce"; fetch = { @@ -89,7 +117,6 @@ sha256 = "1sh4zv0hv7f454mhzpl2mbv7ar5rm00wyy5qr78x1h84bgph87wy"; }; } - { goPackagePath = "github.com/bep/gitmap"; fetch = { @@ -99,17 +126,15 @@ sha256 = "0zqdl5h4ayi2gi5aqf35f1sjszhbcriksm2bf84fkrg7ngr48jn6"; }; } - { goPackagePath = "github.com/bep/go-tocss"; fetch = { type = "git"; url = "https://github.com/bep/go-tocss"; - rev = "v0.5.0"; - sha256 = "12q7h6nydklq4kg65kcgd85209rx7zf64ba6nf3k7y16knj4233q"; + rev = "v0.6.0"; + sha256 = "0w5i3ig3bbdrwbrcwzx8xsxhlb8xr17jj3wdcb6klqglg7551yvm"; }; } - { goPackagePath = "github.com/chaseadamsio/goorgeous"; fetch = { @@ -119,7 +144,42 @@ sha256 = "07qdqi46klizq3wigxqbiksnlgbrdc8hvmizgzg0aas5iqy88dcb"; }; } - + { + goPackagePath = "github.com/cheekybits/is"; + fetch = { + type = "git"; + url = "https://github.com/cheekybits/is"; + rev = "68e9c0620927"; + sha256 = "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "v3.3.10"; + sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "v2.0.0"; + sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "v0.2.0"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } { goPackagePath = "github.com/cpuguy83/go-md2man"; fetch = { @@ -129,7 +189,6 @@ sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; }; } - { goPackagePath = "github.com/danwakefield/fnmatch"; fetch = { @@ -139,7 +198,6 @@ sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz"; }; } - { goPackagePath = "github.com/davecgh/go-spew"; fetch = { @@ -149,7 +207,6 @@ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; }; } - { goPackagePath = "github.com/disintegration/imaging"; fetch = { @@ -159,7 +216,6 @@ sha256 = "1laxccmzi7q51zxn81ringmdwp8iaipivrl375yc3gq56d70sp0r"; }; } - { goPackagePath = "github.com/dlclark/regexp2"; fetch = { @@ -169,7 +225,15 @@ sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5"; }; } - + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } { goPackagePath = "github.com/eknkc/amber"; fetch = { @@ -179,7 +243,6 @@ sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; }; } - { goPackagePath = "github.com/fortytw2/leaktest"; fetch = { @@ -189,7 +252,6 @@ sha256 = "1lf9l6zgzjbcc7hmcjhhg3blx0y8icyxvjmjqqwfbwdk502803ra"; }; } - { goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { @@ -199,7 +261,6 @@ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } - { goPackagePath = "github.com/gobwas/glob"; fetch = { @@ -209,7 +270,6 @@ sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; }; } - { goPackagePath = "github.com/gorilla/websocket"; fetch = { @@ -219,7 +279,6 @@ sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; }; } - { goPackagePath = "github.com/hashicorp/go-immutable-radix"; fetch = { @@ -229,7 +288,6 @@ sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6"; }; } - { goPackagePath = "github.com/hashicorp/go-uuid"; fetch = { @@ -239,7 +297,6 @@ sha256 = "1jflywlani7583qm4ysph40hsgx3n66n5zr2k84i057fmwa1ypfy"; }; } - { goPackagePath = "github.com/hashicorp/golang-lru"; fetch = { @@ -249,7 +306,6 @@ sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; }; } - { goPackagePath = "github.com/hashicorp/hcl"; fetch = { @@ -259,7 +315,6 @@ sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; }; } - { goPackagePath = "github.com/inconshreveable/mousetrap"; fetch = { @@ -269,7 +324,6 @@ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; }; } - { goPackagePath = "github.com/jdkato/prose"; fetch = { @@ -279,7 +333,6 @@ sha256 = "1gjqgrpc7wbqvnhgwyfhxng24qvx37qjy0x2mbikiw1vaygxqsmy"; }; } - { goPackagePath = "github.com/kr/pretty"; fetch = { @@ -289,7 +342,6 @@ sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; }; } - { goPackagePath = "github.com/kr/pty"; fetch = { @@ -299,7 +351,6 @@ sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; }; } - { goPackagePath = "github.com/kr/text"; fetch = { @@ -309,7 +360,6 @@ sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; }; } - { goPackagePath = "github.com/kyokomi/emoji"; fetch = { @@ -319,7 +369,6 @@ sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a"; }; } - { goPackagePath = "github.com/magefile/mage"; fetch = { @@ -329,7 +378,6 @@ sha256 = "177hzmmzhk7bcm3jj2cj6d5l9h5ql3cikvndhk4agkslrhwr3xka"; }; } - { goPackagePath = "github.com/magiconair/properties"; fetch = { @@ -339,17 +387,33 @@ sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; }; } - { goPackagePath = "github.com/markbates/inflect"; fetch = { type = "git"; url = "https://github.com/markbates/inflect"; - rev = "a12c3aec81a6"; - sha256 = "0mawr6z9nav4f5j0nmjdxg9lbfhr7wz8zi34g7b6wndmzyf8jbsd"; + rev = "v1.0.0"; + sha256 = "072a73ij23mp8vabr8xwga2kj8dimya44ciiy9g4x4r9imm86psw"; + }; + } + { + goPackagePath = "github.com/matryer/try"; + fetch = { + type = "git"; + url = "https://github.com/matryer/try"; + rev = "9ac251b645a2"; + sha256 = "19fnqmpl3p54vmxgm1hmqvdc87brqx754wf3cdhq1bj04fcbb5h9"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; }; } - { goPackagePath = "github.com/mattn/go-isatty"; fetch = { @@ -359,7 +423,6 @@ sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; }; } - { goPackagePath = "github.com/mattn/go-runewidth"; fetch = { @@ -369,7 +432,6 @@ sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; }; } - { goPackagePath = "github.com/miekg/mmark"; fetch = { @@ -379,7 +441,6 @@ sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m"; }; } - { goPackagePath = "github.com/mitchellh/hashstructure"; fetch = { @@ -389,17 +450,15 @@ sha256 = "0zgl5c03ip2yzkb9b7fq9ml08i7j8prgd46ha1fcg8c6r7k9xl3i"; }; } - { goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.0.0"; - sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; }; } - { goPackagePath = "github.com/muesli/smartcrop"; fetch = { @@ -409,7 +468,6 @@ sha256 = "0xbv5wbn0z36nkw9ay3ly6z23lpsrs0khryl1w54fz85lvwh66gp"; }; } - { goPackagePath = "github.com/nfnt/resize"; fetch = { @@ -419,7 +477,6 @@ sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; }; } - { goPackagePath = "github.com/nicksnyder/go-i18n"; fetch = { @@ -429,7 +486,6 @@ sha256 = "1nlvq85c232z5yjs86pxpmkv7hk6gb5pa6j4hhzgdz85adk2ma04"; }; } - { goPackagePath = "github.com/olekukonko/tablewriter"; fetch = { @@ -439,7 +495,6 @@ sha256 = "1274k5r9ardh1f6gsmadxmdds7zy8rkr55fb9swvnm0vazr3y01l"; }; } - { goPackagePath = "github.com/pelletier/go-toml"; fetch = { @@ -449,7 +504,6 @@ sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; }; } - { goPackagePath = "github.com/pkg/errors"; fetch = { @@ -459,7 +513,6 @@ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; }; } - { goPackagePath = "github.com/pmezard/go-difflib"; fetch = { @@ -469,7 +522,6 @@ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } - { goPackagePath = "github.com/russross/blackfriday"; fetch = { @@ -479,7 +531,6 @@ sha256 = "01z1jsdkac09cw95lqq4pahkw9xnini2mb956lvb772bby2x3dmj"; }; } - { goPackagePath = "github.com/sanity-io/litter"; fetch = { @@ -489,7 +540,6 @@ sha256 = "09nywwxxd6rmhxc7rsvs96ynjszmnvmhwr7dvh1n35hb6h9y7s2r"; }; } - { goPackagePath = "github.com/sergi/go-diff"; fetch = { @@ -499,7 +549,6 @@ sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; }; } - { goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; fetch = { @@ -509,17 +558,15 @@ sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; }; } - { goPackagePath = "github.com/spf13/afero"; fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + rev = "v1.2.1"; + sha256 = "14qqj0cz6a595vn4dp747vddx05fd77jdsyl85qjmf9baymaxlam"; }; } - { goPackagePath = "github.com/spf13/cast"; fetch = { @@ -529,7 +576,6 @@ sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; }; } - { goPackagePath = "github.com/spf13/cobra"; fetch = { @@ -539,7 +585,6 @@ sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; }; } - { goPackagePath = "github.com/spf13/fsync"; fetch = { @@ -549,7 +594,6 @@ sha256 = "1vvbgxbbsc4mvi1axgqgn9pzjz1p495dsmwpc7mr8qxh8f6s0nhv"; }; } - { goPackagePath = "github.com/spf13/jwalterweatherman"; fetch = { @@ -559,7 +603,6 @@ sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b"; }; } - { goPackagePath = "github.com/spf13/nitro"; fetch = { @@ -569,57 +612,51 @@ sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; }; } - { goPackagePath = "github.com/spf13/pflag"; fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "v1.0.2"; - sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; }; } - { goPackagePath = "github.com/spf13/viper"; fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "v1.2.0"; - sha256 = "0klv7dyllvv9jkyspy4ww5nrz24ngb3adlh884cbdjn7562bhi47"; + rev = "v1.3.1"; + sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl"; }; } - { goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "f2347ac6c9c9"; - sha256 = "0ns8zc2n8gpcsd1fdaqbq7a8d939lnaxraqx5nr2fi2zdxqyh7hm"; + rev = "04af85275a5c"; + sha256 = "1al7hgvg34xbajds99ss5wmlndxbzzmz5l0wrg6wchvvfaiwxlx0"; }; } - { goPackagePath = "github.com/tdewolff/minify"; fetch = { type = "git"; url = "https://github.com/tdewolff/minify"; - rev = "v2.3.6"; - sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb"; + rev = "v2.3.7"; + sha256 = "1mj1lmd8s0mrg9cfj1ihvsqrbsbpzh3icm0pmayd2r6jp6rbffw6"; }; } - { goPackagePath = "github.com/tdewolff/parse"; fetch = { type = "git"; url = "https://github.com/tdewolff/parse"; - rev = "fced451e0bed"; - sha256 = "1n6wcapk8xbck2zjxd4l5cgfn1v12rr7znrdpd5y2xp1nc3739c3"; + rev = "v2.3.5"; + sha256 = "05w859s31dx6525wrjryby601z9c0xpncilznk6shgqygpxda6cz"; }; } - { goPackagePath = "github.com/tdewolff/test"; fetch = { @@ -629,17 +666,33 @@ sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj"; }; } - + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "d75b2dcb6bc8"; + sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + }; + } { goPackagePath = "github.com/wellington/go-libsass"; fetch = { type = "git"; url = "https://github.com/wellington/go-libsass"; - rev = "615eaa47ef79"; - sha256 = "0imjiskn4vq7nml5jwb1scgl61jg53cfpkjnb9rsc6m8gsd8s16s"; + rev = "c63644206701"; + sha256 = "1ml0fk4wldnjlkmliydnig9f3rpp3cdzwgz331mlqyadvma3c0lf"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a77"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; }; } - { goPackagePath = "github.com/yosssi/ace"; fetch = { @@ -649,7 +702,15 @@ sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f"; }; } - + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "505ab145d0a9"; + sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + }; + } { goPackagePath = "golang.org/x/image"; fetch = { @@ -659,7 +720,6 @@ sha256 = "1kkafy29vz5xf6r29ghbvvbwrgjxwxvzk6dsa2qhyp1ddk6l2vkz"; }; } - { goPackagePath = "golang.org/x/net"; fetch = { @@ -669,7 +729,6 @@ sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv"; }; } - { goPackagePath = "golang.org/x/sync"; fetch = { @@ -679,17 +738,15 @@ sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; }; } - { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "d0be0721c37e"; - sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12"; + rev = "b4a75ba826a6"; + sha256 = "0kzrd2wywkcq35iakbzplqyma4bvf2ng3mzi7917kxcbdq3fflrj"; }; } - { goPackagePath = "golang.org/x/text"; fetch = { @@ -699,7 +756,6 @@ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } - { goPackagePath = "gopkg.in/check.v1"; fetch = { @@ -709,14 +765,13 @@ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; }; } - { goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index 2c46ea3ac9a6..72a24026a89d 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, java }: +{ stdenv, fetchurl, java, runtimeShell }: stdenv.mkDerivation rec { pname = "jbidwatcher"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" - echo > "$out/bin/${pname}" "#!${stdenv.shell}" + echo > "$out/bin/${pname}" "#!${runtimeShell}" echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}" chmod +x "$out/bin/${pname}" install -D -m644 ${src} ${jarfile} diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 6841bc14c384..00088aef8ad5 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,29 +1,29 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) colorator (1.1.0) - concurrent-ruby (1.1.1) + concurrent-ruby (1.1.5) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.9.25) + ffi (1.11.1) forwardable-extended (2.6.0) - gemoji (3.0.0) - html-pipeline (2.8.4) + gemoji (3.0.1) + html-pipeline (2.12.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.5) + jekyll (3.8.6) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -36,44 +36,44 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) - jekyll-mentions (1.4.1) + jekyll-avatar (0.7.0) + jekyll (>= 3.0, < 5.0) + jekyll-mentions (1.5.1) html-pipeline (~> 2.3) - jekyll (~> 3.0) + jekyll (>= 3.7, < 5.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.5.0) - jekyll (~> 3.3) - jekyll-sitemap (1.2.0) - jekyll (~> 3.3) - jekyll-watch (2.1.2) + jekyll-seo-tag (2.6.1) + jekyll (>= 3.3, < 5.0) + jekyll-sitemap (1.3.1) + jekyll (>= 3.7, < 5.0) + jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.10.1) + jemoji (0.11.1) gemoji (~> 3.0) html-pipeline (~> 2.2) - jekyll (~> 3.0) + jekyll (>= 3.0, < 5.0) kramdown (1.17.0) - liquid (4.0.1) + liquid (4.0.3) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) mercenary (0.3.6) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.4) + mini_portile2 (~> 2.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.0.3) + public_suffix (3.1.1) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rouge (3.3.0) + rb-inotify (0.10.0) + ffi (~> 1.0) + rouge (3.8.0) ruby_dep (1.5.0) - safe_yaml (1.0.4) - sass (3.6.0) + safe_yaml (1.0.5) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -96,4 +96,4 @@ DEPENDENCIES rouge BUNDLED WITH - 1.16.4 + 1.17.2 diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index d680f9255905..1107ba745fda 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -1,23 +1,29 @@ { activesupport = { dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; + sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; type = "gem"; }; - version = "4.2.10"; + version = "4.2.11.1"; }; addressable = { dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; }; colorator = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72"; @@ -26,15 +32,19 @@ version = "1.1.0"; }; concurrent-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bnr2dlj2a11qy3rwh6m1mv5419vy32j2axk3ln7bphyvwn7pli0"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.5"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3"; @@ -43,6 +53,8 @@ version = "0.5.1"; }; eventmachine = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; @@ -51,14 +63,18 @@ version = "1.2.7"; }; ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; type = "gem"; }; - version = "1.9.25"; + version = "1.11.1"; }; forwardable-extended = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v"; @@ -67,23 +83,29 @@ version = "2.6.0"; }; gemoji = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h85qpn2xbmsn8ssf2fqzlqg181j000m5z4l3g26r7vblncg162d"; + sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad"; + sha256 = "0f7x70p3fda7i5wfjjljjgjgqwx8m12345bs4xpnh7fhnis42fkk"; type = "gem"; }; - version = "2.8.4"; + version = "2.12.0"; }; "http_parser.rb" = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; @@ -93,6 +115,8 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; @@ -102,33 +126,41 @@ }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3"; + sha256 = "1ph1jjjl25vmzif7bvxzviq7azjm384pm7ba4k24cah94285bzhz"; type = "gem"; }; - version = "3.8.5"; + version = "3.8.6"; }; jekyll-avatar = { dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; + sha256 = "03bys2pl60vq92skfhlfqr2j68zhfjc86jffpg32f94wzjk8n0wk"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; jekyll-mentions = { dependencies = ["html-pipeline" "jekyll"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hg1rlra12im62z5yml4rlll3icz1146hkcv98mk2a96fsgniwqf"; + sha256 = "1r81nbw598s485jsppbpy9kwa471w1rdkpdn3a1mq0swg87cp67v"; type = "gem"; }; - version = "1.4.1"; + version = "1.5.1"; }; jekyll-sass-converter = { dependencies = ["sass"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk"; @@ -138,41 +170,51 @@ }; jekyll-seo-tag = { dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19yfr5i04gm50swbc6xxf4090z5z1v0kjfnvh695ydq1dkyx1csl"; + sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.1"; }; jekyll-sitemap = { dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xy93ysl1q8r4xhbnffycvsslja0dskh2z2pl1jnykwsy27dc89n"; + sha256 = "0d3wqvbn37b24ag31xchb5hhnwfl6fnw6pyzp434jggbssxy0a5m"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.1"; }; jekyll-watch = { dependencies = ["listen"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s9ly83sp8albvgdff12xy2h4xd8lm6z2fah4lzmk2yvp85jzdzv"; + sha256 = "1qd7hy1kl87fl7l0frw5qbn22x7ayfzlv9a5ca1m59g0ym1ysi5w"; type = "gem"; }; - version = "2.1.2"; + version = "2.2.1"; }; jemoji = { dependencies = ["gemoji" "html-pipeline" "jekyll"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yjbgawzmlcppmlhz5sdhjim6ki0vh0vh07mbyf05qa4994ckihs"; + sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.1"; }; kramdown = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; @@ -181,15 +223,19 @@ version = "1.17.0"; }; liquid = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bs9smxgj29s4k76zfj09f7mhd35qwm9zki1yqa4jfwiki8v97nw"; + sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by"; type = "gem"; }; - version = "4.0.1"; + version = "4.0.3"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx"; @@ -198,6 +244,8 @@ version = "3.1.5"; }; mercenary = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; @@ -206,14 +254,18 @@ version = "0.3.6"; }; mini_portile2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; @@ -223,15 +275,19 @@ }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.4"; }; pathutil = { dependencies = ["forwardable-extended"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "12fm93ljw9fbxmv2krki5k5wkvr7560qy8p4spvb9jiiaqv78fz4"; @@ -240,14 +296,18 @@ version = "0.16.2"; }; public_suffix = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm"; type = "gem"; }; - version = "3.0.3"; + version = "3.1.1"; }; rb-fsevent = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; @@ -257,22 +317,28 @@ }; rb-inotify = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4"; type = "gem"; }; - version = "0.9.10"; + version = "0.10.0"; }; rouge = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; + sha256 = "10cyx03qjdajkkr1gfqhah4n632ma8k8g6hcf0c60pfp6iii8ffs"; type = "gem"; }; - version = "3.3.0"; + version = "3.8.0"; }; ruby_dep = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5"; @@ -281,24 +347,30 @@ version = "1.5.0"; }; safe_yaml = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; sass = { dependencies = ["sass-listen"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18c6prbw9wl8bqhb2435pd9s0lzarl3g7xf8pmyla28zblvwxmyh"; + sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.4"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; @@ -307,6 +379,8 @@ version = "4.0.0"; }; thread_safe = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; @@ -316,6 +390,8 @@ }; tzinfo = { dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 5fe2d1085001..7b9b74ef1b79 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) classifier-reborn (2.2.0) fast-stemmer (~> 1.0) @@ -14,27 +14,27 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.11.1) + coffee-script-source (1.12.2) colorator (1.1.0) - concurrent-ruby (1.1.1) + concurrent-ruby (1.1.5) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) execjs (2.7.0) - faraday (0.15.3) + faraday (0.15.4) multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) - ffi (1.9.25) + ffi (1.11.1) forwardable-extended (2.6.0) - gemoji (3.0.0) - html-pipeline (2.8.4) + gemoji (3.0.1) + html-pipeline (2.12.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.5) + jekyll (3.8.6) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -47,35 +47,35 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) - jekyll-coffeescript (1.1.1) + jekyll-avatar (0.7.0) + jekyll (>= 3.0, < 5.0) + jekyll-coffeescript (1.2.2) coffee-script (~> 2.2) - coffee-script-source (~> 1.11.1) - jekyll-feed (0.11.0) - jekyll (~> 3.3) + coffee-script-source (~> 1.12) + jekyll-feed (0.12.1) + jekyll (>= 3.7, < 5.0) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-mentions (1.4.1) + jekyll-mentions (1.5.1) html-pipeline (~> 2.3) - jekyll (~> 3.0) + jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) - jekyll-redirect-from (0.14.0) - jekyll (~> 3.3) + jekyll-redirect-from (0.15.0) + jekyll (>= 3.3, < 5.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.5.0) - jekyll (~> 3.3) - jekyll-sitemap (1.2.0) - jekyll (~> 3.3) - jekyll-watch (2.1.2) + jekyll-seo-tag (2.6.1) + jekyll (>= 3.3, < 5.0) + jekyll-sitemap (1.3.1) + jekyll (>= 3.7, < 5.0) + jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.10.1) + jemoji (0.11.1) gemoji (~> 3.0) html-pipeline (~> 2.2) - jekyll (~> 3.0) + jekyll (>= 3.0, < 5.0) kramdown (1.17.0) - liquid (4.0.1) + liquid (4.0.3) liquid-c (3.0.0) liquid (>= 3.0.0) listen (3.1.5) @@ -85,39 +85,39 @@ GEM mercenary (0.3.6) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) - mini_portile2 (2.3.0) + mime-types-data (3.2019.0331) + mini_portile2 (2.4.0) minitest (5.11.3) multi_json (1.13.1) - multipart-post (2.0.0) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - octokit (4.13.0) + multipart-post (2.1.1) + nokogiri (1.10.4) + mini_portile2 (~> 2.4.0) + octokit (4.14.0) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.0.3) + public_suffix (3.1.1) pygments.rb (1.2.1) multi_json (>= 1.0.0) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rb-inotify (0.10.0) + ffi (~> 1.0) rdiscount (2.2.0.1) - rdoc (6.0.4) - redcarpet (3.4.0) - rouge (3.3.0) + rdoc (6.1.1) + redcarpet (3.5.0) + rouge (3.8.0) ruby_dep (1.5.0) - safe_yaml (1.0.4) - sass (3.6.0) + safe_yaml (1.0.5) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) thread_safe (0.3.6) - tomlrb (1.2.7) + tomlrb (1.2.8) tzinfo (1.2.5) thread_safe (~> 0.1) yajl-ruby (1.3.1) @@ -152,4 +152,4 @@ DEPENDENCIES yajl-ruby (~> 1.3.1) BUNDLED WITH - 1.16.4 + 1.17.2 diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 4e33cd6ccdcf..917ba51caabe 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -1,24 +1,42 @@ { activesupport = { dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; + sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; type = "gem"; }; - version = "4.2.10"; + version = "4.2.11.1"; }; addressable = { dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; }; classifier-reborn = { dependencies = ["fast-stemmer"]; + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "mswin"; + } { + engine = "rbx"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "04nxmm5b7j7r0ij9pcpdr7xqpig559gfzrw042ycxcfyav2pv6ij"; @@ -27,6 +45,8 @@ version = "2.2.0"; }; coderay = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; @@ -36,6 +56,8 @@ }; coffee-script = { dependencies = ["coffee-script-source" "execjs"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; @@ -44,14 +66,18 @@ version = "2.4.1"; }; coffee-script-source = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xfshhlz808f8639wc88wgls1mww35sid8rd55vn0a4yqajf4vh9"; + sha256 = "1907v9q1zcqmmyqzhzych5l7qifgls2rlbnbhy5vzyr7i7yicaz1"; type = "gem"; }; - version = "1.11.1"; + version = "1.12.2"; }; colorator = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72"; @@ -60,15 +86,19 @@ version = "1.1.0"; }; concurrent-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bnr2dlj2a11qy3rwh6m1mv5419vy32j2axk3ln7bphyvwn7pli0"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.5"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3"; @@ -77,6 +107,8 @@ version = "0.5.1"; }; eventmachine = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; @@ -85,6 +117,8 @@ version = "1.2.7"; }; execjs = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1"; @@ -94,14 +128,30 @@ }; faraday = { dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16hwxc8v0z6gkanckjhx0ffgqmzpc4ywz4dfhxpjlz2mbz8d5m52"; + sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; type = "gem"; }; - version = "0.15.3"; + version = "0.15.4"; }; fast-stemmer = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "mswin"; + } { + engine = "rbx"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh"; @@ -110,14 +160,18 @@ version = "1.0.2"; }; ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; type = "gem"; }; - version = "1.9.25"; + version = "1.11.1"; }; forwardable-extended = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v"; @@ -126,23 +180,29 @@ version = "2.6.0"; }; gemoji = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h85qpn2xbmsn8ssf2fqzlqg181j000m5z4l3g26r7vblncg162d"; + sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad"; + sha256 = "0f7x70p3fda7i5wfjjljjgjgqwx8m12345bs4xpnh7fhnis42fkk"; type = "gem"; }; - version = "2.8.4"; + version = "2.12.0"; }; "http_parser.rb" = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; @@ -152,6 +212,8 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; @@ -161,42 +223,52 @@ }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3"; + sha256 = "1ph1jjjl25vmzif7bvxzviq7azjm384pm7ba4k24cah94285bzhz"; type = "gem"; }; - version = "3.8.5"; + version = "3.8.6"; }; jekyll-avatar = { dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; + sha256 = "03bys2pl60vq92skfhlfqr2j68zhfjc86jffpg32f94wzjk8n0wk"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; jekyll-coffeescript = { dependencies = ["coffee-script" "coffee-script-source"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06qf4j9f6ysjb4bq6gsdaiz2ksmhc5yb484v458ra3s6ybccqvvy"; + sha256 = "040i6cyv20qmxlpm74kh5hfci8208ja4903yxdv4x0qs0z172kl9"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.2"; }; jekyll-feed = { dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11mlqqbkmddnyh8xfjv5k6v7c73bbi92w7vw4x1c9xvggxrjzicp"; + sha256 = "01f0ivjdr3qc9dh9n8lj6paiy7zmlb7hs9nk6rgni6jjn5plslg3"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.1"; }; jekyll-gist = { dependencies = ["octokit"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "03wz9j6yq3552nzf4g71qrdm9pfdgbm68abml9sjjgiaan1n8ns9"; @@ -206,14 +278,18 @@ }; jekyll-mentions = { dependencies = ["html-pipeline" "jekyll"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hg1rlra12im62z5yml4rlll3icz1146hkcv98mk2a96fsgniwqf"; + sha256 = "1r81nbw598s485jsppbpy9kwa471w1rdkpdn3a1mq0swg87cp67v"; type = "gem"; }; - version = "1.4.1"; + version = "1.5.1"; }; jekyll-paginate = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8"; @@ -223,15 +299,19 @@ }; jekyll-redirect-from = { dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08xfd7fvqcq6skybxsn4d60rqn4ws2y9hkhl71wz9zrc55xhgxa4"; + sha256 = "1cwpr1z7irar81nm60prvl8ywadc82xhpdxs50n7kiic6q6lkjsb"; type = "gem"; }; - version = "0.14.0"; + version = "0.15.0"; }; jekyll-sass-converter = { dependencies = ["sass"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk"; @@ -241,41 +321,51 @@ }; jekyll-seo-tag = { dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19yfr5i04gm50swbc6xxf4090z5z1v0kjfnvh695ydq1dkyx1csl"; + sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.1"; }; jekyll-sitemap = { dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xy93ysl1q8r4xhbnffycvsslja0dskh2z2pl1jnykwsy27dc89n"; + sha256 = "0d3wqvbn37b24ag31xchb5hhnwfl6fnw6pyzp434jggbssxy0a5m"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.1"; }; jekyll-watch = { dependencies = ["listen"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s9ly83sp8albvgdff12xy2h4xd8lm6z2fah4lzmk2yvp85jzdzv"; + sha256 = "1qd7hy1kl87fl7l0frw5qbn22x7ayfzlv9a5ca1m59g0ym1ysi5w"; type = "gem"; }; - version = "2.1.2"; + version = "2.2.1"; }; jemoji = { dependencies = ["gemoji" "html-pipeline" "jekyll"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yjbgawzmlcppmlhz5sdhjim6ki0vh0vh07mbyf05qa4994ckihs"; + sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.1"; }; kramdown = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; @@ -284,15 +374,43 @@ version = "1.17.0"; }; liquid = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "mswin"; + } { + engine = "rbx"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bs9smxgj29s4k76zfj09f7mhd35qwm9zki1yqa4jfwiki8v97nw"; + sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by"; type = "gem"; }; - version = "4.0.1"; + version = "4.0.3"; }; liquid-c = { dependencies = ["liquid"]; + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "mswin"; + } { + engine = "rbx"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "0a5n7q314ma32y7v9a1g6ps60b14zfn2q4nip4j5aknblz51v7gi"; @@ -302,6 +420,8 @@ }; listen = { dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx"; @@ -310,6 +430,8 @@ version = "3.1.5"; }; mercenary = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; @@ -319,6 +441,8 @@ }; mime-types = { dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; @@ -327,22 +451,28 @@ version = "3.2.2"; }; mime-types-data = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; + sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; type = "gem"; }; - version = "3.2018.0812"; + version = "3.2019.0331"; }; mini_portile2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; @@ -351,6 +481,20 @@ version = "5.11.3"; }; multi_json = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "mswin"; + } { + engine = "rbx"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; @@ -359,33 +503,41 @@ version = "1.13.1"; }; multipart-post = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.1"; }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.4"; }; octokit = { dependencies = ["sawyer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yh0yzzqg575ix3y2l2261b9ag82gv2v4f1wczdhcmfbxcz755x6"; + sha256 = "1w7agbfg39jzqk81yad9xhscg31869277ysr2iwdvpjafl5lj4ha"; type = "gem"; }; - version = "4.13.0"; + version = "4.14.0"; }; pathutil = { dependencies = ["forwardable-extended"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "12fm93ljw9fbxmv2krki5k5wkvr7560qy8p4spvb9jiiaqv78fz4"; @@ -394,15 +546,31 @@ version = "0.16.2"; }; public_suffix = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm"; type = "gem"; }; - version = "3.0.3"; + version = "3.1.1"; }; "pygments.rb" = { dependencies = ["multi_json"]; + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "mswin"; + } { + engine = "rbx"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "0lbvnwvz770ambm4d6lxgc2097rydn5rcc5d6986bnkzyxfqqjnv"; @@ -411,6 +579,8 @@ version = "1.2.1"; }; rb-fsevent = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; @@ -420,14 +590,30 @@ }; rb-inotify = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4"; type = "gem"; }; - version = "0.9.10"; + version = "0.10.0"; }; rdiscount = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "mswin"; + } { + engine = "rbx"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3"; @@ -436,30 +622,50 @@ version = "2.2.0.1"; }; rdoc = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7"; + sha256 = "07b7ac2nls2yskaicqshxgip6dwpxl80hlx4pslq90jgpxgs2kkp"; type = "gem"; }; - version = "6.0.4"; + version = "6.1.1"; }; redcarpet = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "mswin"; + } { + engine = "rbx"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; type = "gem"; }; - version = "3.4.0"; + version = "3.5.0"; }; rouge = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; + sha256 = "10cyx03qjdajkkr1gfqhah4n632ma8k8g6hcf0c60pfp6iii8ffs"; type = "gem"; }; - version = "3.3.0"; + version = "3.8.0"; }; ruby_dep = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5"; @@ -468,24 +674,30 @@ version = "1.5.0"; }; safe_yaml = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; sass = { dependencies = ["sass-listen"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18c6prbw9wl8bqhb2435pd9s0lzarl3g7xf8pmyla28zblvwxmyh"; + sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.4"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; @@ -495,14 +707,18 @@ }; sawyer = { dependencies = ["addressable" "faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; + sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; type = "gem"; }; - version = "0.8.1"; + version = "0.8.2"; }; thread_safe = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; @@ -511,15 +727,19 @@ version = "0.3.6"; }; tomlrb = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x3bg9mmma1gsl5j5kc9m8m77w6qwcq6ix2d0kwi5rcwpr7siyx6"; + sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.8"; }; tzinfo = { dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; @@ -528,6 +748,20 @@ version = "1.2.5"; }; yajl-ruby = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "mswin"; + } { + engine = "rbx"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "1rn4kc9fha990yd252wglh6rcyh35cavm1vpyfj8krlcwph09g30"; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 7304ad7141a9..c0052262d30b 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11, libXxf86vm }: stdenv.mkDerivation rec { name = "josm-${version}"; @@ -21,12 +21,14 @@ stdenv.mkDerivation rec { categories = "Education;Geoscience;Maps;"; }; + # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin buildCommand = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/josm.jar makeWrapper ${jdk11}/bin/java $out/bin/josm \ - --add-flags "-jar $out/share/java/josm.jar" + --add-flags "-jar $out/share/java/josm.jar" \ + --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' mkdir -p $out/share/applications cp $desktopItem/share/applications"/"* $out/share/applications diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 0049e9aca755..bf29e05db1b8 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -57,7 +57,28 @@ stdenv.mkDerivation rec { prePatch = '' cp ${src}/leptonica_mod/{allheaders.h,dewarp2.c,leptwin.c} src/ ''; - patches = []; + patches = [ + # stripped down copy of upstream commit b88c821f8d347bce0aea86d606c710303919f3d2 + ./leptonica-CVE-2018-3836.patch + (fetchpatch { + # CVE-2018-7186 + url = "https://github.com/DanBloomberg/leptonica/commit/" + + "ee301cb2029db8a6289c5295daa42bba7715e99a.patch"; + sha256 = "0cgb7mvz2px1rg5i80wk1wxxjvzjga617d8q6j7qygkp7jm6495d"; + }) + (fetchpatch { + # CVE-2018-7247 + url = "https://github.com/DanBloomberg/leptonica/commit/" + + "c1079bb8e77cdd426759e466729917ca37a3ed9f.patch"; + sha256 = "1z4iac5gwqggh7aa8cvyp6nl9fwd1v7wif26caxc9y5qr3jj34qf"; + }) + (fetchpatch { + # CVE-2018-7440 + url = "https://github.com/DanBloomberg/leptonica/commit/" + + "49ecb6c2dfd6ed5078c62f4a8eeff03e3beced3b.patch"; + sha256 = "1hjmva98iaw9xj7prg7aimykyayikcwnk4hk0380007hqb35lqmy"; + }) + ]; }); tesseract_modded = tesseract4.override { tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: { diff --git a/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch b/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch new file mode 100644 index 000000000000..f1b4170fbaae --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch @@ -0,0 +1,95 @@ +--- a/src/allheaders.h ++++ b/src/allheaders.h +@@ -2600,6 +2600,7 @@ + LEPT_DLL extern char * stringReverse ( const char *src ); + LEPT_DLL extern char * strtokSafe ( char *cstr, const char *seps, char **psaveptr ); + LEPT_DLL extern l_int32 stringSplitOnToken ( char *cstr, const char *seps, char **phead, char **ptail ); ++LEPT_DLL extern l_int32 stringCheckForChars ( const char *src, const char *chars, l_int32 *pfound ); + LEPT_DLL extern char * stringRemoveChars ( const char *src, const char *remchars ); + LEPT_DLL extern l_int32 stringFindSubstr ( const char *src, const char *sub, l_int32 *ploc ); + LEPT_DLL extern char * stringReplaceSubstr ( const char *src, const char *sub1, const char *sub2, l_int32 *pfound, l_int32 *ploc ); +--- a/src/gplot.c ++++ b/src/gplot.c +@@ -141,9 +141,10 @@ + const char *xlabel, + const char *ylabel) + { +-char *newroot; +-char buf[L_BUF_SIZE]; +-GPLOT *gplot; ++char *newroot; ++char buf[L_BUF_SIZE]; ++l_int32 badchar; ++GPLOT *gplot; + + PROCNAME("gplotCreate"); + +@@ -152,6 +153,9 @@ + if (outformat != GPLOT_PNG && outformat != GPLOT_PS && + outformat != GPLOT_EPS && outformat != GPLOT_LATEX) + return (GPLOT *)ERROR_PTR("outformat invalid", procName, NULL); ++ stringCheckForChars(rootname, "`;&|><\"?*", &badchar); ++ if (badchar) /* danger of command injection */ ++ return (GPLOT *)ERROR_PTR("invalid rootname", procName, NULL); + + if ((gplot = (GPLOT *)LEPT_CALLOC(1, sizeof(GPLOT))) == NULL) + return (GPLOT *)ERROR_PTR("gplot not made", procName, NULL); +--- a/src/utils2.c ++++ b/src/utils2.c +@@ -42,6 +42,7 @@ + * l_int32 stringSplitOnToken() + * + * Find and replace string and array procs ++ * l_int32 stringCheckForChars() + * char *stringRemoveChars() + * l_int32 stringFindSubstr() + * char *stringReplaceSubstr() +@@ -701,6 +702,48 @@ + /*--------------------------------------------------------------------* + * Find and replace procs * + *--------------------------------------------------------------------*/ ++/*! ++ * \brief stringCheckForChars() ++ * ++ * \param[in] src input string; can be of zero length ++ * \param[in] chars string of chars to be searched for in %src ++ * \param[out] pfound 1 if any characters are found; 0 otherwise ++ * \return 0 if OK, 1 on error ++ * ++ * 
++ * Notes:
++ *      (1) This can be used to sanitize an operation by checking for
++ *          special characters that don't belong in a string.
++ *
++ */ ++l_int32 ++stringCheckForChars(const char *src, ++ const char *chars, ++ l_int32 *pfound) ++{ ++char ch; ++l_int32 i, n; ++ ++ PROCNAME("stringCheckForChars"); ++ ++ if (!pfound) ++ return ERROR_INT("&found not defined", procName, 1); ++ *pfound = FALSE; ++ if (!src || !chars) ++ return ERROR_INT("src and chars not both defined", procName, 1); ++ ++ n = strlen(src); ++ for (i = 0; i < n; i++) { ++ ch = src[i]; ++ if (strchr(chars, ch)) { ++ *pfound = TRUE; ++ break; ++ } ++ } ++ return 0; ++} ++ ++ + /*! + * \brief stringRemoveChars() + * diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index d6e05056e1c1..61eb959a1dda 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -50,6 +50,6 @@ in with python.pkgs; buildPythonApplication rec { homepage = https://github.com/scheibler/khard; description = "Console carddav client"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 845de8b0388a..be70efba5ad7 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -2,13 +2,26 @@ harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, - which, dbus + which, dbus, fetchpatch, + Cocoa, + CoreGraphics, + Foundation, + IOKit, + Kernel, + OpenGL, + cf-private, + libicns, + libpng, + librsvg, + optipng, + python3, + zlib, }: with python3Packages; buildPythonApplication rec { + pname = "kitty"; version = "0.13.3"; - name = "kitty-${version}"; format = "other"; src = fetchFromGitHub { @@ -19,12 +32,32 @@ buildPythonApplication rec { }; buildInputs = [ - fontconfig glfw ncurses libunistring harfbuzz libX11 + ncurses harfbuzz + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + Cocoa + CoreGraphics + Foundation + IOKit + Kernel + OpenGL + cf-private + libpng + python3 + zlib + ] ++ stdenv.lib.optionals stdenv.isLinux [ + fontconfig glfw libunistring libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext wayland-protocols wayland dbus ]; - nativeBuildInputs = [ pkgconfig which sphinx ]; + nativeBuildInputs = [ + pkgconfig which sphinx ncurses + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + imagemagick + libicns # For the png2icns tool. + librsvg + optipng + ]; outputs = [ "out" "terminfo" ]; @@ -33,16 +66,41 @@ buildPythonApplication rec { src = ./fix-paths.patch; libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so"; }) + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "macos-symlink-1"; + url = https://github.com/kovidgoyal/kitty/commit/bdeec612667f6976109247fe1750b10dda9c24c0.patch; + sha256 = "1d18x260w059qag80kgb2cgi2h4rricvqhwpbrw79s8yxzs7jhxk"; + }) + (fetchpatch { + # fixup of previous patch + name = "macos-symlink-2"; + url = https://github.com/kovidgoyal/kitty/commit/af2c9a49b1ad31e94242295d88598591623fbf11.patch; + sha256 = "0k3dmgbvmh66j8k3h8dw6la6ma6f20fng6jjypy982kxvracsnl5"; + }) + ./macos-10.11.patch + ./no-lto.patch + ./no-werror.patch + ./png2icns.patch ]; - buildPhase = '' - python3 setup.py linux-package + buildPhase = if stdenv.isDarwin then '' + make app + '' else '' + ${python.interpreter} setup.py linux-package ''; installPhase = '' runHook preInstall mkdir -p $out + ${if stdenv.isDarwin then '' + mkdir "$out/bin" + ln -s ../Applications/kitty.app/Contents/MacOS/kitty-deref-symlink "$out/bin/kitty" + mkdir "$out/Applications" + cp -r kitty.app "$out/Applications/kitty.app" + '' else '' cp -r linux-package/{bin,share,lib} $out + ''} wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ]}" runHook postInstall @@ -54,8 +112,13 @@ buildPythonApplication rec { ''; postInstall = '' + terminfo_src=${if stdenv.isDarwin then + ''"$out/Applications/kitty.app/Contents/Resources/terminfo"'' + else + "$out/share/terminfo"} + mkdir -p $terminfo/share - mv $out/share/terminfo $terminfo/share/terminfo + mv "$terminfo_src" $terminfo/share/terminfo mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages @@ -65,7 +128,7 @@ buildPythonApplication rec { homepage = https://github.com/kovidgoyal/kitty; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.darwin ++ platforms.linux; maintainers = with maintainers; [ tex rvolosatovs ]; }; } diff --git a/pkgs/applications/misc/kitty/macos-10.11.patch b/pkgs/applications/misc/kitty/macos-10.11.patch new file mode 100644 index 000000000000..c8bf46839e8a --- /dev/null +++ b/pkgs/applications/misc/kitty/macos-10.11.patch @@ -0,0 +1,116 @@ +commit 749772b8b8179eb3b71e542fd9ed5621feb578f5 +Author: Matthew Glazar +Date: Thu Feb 28 22:01:32 2019 -0800 + + Support macOS 10.11 + + Allow Kitty to run on macOS 10.11 El Capitan. + +diff --git a/glfw/cocoa_init.m b/glfw/cocoa_init.m +index 1e719d2e..05a680e4 100644 +--- a/glfw/cocoa_init.m ++++ b/glfw/cocoa_init.m +@@ -30,6 +30,10 @@ + #define NSEventMaskKeyUp NSKeyUpMask + #define NSEventMaskKeyDown NSKeyDownMask + #define NSEventModifierFlagCommand NSCommandKeyMask ++ #define NSEventModifierFlagControl NSControlKeyMask ++ #define NSEventModifierFlagDeviceIndependentFlagsMask NSDeviceIndependentModifierFlagsMask ++ #define NSEventModifierFlagShift NSShiftKeyMask ++ #define NSEventTypeApplicationDefined NSApplicationDefined + #endif + + // Change to our application bundle's resources directory, if present +diff --git a/glfw/cocoa_window.m b/glfw/cocoa_window.m +index 1ce79b56..fd2255fc 100644 +--- a/glfw/cocoa_window.m ++++ b/glfw/cocoa_window.m +@@ -41,6 +41,7 @@ + #define NSWindowStyleMaskTitled NSTitledWindowMask + #define NSEventModifierFlagCommand NSCommandKeyMask + #define NSEventModifierFlagControl NSControlKeyMask ++ #define NSEventModifierFlagNumericPad NSNumericPadKeyMask + #define NSEventModifierFlagOption NSAlternateKeyMask + #define NSEventModifierFlagShift NSShiftKeyMask + #define NSEventModifierFlagCapsLock NSAlphaShiftKeyMask +diff --git a/kitty/cocoa_window.m b/kitty/cocoa_window.m +index 5e9252ba..99eb3352 100644 +--- a/kitty/cocoa_window.m ++++ b/kitty/cocoa_window.m +@@ -15,6 +15,9 @@ + #include + + #if (MAC_OS_X_VERSION_MAX_ALLOWED < 101200) ++typedef NSUInteger NSWindowStyleMask; ++#define NSWindowStyleMaskBorderless NSBorderlessWindowMask ++#define NSWindowStyleMaskFullScreen NSFullScreenWindowMask + #define NSWindowStyleMaskResizable NSResizableWindowMask + #define NSEventModifierFlagOption NSAlternateKeyMask + #define NSEventModifierFlagCommand NSCommandKeyMask +diff --git a/kitty/logging.c b/kitty/logging.c +index 45c88174..1ec9f1b0 100644 +--- a/kitty/logging.c ++++ b/kitty/logging.c +@@ -5,12 +5,21 @@ + * Distributed under terms of the GPL3 license. + */ + ++#ifdef __APPLE__ ++#include ++#endif ++#if defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12 ++#define USE_APPLE_OS_LOG 1 ++#else ++#define USE_APPLE_OS_LOG 0 ++#endif ++ + #include "data-types.h" + #include + #include + #include + #include +-#ifdef __APPLE__ ++#if USE_APPLE_OS_LOG + #include + #endif + +@@ -21,7 +30,7 @@ void + log_error(const char *fmt, ...) { + va_list ar; + struct timeval tv; +-#ifdef __APPLE__ ++#if USE_APPLE_OS_LOG + // Apple does not provide a varargs style os_logv + char logbuf[16 * 1024] = {0}; + #else +@@ -44,7 +53,7 @@ log_error(const char *fmt, ...) { + if (use_os_log) { bufprint(vsnprintf, fmt, ar); } + else vfprintf(stderr, fmt, ar); + va_end(ar); +-#ifdef __APPLE__ ++#if USE_APPLE_OS_LOG + if (use_os_log) os_log(OS_LOG_DEFAULT, "%{public}s", logbuf); + #endif + if (!use_os_log) fprintf(stderr, "\n"); +@@ -66,7 +75,7 @@ static PyMethodDef module_methods[] = { + bool + init_logging(PyObject *module) { + if (PyModule_AddFunctions(module, module_methods) != 0) return false; +-#ifdef __APPLE__ ++#if USE_APPLE_OS_LOG + if (getenv("KITTY_LAUNCHED_BY_LAUNCH_SERVICES") != NULL) use_os_log = true; + #endif + return true; +diff --git a/setup.py b/setup.py +index f8643fce..55a96e73 100755 +--- a/setup.py ++++ b/setup.py +@@ -711,7 +711,7 @@ Categories=System;TerminalEmulator; + CFBundlePackageType='APPL', + CFBundleSignature='????', + CFBundleExecutable=appname, +- LSMinimumSystemVersion='10.12.0', ++ LSMinimumSystemVersion='10.11.0', + LSRequiresNativeExecution=True, + NSAppleScriptEnabled=False, + # Needed for dark mode in Mojave when linking against older SDKs diff --git a/pkgs/applications/misc/kitty/no-lto.patch b/pkgs/applications/misc/kitty/no-lto.patch new file mode 100644 index 000000000000..c5fdeb7ddc03 --- /dev/null +++ b/pkgs/applications/misc/kitty/no-lto.patch @@ -0,0 +1,12 @@ +--- a/setup.py ++++ b/setup.py +@@ -223,9 +223,6 @@ def init_env( + cppflags += shlex.split(os.environ.get('CPPFLAGS', '')) + cflags += shlex.split(os.environ.get('CFLAGS', '')) + ldflags += shlex.split(os.environ.get('LDFLAGS', '')) +- if not debug and not sanitize: +- # See https://github.com/google/sanitizers/issues/647 +- cflags.append('-flto'), ldflags.append('-flto') + + if profile: + cppflags.append('-DWITH_PROFILER') diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch new file mode 100644 index 000000000000..c9b6dcd6b694 --- /dev/null +++ b/pkgs/applications/misc/kitty/no-werror.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -202,7 +202,7 @@ def init_env( + cflags = os.environ.get( + 'OVERRIDE_CFLAGS', ( + '-Wextra -Wno-missing-field-initializers -Wall -std=c11' +- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' ++ ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' + ).format( + optimize, + ' '.join(sanitize_args), diff --git a/pkgs/applications/misc/kitty/png2icns.patch b/pkgs/applications/misc/kitty/png2icns.patch new file mode 100644 index 000000000000..d2d0806c862f --- /dev/null +++ b/pkgs/applications/misc/kitty/png2icns.patch @@ -0,0 +1,19 @@ +--- a/setup.py ++++ b/setup.py +@@ -744,9 +744,15 @@ Categories=System;TerminalEmulator; + if not os.path.exists(logo_dir): + raise SystemExit('The kitty logo has not been generated, you need to run logo/make.py') + subprocess.check_call([ +- 'iconutil', '-c', 'icns', logo_dir, '-o', ++ 'png2icns', + os.path.join('Resources', os.path.basename(logo_dir).partition('.')[0] + '.icns') +- ]) ++ ] + [os.path.join(logo_dir, logo) for logo in ( ++ 'icon_128x128.png', ++ 'icon_16x16.png', ++ 'icon_256x256.png', ++ 'icon_32x32.png', ++ 'icon_512x512.png', ++ )]) + # }}} + # }}} diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index 33a2cf932095..7acbd3389f9a 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -30,6 +30,10 @@ buildPythonApplication rec { buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; + # without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk' + # see https://github.com/NixOS/nixpkgs/issues/56943 for details + strictDeps = false; + postInstall = let pythonPath = (stdenv.lib.concatMapStringsSep ":" (m: "${m}/lib/${python.libPrefix}/site-packages") diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index ed3aca996e15..5ae652d750d1 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, -libGLU_combined, freetype, xclip }: +libGLU_combined, freetype, xclip, inotify-tools, procps }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; @@ -34,11 +34,17 @@ stdenv.mkDerivation rec { ''; installPhase = '' - install -d $out/bin $out/lib + install -d $out/bin install build/llpp $out/bin + install misc/llpp.inotify $out/bin/llpp.inotify + wrapProgram $out/bin/llpp \ - --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \ --prefix PATH ":" "${xclip}/bin" + + wrapProgram $out/bin/llpp.inotify \ + --prefix PATH ":" "$out/bin" \ + --prefix PATH ":" "${inotify-tools}/bin" \ + --prefix PATH ":" "${procps}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 2928d271efcf..7acebfad488b 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }: let - version = "5.2.20"; + version = "5.4.10"; in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "1399zv3m7a2rxvmy213f5yii3krsqyahpwdzsw8j535xrb9f3z1m"; + sha256 = "1902ahb2g9xanrip1n0ihr31az8sv9fsvzddnzf70kbwlfclnqf7"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index cd7bdd1fe7e2..6c58dde00d36 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/visit1985/mdp; description = "A command-line based markdown presentation tool"; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ matthiasbeyer vrthra ]; license = licenses.gpl3; platforms = with platforms; unix; }; diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 88a7b94897dc..a2678d6067f9 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5 }: +{ stdenv, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5, runtimeShell }: python36Packages.buildPythonApplication rec { pname = "multibootusb"; name = "${pname}-${version}"; @@ -40,7 +40,7 @@ python36Packages.buildPythonApplication rec { mkdir "$out/bin" cat > "$out/bin/${pname}" < $out/bin/nix-tour + echo "#!${runtimeShell}" > $out/bin/nix-tour echo "cd $out/share/" >> $out/bin/nix-tour echo "${electron}/bin/electron $out/share/electron-main.js" >> $out/bin/nix-tour chmod 0755 $out/bin/nix-tour diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index a79c63db1633..a732a5ed536e 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -1,36 +1,33 @@ { stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3, pantheon -, gtk3, gtksourceview, json-glib, gnome3, gobject-introspection, wrapGAppsHook }: +, gtk3, gtksourceview, json-glib, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "notejot"; - version = "1.5.4"; - - name = "${pname}-${version}"; + version = "1.5.5"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1lv4s2mqddi6lz414kqpp4vcwnkjibc0k2xhnczaa1wf3azlxjgf"; + sha256 = "0khf6mwidybfgnq4zmhf3af4w6aicipmi12fvs722fqlf1lrkdmd"; }; nativeBuildInputs = [ - gobject-introspection meson ninja + pantheon.vala pkgconfig python3 - pantheon.vala wrapGAppsHook ]; buildInputs = [ - pantheon.elementary-icon-theme - pantheon.granite gnome3.libgee gtk3 gtksourceview json-glib + pantheon.elementary-icon-theme + pantheon.granite ]; postPatch = '' diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 9622689199a8..e173f6d0d7d5 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -32,14 +32,17 @@ let "flask" "future" "futures" + "monotonic" "pkginfo" "psutil" "pyserial" "python-dateutil" "requests" "rsa" + "sarge" "scandir" "semantic_version" + "watchdog" "websocket-client" "werkzeug" "wrapt" @@ -47,13 +50,13 @@ let in py.pkgs.buildPythonApplication rec { pname = "OctoPrint"; - version = "1.3.9"; + version = "1.3.10"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "1yqbsfmkx4wiykjrh66a05lhn15qhpc9ay67l37kv8bhdqf2xkj4"; + sha256 = "1pvh7ay76zrvfzcsadh3sl48sgf3by9vpiaqlrkscsw02zirx9r7"; }; propagatedBuildInputs = with py.pkgs; [ @@ -75,7 +78,9 @@ in py.pkgs.buildPythonApplication rec { setup.py ''; - checkPhase = "nosetests"; + checkPhase = '' + HOME=$(mktemp -d) nosetests + ''; meta = with stdenv.lib; { homepage = https://octoprint.org/; diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index 09ec34338628..c98defee57a0 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip, runtimeShell }: stdenv.mkDerivation { name = "openjump-1.3.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { s=$out/bin/OpenJump dir=$(echo $out/openjump-*) cat >> $s << EOF - #!${stdenv.shell} + #!${runtimeShell} cd $dir/bin exec ${stdenv.shell} openjump.sh EOF diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index e8843c1bd6f7..0a35484a80a7 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -38,6 +38,8 @@ buildPythonApplication rec { pygobject3 pyatspi dbus-python pyxdg brltty speechd gst-python setproctitle ]; + strictDeps = false; + buildInputs = [ python gtk3 at-spi2-atk at-spi2-core dbus gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 2649c7cbd6a9..633c1d82159a 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138"; }; - buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index cc6b74dc9989..8aff573ab839 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -1,36 +1,49 @@ { stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3 , libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2 -, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus -, wrapGAppsHook, autoreconfHook, gobject-introspection }: +, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee +, wrapGAppsHook, autoreconfHook, pantheon }: stdenv.mkDerivation rec { pname = "plank"; version = "0.11.4"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://launchpad.net/${pname}/1.0/${version}/+download/${name}.tar.xz"; + url = "https://launchpad.net/${pname}/1.0/${version}/+download/${pname}-${version}.tar.xz"; sha256 = "1f41i45xpqhjxql9nl4a1sz30s0j46aqdhbwbvgrawz6himcvdc8"; }; nativeBuildInputs = [ - pkgconfig + autoreconfHook + gnome3.gnome-common intltool libxml2 # xmllint + pkgconfig + vala wrapGAppsHook - gobject-introspection - autoreconfHook ]; - buildInputs = [ vala atk cairo glib gnome-menus - gtk3 gnome3.libgee libwnck3 libX11 libXfixes - libXi pango gnome3.gnome-common bamf gdk_pixbuf - libdbusmenu-gtk3 gnome3.dconf ]; + buildInputs = [ + atk + bamf + cairo + gdk_pixbuf + glib + gnome-menus + gnome3.dconf + gtk3 + libX11 + libXfixes + libXi + libdbusmenu-gtk3 + libgee + libwnck3 + pango + ]; # fix paths makeFlags = [ - "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/" - "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" + "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" ]; # Make plank's application launcher hidden in Pantheon @@ -46,6 +59,6 @@ stdenv.mkDerivation rec { homepage = https://launchpad.net/plank; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ davidak ]; + maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; }; } diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index c31d442d2d67..da09c123dcde 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -19,6 +19,9 @@ , pkgsi686Linux , which , curl +, jq +, xorg +, libGL }: let @@ -41,6 +44,7 @@ let xterm which curl + jq ]; ld32 = @@ -48,7 +52,7 @@ let else if stdenv.hostPlatform.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" else throw "Unsupported platform for PlayOnLinux: ${stdenv.hostPlatform.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; - libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xorg.libX11 ]; + libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ]; in stdenv.mkDerivation { name = "playonlinux-${version}"; @@ -64,6 +68,8 @@ in stdenv.mkDerivation { [ python2Packages.python python2Packages.wxPython python2Packages.setuptools + xorg.libX11 + libGL ]; patchPhase = '' diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 878de748dec9..d8726397eea1 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -29,6 +29,12 @@ mkDerivation rec { variables.pri ''; + enableParallelBuilding = true; + + postInstall = '' + ln -sf $out/lib/*/libqlcplus* $out/lib + ''; + 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 ]; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index e03dd65b9eb3..15cd426f1b3f 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,26 +1,21 @@ { stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }: stdenv.mkDerivation rec { - name = "qtpass-${version}"; - version = "1.2.1"; + pname = "qtpass"; + version = "1.2.3"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; rev = "v${version}"; - sha256 = "0pp38b3fifkfwqcb6vi194ccgb8j3zc8j8jq8ww5ib0wvhldzsg8"; + sha256 = "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky"; }; - patches = [ ./hidpi.patch ]; - buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; nativeBuildInputs = [ makeWrapper qmake ]; - postPatch = '' - substituteInPlace qtpass.pro --replace "SUBDIRS += src tests main" "SUBDIRS += src main" - substituteInPlace qtpass.pro --replace "main.depends = tests" "main.depends = src" - ''; + enableParallelBuilding = true; postInstall = '' install -D qtpass.desktop $out/share/applications/qtpass.desktop diff --git a/pkgs/applications/misc/qtpass/hidpi.patch b/pkgs/applications/misc/qtpass/hidpi.patch deleted file mode 100644 index 629bcbb5baca..000000000000 --- a/pkgs/applications/misc/qtpass/hidpi.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/main/main.cpp b/main/main.cpp -index 8a18409c..1cddd911 100644 ---- a/main/main.cpp -+++ b/main/main.cpp -@@ -35,7 +35,7 @@ - * @return - */ - int main(int argc, char *argv[]) { -- qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); -+ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QString text = ""; - for (int i = 1; i < argc; ++i) { - if (i > 1) diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 0edcde12e341..a8e82998c306 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Window switcher, run dialog and dmenu replacement"; - homepage = https://davedavenport.github.io/rofi; + homepage = https://github.com/davatorium/rofi; license = licenses.mit; maintainers = with maintainers; [ mbakke garbas ma27 ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 05b19bbbff9c..a3be9cad3aef 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -2,14 +2,14 @@ with python3Packages; buildPythonApplication rec { - version = "1.24.0"; + version = "1.25.1"; pname = "rtv"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "0vzhnqys8nr6ymsi1mnv092z3i7nwyhgnj4jv6mjifak9j3164fw"; + sha256 = "0pfsf17g37d2v1xrsbfdbv460vs7m955h6q51z71rhb840r9812p"; }; # Tests try to access network @@ -41,6 +41,6 @@ buildPythonApplication rec { homepage = https://github.com/michael-lazar/rtv; description = "Browse Reddit from your Terminal"; license = licenses.mit; - maintainers = with maintainers; [ jgeerds wedens ]; + maintainers = with maintainers; [ matthiasbeyer jgeerds wedens ]; }; } diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index e99b305b2b33..f4918565f353 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -17,7 +17,7 @@ in buildPythonApplication rec { buildInputs = [ gtk3 gobject-introspection - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index a10b58d00b61..978ac2b7035c 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -29,6 +29,6 @@ python3Packages.buildPythonApplication rec { description = "Yet another simple static gallery generator"; homepage = http://sigal.saimon.org/en/latest/index.html; license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ domenkozar matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index 6d6382faccd4..ebb50e685da7 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { homepage = https://github.com/seenaburns/stag; description = "Terminal streaming bar graph passed through stdin"; license = stdenv.lib.licenses.bsdOriginal; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix new file mode 100644 index 000000000000..8f26ee99e227 --- /dev/null +++ b/pkgs/applications/misc/stretchly/default.nix @@ -0,0 +1,139 @@ +{ GConf +, alsaLib +, at-spi2-atk +, atk +, cairo +, cups +, dbus +, expat +, fetchurl +, fontconfig +, gdk_pixbuf +, glib +, gtk2 +, gtk3 +, lib +, libX11 +, libXScrnSaver +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXtst +, libappindicator +, libdrm +, libnotify +, libpciaccess +, libpng12 +, libxcb +, nspr +, nss +, pango +, pciutils +, pulseaudio +, stdenv +, udev +, wrapGAppsHook +}: + +let + libs = [ + GConf + alsaLib + at-spi2-atk + atk + cairo + cups + dbus + expat + fontconfig + gdk_pixbuf + glib + gtk2 + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libappindicator + libdrm + libnotify + libpciaccess + libpng12 + libxcb + nspr + nss + pango + pciutils + pulseaudio + stdenv.cc.cc.lib + udev + ]; + + libPath = lib.makeLibraryPath libs; +in + +stdenv.mkDerivation rec { + pname = "stretchly"; + version = "0.19.1"; + + src = fetchurl { + url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz"; + sha256 = "1q2wxfqs8qv9b1rfh5lhmyp3rrgdl05m6ihsgkxlgp0yzi07afz8"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + buildInputs = libs; + + dontPatchELF = true; + dontBuild = true; + dontConfigure = true; + + installPhase = '' + mkdir -p $out/bin $out/lib/stretchly + cp -r ./* $out/lib/stretchly/ + ln -s $out/lib/stretchly/libffmpeg.so $out/lib/ + ln -s $out/lib/stretchly/libnode.so $out/lib/ + ln -s $out/lib/stretchly/stretchly $out/bin/ + ''; + + preFixup = '' + patchelf --set-rpath "${libPath}" $out/lib/stretchly/libffmpeg.so + patchelf --set-rpath "${libPath}" $out/lib/stretchly/libnode.so + + patchelf \ + --set-rpath "$out/lib/stretchly:${libPath}" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/lib/stretchly/stretchly + ''; + + meta = with stdenv.lib; { + description = "A break time reminder app"; + longDescription = '' + stretchly is a cross-platform electron app that reminds you to take + breaks when working on your computer. By default, it runs in your tray + and displays a reminder window containing an idea for a microbreak for 20 + seconds every 10 minutes. Every 30 minutes, it displays a window + containing an idea for a longer 5 minute break. + ''; + homepage = https://hovancik.net/stretchly; + downloadPage = https://hovancik.net/stretchly/downloads/; + license = licenses.bsd2; + maintainers = with maintainers; [ cdepillabout ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index bf0e964d591f..7ca421b49a35 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/lharding/tasknc; description = "A ncurses wrapper around taskwarrior"; - maintainers = with maintainers; [ infinisil ]; + maintainers = with maintainers; [ matthiasbeyer infinisil ]; platforms = platforms.linux; # Cannot test others license = licenses.mit; }; diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index dac447edd7d2..6a30adb23da2 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "REPL for taskwarrior"; homepage = http://tasktools.org; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index b05c8a803996..3599bd0030b9 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip }: +{ stdenv, runtimeShell, lib, fetchzip }: stdenv.mkDerivation rec { name = "terminal-notifier-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r terminal-notifier.app $out/Applications cat >$out/bin/terminal-notifier <> $out/bin/thinkingrock << EOF - #!${stdenv.shell} + #!${runtimeShell} exec $out/nix-support/tr-files/bin/tr "$@" EOF chmod +x $out/bin/thinkingrock ''; - + installPhase = ":"; - meta = { + meta = { description = "Task management system"; homepage = http://www.thinkingrock.com.au/; license = "CDDL"; # Common Development and Distribution License diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 4ca7a86e6f7f..ca049ba04c91 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A command-line time tracker"; homepage = https://taskwarrior.org/docs/timewarrior; license = licenses.mit; - maintainers = with maintainers; [ mrVanDalo ]; + maintainers = with maintainers; [ matthiasbeyer mrVanDalo ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index c6ee75088902..127d9f21d998 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 5a856a5f2b28..413f082fb22a 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, python3 +, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas , gnome3, pantheon, gobject-introspection, wrapGAppsHook , gtk3, json-glib, glib, glib-networking, hicolor-icon-theme }: @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 pantheon.granite json-glib glib glib-networking hicolor-icon-theme - gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas + libgee gnome3.libsoup gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 5d96918e42da..a923cf945f00 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,33 +1,41 @@ { stdenv, fetchFromGitHub, asciidoc-full, gettext , gobject-introspection, gtk3, hicolor-icon-theme, libappindicator-gtk3, libnotify, librsvg , udisks2, wrapGAppsHook -, buildPythonApplication -, docopt -, pygobject3 -, pyyaml +, python3Packages }: -buildPythonApplication rec { - name = "udiskie-${version}"; - version = "1.7.5"; +python3Packages.buildPythonApplication rec { + pname = "udiskie"; + version = "1.7.7"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "1mcdn8ha5d5nsmrzk6xnnsqrmk94rdrzym9sqm38zk5r8gpyl1k4"; + sha256 = "1j17z26vy44il2s9zgchvhq280vq8ag64ddi35f35b444wz2azlb"; }; - buildInputs = [ + nativeBuildInputs = [ + gettext asciidoc-full # For building man page. - hicolor-icon-theme + gobject-introspection wrapGAppsHook - librsvg # required for loading svg icons (udiskie uses svg icons) ]; - propagatedBuildInputs = [ - gettext gobject-introspection gtk3 libnotify docopt - pygobject3 pyyaml udisks2 libappindicator-gtk3 + buildInputs = [ + hicolor-icon-theme + librsvg # required for loading svg icons (udiskie uses svg icons) + gobject-introspection + libnotify + gtk3 + udisks2 + libappindicator-gtk3 + ]; + + propagatedBuildInputs = with python3Packages; [ + docopt + pygobject3 + pyyaml ]; postBuild = "make -C doc"; diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index a448d35485a7..1feec9e45509 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { name = "vue-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/{share/vue,bin} cp ${src} "$out/share/vue/vue.jar" - echo '#!${stdenv.shell}' >> "$out/bin/vue" + echo '#!${runtimeShell}' >> "$out/bin/vue" echo '${jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" chmod a+x "$out/bin/vue" ''; diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 544c1252ff41..90fa01661543 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://fungi.yuggoth.org/weather; description = "Quick access to current weather conditions and forecasts"; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux; # my only platform }; } diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index f9267411dda4..f5c92592cd10 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "worker-${version}"; - version = "3.15.2"; + version = "3.15.3"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; - sha256 = "0km17ls51vp4nxlppf58vvxxymyx6w3xlzjc8wghxpjj098v4pp8"; + sha256 = "03dv50h68grscxiaxslzv486v1bfi8y81vrjr2gs39svw7bwz5d4"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 7148caf35d34..88ab52313b06 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { export SWORD_HOME=${sword}; ''; - configureFlags= [ "--enable-webkit2" ]; + wafConfigureFlags = [ "--enable-webkit2" ]; meta = with stdenv.lib; { description = "A GTK Bible study tool"; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 6878bc5ab03e..d33135ccad70 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "0z0fdh5fmiisx5dgfyyin3ddl8g28fpd64gn8nl8dd6sf3iw8z7p"; + sha256 = "1yanyaz6gh5wbccj9mfd39pyrg69gb4jn6sjvx1k63pkjrwr2ap3"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index cb2b682a952f..ff0555eb9657 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.11.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "0k897lx60gjf464j2ndindxhr6x3l90fv81bcqyglsv47danivlc"; + sha256 = "0pc3ssmnn36xs3jgznx36q4z3qh06fkbz8md3p3rk6rpvly929pn"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 2df0cdafdc4b..6040b60707a2 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-proxy-${version}"; - version = "2.11.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "1jjcgnpkxdafsdsxndsvzd84i6mwk7ix4vvgs3k1dla9ll9nwq5j"; + sha256 = "0yw9g18blrwncy1ya9iwbfx8l7bs0v6nmnkk71bxz4zj9d8dkal3"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index ee267c1ec7cc..25d2e0905806 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-342"; + name = "xterm-344"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "1y8ldzl4h1872fxvpvi2zwa9y3d34872vfdvfasap79lpn8208l0"; + sha256 = "1xfdmib8n6gw5s90vbvdhm630k8i2dbprknp4as4mqls27vbiknc"; }; buildInputs = diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix index 0794b2b6dbe9..d273d27944a8 100644 --- a/pkgs/applications/misc/yaft/default.nix +++ b/pkgs/applications/misc/yaft/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/uobikiemukot/yaft; description = "Yet another framebuffer terminal"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index dec861009eb4..6b3a4f747f47 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, buildPythonApplication, dateutil, - sqlalchemy, setproctitle, icalendar, pycrypto }: + sqlalchemy, setproctitle, icalendar }: buildPythonApplication rec { pname = "yokadi"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://yokadi.github.io/download/${pname}-${version}.tar.bz2"; - sha256 = "af201da66fd3a8435b2ccd932082ab9ff13f5f2e3d6cd3624f1ab81c577aaf17"; + url = "https://yokadi.github.io/download/${pname}-${version}.tar.gz"; + sha256 = "681c8aa52b2e4b5255e1311e76b4b81dcb63ee7f6ca3a47178e684c06baf330f"; }; propagatedBuildInputs = [ @@ -15,7 +15,6 @@ buildPythonApplication rec { sqlalchemy setproctitle icalendar - pycrypto ]; # Yokadi doesn't have any tests diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index d1fa28318d00..edafb0034800 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = false; - buildInputs = [ stdenv qtbase qtquickcontrols pyotherside python3 ]; + buildInputs = [ stdenv qtbase qtquickcontrols python3 ]; nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { buildPythonPath "$out $pythonPath" wrapProgram $out/bin/yubioath-desktop \ --prefix PYTHONPATH : "$program_PYTHONPATH" \ + --prefix QML2_IMPORT_PATH : "${pyotherside}/${qtbase.qtQmlPrefix}" \ --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index bdf6d0da1457..d4afe4ea9e14 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "zola-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "getzola"; repo = "zola"; rev = "v${version}"; - sha256 = "0as8nrzw9zz10w4xxiibgz8ylghc879b2pwaxnw8sjbji2d9qv63"; + sha256 = "1jj6yfb3qkfq3nwcxfrc7k1gqyls873imxgpifbwjx9slg6ssis9"; }; - cargoSha256 = "0a14hq8d3xjr6yfg5qn5r7npqivm816f1p53bbm826igvpc9hsxa"; + cargoSha256 = "1hn2l25fariidgdr32mfx2yqb3g8xk4qafs614bdjiyvfrb7j752"; nativeBuildInputs = [ cmake pkgconfig openssl ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 44313fa1ea28..de2159849b75 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -76,11 +76,11 @@ let rpath = lib.makeLibraryPath [ in stdenv.mkDerivation rec { pname = "brave"; - version = "0.59.35"; + version = "0.61.50"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0z0fmgmfayappncixrnz7g42mcrm907lsvgynbklq2gjcxpsfp8k"; + sha256 = "1lbajxnxqkd422rckfjm65pwwzl66v7anq4jrzxi29d5x7abl3c1"; }; dontConfigure = true; @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg wrapGAppsHook ]; - buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ]; + buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.adwaita-icon-theme ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index f31ff05a42bb..faa5bc121cb8 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -47,7 +47,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ chaoflow bendlas ]; + maintainers = with maintainers; [ bendlas ]; license = licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 5d59f7514c60..2d8f184dddae 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -11,7 +11,7 @@ , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf -, glib, gtk2, gtk3, dbus-glib +, glib, gtk3, dbus-glib , glibc , libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups @@ -65,7 +65,8 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gnSystemLibraries = [ - "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib" + "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" + # "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* # "re2" # fails with linker errors # "ffmpeg" # https://crbug.com/731766 @@ -104,7 +105,7 @@ let else result; base = rec { - name = "${packageName}-${version}"; + name = "${packageName}-unwrapped-${version}"; inherit (upstream-info) version; inherit packageName buildType buildPath; @@ -120,7 +121,7 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk2 gtk3 dbus-glib + glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libGLU_combined pciutils protobuf speechd libXdamage at-spi2-core ] ++ optional gnomeKeyringSupport libgnome-keyring3 @@ -132,6 +133,8 @@ let patches = optional enableWideVine ./patches/widevine.patch ++ [ ./patches/nix_plugin_paths_68.patch ./patches/remove-webp-include-69.patch + ./patches/jumbo-sorted.patch + ./patches/no-build-timestamps.patch # Unfortunately, chromium regularly breaks on major updates and # then needs various patches backported in order to be compiled with GCC. @@ -242,7 +245,7 @@ let treat_warnings_as_errors = false; is_clang = stdenv.cc.isClang; clang_use_chrome_plugins = false; - remove_webcore_debug_symbols = true; + blink_symbol_level = 0; enable_swiftshader = false; fieldtrial_testing_like_official_build = true; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c7917e923d4c..4b9a747811f8 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; outputs = ["out" "sandbox"]; diff --git a/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch b/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch new file mode 100644 index 000000000000..cdf0f695f761 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch @@ -0,0 +1,11 @@ +--- chromium-70.0.3538.67/build/config/merge_for_jumbo.py.old 2018-10-25 19:15:54.578222230 +0300 ++++ chromium-70.0.3538.67/build/config/merge_for_jumbo.py 2018-10-25 19:20:44.397613032 +0300 +@@ -132,6 +132,8 @@ + assert not inputs + continue + ++ inputs.sort() ++ outputs.sort() + write_jumbo_files(inputs, outputs, written_input_set, written_output_set) + + assert set(args.outputs) == written_output_set, "Did not fill all outputs" diff --git a/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch b/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch new file mode 100644 index 000000000000..6b788f43d29c --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch @@ -0,0 +1,17 @@ +--- chromium-70.0.3538.67/build/compute_build_timestamp.py.orig 2018-11-02 16:00:34.368933077 +0200 ++++ chromium-70.0.3538.67/build/compute_build_timestamp.py 2018-11-08 04:06:21.658105129 +0200 +@@ -94,6 +94,14 @@ + 'build_type', help='The type of build', choices=('official', 'default')) + args = argument_parser.parse_args() + ++ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here ++ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None) ++ if SOURCE_DATE_EPOCH is not None: ++ print(SOURCE_DATE_EPOCH) ++ return 0 ++ else: ++ raise RuntimeError("SOURCE_DATE_EPOCH not set") ++ + # The mtime of the revision in build/util/LASTCHANGE is stored in a file + # next to it. Read it, to get a deterministic time close to "now". + # That date is then modified as described at the top of the file so that diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index a097b9fac4ec..664f9343eabd 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,17 +94,17 @@ let envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@out@/lib"; }} ''; - + meta.platforms = platforms.x86_64; }; flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "32.0.0.142"; + version = "32.0.0.238"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1mifgrfcvz1mc5w9s0df498z2dma50yq3vqw3pz82wxynmk28gq9"; + sha256 = "0jqx68lfqjpy6wbxdi0giclvh9mc9rha92hqdj1nx42v95k3gc65"; stripRoot = false; }; @@ -135,7 +135,7 @@ let ''; dontStrip = true; - + meta.platforms = platforms.x86_64; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 62858904ffcc..14799e9f96cc 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 = "0gd426a9xcgs8a9286gavziysq6fw1ilaifsna396dbdm8b571wi"; - sha256bin64 = "05p20l0969rppbyn7965k78ccynng47rg7d7h7piqiwnm6ffg9yx"; - version = "73.0.3683.39"; + sha256 = "0m7xdpi1f2a33csd7bsp91g5klz0hmr83ksfwsd2fki3iipvfs4w"; + sha256bin64 = "1b4cyf4v55sy52mxxl8d70abg5ck5k45jaqdjsjw7dvh3s2x4bwp"; + version = "77.0.3865.42"; }; dev = { - sha256 = "1yyzhw5zv803ysdj7zf0imdw9cf0mdlw30vphcb59a93nnvhkbb7"; - sha256bin64 = "1a1dswkfc4x2rslkb899fgywv5mfrmcp1d8wxy7h034504r8gy87"; - version = "74.0.3702.0"; + sha256 = "0x5r6xqwiggwyzbinm252xc1n3f9r7cmmzj6assi4v1nsispdh2k"; + sha256bin64 = "03yymhbpd1snycmcv7wkg5j6zbydvyc365gy5myp7wgas7cd0mb6"; + version = "78.0.3887.7"; }; stable = { - sha256 = "0bcc0iksk2v30drwd5zbw7v6sfbw16jqllc12ks2nifrvh058jjp"; - sha256bin64 = "0azyhnmdg3grladpkpsv67zxqiqf5a3x9qjfj8h831kh7i7m3gy8"; - version = "72.0.3626.109"; + sha256 = "0hajwjf7swlgh1flpf8ljfrb2zhmcpzvrigvvxqd36g3nm04cknm"; + sha256bin64 = "0hdsla8i3q0zbczia64ghqsf420alcc31xdishx1sv48x3rlrxkk"; + version = "76.0.3809.132"; }; } diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index ded2b688815c..be1389c2121f 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = http://conkeror.org/; license = with licenses; [ mpl11 gpl2 lgpl21 ]; - maintainers = with maintainers; [ astsmtl chaoflow ]; + maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 12a6c64c7ae4..5b3e8d727d0c 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = with gst_all_1; [ glib-networking + gobject-introspection gst-libav gst-plugins-base gst-plugins-ugly diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 256d2e39cded..02087ae01ac9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,935 @@ { - version = "66.0b7"; + version = "69.0b14"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ach/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ach/firefox-69.0b14.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "b654e75351d83ad81df615c9a3f3ce90cc7d033b43162be78cef88bdfa4f730c6f457e09f7a3d7f6f4253407dac6c65106f5af3f3422de4eb14e982fecd06367"; + sha512 = "69f7a54d9e458d67fc554e282bd3d25a97e78e9e1aef70db3ca1ab63eec572da1746ffd405cd722243e12bede511b98fe5dd6d8fe70d39660c9e08cdde5d5704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/af/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/af/firefox-69.0b14.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "97f7c12034384ef37db8a30b31e345caa578ed9e1720bdb4555f29a82397f009d2cb771946e1d05d8aaa67e2dcc6081829977201ab78303dccb98cd0084b0d49"; + sha512 = "367200eb6731ecc4934f98abccdce40ddf4a73324162e8c76ac3903593f7eb8a73c9abc34d36ce7502be4f55e865a1cc39d629b9f026e25ce56af8d76edab915"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/an/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/an/firefox-69.0b14.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "cc9822f0a07a490a2fc5e3138e0320b01e395eb648724c33d177230aba51e50bb3dc30630065e66d54b3f0aac8339a23393cb07e3eae15aeeb9d60b0ca8866f1"; + sha512 = "4d146e92193945daada5e3db6e3de0beb5b453bd237b07c036a8bf3dfa92894b74e0cf956e5eb5217cc1872794f7f40dc58f9b1fd21b2ff89c6122a580ef5422"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ar/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ar/firefox-69.0b14.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "335d84de77df91f4fbdb545d8762d38a64743c1001a88133c64e09b05c5728134ab5bc6d9eb44795a797ac3299094f24fa3a00971bf030511c09c5c5bea708b5"; + sha512 = "ead64f65522c0775fe58dba27df1cdbc589dee666e2ffcd1ffa84b2285205afbe86f6d6b1b59b74eb6add2dd8332e2488165d6af21819269f2bdf394d0a32c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/as/firefox-66.0b7.tar.bz2"; - locale = "as"; - arch = "linux-x86_64"; - sha512 = "df7c4e094243a4ecaa3a269a3e22c15c6756b8df4a970284b98c8db3132e2b552c86c0c39241c58522d5263abd011f16f5d2f27e2f23dd191e98930801c52c70"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ast/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ast/firefox-69.0b14.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "5b81a7dd3d969336ebd8f88f88f42c2008ccebacca5ee90db6f406b3b3803c3ee5c0932dd0528d42197a9e44a4f23aea738c789221339dcd99ae2fe3be6a1920"; + sha512 = "c5e1faa329fe3c37eb4b2856280011d8750f0c5e1cd638b409277826d612421b35b14682e553bab41a856d8dbb9104edc32a08ee612830b2292c991860c0404d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/az/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/az/firefox-69.0b14.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "e88448e4c5dd8ffbd626a3c215165cbd1a6f57880bc0574e93cc1573a208c8c329fd684e50099f0512f177a809314f9e2a8a7e27bc4b37eac618a786202cb851"; + sha512 = "dd48ea7a7334798dcd26a9d15ee101936d603fc0f3374f6e36653ffadd8bb623081e232d1aef682caa31ce2409cc508a51bdeb6388f43d47b946e74bd2022238"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/be/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/be/firefox-69.0b14.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d88e247de3ad2079852cd12135dafac94fbc491bd2ed974aa6891f30719568f29b7f85449ed3d236f52f7b376ae976fcf94cb15d91144789a837b71cee8fbc26"; + sha512 = "de23e64ae742d96ffefcbe3abe1a39f62dd1df291c023d71b361ceaa596e9972ffe07b24a10203497024b575b2223ea4bf695b6561717e879dcc03d7b6b8915a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/bg/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bg/firefox-69.0b14.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "41bc5b53dc193c38042b585d1c667ab6bb946a6479c7b64fe2bb160cdae559e59770c0c067249723d96f80993b358b0925c6d4f4e685e7f5bce50aafd7a6ba7b"; + sha512 = "4e4dcc3e755b6b721ea005043310220f67e525e4c2339f7fcf12b078c2e611dac8b4fad6b734cf7207641b3823fa2d0d1f271e71103f8cff184d6669b1b1c883"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/bn-BD/firefox-66.0b7.tar.bz2"; - locale = "bn-BD"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bn/firefox-69.0b14.tar.bz2"; + locale = "bn"; arch = "linux-x86_64"; - sha512 = "5fa6ccff9c96760ee5fcbb1a5a23a42412a5a3d54d61810eaa5b5670ff35715c20ba8ef449a922cbbb2fa5fc8d8817c64dcafb2f4d6945e8630141559a45da0e"; + sha512 = "766f354fe5a168b902fa7c418e0f328f0e95ef0754db29740c6093bad202caad443cfe02e5c3841fe818b1f6b9b53e1b2ae84e29d72346260b5a07cf5ca24ea4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/bn-IN/firefox-66.0b7.tar.bz2"; - locale = "bn-IN"; - arch = "linux-x86_64"; - sha512 = "5912e3889444159c2ce5fa0e74feffd48119f9658f0f7f7c83cdd2b67b7694dbac908fab4daa91c34bd154d274a8fee4a9106709a5cadc1f75cdb033847b7f38"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/br/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/br/firefox-69.0b14.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "868742b065866557a6e128dd1d55122567df1385c83c83a69775abdf74b4c1dd46f7fa4c1cffdb0775e3cb3e1d50e1c767d3d6147a5d4f088608940c6c6ad232"; + sha512 = "c5457927947a378e3778cc01e706deaf02a01e6ca4406270d6e4f5973e0f00ea3bbd27aca09b65c0dcfa5b430c600ec1e0d71cce48a796575d9c469e44679d9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/bs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bs/firefox-69.0b14.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "edc9c5bf8570a778458987f714819fe29202d34c7f36702bc52c28d92ecc990a3cb5defbc1cf7e6de8c9cb5417a0511958a9b158b08e174bdf2fa461c5fbac3d"; + sha512 = "50605bd4bb4583fe7835f31e3f21186e6ce8738bdb55fc4a2832442cb4b21d5bdfcf3bae7905636e37c132db6c4561dcd93ce208a12b1a9c52d8d8248df2c4af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ca/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ca/firefox-69.0b14.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "c2afeefc651e088ed37a432c1ea41243bb104f46e811776a00fc16b8d167084fe2a3f89846439dd0c7f996761a998e6f2d9c858d956d77c2d889bf7604f66446"; + sha512 = "baf2c5fc6e752a5d3f8b2e5a39a89f709e3203c53caef5bf3d649027bed2dfc5191b31998074f5ba7a437c8d8f2c911b5c6bb653ac1e6cf1d2594772431b0c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/cak/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cak/firefox-69.0b14.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "89738c8a65cc4f9916f9176dcdd724633af75eaf4ebab91dcee001c84b2a66d213b02e070653b9695b53f5f1b8201cd9e06f51d77bbe1d03635021b7aea86b2a"; + sha512 = "8117c621252a9a6ce9eabdaf7dae8ab9499a20c407b9d48bdc49b17fb72659889b038296f6af11e66a3dd5a9f6fcca9581396812753b7ea80a9299c1f558693a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/cs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cs/firefox-69.0b14.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "eb43b421ea50f6bf7d5f5299cd8aebc56e610cfc83947246805c786f096bc4624c9f39c3fbef149c40b778450f3c4ff5f5b0cfbd30eb80ebaca28055045ef2e3"; + sha512 = "7c9103c4938e57bfc7b47a9cd0c07e38775edc50a001fb24f91def01a8c3c7a3de1330173fd3842e8b0ec42d001d2cd5c9b4a4caf60613edaf331059d6cde524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/cy/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cy/firefox-69.0b14.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "3dda2c134eac43b9fc091a34c3ca39715be0fdcf6ed1a39c8a7c6895656cffd6b3321de05eeee15396b4ebc7300ed2a5b8b3f311b379a434369ee9239a063404"; + sha512 = "10ad0c39925c53381a5e8ccc6fdacb3939e2f32c17a6382f6279fea32bebb8a2a43f326e2467fcb48f4df1ea96c445cfcf0f413b436814da1074f6f5b353cf89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/da/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/da/firefox-69.0b14.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "e22dcee97ecf12846bfb1e130b47a666b7b414db32397f1f1e8c26287d9068f4590d730a31dc79d2752fd4b9ab5ced01a8ae0435775625a737d2638480eb64ce"; + sha512 = "8bc4c854a68db46280e0e9d561cf507ee5c334f3ba70d2834906face0540a47b77fc45d526024bd106c233f8e5245f3258279810a9fc2949e5e24d21fc17ef0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/de/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/de/firefox-69.0b14.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "2c1f121bd69d0fd3cc54e5c6dd90ee67cfae72a237df4ad733e380626f234d8404bfb066f77d918e6b369eb8d0382dd1e93d3c9ac8300e889d0ead88362c3201"; + sha512 = "d793e9da3997aaa0318d1b1c22586d31b65bb1eaa21049a86878fe32acbc75161f1a48f9307c3c73bed9d15808252e644622648c150f5cb52a1480a418921b90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/dsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/dsb/firefox-69.0b14.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "ab2580a816b8bc7bd8d34538240f1cb3761a3330f14dc9219e422ffa01813d6b8f77c858fca1fdf3e41b8624d80055faef943e51328f551d4e6a99690a4b35f0"; + sha512 = "e9ab9d16d1eff15d049beb6b9293322b425e6da4fc1f1286c2bc785d7235b1d672df1f476a6949371af687ffa3af3b7cc214bb886a1147f96fca4b6821aabbdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/el/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/el/firefox-69.0b14.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "6f53270119cd749172c8a766e293117877e0f62801b4d45e9e6448cf3d781c746ba0a9ef5f26ffb8ccdd31db5ef773220a22ca019ee298e2484badbc3c785931"; + sha512 = "31cc046a58bbbbc2bba80131bfb456019c1b38f6a5efec72d140743e5e1f61b0cf10094d61fbd9f76806ea03461365a27aaf3b15531004baee5b431a59e32539"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/en-CA/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-CA/firefox-69.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "ff54928066083a535795c591abdddfa5a08ba9393f121fc98ea0c92e42860bec0e604562639dec6d79b04f906b2e7b7bd40259752b168835d7ff79b67068290c"; + sha512 = "eb9b3b8278c589f1b693bae1f48d86a4611b377c3949d51d75f534f133d85436b277f5acee1bd419a3f24faca245abb5d4d9f9fbd95b2adf05c03af72f37cdc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/en-GB/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-GB/firefox-69.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "370312880d10268a8e7963e9ae7e07849c4a8dff6c80690c44fc33a234c2466c8c0b71d906c5edb44aa07a27ad2dd93137d4afa1429d796039ae6cf89d7eae80"; + sha512 = "03ba44f4957abf9e2c36ad394af34354c0674b8e20a7e75d40b516434b3428fc3ad1d42ded42bd0587f282637ab663175a217eedf41f444d7e2e77d9d08c0dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/en-US/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-US/firefox-69.0b14.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "a4c27d076b2314149f7c60fe43489f5d19dfa3de1f349f52d00c342771789345d7c41d4c488803beb496fc405d9d7743bd7ea5fc9f8d8397191706bad459953b"; + sha512 = "e61379736128667d1b4e5271037b3dff8f2c6425678791ce2883345a672023665573177019001364324bb4b166989bcc475844ef30ea5a8703a949d3c08882e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/en-ZA/firefox-66.0b7.tar.bz2"; - locale = "en-ZA"; - arch = "linux-x86_64"; - sha512 = "a4328cdd79b1c0c35d71cb2a5f8870ff2b340ae0859cf0d32d132794aa119deadb9ea185ea5852fea7d2aaffe788dd58cda7ae05bdc4d5f4d6c28f3379c27100"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/eo/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/eo/firefox-69.0b14.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "6052d64d0694e6d7f4ea2b0e3d6de656f26dc12651bbca7cb5325fc1c8c2482a9c68d6dec34abd28db46b381a036f3a3acc9067eecf258311af41e36058962ce"; + sha512 = "081d2573b5674e28e7cd04f0e856909ce7b1d2d16ec61bdf99cc5e0fd8aa5abb3624e220d609bf7dbb0b9d2db6367d7c67a64ffc470700896ed7520a250d06af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/es-AR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-AR/firefox-69.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "cb0e4ef918b2dd1848d09b80e2bca2b0b9fe81f87374da2b5e8596ad8c3beae0a75e9dd911b7fa686ab130bbcc7159cae087b7683a2e3e1938a695cdb25c8341"; + sha512 = "12fb861ad3e36473e4384f8574d479b2beb4d036dde78478b391381afccc1fb1e7888e08d0de366acc8c537f141187a0075438cf53601fd0bb4356ad7a76484c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/es-CL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-CL/firefox-69.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "256cc9ec86dffc9247b09ea55d07a48d474dd57199972d36a24d95c043bc465d495eae45c8c8a7415884977997ce649e7d634330ce9a789d8fb76ff76ffdf9bb"; + sha512 = "6adf0c82bf246e256db530a4abff51e6389ec5ef899abf406fdf78c2c81831bccdf88cf133e2b8fb5a4ce4d843b947703dcf7a5aa721a6bb4913b6d07d04dbca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/es-ES/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-ES/firefox-69.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "fd767bbe55ce1a905c6dafa8297dcc481457726e4db1fd796f0974f9b06becd64c695cd258448692db45e4d168858f8cb529c74ce88a06fbfd94d9c1dc5d126f"; + sha512 = "6b31621b8d8f0aa090839fb4db7c10618374551b04b66b1696fff7ece4de9cdc7da06243f2f6a0be931a201cd984b9c8a4ff4332d0ae8ad2a42e08fe0de0f709"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/es-MX/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-MX/firefox-69.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "9ee47247450b5435920a87baf878e90517d8b6e3cf6120696ad465b882e41294599a10646b27688f1f1b51aa34669a82931d9c5d028d7221ebf2f124808575c0"; + sha512 = "e1efaa7059a8e7c4b9dabc5481ef9ad14235e310ee42a8f28cf3eedc1907484be9fec8fea7dfc76e11fd531fdaa4933b581425d826ac41e040a855a3d2bdbc6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/et/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/et/firefox-69.0b14.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "b8f20f70399727bc6a737e44cd5c29d96cd82cf5066f1cbcac4b1d1e4bd81fc2674e44447d8c1b304251c54cf827279a64b8d487597b5d2d4733019bbeb10843"; + sha512 = "f8683048d0b87c0dcb0d929298e7b6429540edcc9308a1fd8dd6c40e47a39011c9abd4fc495bfe9fa8702f68717cbb06611e6f023d43f84cda623e23b67d2331"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/eu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/eu/firefox-69.0b14.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "b052c683646d706e2feccd6a1c936445fa9f29539d7602c23886bb338138f0329b27d04106fd13c9ced843b50ba20a2f3087f93f77386129dbf8e976b2370403"; + sha512 = "6ec1a27c6d786d3af512f03836f1b795df14dba63c935274fb601228af012eb6063c035d3cd5c9e7b24976be57f0d62e03f7f136bc322e667adf8612cca08b25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/fa/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fa/firefox-69.0b14.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "ef92ff55bc96e28dc710fd060b6852a236b1c27c059ff1b3b543229bddfd4b992adb8c4a1deac49ae90eb944d1d0629b20436f69ca2aee29c261b6e371bd97cd"; + sha512 = "0ef5ceebf4c144ba6b6fe8c999f97b78f6bfc18667229a85ed2093fe3838d5b1f7213ecfd004af95cb18b2a6dedd8675d1365d6b9a09b2976a771d96b61954be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ff/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ff/firefox-69.0b14.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c9b5cdebe25269aca9041fe361a3984e30cebc7b6ffcafce4b4ee3777489fd135829899d4ca028e667f3b0e5b007c4b985d8bb962a364a5b4e695ae647220fcf"; + sha512 = "c17d2f95b4e1441e7f5efcf597c7c4ca362aeb837debd788933c52d6803bfc987bc8eb218391dd71a0581bfd386e625eaa2f4e3ac678f74a9ad3ec4f6ae34ca0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/fi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fi/firefox-69.0b14.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "7a2945e59385ac1b9d9db373f9855f704d6a6a82a8f1a66d1068cf7643b3bb5c80b29561329675823b827e67387c0496ce9af46dfe20ecfc8c9ea31b20582aab"; + sha512 = "ab77f83eb23cc32fc5bdc4bec4f5c5710d53d7e46df6004e6a4751f9ba111366ee96742862fa5b76b438fe693b06245874ea9ddb2fa3575b4966bb1ebb66bf12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/fr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fr/firefox-69.0b14.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "953f03192c33c066b48b47fa4eabe72c93d92540117f4c6060681da272c2f09600ffb58b679ae63c2e9b1f7540701bdda5d184bfa962799a284a27ec305ae3a9"; + sha512 = "1c78f9c50efbaa3336503c6810260fd9b8d7478fcafde0a54155fd177d22a8988e35edfb26ea9e3e0d6b37984ecf72a98b2928f14d39a7927b53c76df1d60bcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/fy-NL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fy-NL/firefox-69.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "df18f0c7f6c45da62b876ace7a9aab2699883c64356381fabd1886a810451f65c2a95f2df594ddb945a997090d917acdbd543a052f9baed6900bb88e4fb27188"; + sha512 = "396d65f9647de3d46d6936143dd1173e91a2d023e82bd51d6b22fcd0a06d87e376f83c33ae983f3d192cdd34dda8f97b38a6a9b0a3c49dcc75db7ff913131172"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ga-IE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ga-IE/firefox-69.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "ae7952ab62b70cc5e22b45e0686702736ed88439a8b3e193db416ff6cdc0cd07ba9e9763d9a1cbda93503e5a2d25bbd0ad4f540e497cfd99d380f93571f7c7a5"; + sha512 = "c66a6cda941dfefaafaaa6e674110e4825032d468dcd0f299ff9795a7ade24e89524badeb27d6ee9decae81ed63ae1c4df1ca0f9f8c7f1d35d50ac4cc36450b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/gd/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gd/firefox-69.0b14.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "7afe9eb5815568c450b1ffb41f55f0321dfe18e3837deaeed5a13cf0eb1569ea30f6a67ab7fa9599875c7020428e3cdfc115f38687f9b75450afc556f96d5c92"; + sha512 = "077423578f0acb3ab6dcafac6394a5a75110252532e7552e1c81976298fa50187cc9f93f43ff8745f2cf2e148f0a4ba3d206607396dec83021fb7c825295d02e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/gl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gl/firefox-69.0b14.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e6f6b1c690e55f74cd770e044e20bb6c8aee5032b8bbcd4a44ce9100d7718e9651e5e259e11541e2750a8ab4fb05d53d903ec6c8bb4fb07aa98a1156c41b73a7"; + sha512 = "52dbe9d4f88cf6d2d5710fecc95f0ea78519034ffc9d4f111cf96e99296ae77617a11735dcae3ebff552ba1fe741c11f4f767cb9710e4fea4d4ff961d42fbf99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/gn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gn/firefox-69.0b14.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "13f9b91e9ac3fba5eb6a6dacd98c3da82cdbb7da8a39b0b7fbd43ddacdead0f994b9ea8e703910eb46c65ea31ca5ae3b03e534defc1fa1605135e2d4d7e5eaf9"; + sha512 = "cb38005b6db3b58559baed9c427d19b36550bae82d6b6049c7c705df67ce736a772f868d4d770fcadf37e7a19cf2d02f221b2472ea9fafe26d00f3ddb0798079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/gu-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gu-IN/firefox-69.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "db2da1f38a47fef2dd9f1dbac3ac946ffd93fab83aa152644116a66161fe9546f38b4e05e54d41ea41802c26c313b5fbfdaf339559001fd1580dbec2e1009cc5"; + sha512 = "776f81e4aa1c01d8bbbc7ff83f6c0eae549ca7b6b86aeb6b346280a7188704502c1f62790eaafda06defb73744930ab61aef97b9ddbe16581de2129da88c6eb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/he/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/he/firefox-69.0b14.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7b93849512bc9e0dba46577df75bb5db9d01d1b039e31efc714443d4a372c76cf9a8a61d782c3345aca9d8c31028e483dfa47c3a488eabff0a59b6edded46737"; + sha512 = "fa0a8beb4edc5363d339502aa132f257a6a78c2c96a5c9cf43ebc5522e43ccb96940acfcef0c06b2e9e5325860f2b93a5cbc3d77553e8c7f7a39ed010b1b69cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/hi-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hi-IN/firefox-69.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "8608b5f2d5a15c4d044c392689019abd3771151ec7746a2f7b8f23f759dea195938cc39a61be2282153820928fb3d937d0f8a17238929455898ad69897d3eecc"; + sha512 = "114d157b3e2b4891544fd1c4496c8c2b2e697250c71210f0ad034c6eacf2b35157c18146ce843d2bd2927fb9e7f71f2854e8bda221d4af91b2d50df21747d0e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/hr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hr/firefox-69.0b14.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b4037d0941610b5bcfdffd725621127b0b5e78aa66ee2df8de4c00303dc87c39a2d07b452520461f4e4dd9f2d092f6f1a483fafd1ea122ece67660a1c69aabf5"; + sha512 = "701470a4164010d28590f53008568b01017c4d0047d815f51b0fd1781c037f110c4fdec0820ef6ebda01efec1c0acddb7938ed40e946ee77ded662e760b2b61f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/hsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hsb/firefox-69.0b14.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "624ced9f602692396b62f835f5f3576fbad76128599c18c5d40f7bf20f9fb9be61cc1049262455de4545c83d3d97ddc434e9cf2fccbd3111b8fcd49e4c0bff00"; + sha512 = "625488b1e226d36b4995d81215128d647cb780062ab450a7df05c13edfa71ca5ded4d8d778876721228bb16c3545fcc069af692eb962d7a1028c0defe74a189e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/hu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hu/firefox-69.0b14.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "8a15e2ebf546d3e6346952c57e1a939c977699957a1ec31a95c0624db17fb6c06395a1e72510a821a9d22b8c95f30f0423aa764068e264293b934f10a4c8618e"; + sha512 = "5113917f0b5ac615fb68324acc6dc966a457262e40f49678c215184500cef1fdd300ddc18fd3bf62222f1fe2d00c916ac8dada8adf6060a2e2098cd96fc4607b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/hy-AM/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hy-AM/firefox-69.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "395c7e7b1aa62439178053a2cda82c15daf5ab489cd5c461deafaa6045898805124260dd8c6186ebac96ee59d9f1e307ae81e1c52fc3075e21cf14082b91dae0"; + sha512 = "70f989efad4fd4282a06e78a1a6cfc28159168428b24efd9d393f2ef7d02afc06eb3e52349797e9e5a8b6cacd13a2cf7e9bd0758dc203bcc7d0ba4a77a599b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ia/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ia/firefox-69.0b14.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "fa8041532a262807fdf0e132d062a502f290cb8474af161080ef8db0e574dd8d4a50d730d07a9f9c94352812ab4f0af7a0c281778fcbeaa15c90193f0c31036d"; + sha512 = "a8f01c33f945eb0377f2907811db68d912ea2e7a200e362c311a9ecb5b8c5621e05364a05fdc07a35a438d0ffd8e56f83341561823fffd0aae7d7e9794ea9079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/id/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/id/firefox-69.0b14.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a8a5f3b772fc75a82efde0f5f72de8d38a6529efa176eae302ec32dfa93a239822b229171a2b88eb7e3adc3a94362118aff1af6731d1af1c7821febd824fc8ea"; + sha512 = "359744507ac8c7acaa18ef5b81b7979777e1e860ae443b93b8b510389e198a4482f02d10e86996ccf9879748613a5a26aaea9fb5affc7ed8477891dbfdd6006d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/is/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/is/firefox-69.0b14.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "d8afee72c442176d471ed62e2e97ce643d3b5efc9dcfdf4ddfe0a0a434e5e1202dbc4a8a71948859c150981e6445ded7d43c45ac984a63ba03ddbcb6ae677148"; + sha512 = "fa008324cb424c675bd5ed33eb886db661329254cd5809e3c1d51f4e530d034eabbdc607cc6fdcb3a332f5cf45078b0d49425c83e6985f9cc87b939c94391bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/it/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/it/firefox-69.0b14.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "4568864e61228f2a6fd13061d74526512eaea7591efe1947d0e72c4eafe89337d052c3ddb9b76b476cbeedab2cf55c6a48e9b46f0430f95fcd46281d249ec184"; + sha512 = "406e361c1ef650cafec63b213f67ca016e251c50455866ac112039abb85bfe62ef6c56e7ac103afd87c05535f42767e937f99a045d456249f87187b00948cd71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ja/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ja/firefox-69.0b14.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "734ff5a6d08a1a711c63cf58c1a9e6ca2e6b93aeefcf4df165df5cfede8aeb2945c71d1fcb37dc62523115c298f653a2fb28a7024740c2890027091ad5c07994"; + sha512 = "d1c5d95ec4f8ca8e46dbe90e6c16d4e2da7b2c29664ee878be09c8aa46aa421f91c419cee4e8db0aff47c768df49ed316d789fb20c50a04390bc63bdc5e5cdb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ka/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ka/firefox-69.0b14.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "0292eeb31ae71bb405b72cab8cf008f4a535806f62bc9e397d312197ae5279c9415c879cb8607c6cf28b0df643b737c7f4bff3dfd72c8c8d69882752b6fb9fc4"; + sha512 = "623aee24ae26658971a1bc83b80fc45e296c9c17a82abf6956ea6f019db37b110d9642144c7c3fd05ee681a9953f9d4889dedb82c6b421d975d13f4d7e0c61b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/kab/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kab/firefox-69.0b14.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "8630af1ce9a4c2a83bb4fd8796907ddb9498cb489ad297782d4c0d6f419af77ce7974987e12fdd7bf12189636ea8f0bd669bc77dcea9f609745a59646ca6c654"; + sha512 = "0405b91ea64f7840632b2c7f633af1ff478cee3910ffa32b6e49a87e4d7eda3f96f27eafca2c249f8ecf40ebbb89a615227ea011cd6269a7699bdf68b213f877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/kk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kk/firefox-69.0b14.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "dd8e5dcea7005e0d3a713396f42375a6d75bae349df6e6f58be105a83127696487da2fe8f701ba41439dafc3172f8181f5ea26374865f7797a6755790b5d32d3"; + sha512 = "b8d170de3d7224c17e72d6c598f7d53184c0ac7437b93b3770df504789e862e68bbf0ba73727fb0cf8c3cbd177fd100c8c0039454a7c32bc33b6a4e05e1257df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/km/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/km/firefox-69.0b14.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "bdc102126ad2b3d44c8a24fec8e62340b72171890e59fbb7177d47f0515042bcbdea4ba7a56a22f09613b3dafafa1c9db7327dd233c58badb0082784e681e604"; + sha512 = "2d6d79109681322c73a9ca4b544e5764a0c6312d98dc46403a1d9f62285ea4fc2d88900a2a2c67f32ac61826d59f684ae4e0d9d3c09a5eca0938292e8acdf545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/kn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kn/firefox-69.0b14.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "0f222b303dcbe8e0c275f3cf92c53e68eb252963b9bded6ed4f9436f0e440fae7fc0e0b21f4e41a24643defd6a9a89d306aac481ecd69e4e4fc4fd3c74c5da9b"; + sha512 = "9f143e23caa679ef6d7d5cd4abe3e078882bfab15cc18f1209b7a5b654208f5904a225eeb0be744de341954d076806679657546f2ad2560b5a7f8df1cca2d6ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ko/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ko/firefox-69.0b14.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "004f01005ecaf537fa515cc1703d95a8cf7bb23bab302b3050d29318c461b452dcf432a5c25bc0b7f85699e0074866c5f403b35c6d6009efeaa81d8bedf392a7"; + sha512 = "c1dc9b159da316ffc61a64684dde56aba305a7a17fe8a6ae32520ba950096e62c8e265bcf98124c45ab39ebbd6f9edf7ef63e8760b0b434810e7ef67eb9b7586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/lij/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lij/firefox-69.0b14.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "b751989f6154f7ad94fd4a54e5cef4b0342a6457b7e742d7e7231faf428fe1a17fc1c16bc16d55b32b7ad01487b0d59737acacb2b27097452cd100b163e09421"; + sha512 = "7a9077eb4d267646bdd0890d785d6378e91ee4af4b41af1f90384af3ee1274441a78fe80e33de7eca3dd10f7ac4d1fa43d9720a931ff5036264f8c0371c4a401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/lt/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lt/firefox-69.0b14.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "3415c6daef10b4495cd4e569e813a6c9d98714ad2b531d32188b5a567dd40cd3e18f6645e9cbd327946c65edff368737dc7e49864bad52b36ea57e13351881fb"; + sha512 = "a9fb3b19c7413da23783dbb79fb890293b9f9efaf0e50ed1f7b13aa0382dc971da247824450338564303473f735175131b3bcafbde8696b227671ffc6e2d1de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/lv/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lv/firefox-69.0b14.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "28380c325117855bb056fba5b02cfc62242cafa36f026c1827cb814097790b29e20e8a3c3c466b7a138577f38a11dcd2bf10b76e3415db14462c97db7701018f"; + sha512 = "805556c78f01629f44dcd960d29292b1da81082fd110101e36ad8d41b4972207ee201938413c24b623d891d2632575862f42ad96271c18f13f4f50d12d8d06bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/mai/firefox-66.0b7.tar.bz2"; - locale = "mai"; - arch = "linux-x86_64"; - sha512 = "199fbc8729127797add6bbf29dca22e8c9b091f985a060cb0bdb5c573028ab71aa53d3290254610db9272cf08bdeb23bb5b4ccf4fd956848b805f808f3819985"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/mk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/mk/firefox-69.0b14.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "372cbe55cf84351ece90347fa093f19a30c92768d0c63e84c9a436b2e6616da74bc20514208fd23a9b78a81f70274292d23d2bfca24d3aa095c344930e068e37"; + sha512 = "ad3373da3f42c2d4960433da7bfc2717ca39c39a4f9e3c539ca72feddcbd24bb4138d0cbc790ad0c8d5fa64a652e5750b4c95e363e125d852548164062f590cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ml/firefox-66.0b7.tar.bz2"; - locale = "ml"; - arch = "linux-x86_64"; - sha512 = "f45a09a86f05ab0b0268105ee5edcb620b53ea097a4523d7e5a5f2148dffe226aa25e42d2132314b2f8df9a94868cf1fbb523b345acb4c9a4bea3f5ff0097184"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/mr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/mr/firefox-69.0b14.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "bf3cbe6de2574c0bb7a1856a97376363e1db88897877602cce2c07eed7a5793b0042c0ca0b6af034fefd9ec998c4cce3621018445f8837ab4d9f53c8af6459ce"; + sha512 = "9e9b07ddf0647977cf93d8be02eff0fcfcda2914e8c9fcea418dc03ed3bd0adb1bb71dfa9147d222866d9b86c2b2fdc8827304fb4099da6024c205ff9a564f8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ms/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ms/firefox-69.0b14.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "c8a415408847bdc7a0ef2348c3faac2ddc2389e608e536ab98da3ba502dbb7d424f67ea5bac9aa373a1dbfb50e075cb16f525c5203d85522c4c79028b1511686"; + sha512 = "a56f7c3b8c713b08e1f5e19b290fc1f0dd108d285b83fa3489bacad6757d02970368f4cbcad6ad78ef53c587989a8f96b23146024e705158a9c3b309bf530041"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/my/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/my/firefox-69.0b14.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "6a3a74266284857e6b016fe93aa00a0c149c087166fb8a242186e0eba1998df1c96fea3c6fedd0ee65638a5372dd2e3d49d0abc45c60d933b03328346caee568"; + sha512 = "5be85980189d689fb1f16136c7ef0d427efdcacdd966a00c67527014588e62c20397483116e1728682be5eb6aea445c1cd3d8290452f05a32023ba593ce0b536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/nb-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nb-NO/firefox-69.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "4276088362d3142f751a3a88e4bc435b82055a86041084f1a056b2b9bf12c3d2d657808ea8802484a1880e1162734f13b809f246125c83374941e4283cd00060"; + sha512 = "008908a88d4c4edf535b3cfc009140da760e40de0b14377ab79320431229b0e9b27ad745aff2265fe7d689e1391b3af3467a70f4279b82033380e3b7d234a5d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ne-NP/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ne-NP/firefox-69.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "680151304f1156ff0a2e05942f4c1b78966c9ea9dc8b23fd5e17cceb36fe1808be23eb83a21c6a93a42e5f13c2d2c12d81e6572dafb982569c0c74b0ded69e65"; + sha512 = "7d7bdde40155ec5409b43cc150c44b6687f7ae8bbec411a5b1c257a0dc630d58c6dab289772804f632fece1a3dde5d613f939ff153486a8a38052d3f1abf312a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/nl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nl/firefox-69.0b14.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "dfe9e2fd0907602927b07fd7f300bdef8ee495762d1006852074af0d968e3d3910d0ab0385173742fbb40ec6c2abf951f56a467ec77bdaae996ef21902bcdf92"; + sha512 = "467e487abb563fb8354c0f3a3661951acd40c851b4f570bb9483580a9004758304eb35842b7d75b3a21f0108914487c56416584f02abfe0ec7180ccf0e9af166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/nn-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nn-NO/firefox-69.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "a98cf7be210e1bd87accc2ad676ec42e69764b0c8ab0c767a2d532c8348f42a8bf773ab7211c4988095e3de86070e5dbe43a62514871e4765d211faa90ebfb99"; + sha512 = "bd3ef206e3cc0f8674391940878f5b9bb9cffaa82013bd59d1bf924bfd20171df753ca51fc74f139c8bf4a977397ba8611cd90664de80b83a5eaf6ff3aec05e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/oc/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/oc/firefox-69.0b14.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "acba5537fed9e25a657363c362df74ebeb74574db96e187e6ec952f0a43d67e4ce4ca33fd74f000be66d3b47f30792ba8d04f3ab7b0ac895e7e8dd79807444dc"; + sha512 = "5c955c03cb776dc6eb584d29197945ef22bc1be0074279947483750758b368a2a88f23b8412ac8e76ed209f37d35dd37f33726828bf33c8cb576cd5f7f51e7ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/or/firefox-66.0b7.tar.bz2"; - locale = "or"; - arch = "linux-x86_64"; - sha512 = "359be0716f8ce0cffe983d0c716960ca860ba7321497ece3726b4dc86166ecb31727412b11335c56f2db1d64900a46049eaac1f87a57e7c05bc9a28c5b287ced"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/pa-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pa-IN/firefox-69.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "ecabb157083f7d423b0b07a2ec8ef906e0eb6c36c14f46c64e90e7fcf9e889955758b062440f6fafcf0dd84f733cc36b63600a50865dae11dd4c66e7b7d7ecbc"; + sha512 = "48442fc58995e0f97ab255307dd6adf55b296316f19487f35635df4252547b3d3da3d76fce995918e9885a5fe79a68c0e711ec20dd22546f5dd5a4a531654009"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/pl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pl/firefox-69.0b14.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "47e3e5345143a1638d9c57575fb0e9b2bcd579195cfa90086355abac54c043e311e136a8ddf51bb86b1b613ecfa44f775871aa3d9e2ccc83a8e14494640eef7d"; + sha512 = "ab5f1d3e874d4cdacde0ef1978202fefb71ca602775ffc5d228729a6ea23c47b0efbaa3c554290b90030fd5145ad4d9a2a11b8e22973ec5923fc41edd86b666e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/pt-BR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pt-BR/firefox-69.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "78345b4ad5097dbea9f8598fe48da9cd44716bb301216959741ee3b0da648802e439f718f464b5c0522439419cc0fb2d007c3f476a688d196afad97a66a5543e"; + sha512 = "55f0f8539a4439c9e78ba794f9837f89cf9470cca827b036c69098c83a9cef91a1abe5dcc0b350358e707b274944a81600b90022e52884d3f2c7f7288b4a7d19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/pt-PT/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pt-PT/firefox-69.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "f52f3418536860424e158458e91e8332675beb49aab8e39b00591d1aaf55fe6ee9c095de6500e793d23c5e6518c3bce44124d85cb8ce535b7e5c44fb078544f2"; + sha512 = "23b9a79b6fdfae7a61a9efee4e0624a925bd234cad98c3309fe8ae389e4d01cdfd3c4f77cd2283f9649d87daba59c383d476d3f6d4768e580cf3905f5ef9a943"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/rm/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/rm/firefox-69.0b14.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "70a34fd05f3b03d2021527934055e35f7b7b1c55619b69386d32ef23568fcbdd19393b1b7c093d6f2424566d41b5735763befeb09bc41775c059bd77c8a6931d"; + sha512 = "b33e9e6a9d1fb694be1fb3990a790bf9fee990b1d45c8b3a318561c2417ba5fc0993349779b58aa2174f2fda9e610b0728a36c0d926a07f73275a5add8413f2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ro/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ro/firefox-69.0b14.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "4f9fb2882c5a79037b95c11da8b23a581593cca27b6fe943eccefa11caeb94f35e3335b20145c8252cf7275df73d40bce164dfe316396bff978a5305eca1173d"; + sha512 = "0dc002bd4872ed8907c0794430b44476e21d732624626bdb8f9cfd3c81b4b63ccd21b11456f660f58a05ffc91881903c510222b093c316f1182376eb051f5989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ru/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ru/firefox-69.0b14.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "036a47c7d6c86a658422f43d8b5875b01e24478ecd2511b90965c505c2e3153d6fd64861606d89d34e678ecb05ca90e2a034c79ca9359399c91d4d142810439e"; + sha512 = "b29a6e02fb86387d1209b8aee76be34e5ab9e1848084d8f722a55bbc4f61801dd0e694ea6d284574ccb89c65ec0c12f395a97f4232b39c28ab7b75e730a436c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/si/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/si/firefox-69.0b14.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "9afc826ab7b577119bb8accdb99b444bdb9d365910944914f2b1fef89015ad2db010c2a76b70d3b45fe4c35cf892d8d47b13e6fe0e15faa9b64f4db85b493d42"; + sha512 = "a31294e1cb39c3949cdcf0b926edfd5f196e6e9a91e99c213d86129896c56b47e4f3a33b11c4b6b8d9d44a2b0fc767a87a67d9252cf1e3b4d2ae7f9716ccee4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/sk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sk/firefox-69.0b14.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "f20734297f0a74161dbad53607e5b41d893a1256f066ebfec944e8cea2f6ec0b3825e76d971f3956275c4ead151cd6c93c85f8db520745e5972b78ba59134f22"; + sha512 = "f736359f8f3086d560b84070f35a2184b316c5f6ebccf9665232b031a220d3d638e85c67ede20c3ec5836ef12251f77f4df429842c824ebd6961d58a99ba3c22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/sl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sl/firefox-69.0b14.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "93802f825030a9f4da4f3e1a334c154e323644a73b9ab33d9e4ca57636d2b26dbff2111f897dbe4f6e52867f90a0c8ccf079d81eba3ecbc50a30fbb4a81e9e4e"; + sha512 = "f5f0f3cfd91ca5a5201e3178a39d8ce0db3f01a36a4854dde16088c6b8423b5ff6e45793bc5221a02fe444a15d83078ab13ac48ae4b529144ac183aecfeb4811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/son/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/son/firefox-69.0b14.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "de7f5063e7662c16f84b792ca2f3d8312627d5530997637b7b10021b90f3f2d56365d58f9d7dbf5fd39cf3031e6596f37d2b37c7fe572cd033d7de03c9879b95"; + sha512 = "2ba05fbe3f440a9010f999bde29849976042f2874b6ccae408fea5e5057d812fd91879d5a288ccef6a4795101f854f74de794576706b90078e1f3c3887818592"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/sq/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sq/firefox-69.0b14.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "f9d482c2e572228dd916fc10c27250c1d6b69e2a3f7ff8bc9a03ac48aeef4387c5cddfc6509999819cddcef2c1d03b25fb6646d1402e73ab84df0114a7648d0e"; + sha512 = "cac976f53f72a5eb974ef97727a5d6ed38a5a4b8e61094f8e5d76968d6afadf0daa68c7d6b29a45df6dddef8cf26973e0ab1a65c29f906f7e404cf0b152c5e08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/sr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sr/firefox-69.0b14.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "98b75fb820d8ee4109b59029e1e9c411875d37fd85ebd993c8d77e11325a810a96d50a4f0346e9e8fd9f69d58497dc7ad7c7121631909b33cefc427fe6733bff"; + sha512 = "cb87cabbe1a9d5910354887b0a6eda4ee055b823a0ac35bc414d41f9fae636834344451e3a882c65cf581d21e875b400f5e3e054ab053ad1577fe48eed8dbfd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/sv-SE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sv-SE/firefox-69.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "9d8dd14d7ec016d7605938c0730bca378bd7a16c7a342e1efd0a6d28bc0561265426bf9d9748feef778c6d806cdfc347b723ff2534089caf5be9424f747d769a"; + sha512 = "c4412a7488797482b3315a2872fed79ef033ef4fc32ea119e4a943999f5a892c430486a6e13236127c97af3c01f25724bd5ce6e84d4a9bce69d10b5ef84ffe7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ta/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ta/firefox-69.0b14.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "0e2fffcf0724395e4dc1808a569ccc244f560e736f7219fe550fef4109ef695f41d17621d42049f20cf5eb9abf1806b08526f7c6861f345f9c210aa25687e6ae"; + sha512 = "55729c9d755d83286dd88642cb130d75a827ecf98959cfc8e20f205e6c4c3ec31a03fe0a6f304662beae68677aacfaf8b993a4f79dac79c2b8157a3845bb022b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/te/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/te/firefox-69.0b14.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "e05c49be0770f6901164ef37762d24bfff1aef3de20e991d48e9e065ea449d5fa794fac4f50fb638a2b90b9537c316bff8fe77c3a4a5f2a4f89ba83a91857f4b"; + sha512 = "2cd9b38b607b89b909216afc403e7394574e66abdafa327eed33edbac45eba850be22ff651b9581c53a7ab4735c29f1a4f2ee3fb3c220ef2f527f48d919b15fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/th/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/th/firefox-69.0b14.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "cdd1e25b5b3f4344835707ed3cd0601ba0f87cfdc8f01324d14fdf765b7c2f4e1cbaf6b0aaf280a17a13d4c72d382da58290819cdbecbcdaa000af2d8af2a007"; + sha512 = "721711be47093f846b42d5bdae36ce083e05ad7edfbd75a32827189c4cab9da3af0b34551d55ebd67cecf8e04912c17f2a44b032f2a9a76e926a589381f3ebe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/tr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/tr/firefox-69.0b14.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "6b270e7fed5a02e403ac4bc3b744a051a9a3d90f709fcfd7bf6cc72a213b803ed65e5a03c1513ab1d756dca0ef600c794355923948f8bac986c4f9163bdd4270"; + sha512 = "36c4b39480b95152795ebe744c6d1390f38540c3cdd19cfaccca40f3da446a5afb6c5b8dcd3bbc87b15bcfb5214870104724d645cc630c87373b78d89c7acf94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/uk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/uk/firefox-69.0b14.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "23c90ca3ee790f760b804b3dbdaab61a154826f5c58c2a24e1e358782b621c82a61a5ce7562b957e5b8599fa3aeef73ef8b50afca0e9e20ac852c70c47d1ddd1"; + sha512 = "4b388a81e67390ff461681587914ab944230361790f5b48676df5d402aad2a3ff28c808a2c8ecb655f2540c3d6cbab8188c2b154c0e173625b7be121968e853d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ur/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ur/firefox-69.0b14.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "b7237e418bfe05a80f289eef07756b095fd6320ccf8cd3acf6403d6325c10cc8b37877f1be19208f7124d3c0c23c610b990b0ccfa5076a9c9e25a37dc865d3fa"; + sha512 = "43cb375b00bc335f5a5907796ffd84279799c8c907cf372968abb8a1e9c4ce4a4b9b199eb0384b548406a158216cb5e42efcc61836b5ece94fabe83d724bb26b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/uz/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/uz/firefox-69.0b14.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "30d9291609e2163fc24f9a084ef4a76ee533eda3f2a3b51e95264e86841cef0b95351c875a428a5cc701da4dbf6f6e5e0d5416a1274cf01e9594017efd22f816"; + sha512 = "33c0922104c4f0d6e9a5860738bb5e5001ef24c047d617b86d16f9a8668092ca0c3bf88676c448947e4c07c3d80fead8714291cf9e947698765fbce65247a488"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/vi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/vi/firefox-69.0b14.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "02a7c16ffd23241b621a0dc6144a7a99f68dcdd3ee88c17c9c1c2ae92c9f1c01241db7fac0d57d80c1d0acc12435e7f2ae4102934345ddab51f975bd1539a7f0"; + sha512 = "d4fc27a2f69dcda6832bd0372c97381e3c47883b2f9abdb21b67b2c06f392cf2e2e8aaca8f0c5f67da87f8884b7be8d407b49a3caa04dd166165a8623f621cf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/xh/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/xh/firefox-69.0b14.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "1f3a3e14c14a5914fafe52eca1dd85869b6bb301279bf248206ebbe66614029e30a470457d7165eeafd998a79dc92325096d3f161572e0ef694836fce986debe"; + sha512 = "c7d3c3975ccd4b2635f30aea2c2ef8e2c8197c52730fb60fc0a9adc5321a1f960565a442d73b68ab15367ff06f87ad09e463c8b9a0f871aca526716828795d1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/zh-CN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/zh-CN/firefox-69.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "fe701c8ea2ebc9b18f530470a1babf0e5d3202cf3f97f738b032d6a2356704c8725910e921b6ca7b40b809f7fdce41ea5b168ed1c2d2f0e6f3a5a6efbc463f88"; + sha512 = "f6df2df60e020f07aa210e373d177a49204ac35912172a0885e9767eebf64f660d2288e3d9d3cdf574c22c4c0257c955faabc02721c34c59a113de94674d80fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/zh-TW/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/zh-TW/firefox-69.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "593cd1a610047033ef770c8c3e9b469ced7c501ea4ad687e6cf72ab734e9877a8b5f762e6b2b0a1f1706d1205babe92d662a8c0dc41c096f5d6ec7555c25f354"; + sha512 = "70d1cc8904f27509fc476b59a634eb7ac26cbf53c88069b104d00ddc3c596384d75bb5522bd38fa25f2aaebe2ade7453505622110a36f7f77f19062a846f01ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ach/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ach/firefox-69.0b14.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "c047bfb9e3f62a0bea8d0f1352c8d1780850835d156f442f35a911f677cd877896cde1c4ad6f49fedaa780bbcc7b46c434b26b6b3598d66dd3e2da118f2b0b6f"; + sha512 = "74550f32169f07e5d551ed20ddc3f24f731a18966f75f80d40187496af4bffd1b0742c6ca001fa263b236826f2dfc6edd21e724bb1e4c8c8260e5526e20d031d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/af/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/af/firefox-69.0b14.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "19daf8339c6082dff06c82cd1d2a7e7344df6f6174d8c7b22fd75d74f2cf64fedb38ae420016024317d4ea0ca85739d561a7e2dbf258e1ffff26e00d12cf0ed8"; + sha512 = "2d305bfc2ad71d6c37a3de2e4427417c5ca67cd97eeecda91c8d5a84d72eb7f02c6d11a857af6af673caa5921abe8420b673c4ced79025eb5a639f466e0cc8d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/an/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/an/firefox-69.0b14.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "6ed3e6e89f6b5a4bf8a21f910ecaeb152d090d49273ae600c3cc7e97e71699309825b2dca870d536a19cdf00b30c68defc540b901d8f34801580a94847d084c3"; + sha512 = "0a6319ac1017a9c022da4d8a3a619e9243668090e8266b4778e767a9313aaba5c1d2d5174f640c3103220b5e0dc40ec4040690767062d8e6819ac0b3573ac464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ar/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ar/firefox-69.0b14.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "e9ac54884e9b9c53a97f38214436f3379f64657edfe9fdd133f5e61a67f4d28ed1859270312accdfcb5a1748a9240f5561583eb37319d0011d60d062e9826168"; + sha512 = "dee2b757f449dab23baa5ff16cdc123564650c48cc4492bddd36e7ef4f99608c2a4077fe7478d035275aa3ab2368b54e2e171ab689537081b09de0388cdd0922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/as/firefox-66.0b7.tar.bz2"; - locale = "as"; - arch = "linux-i686"; - sha512 = "527a9f5155cd75294209db47bd59254b2a57649b055b5982de926ec5411dcde56f02fdd33afba2b38392c32f8558df9fb97f5c845810db1bfd55fa73ae5ffee2"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ast/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ast/firefox-69.0b14.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "ba440780d470fbec02750d8298ee718907766dc0f97374a07f0a8b1e728cc8a99e41430461cbf3b6fd70f01af8a05e63df709908003dcb4b9225bc6cf47738d1"; + sha512 = "1e92c8fb6965dfbc9dcfda7bdd44a8612487541930a0e758c0e8b8fd27e2a5984761a430420924adbffbc11f6523beb80a8995f1e6d0ab37cec9d130306f81f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/az/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/az/firefox-69.0b14.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "28f0b46f1270a57e28002401360dd2c0c074e912d1fe71edbedb5f590b44b0966ae22fc7615fa2509262ac2bea1a28a11e769fc2970bfe68c73f0929530604cc"; + sha512 = "e35e1e9a217a7a8da13297e7cc1d553b7a4698ddce0eef31bea85709c836f4ca5993cd4892bdcf0e61d6a37cf125a4b9b6a4df36cf19fd4f09ca63c802069bf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/be/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/be/firefox-69.0b14.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "85c7470c4def8f05a9216c0d6cc41137bb97db1b75f0baef6168612d8848afe65bc30dbe1e528140ad09b87196c431bcc3566cef3401a1c41aa1c9c6ca448035"; + sha512 = "cf65d94565d2b25ef90353dc686cc4780eeefb29cde142a735d10e8511e4d9d1db74ce57d80da35d1ad9b9cb3b8cb060fad01ea95b46a86231063f4559cb50b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/bg/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bg/firefox-69.0b14.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "167734fe15a4aad537eab4cef3eefe403df2f72be1969bd6f599f9a355457862a794a74984d8480ebcb88230a471230a09f9cfbc44a05835869cf2f693cbda5d"; + sha512 = "09540c63919525169cfb3c2ef8d19115cabaa63b41b21de43e15335797761d1d452c80ebfce1768a88f3a0e135a222e30486708a8b2ef5c1327738f2d5bc8325"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/bn-BD/firefox-66.0b7.tar.bz2"; - locale = "bn-BD"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bn/firefox-69.0b14.tar.bz2"; + locale = "bn"; arch = "linux-i686"; - sha512 = "e33df73b8917aa7b3b0dc3d9600d7082943d595b8e3442944aa2570dfd3bd755f596c21b7f06d46e6e4b462e54a5092e0f503e6c5a5838968e9ee5975d431784"; + sha512 = "47d497da9c178e675989b046acf7d35caa7a66090d8751090e86c5b9d9ddf6924767a586d43d33a7a093f1885f5477a8bc008e58eede27bd219e0acd6b00468e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/bn-IN/firefox-66.0b7.tar.bz2"; - locale = "bn-IN"; - arch = "linux-i686"; - sha512 = "468360b5d13a3a43eb3df625685028c4b3077d1ba31332e994ce26f8f88c65c2458426fbeb7ea0e7657e7f1c5b43b8be772609d44c615fd1ea248e276ca7f90d"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/br/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/br/firefox-69.0b14.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "90c2eff0f21f6f4424dfe2a054007d9e2a052c33edf18ac24dd4ffde071abcfc90cd48372eb8ae0e2bfa7d2aaf7d84832786dc05f33f1ba61d0eb08f439f7d98"; + sha512 = "bb313f01a39abb6687b71314755be566ec6944fbe0aeb5571321032ee814e4aecf57fbdae9847f4e72a8844813d086d7cdb2521a09578ad04a0f31891571d508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/bs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bs/firefox-69.0b14.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "d4e04a8a6dac7d2c01342d80c6cc3194581f67a6a428f7316e6f96424e2b33fdf10e280f299c547920910e38d1c5323914c18eda735d23d038ac1a6dddd21f83"; + sha512 = "3b6a6e000d6887604696014e82c8668f4dd5e798287bc2e60cab98a0a51a4446854fc78a606615fd760f731c70cd10bade6e6f07fca17c5abc4e50d2c1cdb893"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ca/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ca/firefox-69.0b14.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "cc3bed4f93634caad8dbdeab570c67a09a64ea1ca4ef3e26797bc27ac63f41ed9487eb11d339cd7be06cc5a77d64c83297847f7d39c5f043b384f0ee6b89602e"; + sha512 = "ddde0c94dae1ef133d3312043271d7fc9d626900f5bbb473b7aa6c2ebb455d358736da2736271611f3e6b336f7c88a4e60d060101788bfc7ccccb9e2ff863259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/cak/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cak/firefox-69.0b14.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "31e7f7cc51f31ca19f9d8ed1facf6019ae863a9d3ab61c60b7817576571ab4ef65249867bda776f416a1fe5051840220b125edf05666a02bdb29c20f898ffa08"; + sha512 = "875439f58c7ccba85c6a59031d92344262de3fb27852fcc727b15ee0964d37eaedf6715dc5569cccd0f7d684e96052b84926c4b81c509fe456015eb67ff883d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/cs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cs/firefox-69.0b14.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d906eb97754aafcf4378b6be23569c346e4c7ee8c041701affca50ab75e69e0af5fc2f9f0a2e1f5877e6328a2c9b420d43f19871125b6b26483834db3a8ceac8"; + sha512 = "c93a27a66889e2e2ced6dcea0495d9295c179b2aa2afc706196b84a4c4537e0499875bd2b2ec152a38d2c5afb5d1d45224086c2cc2bfa56907c9f9aa883deea2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/cy/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cy/firefox-69.0b14.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e02310f5b2819179d4e759119285b62cfab8d83e1ade570c0cfbabf24d216a3a815e89bbcc5f7d9d843f86f1295e755c9d823ee282e33fbeaa9790585b1f6433"; + sha512 = "66059d9f6e059bbebf42ab3d29fc9103de639e5b1fd7f4b8b0648b98d86a030d668bf35852bbe83ff27dc3d1ababe47a74f1e37a227a61da6b4c90b12543207a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/da/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/da/firefox-69.0b14.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "fe2f29a915872ccda6265e29dcd83795ef5443be305ec249219dc0c6b3b15a7a7a8eb8f697842f2d6b25285c22da93489dc7039793ffc4cb097c79d1ea8885f2"; + sha512 = "a3943bc573c65a0c90a88ea76882a4b43ded06aa33c1bf1d861d3d6ababfef3c75104c7614b740860cd682c4d0cf3fdeaf54a41ef206f117ae8197a73431d362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/de/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/de/firefox-69.0b14.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "dd317c8fc5487058a81af3f743b6b3ef57a3493504fdfa6a0dad46bdfb34b6f4becf9311c71354d4a354633d973d42f9da5471ce2e9aa97a00e558c4f635172f"; + sha512 = "2635e6ab49e4545f562043cc56e56750a882943ee160b3f2bcc328ae53bbeda364746a3d97cec3d84086e90b554a98184d268b27efb9e51255a3778ce1f5abf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/dsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/dsb/firefox-69.0b14.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "51b0432f68ea4d1443bf9c47cf4db826b3f36b0d2bee50fc62a66cfa17c76bd7ac91a3ab590e7def5a16db3ab90bc426aaf49d7a2f30279369123f3e9601bdd4"; + sha512 = "aa44a98135e4e5b3f28ac37eed0103876a817c07b231830271c2dd44351ac43da9139a3adbbc8a6ebf0cd28c87e802db27632d87e7f5afb0209f4816f35273db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/el/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/el/firefox-69.0b14.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "2fa2c1ac31e61db5bc3a737c07ae681672b33b214acebbd30f74d21857421e2b8e845ab108f303f102694d945a1471e68c7dabf419418daabe774602aaa84932"; + sha512 = "6c86717c1ec09829567ade584c4f114d6bc92c9ba85a4583670a038b5616521a4578ad97b023673125fe85b9a99fc7c3999fb7e4b50fd75540386b6024d26c69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/en-CA/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-CA/firefox-69.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "6c35875aabd1d18a3110ed00390433fac5d5fbbfb35b07e66f942fc59bf7397ecd18fe6745632c0165d66b620ebe4ca22b328e13d632dab2e54736af4e59108b"; + sha512 = "90af2b18f403b7fd25bf5d920c3eaca638a6fd5c75dd57afdb0c9e1a20a8404cd652d2c69b63bcbf4365af88d1483f02b929d3b825899eb465c142775e4eeea6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/en-GB/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-GB/firefox-69.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4625f5eda39a7a58f0d3769cbe6f56bad4d214635cbbc67b1d7ea006bd62c639e665ba50e71e52ca81c3f7a82c4a0b9250a2b3e886ce309afdd025dafd34f760"; + sha512 = "4ff1dfe725977d16c23333b3f3c8ca035d4973fea2d7d1f49daaf75cf6597fa56690512636a19455e5fcda984a4ac887d4b987b45b811683cb65d40daee7b8a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/en-US/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-US/firefox-69.0b14.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c55cbf26d6c9da91f2b6a3f1c881f30752053850ce47d899ad9e3b82f5494aa26fb5c95e7d76a0ff03e97c7a18480ee764643866366c611bac8acb9eaa063324"; + sha512 = "851e15abeda5a7d9faf74950e97b2decd6ef989c04acf8d57833f9172f0793f9741d9f1212c2aec41f017c8ccd491a1dc973beddee39ac7660e63f2a24463911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/en-ZA/firefox-66.0b7.tar.bz2"; - locale = "en-ZA"; - arch = "linux-i686"; - sha512 = "194284f7a878d8190420c4642aa4d83a6ee9b41926e1225bd83c63906cad99581a5ea3049e004064efd2ff9c1219bb31b08fc806f5a072a54f39d9e3e9e5ff4a"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/eo/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/eo/firefox-69.0b14.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "4aa88cff2f27f92f922acc7dc30e68a2a58f6ebfe1c023c6911e3ecac84bab8ad88f62d2c04a6f85bb4cb292e30a78b0bba4cb664375e68ec57621e2c816c166"; + sha512 = "623247002b82238eb05f4bc7fa6182aa5f68121a87af6cb78315b4f144a17a50899905d915dba41b5dc2d372ff97ff8dfbf0ed2a0a216c85cd45f65206ad23d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/es-AR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-AR/firefox-69.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "d3e60c167deef4da8740b7c7750d91fe74513553876fe95e654b7c9625b0920fafc974253c800595a409da65e36073a574aafb136d9ea8f3e3667e94a64517fb"; + sha512 = "fe485782e38e7f0b74e96e2e06283b6ad30223ab1cdc3636fc15810b327ba564706d134ef00ab0a38d4f6d5639aa84a52cd46af4726e1fbfc9eb2ec19ce1862d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/es-CL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-CL/firefox-69.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "5a72e02d820205e15bc0f366f0593cc0305b35be45f23679c84f320bb952b5356c490ad2e627eef69cd836afe3ed53769dce535e3a727b6b7345d3ba02b0c0de"; + sha512 = "8520600de63e160c21f4edddefdf8f971c12456a5ffe967dd02ca00c7227b34f6b8acc569fa0c0d40c6f91bdfe97683444eb38cbda8d1cb1ba2b913c943038d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/es-ES/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-ES/firefox-69.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "19418e1fb052d32e50aa6b5d3469c2da254786560e63d5e1fcad3ef8d6ad13e77d243725bc3a4e543ab8b1593bb2e9bd8a00deb0168dc0bd55034abb18bd8c39"; + sha512 = "0e36857acf8231b9be9983aac35b2090ccd85dd2f8cd7b37021f2d62b37b17eca4e29afa8afdc000ff608bc535b3583720c4111c6bc87a67b5928e25d1912f9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/es-MX/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-MX/firefox-69.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "659d34590b1b68b308f67c978c1ddea6aedd7e58b95e3b502ebf0c71143f4ab1979f833ed0d56354c7cc7f65d01b63aa1f5d4b772fce66c9ce1873d2ab608a9e"; + sha512 = "4611aa1bf2f9717093027cd38e60afecd855f9bd6f5b90e57ec64ba61c2d3cfa38e94688e5b7e02e6ca40a9ccd03ea9c25543b03be297ab76a89db3395fd7dca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/et/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/et/firefox-69.0b14.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "b391737b359ca832c604a25fe18b32365e479d83005cd37f8a0fd8ed2a5423b4f3f517529450d8be99170e0d73a6e10c446566772adc54975d0c364eea229ded"; + sha512 = "94d4cbfcab4dc697462001946eb91733e7c9cad2d70d1d7070ed6d6e4cd83f364338a70f313c400ebd9f17bebc05d8297e27b5d662f0f940a66e63a97e549ee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/eu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/eu/firefox-69.0b14.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "00dde956127620922165476a61690712806bb39ac49a6cb365255dcecffcafe5c12a9d00d7f2125a583db56576d9ef716a43b71f5ca8eeadfe4c1ae875924c88"; + sha512 = "e140a1bb452d2a970d540b764ba41bd70f4042f7f6f2d8bdc3407cd3d428e009815c3fffe4dafe3964dce45d860c7960d0818acc6fc8878e323b4fa1dbc340cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/fa/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fa/firefox-69.0b14.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "0d2ef108c14e709478656935f78a2e3ac0d1420c0162fb44a8dbc44bb7d49b4f870888c0999a99991a85ad7da8106539b5893313fa2ff5b4275b9f46197bb1d6"; + sha512 = "2ce77cb106e64e49b2605edd7f6ba19e7c0782356de0a38ee572e8b5f18020ff4e8235bd83749b578d67a40ac81b246a531e21ed24a944e562444344bb594121"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ff/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ff/firefox-69.0b14.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "6f6efadce4a5582d2b38e350dfb3895a39f5f0603954b5368379d885fe83b994272fc832acbc9047570d5dd9d30c79f0e931440c533466d2dd4b3b26b0c161a5"; + sha512 = "a3b44ae73ff9bb7ace9ddc7d7886b4362eb2265fe0f8d5b2e34fb929dc367a6be29a46d750cd33b7d03cd321827dc261f1d88cca91fbb180ee1dc72398c1281e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/fi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fi/firefox-69.0b14.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d3404e2f12ee101a1807feb52f219a52832a2bf2d6160d1a7dc982e937f5ec5a9090604e1891c1d5e87ee12975639bde6076730f47129aedb6fb82c6e9550fc1"; + sha512 = "934f497203bde168237ba43d49400dc48c9082a24de8f74ce887cbbc1f35057a2419dc346b88f18ed7d78596ed220d4f65371fd2bc34a1ef005803109c7e77d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/fr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fr/firefox-69.0b14.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "d89858ed2c5c9d3a7db44e14dcf7d2cdf69f53c4691ce2778c129478d855d6607436455f9113c903578d8ac551dd86914e3b449a02ebba827fcdad7d2a18201b"; + sha512 = "778509904c83b8c00c0b71331c770cad677ee487079710d9244d1bcc5a2e2f6e397b30c1c8ffd7f787f8fbbe87f509105bd2978d26f60406b8904245f170d79c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/fy-NL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fy-NL/firefox-69.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "ac2c69cff8e27e5dd722b2f12357fd3182d2c7e80e9c70adb2eca060be65cc04cbfe19c524d940eaf0faa5ad2305da3cdd0a1ab383c18781083d5d93c7e82e70"; + sha512 = "8cd82fc3c7a2558f5408d2e18d8fffc01dc1a0c69f52e61e7da185a9b7d24c79e29d68c7e61386b6910aeb8f91276fc1fe5c142ca526112b1e0ab206ec3757dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ga-IE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ga-IE/firefox-69.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "d026e125cae037d60f573282d351eee3cba26051e495d668ca26262a13fa62cae895827630d8137e1ad0e7ece1d4e78def691b057a83795723d1aff2b23115c0"; + sha512 = "4e0184a5d0f6a8213d250b2210076e4857d27224b2d6ca27375a8951417ffc74e8fb02b9b571a12f34f59911f0663ff21d1abb09836bc0f4a1fac3c6894bf82d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/gd/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gd/firefox-69.0b14.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "2390e38235251ffdbbaab15c582a1abd6011c44b3122b0a9aee4f80a2c6604ea51ab66e1ad6366e78feeff74737fcb0e0e5f87eb42e2cf27e3dfdbc535bfe58b"; + sha512 = "f67a284aba28000a070f06c1b075dbf3edb60b4704c62fe80df4714df51395644507ebb89506ab2cb65ccd8d1c16e896da0c4dbac7fd3251026f0e00bcabe014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/gl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gl/firefox-69.0b14.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "9e97967e89b226460ab6253ef2f5e516b3977869d3290e99bcdb40b2bfe6589bd416395d3302a88f85ea9a2ae6922ab4a0350c9159d26aacce380e27c42618fe"; + sha512 = "c07c74904f845e2b740f6eabd334fa1aa0d74012e86fbc17624d671c7e2cb3d78143a499aabadeecdf276c3c6d4f2934a54240ec7078619491eeb28c8c50be9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/gn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gn/firefox-69.0b14.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "763929a79725ec5b8bad8b77a5fac4a452d008af67e51ca6574cfa13f4fb33fbc6f095c14ceec57fe942f514f4550c94a691597c5a0378a2e63d84999c6eaf01"; + sha512 = "426ceb6386da90c30726ff5318613bb88875c1b109bbd73f46f6c436b61a18b76a8272807323abf925e1ebbc6531c7d82ce1af5dbaa9a2941a8007cf8dffd3f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/gu-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gu-IN/firefox-69.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "75813a07a1aa83eb010d7856c447644723f4c05e8a9d1c68a09e49c6f40d8504956a3b8a72af4b3c28ca84357e1cde3ac075447a41c73ef681cf9e4770744a90"; + sha512 = "71217c32a6cf4fe5bdc922d09bc290537e58f26a75290bf23a5fc60be3e42b8b17d5b05dfc8ea4c547a149e795fc9449459d5f74efb4c7d9ab7068f5533c0bb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/he/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/he/firefox-69.0b14.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "d9c9285e8ffca75a9ecb0d4de2eb7471e523dbf47f1061bf5cea4b2ba363aed4f5a506a822f390f46b4cab8e24a848ed6a3ab5b25e94c56a80bda86020e6cdf8"; + sha512 = "580b58ccefbc9f1d79027976dcb8b880c6608208322449146c99e1e6ceb18b0d9069891dccee5c37df48b8251984ad915228fdebd48d3770b54e47ee2433440b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/hi-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hi-IN/firefox-69.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "8181d6ef8b24a9e2fdd59aedd1d091d22950ea48a9bd8061376b0d835f949322fbc66016e79729d27a7ca70fc3378a9d50ed78f51a5b69ce005b8ac7166eea9e"; + sha512 = "52d0bf548b7cdf6db5bda320f8262d226adde14cab042458e591fa922e5c4cb66c7a10699ffd3a4e90b9be522c5dba77bb8bc787b4db73b6805a04b72d92f752"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/hr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hr/firefox-69.0b14.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "1d229abfff336c50e234735ed806ee2e02288391d80a037f9c680754e268e66f60b8c4d18b0d52bdb097ce1283bc57957f512dc0ed117a67e8e1b8f758f2241d"; + sha512 = "8a24d6c60af65b624a3f577a984d237ac93582bc5630ec2fd7d3c39902ca73ea47ae34d41fe90dbdabf15872bfd679e029ec361ecb7d38c17be4441f3df298ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/hsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hsb/firefox-69.0b14.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0d3a70aea9fd43cff0bd91e028e07a54c503d749ee303426d416ad39edacd99a7ad35e724030c804e2224dca13112c9eeb98bf35906290897740bb2137e1eae6"; + sha512 = "085f6fe6b298047cd08c153c8fa9c3266c8fe69c0165647c863053e2b9836db9b5dd083c7fcedbb2100b22947a296da5b0894897eb801734430e153eddd168b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/hu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hu/firefox-69.0b14.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "b6dd499516c6887f68172cfd686bce8e5eeb8ec84c9b4397b8c1c3fc8ff9763bb62d08d642bebc2055df6cd7e03b03cb6bc1fb9f58ae253c5192e71621144e76"; + sha512 = "06c2e59c69eabee03b5bf118d27fcc5b9ee3ca21e1596926c5e75200f47ee4b27c4bba5da0e3a67cf6acd7986dd066f2ca79089156559c2cb725023067dddbbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/hy-AM/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hy-AM/firefox-69.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "dc33180a6b2b1e873f5d6958b62181d793b109f38db24daa09e588143bf67b9aed7c3e0f3597960fe3c8311400bdb3a38c0c3456d85b0b1dc6aa80d0c65f8355"; + sha512 = "94f95dc01d54875be32db75a8ba17202678aeb8f0dc471a356b73ff6cf2725d302dbb5bb41318b69e904d9a685e8b833bf0ad489818fdc4aec72617cf19e3221"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ia/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ia/firefox-69.0b14.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "e3a21cbb03a1deb06ede565e267e6e5a47d4a41b2c6f140205aa314d7d20252b8d73bf71997829aeb6d2b105b379320678a7f43cc9a039c7285073e126102f1d"; + sha512 = "ad541cabe5f20fc90cccb932e4062d8088fd58b9bffdacf6da8c53cf9667d82363a8da70bb441881fd132bf0239adca681abad4ffc44808f4565eca9830ef387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/id/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/id/firefox-69.0b14.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "9cd48d1b6e28dce9efbdc418ff7bc2c4e823cbf93dcd7933321b093c86e412c505cb3fb17861602d428cfd847549e6afe28b1ae270b9aa03a4a1ab3b6f61b4d0"; + sha512 = "ccbba3cd4a34a2db26c81bd670b53e50279ee22b1e43203802112010024ab496077f2efab9f100f50dadfda7d35edad09cfee7e54997ee2034d84e8efa24dc3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/is/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/is/firefox-69.0b14.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e5dd3bcbc28c4733916e047645c87dd410193d5c14da5589d5e80cb19fc16185c6bf68607c8618c83dbfc791efe2b821c0272e59a724afc9437964ad6e5d1476"; + sha512 = "11ef7c6e96d4fe5813bfa63a322b9a57f283e444a22be440ea14acc0d186314e57119642dae7d285122a17ede96eb8d37f8f879c22101f8a64ea5f0b97dd1a17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/it/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/it/firefox-69.0b14.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "5693617b3b5096ff21d2c0a96300d352f86055b4c1c7ae4b44e852f424e749548cda6201629686dada48070f53cc39af92f4f6660e7d3322acc11ddb8bb1d13d"; + sha512 = "c568510a83c61f9472852f8c8fff0293bc7dff741f4ad8bdcb16caa5abdb2fc9cc0186ed13c95485775c8041e9ad0a4f6433fff933626f80eafea9ffa3fd3f61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ja/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ja/firefox-69.0b14.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "9e009f04907f7ffbf9babc1bcdf4d7f3c6f9af832b5e9704ff3f15c62c4952b9027cdf839163cfb941d1192960ac996f13663c93ce04afe3bf3e555dab3d4384"; + sha512 = "f04b5d728d9e319c2f88db4c283daba74cc36b03221a61c92dbd3301f1a2a8d725dd72fc9fc95e984082eb128a519e002bb62c59f82e6a529afbb36289be5e23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ka/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ka/firefox-69.0b14.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "52bca3487e3eb6c1c91771cc839249592cd8e8dc500b21daefb26bbc2423a29278545e9f4f6e825dbe4a7de488bffb09f9cb223f6a70dc095e250cf5f284a73e"; + sha512 = "9c47c3e57913fa009e92858363a7384f9e71a9b6826c64edaa2772984be43c32e45c73b7599d45ff51dcb11a42fb70963ab95615f730a2f11d792e0ee1c0417a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/kab/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kab/firefox-69.0b14.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "20a7814436c99cb63f2c0337c69d199c34e005661d37c47d86bbdb03d0ddaccb9b6a25fc6fe59e3690263bf0134ccd9a2d876a649f2d3c9df8792a0a78bf08dd"; + sha512 = "aa7e4e641d79568af30845813ae6aed59d59964b37be672b9a18a0006f152dce7fdace65a6d4ae2626f80becfa56b32f0b18cc826cde2d555816a27c76b175da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/kk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kk/firefox-69.0b14.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "72e4ccce43dac6aa2cacf4f6b6209d902c3f3ac15be76cc0e5c3ab8f5fb95f9c4003b0cf7993b322faf09a7b5c8bed8dbe0759c21138b7e22df461821a9256f1"; + sha512 = "30817ac01333af478e9dc6be7db8e898705bc9020627b171de664e892ec13987f17e8e2a346cd94bf77bd9caae62cf8b37a1ee3714cdc034c648cdb424c72cac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/km/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/km/firefox-69.0b14.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "b24c9581df3426c1259d6126838b4b70844fc94de35be5e0c2203d471e5cd0d29102652679dc67fb475598452fb871bd0a76b5c470fb044828db4fadd8f46e31"; + sha512 = "f0c6fac7c89b677eb2407b199d61690a3ad59128b9d1a06575dfe289718e0d5677573cb0ff3da8e313d24798a9776c4387e57a60bae3ba916383cc02a57612e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/kn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kn/firefox-69.0b14.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "e09094576ad84fb0a063a4343b9f6f379c3f1902d7fb6eba7146f41fbfd6c02ac54a655f8541bed8daefbbb1232c0c270bb4447c249aa5f248c2cbc0631585c2"; + sha512 = "5ac4a09bf82678f3d8bd53c8bd44c1f6c0811a942a99321cfca1d553d68ead2abe8ed2f4af3c50e9ee88ac1ede35e201fa4fa2ec399016b122389a51f16cd5be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ko/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ko/firefox-69.0b14.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "7dc27aed444efea1d6e78dff3228ac46e8cba2cb8294cd8354af5da7f7339abe38315ed25ab8cae6fcda8973aeffceb4b4c0db63e7bd055d2e9d670968e0dc09"; + sha512 = "dd1bdf3e30b3a43d196ec50870bc8f2abcacf703860dab5b21e9b50fad5dbf9ed7cf0bdedf0844a2d56e60f9fc461e397b48f12956e2d95ab6e941b760e6f5c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/lij/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lij/firefox-69.0b14.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "379bc462dfd6aa153d4ce76a857f19860c3f45884469674cc8bc1dabdf4e5a56e8bfde838fc080ba7c67f585ce05907c235222b43df4007323e798f660a18dd8"; + sha512 = "5c9feb27b7ccec9a6594cf027b7ce55df4e0becb5871444bc24328401e3a764d7dadfa3a56b654b18b2e10ab8a8e03c96021a33de5cdc66b0d7e3d6992a2fb5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/lt/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lt/firefox-69.0b14.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "7dfa7d62501ad083ed6c3f14239326aa09de62bf7ca1c216fbedcd642c038c4a988afae1b4da505e7e17d82a346e15df9274ea5614833ee8640590ac85993e43"; + sha512 = "ebbda17ab983261c9a593a4368696026f4743a79c6cf70e89184390b4c1966d474b75bd751a52dabe06e303b8f223c524494a6cb753dcd547cc8c93ba911088e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/lv/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lv/firefox-69.0b14.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "bb5dd1aca7d817e47da0ee039bd9dd664a71fd08b88b231c587421b4a020ade5e89f0e3af30406cf7b7130ac113bfdbccde97e6a93675aad43afe30d7b629417"; + sha512 = "059c241db15b20d4a5713b35fc7dec60d51253a0d3c9e9e1337defa2ec33e0a3e22b2be6346b6b7fa51e35fd48870a86c2315bedbc32669260195bdff3e5d9b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/mai/firefox-66.0b7.tar.bz2"; - locale = "mai"; - arch = "linux-i686"; - sha512 = "ff7412e45c891809358d35806fa79f74cb39dc71b30f6dd1e84d12f445b8c50544cdd57325fff18fff809710382a51d1fc4630e4a7e26de79a0b0a6517f7cd92"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/mk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/mk/firefox-69.0b14.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "f0c8d41591e081f48b31fcf27bbcb97f96ae09583718da00466f9d85f7ff95ca6444e8839fb95373787263596b4593e1be408e563df5d15cb1385eb845079cc7"; + sha512 = "170ace7a442581946c8ab52b63c935ad58cd3e6415c109c564faeec9333025fb9647f0f049a192386a2d980b7c3f9ceea62e1d56cc90e8c8a4aec568f58e4dbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ml/firefox-66.0b7.tar.bz2"; - locale = "ml"; - arch = "linux-i686"; - sha512 = "98fd5e485411ecb42cb2701b5a51c8079502f466ddb3931b98ed0c650f81d8b4e0036f339bcd84cd7cf102db22b2556a764ee75029f34d9857ff3a8b3e4cfc21"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/mr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/mr/firefox-69.0b14.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "4f2f7810b152f26acff3b3d65f0029bef82619156f5b77a165a2978ee6662d0b8bb2242e6257e170df29a5caa7098f4e934d9ecaaff0270da7c1b5239daf7fc0"; + sha512 = "91e4aa884b26041047ab3bc0c3eb5bb14a62776982f7e1edfc53f1732c5fba9bdb97b77e5f9603cfdd4bb2f67ca5f5959ea61eb4827c6075d30b502c9282cb3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ms/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ms/firefox-69.0b14.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "cd861c3ee3f0d6ebf4d98142a9a916c19523813f9e2d907854f6498f592e96a2fcd29fef253d6f62650e3d0ee0ea31555dccd2bcd19a10f788e13bff14497421"; + sha512 = "2c236d61824b559def24a9f96ff15075d17220893ce5500bf1f997d582b89b8948eeb88683997ffb64dd57c2fdc01961d877de28be6110da7ff4bddb129540be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/my/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/my/firefox-69.0b14.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "58cd04852458b5c3ac904b9815805edc64fea182b028ea93aa940d1ec12d05d3d25bd63078a600255c18aa0f6c85208d3e1356fc3bfa556d26a0098418218098"; + sha512 = "909aee75dd8597d4c7d08cd28972c27fbe07aa774c93a6639d38ca152ea2d0a5330329a857b04100b67b35142689b3ab9f4376200b9d6efe8612a8dbaa19618b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/nb-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nb-NO/firefox-69.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e8eb0c3712fb1d9d35a3db2117497fca0bc8410acbae841a1fed73f08bcce57d1b19287a76702d059b5e1755900068cb2cea48c56ad0f3ae17579ebe82828a53"; + sha512 = "a7b65f920dccfefb64e1d0a2425a8514e555089262f2d0d5300009c9d8b8ff343f387d0f3797819808a2d2b67c10ec026fd12f0306e23d8b31573a9ebbad726a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ne-NP/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ne-NP/firefox-69.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "c8643be9cfdf53f04cc33b612bb9d29d7013ab3f65bb66400cc4b7f80345b96c495ff13e9647eacf29dcaa1f8e6890056cc66a1af3f39418f1cc035657be8800"; + sha512 = "10e0715ca360b3299312c6f8c86b4d89ccc0788611c44e20d90b0cadb20e00f2071377fb934383d6d76cff49d0fcaeb155b68328fb5bc96fb09479a192df1464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/nl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nl/firefox-69.0b14.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "3c7c1fac98556ff0c4d87c8c4706b71e1dc4230a4cd2359352204b20670fcbc5cb5c7b844558f6d09629277e9e0fe6ae7015176d41dffaf1929c800c3d24fc3e"; + sha512 = "1e688394daf56bc6900d765ae4d01941d9cc02457b95965cc9624be7ad5a50a8b8cdc6212d7270c8253d539ecbe60a21648cf13f61bfade3dafcd8e6273509b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/nn-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nn-NO/firefox-69.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "5b671dc02e1624a998b3b081b190660cfcc2e24502d84b19be32067252f62aad547ed978bd06cc3a7df39eabd3b92d47d8d70534bd1f5cd1e05329f4136f4496"; + sha512 = "8fcaadfa9e895a97403c60a09e27282b0907346d20c8dbcc8bc9343c0bbba03d3bdf6fc22e52271d5edb9e1df214844f17dc81d3aa74adbc2623fc34f034dcb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/oc/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/oc/firefox-69.0b14.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "8fb54d582b493a89568b4b4b4c0f03d72684fa700dfe484171eb3cfdfdc2847add46611908a6fb3e01ce027a1292b64beff565088298b926f715d23a060580ff"; + sha512 = "d2edc1fc3fb685ec8f46b58559edac3e6fa3eda0df5ef7bc95c4b4ed444bfdbff43257e5cebb50ef438c7638ac3cde6411e9d5b0a93bd22876c0a13965403a30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/or/firefox-66.0b7.tar.bz2"; - locale = "or"; - arch = "linux-i686"; - sha512 = "e1f8d44bb89a23fa1cfc073508adbf459397d71251aad780378e95537dd4c29aaecc19d65f7db60f4fb647f544eec1e471b52cd6aec24db77ec873448c51ca81"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/pa-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pa-IN/firefox-69.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "ce51ebe527bc47f32063cd236ca34e9da433a4c22353b1893806b3e61095ef8a6b6f6c37e7345a46f92f3fbcfc9bcdba13c100f9f6d31dcee1bb04e5b70ae971"; + sha512 = "535726a70b1d2e4562f4459df2873aff9b41ffc8e88bfe606465871e13ea4205431ce8846670b178e043e35b81ee8e71bcc896971dac2d8d538681ca8dd0db9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/pl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pl/firefox-69.0b14.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "59707508b21d35ef00b865e79aa817b051a7818907c25a11232425aa514e20eca5e61d900710fdd86a3e56e793cb780f355ba054b07f84a08430bcd53b73acfd"; + sha512 = "1704e78bb2d0e9e8b50c078a52a01777f6df1fd4b2ed05a7226fe7f6eaaa38ae72a9ffd8780b0e6b9a51da40990de386e8acd518426ee89e61d16d6505e7befd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/pt-BR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pt-BR/firefox-69.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e62438de6765a25718a02e51ce25c18f936df07e8a77ae64c2f109a852e7d50a9d5ea8bbb1a6b1d0437f77b29502495556bb6e7ec2b670ea04bfee1239da5359"; + sha512 = "0cee5dc74c31ccd80b2cd81a83b909a77dc77c06f38af6290b7d6897d97e7aedf3036d03b1d42ef33dc3942566809388ca5b3e6d9b78a84793987db77fbb1fd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/pt-PT/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pt-PT/firefox-69.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "c10d12c00be906fc50031cf93a0ef9ec4c76004c26e8a79607a96095a0374a5fc12e015bc7e34cc9814cba5194296d557c50eea111a925357a2fd87ada21d63b"; + sha512 = "b43c1fe0fcdfac892b73a3ef7c3ecfbdb5b646f9badb0dc5d64f9614ad35686e1eaa1e6ccc2cccf9c9a9bf25cd629e5bb893d13942a5dfba67368cf3ccf59c82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/rm/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/rm/firefox-69.0b14.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "3b0d125070342dd38b068abaacc5ed9218c7a6dd6d455bdc1c5db03ecf4022457fe71f9dc1b5ae19b0d4361e3f4ac4f9f5ef08381e75b31d9c72e6e9469ab198"; + sha512 = "370593dfc73e15ec56950c6fe788d579582451151e26896587258bbda65e623bcf28943413d80ba7bb629dc2230e4f42da0c26cd137f8fcbee79d85a8fb4c57a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ro/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ro/firefox-69.0b14.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5bfaa08c609eed99207b39c3ac2a802a4877a9d578019ae62bfdd5f725b2158e784a005f285b125e3d87e5bf1a9ffc83422205bdc9a57b56df0fb867305d35d2"; + sha512 = "6a415e17b0a3511da4bc97be2cbff5cb4307c4c63bdd2bf316b3469d6ea1abf365ac84608b169efe3e5ad8629a0430bac0898750b964672f83da0999c1c9b12e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ru/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ru/firefox-69.0b14.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e0ff1343f2ac31d27f9aedc57c78710e1c807d33d0cb8c569bc5bb36fcf5b698e955cfe0cb7af371ba48d68b007a73cb5a87085d5da039ebb049d13968304232"; + sha512 = "b6a7c931874e0b41dbdfa7658b3ce1f7560d20acdc2ad1cb7fd3a51c05e6c7f392eb39c55faae6d723b23cf83ba5134bf9ae12463161fc9df0b04a311bb8f7cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/si/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/si/firefox-69.0b14.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "29f28d18b80e73f984673b298a479811dce3acd4b7626347d422085774b9c6504cc481be7b31d54347bce2f6252b7718e7b34feebbd8056910f0477e715da041"; + sha512 = "c2ccb292b6652320593dfb05af30be4a5fca09318981e255f15003bfb8911a6fc3c8bff420bdc13bbd1aea69b44e5809370ec100c4b6eb6ff54c71c85b3f52c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/sk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sk/firefox-69.0b14.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "3833b21823608dba1943d55fd49827fce477df0b2550d52eb1b7fc9b7a327fb2b70fe034db655d51b7dcb686566b8c1c41f325f1923b3591e3f08a53b722103a"; + sha512 = "8cecce76d5d8f6ed8d778fe2d2c733f1d81255696e78f7422c464df96275149246704175ae1c28566d223ca38da908d7974f0b055ab953cd3acc08c4e1c246a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/sl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sl/firefox-69.0b14.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "d29704974cf907552aab16eb4ca94113db6e8594da4cc53cb97a2af0363de56b65bd3a708d235b46919e08bb5b46de8dfe0898213454bfb44adb44fa956add34"; + sha512 = "0cfc0a94d8273926407ebc8addb69b76fc734215e6f0199c8b7e9e932ff89315f49f2695826446591a7e223d07b61da8ac2146f5589d58093096f70425ae15c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/son/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/son/firefox-69.0b14.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "2a4015a2f7b2aae26c36e31fa1cf509ff0439fd4b91697ac8195ba025ebd51b4ee5e83351486c367be342bddfcde980801d154f8aef5197a9b01ce8c4ac307e2"; + sha512 = "321034ab272f1bfd07bc4938912be05b0a14e81ba537cd232ce38e408d3c9dee6d93010c62c029be27d0322db7883cba6d418b35b0afba534eb32f4bf18e0273"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/sq/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sq/firefox-69.0b14.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "3bcd37367086952dea966b2e201dfbedc22c1d3865d242350fc9c019b3186b5bc77b267994355b6a5554740d0baef67e6994283b900cf83adccf218312f3c387"; + sha512 = "3eb99ec8007060e049b1be8a70360d8839b90a48599866687b7ccefb46f736ecbcfb166936946feb4e959a941fc0534b6f843d8c62ef4f77b2cead7df32b892d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/sr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sr/firefox-69.0b14.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "6a669d5a22f459a6745a57d6a329c08ea4f77573e675f2a27ab7f43afa75280f98becd69a7b136bb4fc28e44e1b60555e7e2f654d6ca2f7a5faf16f2bc81fadd"; + sha512 = "1645d31f9ae714a85bbc3433bfb97d910147d2b4c8e0b971a75d4bea5b8aeb2c500093e85beef9b28720a6c372db5edf68bd83be874cdf121add61fed3f098d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/sv-SE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sv-SE/firefox-69.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "6a9ce6a980a1baa00fa59faac21f6710f92bdccdd51ed3943a26247c2d52a1c24b5faa82c14359d6cfb3af80696a7ae8f53ebbcbf48592b942a36aeffb0b5b33"; + sha512 = "5a6c3329faf019a10d55a36cf893ce0d961c339c1a80ddec644266c164b774a6fb2bfdd371ceb50de758f12da5172c9bfc37aa6dda254c95b6fe01039c708191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ta/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ta/firefox-69.0b14.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "2a8ce8f2f62b700ae31aeb17f00838aea7ba8d2b4368d49ea495a8436dadd551e80b1d6a07001cc6f6fdd6d65503cfbdde9c59fd1689e0b3130f2ff7761575b5"; + sha512 = "98810df80bd496c8fab57530c56c7aaba0425bcff3debe07dfa4a647f63d6b7cb652fea19c5ec00c61536ea0e94fed6ea583aa411cd72919852f832dd02d6b61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/te/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/te/firefox-69.0b14.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "67b204b26754134f2398b196f7f8631b965936e25ba2fa786c8fbaa1482d5a6ff0569345da544f14568a9c17ce5a907a6edb80f7e4714460adafef2eabc326c6"; + sha512 = "ad71ef457a0eb6324a23f7a2e4c6a0dfb6b07063e1ee5f2425a6dd6ab9feeac9f9240b9193d4bc8a70b715cb4f88322f39da577b645cc9359915ccaf91d1d19f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/th/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/th/firefox-69.0b14.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "0a1bdcb4c7a876d96d70a7a93f72cbdd87bc081f67e4f5eb5538fec347484296dca9958289c1fa4326e7320f2a2d4ffe14bc8ce9c3add24ebb58dbf04d750161"; + sha512 = "2e522f9c164049b6f8510065e2bd69394067b45f361ff127880dcaf1bb4bf893a8d4559222c39dae46b85e6b72abd0204e36296c119ac8c3442bebc8426a5276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/tr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/tr/firefox-69.0b14.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3896c5c882b2162b9e465b500c8f6c9f067a99c7ef70f0ffc4e8cff59f80e0fef4a12389d71b82abd512769d9fd58a6f93eb2bb318d26e1a8969187dafb20c5e"; + sha512 = "b6f684716068ad18aa626c05fb2ea331f33e0648c1d710f1037e3c5ad79d9f95748314d1f205fd1c3f3bda57c8512adc0bad55b56f355d9ba5f20469b00e2fb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/uk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/uk/firefox-69.0b14.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "191af410dde229aaf24dfd10e3d21e6b0fc9f2e383eae99fd09c23a49c177c4b2e644c244ef4f4bc22003769e3bc0716550f53a1b1480b7224128bac0616242a"; + sha512 = "edeeea9cddcbb5505bef77b91a7f85ee909aa1fa803fe0e5a142a2207a0e8717a983bbf5636c3adf0798fd77e509bb90c759615810f19a59a2839e5336264d1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ur/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ur/firefox-69.0b14.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "e7f93ec854315d719702b8f0f90089d2a3b33465f5a809618de69b4b5b322cdf68924338b058df30aacefd4d7842f4df4c728a75dbe2893445fdf30b083d36be"; + sha512 = "36193d23c39331bbdae452acd06fa9db963366cb302ecbfc19724ab41fbba4d1ff3daa0f58cfafda95146792dbc1988878080ed104b8f77f1f81a53157728a93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/uz/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/uz/firefox-69.0b14.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "01ccc5bd6cad0efde5ad49cd24cc41a1b33ec5bd7abf77f1bcc7994b2faa8e16841da7a8df34f3b9143586b522bbe5971e580638290e1c3d6600156391cd2b68"; + sha512 = "06ebb9c3c88d2332fcca2eb51f4a2995c9e181da9e84db1d8f57ce1c2ad4dd35a6b0ed3e7a61395bda7302bd6e7eacfb2114b51fb71e2e3dcefc9d3ef975036d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/vi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/vi/firefox-69.0b14.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "07819858db4bde6390cd60c004eadccb2e5a8287855532789f408643cdd2d3f3e71808c09cdb26874433af80914f83b93ccb76486ab8f32c60d3881bdf849d39"; + sha512 = "944b716ccd4ba2ca23f1fe1ab8f5a6e16edee1d8f1ed3d2d785f061ec3317431f941b6aa811ed02f35d9862e44dd7b31a860e292509632258b45b6160a6bbd5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/xh/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/xh/firefox-69.0b14.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "390bae062fdb539a2871b83f31ac854da63a9adc75061dd3c27250d549eeb9ed6657275af4be691f9f5e7bf27ac6c748e7caf4a78f36a0f9cf735680b3cdad24"; + sha512 = "f391a9ef0b66224e91bdc99a0a509211a56af3958f0b2d491d11ab024771bc91986b79b87733c86f8d045564d2546f68a8f2891bb13baacffa55d8f481a87421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/zh-CN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/zh-CN/firefox-69.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "3f00515d1bc2b8de0fbc77a809419e87110ea4715cfcae7f524d5a7e887939dd52149d8be2216d82e0ad6653b5f0459fdb291837fb80a4e09cfdea320f911d72"; + sha512 = "ec812067a347aa55d3555f156ce9dcce040ac7fa363dd3ff06dae9120e8186f521b08e4b02ce23e41adc5ee443dcf112264043efdadc328b43ba192d977f7d15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/zh-TW/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/zh-TW/firefox-69.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "8dd0a7dc10c00c0f7fb9d3c4046aa6b42c260541862cad7a9374798fe9dc4c7565cf8218399fe16128c73843c5c7467ad4639cf1eebdd62d9beec4b164c5e062"; + sha512 = "a42ceb0523b083feda01262678344ae138bc5ff64c4713791a005191b5fe8378813501de11b25bf9c50019f0a07b9180fb34547ae4bebe98eb9964ab9312560b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 2d9692c0528e..fab98ad2e2b5 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -31,7 +31,7 @@ , libgnome , libgnomeui , libnotify -, defaultIconTheme +, gnome3 , libGLU_combined , nspr , nss @@ -49,6 +49,7 @@ , gnugrep , gnupg , ffmpeg +, runtimeShell }: let @@ -141,7 +142,7 @@ stdenv.mkDerivation { inherit gtk3; - buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ]; + buildInputs = [ wrapGAppsHook gtk3 gnome3.adwaita-icon-theme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 @@ -191,7 +192,7 @@ stdenv.mkDerivation { # update with: # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped passthru.updateScript = import ./update.nix { - inherit stdenv name channel writeScript xidel coreutils gnused gnugrep gnupg curl; + inherit stdenv name channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; baseUrl = if channel == "devedition" then "http://archive.mozilla.org/pub/devedition/releases/" diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index b49d20c1e656..d9b96fb7e634 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,935 @@ { - version = "66.0b7"; + version = "68.0b12"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ach/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ach/firefox-68.0b12.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "49a937a5cbdb2f7f42326dd3908c2272f6db08060639fd4221017354623fffb5363c95269fdb9b2886a4e880a8521cba907f31643c51667b0f37f85c6a66c3d4"; + sha512 = "4239de26746d164633b7095da96a837bbd58294a4636d6bd3e4b23cb711f6cb6b1f56f1fd7d30938225f1532117da1d9eace309e2249ca7c6671685d1d9a97d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/af/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/af/firefox-68.0b12.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "ca316614b43f05fb22ba332c5ee93e682537add0ad74ff57b49ce27cddbf162b0d2dde4303958630c2ad59b8213ecf3bbe20f0e4f5e4e9cbc020aeaae1df776d"; + sha512 = "ed5e3724fa2c88c84b4bf5d4c38613dc99546f952b74ac2e9803f9fc8fb2d5dfc58f8ab34244671eba42adee1ac1e917e578e9625f7206bf3b4b58aa75a5c8aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/an/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/an/firefox-68.0b12.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "c5bfb6eb3791ac71bf53c0fdafc1f966d153112de6defb5cb3480d0515c9e729e20011130d1f9822ba3e010d01a52445fbacc4cbd01a848c4be427014a98c275"; + sha512 = "ee87f64673037099dd29fac1d3c545298f4db4d12d0c8809e1f8ea6eddd29210edfb9e20346c0f5f747ba86335e123fd08d5b40b0a6d7ba2f34d4906dfda7f19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ar/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ar/firefox-68.0b12.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "b222564c9a831e8852e72f9309e33ad5d20c4593a43dfd43bbf3997a2998af4084b6e1c95d14ce88dcefa6d53a4ef8c8a8c56baf3004df04a257ea38663cc789"; + sha512 = "ee2d65b077b464ac1a27e5ff24f33a303ec2a614246cdbf83cf84a7356f1cf3f721f6d804283c9fe2a47ffff1e61688de6129515c5fc833d60f8de2efe370f0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/as/firefox-66.0b7.tar.bz2"; - locale = "as"; - arch = "linux-x86_64"; - sha512 = "3f6c8f17b4329a43d572f252cf8d6d1945ee6b24bcf6b33684257ee5557469dfc79dfb61038acf9b067a38ffb994e4b2f18026acecdb95f31f8fdfdefb46cf4f"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ast/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ast/firefox-68.0b12.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "59d712544c565eddacfc8d75dba5aaa4b1a87eb8faccdc164f0bd7e20345f8a5525b231ccaac460b3596543791848d7ce3a01483db876c6e09bd1492ceafa748"; + sha512 = "e9995774e3349c221f22d09413d6fc30bcb57db262ff311988f596d63702d210b904db5720577c06be4d53e2b95ade7aaa7980b5002ea93c9b9186f108fbb83e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/az/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/az/firefox-68.0b12.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "5ecb1c35288a0c9aa2bdade2ccc74bff12241d9737c2f8d78cc2a9b8364065c8f875e3f7d3a3671c152f7ea6fc8eeb324bd19cb1e2bed74f2a0ac48d1afc8b06"; + sha512 = "0fe2676b475fce70b5cf325d1044829022599962d1dc144840189f9057623bf575db1cd7cfb8b6d7ccce6588134c91bdf15cc6907fc94f696947a83671cee9b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/be/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/be/firefox-68.0b12.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "dcc11dd9254c51ea0ffc7f2e0d1d26b49d7e543991245d84ce1ef7ab7a8ea6b4f1fbdb3f08e263565971069f74267ca4aa7797139385e3e8bb4d7bfed5434278"; + sha512 = "ece3b80725f7a2cd2a97778a64f3be788277fcea436151cf5221554a4746e7f9215fbd708f1d7634b974e7716c387c3c8914a5ce3386323c048353cf8aafe039"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/bg/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/bg/firefox-68.0b12.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "ee8431d249f533268a11d7dc983cd541119156e5914d728a6d363721e15025a75fc31fcecc74049d0ae866afec0ee11546967db997703e8eb5cf0131df574019"; + sha512 = "5bb8489017dbf8a66aeae34299257afd9849337ab94de9d840db7d408bfefce3959ef08fff6eb2f5f8b3b5878c451b32d9b1ac9b46769149b8dbabeef1b38352"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/bn-BD/firefox-66.0b7.tar.bz2"; - locale = "bn-BD"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/bn/firefox-68.0b12.tar.bz2"; + locale = "bn"; arch = "linux-x86_64"; - sha512 = "c0fa1c00cffdb723263879974de005f7f62b661744f246d78d4aae152da1ec4b72cb4085c4956d57d594054720d99b8a7c0254620ce8bc481a83ac43a1bd31b0"; + sha512 = "fc3633d0b2668687410a0163e51eccc67ded362e5e588d53ab2d3ecc804d2e8467a6e935d1eaa696eda720079a82a3c63913803787e33d2b93016d1125f52ae5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/bn-IN/firefox-66.0b7.tar.bz2"; - locale = "bn-IN"; - arch = "linux-x86_64"; - sha512 = "9591940be5d6864041384bccfc321043b2bb09462506cc41142f378e423e0aa0a2d0dcf137ecd0331974809cf1f3ef80c30926b9f8565c08f505922bb01bd015"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/br/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/br/firefox-68.0b12.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "340e665430104e43eb30590423d07488d75618da28e3a2aee2e7fe0579cc0947959122869ce8b6c551e8108bcf5cf19856fd895d3a07fc7d0cc90b6d81b46dca"; + sha512 = "5e310958d3cabb6911cdcb5403d377baa011be673f3e69a55f4269ad427fd33e13a2b2c674e0bd221589feaeb26b91ac98d7cb9c1d5f718bd7a83c5779ad9e9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/bs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/bs/firefox-68.0b12.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fd8c39b1e21c7bcb169b569f059549130f47bce20a68941ef0c3c5dd6d331db5022683148e2653fac2f0d088792194ac09b6654ded66dbac8ca6ad86d0c64611"; + sha512 = "0803e0f91a6696b643e73ea0fddc2e58867a3ad1ef909a8f19aa03aedfb2dc6197dcfab8bd14d0472783d10880e1e23f19720192fc22ad42fac00dc02e4edf0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ca/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ca/firefox-68.0b12.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "89945169277a9dcb3f2491db6560204aaad7feda9f61cee0d85852440b3c69c4adf4eaef0db9fde54af2058b3d213d24b0a932d217a5e60ff365315955219f8b"; + sha512 = "ee6cb26b32ac4a103736432007bb48f41167d52ef89ab27fd2c9764aea4370eb65d88b54a06c37730c3c4c823b02b2519109d9a71d096c9a68a82e86305a01f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/cak/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/cak/firefox-68.0b12.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "6fedaa1020e3c3d1cb15d4f18f7fa5af719ef61392b97586b3e194efdca859dfab17215f7882595d781128a073b066637cdaa9d2e1a133d97ea0b36fa94da753"; + sha512 = "a5547de0ea1ac5c39aa97550159e82c6595241f6079a86bf832c798e3b4f215a6869c1e43e9ab0e1f0d9ddd54133ebc6b0fcd20bad39f5fae9d30ff641c5397d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/cs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/cs/firefox-68.0b12.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "4b0eb239fb44a7246582326ab999230339af4c2c45fab4e4159134dfcc3f526ca1e0ee544050ec8e699575540c780b1b09da7cbcff21253f4ca7cce121abb9be"; + sha512 = "b4ae0ce992a4aeb6d16ce6f56ce81887557c95bbaa70636e1074c9d3e2766400413cdcc36c0a5994209dad20dba9a6cebe55011eca9295203aeef0a13b74493c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/cy/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/cy/firefox-68.0b12.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "d3c72a27fd09aa473284b8e370b781a591d6a4885ad25b74659347c4df10f01456d0f06078cde8c7b345357eabf30a757df1b6680197de292f081a79a47d680f"; + sha512 = "d1bb65cbeac9c4bb7071a5963cf622d36792b9ca436b89e0d3f6bce3e718c2e6365364d876379ed5cff908a38565f593af236341b9712d54818f1c359a55cf57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/da/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/da/firefox-68.0b12.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "395cd4ed11f1a14fc05d79583501df1aad15956bf34cc63bfc71e42d55fa51cf7f8ebaed15122c7bdae7437d5e564d804b23df9e68004576c843833c9aed7d7d"; + sha512 = "a9b46e51ee7e941414cf6ccc3d9b531ec5e621966515d66f7b0673a7b2be548e8cdc7f783ce0a756e4b50ce2d4b17dcc0dcbdb8c07c97d8ad70a44264155cd69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/de/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/de/firefox-68.0b12.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "08299f65c133c93912d3e3a2e9da07ea6b5282b18dd0cce0ee54c301455a13bf1d2b9f086bd305a60ed82e0adb0f07fef08d7932d10541dcd213c3c97960c362"; + sha512 = "f591e1ffc684f428fbae4b94ce1086a27c9ecea4e9528c18e6dfa8af2a967ff8bfe374984390a6808c2bad656e13adc7cafbb76c862a16f77804d1b4fdfcd29c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/dsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/dsb/firefox-68.0b12.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8eab1f1c998e552f60ce120f38cd408fe22e067cb04112847bea33aff803fa0e42ab095b39a12281ed124672add455f06d57f1bd246976f071ed5c7f6a2aa47d"; + sha512 = "9947092a150bbef82391521ef36dccdcdef9eafe5b5282af5f34d28fc0dd6d173e146ad9ac7f7ee10ca02e4a5ce5099f29939852565c3cac95507f33a8f23e1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/el/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/el/firefox-68.0b12.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "933d8698b55abd1364d7de8d13982dadaed4dd09f0f0b796ea5c60ef556b557c9d854c62cf023e5a391a31644899a8df8832a086a44355af491d5f020fb1da8b"; + sha512 = "a806b3ec254afe96748abf2f9c970e5e5b2ffcb7f7c70e1c4c0c92ed60d493da5cc6b22a5bf78aa1de8c36f5108e4283ed67285d53ebd737d86950c18cce66d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/en-CA/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/en-CA/firefox-68.0b12.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "58e861fcd6364b9cdde2805fe218d6e88517572c59ae562148fc5fe48b9f46a94ba2657a133db71c91d508e139fb25c01c19c0b2bc9e451de99cb51620aad4dc"; + sha512 = "b3967481f6e7f4e03ab431d8e76ab8bbab286da468897e75a6dceb6ab735f36122ea4ce85867113143019d3750262f705d1f64d59669ee590bf08db409788c09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/en-GB/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/en-GB/firefox-68.0b12.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "545a5d7e2a3adc8f9b448e4f06bc33a412cf3a7e25e29d26ccfd7bd74c6bbaa6517143264a127742cc483d57c0fa4d0d9380bcf52babbfec2e38fc6f03225c7b"; + sha512 = "7c68680326ecd1d0e7bbd2ccc90d36623434e8019c5bc0968227e15af92b1f07f65767fb2c78a5051538fe79a17bb485b3b697774d938fe3ca876ae3a2e728e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/en-US/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/en-US/firefox-68.0b12.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "19d194a4c066b310c6115ffd252999102e7ad8cb37b6bec63a36b53550973be2d80ef91ceaa5630d314f05fce4ac460b170901a77cf4587d4a255cad386b80b6"; + sha512 = "5cab4ea7a8d3a72e6fe1535b21f1b48c2adb183764b71fb230d051b2112ad2466672046faf6b0feffd4b93dd727ac6c824ff420e37901b6e00b6a32b91c830c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/en-ZA/firefox-66.0b7.tar.bz2"; - locale = "en-ZA"; - arch = "linux-x86_64"; - sha512 = "43642d4af03a0621c20b938b1503a03abace13700768219cb8e377a0eb9f8ce19ce99e06e173976b80abb11cc74bc08e9cbcde3680de58428a98a0bc48aa4f79"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/eo/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/eo/firefox-68.0b12.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d2d026eb8ec3485063be6c9fb5f92615a3ada2f706037656b62461bb471d02006c624752ead7e868a536546d188c73f5af6fb734033e44f7d010b1de0718436c"; + sha512 = "ac913d42212452ce632c86debe61a27d46f682d3fe1c41c61724cb0aaa5ba3b2f63867d0addac46fa3f71d42282dbe3a3e5600990a1dfe611979fafb1c98f4a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/es-AR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/es-AR/firefox-68.0b12.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f444e763b604e7cf283b885259e640624d4b3c450b3682ce5a4feef7ea91bf4fd0ed84c634ae8dc8193871b41b75bad604a6794c2dfe32508d27d318395a782e"; + sha512 = "fd003ca892cb26d56f6a3e5553a108c29180310203d095e8cd428a2bf499908c24f8e55077ba443bf9dea6188025e82bb18ebd86fb06e59d3abe83bd1fb23171"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/es-CL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/es-CL/firefox-68.0b12.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "fceafb790aa66429a94b79755d1afd4640f222e8b3cfba0eb423495e1851da3247e9fc06d2db63a9fbbc01bc18037d823d9a0685473659d250bc757f2e75c521"; + sha512 = "d5144d975a73ab85cef8e271d78f408c7f4f72db7df29c4a7b756fb6134a2a0dec9eb77472f2c980c2e290cea6d59ac9f599e4e946844c0fa0054f79fb201fb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/es-ES/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/es-ES/firefox-68.0b12.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c48f5b32f93f8411b1f9de645fe2913f6294c7d07d7c102378ff8acb724142aed9c5b7eac21503154e5f71bcf79531d0cc1cc103449c6fd0862098f62b244866"; + sha512 = "586ef6cff55662f1287cd5ab7926e9f269f8e337432d3708f66e660aad348b88cfa5ca28579c703892695091501cdcda0df18553bfd16ee13c06b26de5581d97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/es-MX/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/es-MX/firefox-68.0b12.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "186982ccdb3fc9b43ee614c958c76e6a8d41673d7f28e6f959f969f5fcd8777122da3955b0c67971c6bceb2a3075ad481ab5e433cf29c36005357dfabd42e643"; + sha512 = "1a5e2bb5f11d289846214261703fb1b953fbfcf5dde959ef769cb03286bac9a9ef93866000b00828b49c79e4db9aa620327b4f77c3a44f7ccad158a66600cdc3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/et/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/et/firefox-68.0b12.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e5fd680a09945ef88bd5532d4f55fbb007e1238138a04dbe25fda21cac1b278b5b46594332f6ca819c1fef6cb05acf03c5ab07167c6d223741995f0f0817f0e0"; + sha512 = "6542fbd6db3f5b41a878ad1172da004407a733c7b6cc19688c1377c24ce5c13ad8e6972d54e02acede345ce948c34b6c164589d452295c0be723145615d2743b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/eu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/eu/firefox-68.0b12.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "ae8f4813d9c1f5eb60e5bd55a21ea4dc3863cc98118c5e723c4af21e1cda8b444d646cbdb96848306261f73373c82b315e44ecba705e7a3df4d57fd310cdebaf"; + sha512 = "bfce7ce5f0cd03a065ec995f9bbde6a797741b1e9fdb9d7ccc334a8e84deed04dac62e344a05f1ba29f8a9487866520821eb8da02915e2921d0dcaad0922924d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/fa/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/fa/firefox-68.0b12.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "940e45f21fb3085296fc823695e22578d948881bb8abd5b6baf51548daf17e7be9936765373d3d3104b637e8a9fa21190fca790bdaa941e8b290fc65e228754d"; + sha512 = "e0e0ef6054925fa5e8987ea9f802311ac80d0290107bc7cbbf8141ae6bd191928cd12a17331edff49ac59673a8ddbe5b35fef6308957e57d6204350ed13b5e97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ff/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ff/firefox-68.0b12.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c52c5623fcd31636ed8f1ec3b97aacb876294d32fd7e42c4cd91ffa5b3b8d426fa3138e4049cf8c7c1dad3df7d7f48c751cc9198ec929d255362819993b186c8"; + sha512 = "e224b2d00f272c997ea127f4664e958ae7a7e795965a07beb4ae082549e2f7a866eb5489a7e82240c00fd9f21223d82fbca0f3b708b9c632a98187896c6f1424"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/fi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/fi/firefox-68.0b12.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "00b1784ab2a13ea39c4548e7315413f0f707ac6679b931f0fe7bcfa0c0f05a0157aa166e859ddcb2a61aceb2f57477e9f1df09896882593cc1003c2ecea4bdf2"; + sha512 = "294d654921278d359cf174e28c9cc6cfab1800caf42beee733621ecf3f6b27add20e036b6fc7f7f6fbc6a14acc2ee47865d28f14999e88fa91b5da5248282f8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/fr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/fr/firefox-68.0b12.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "bcd6c691503c1402ccfeb4498b15b1ffee3af680c404c0774e8195842ecab03606714332a48564e8baf6e83e2757bcfc03951f2553238b01d1bc1d99990806b4"; + sha512 = "c855b9c5880229379823d5a3486f588cafd654f75cd60ee741e3b1cc3cf84acb200f0a62f7c17d2eea68ff65df83a6b4789b11f027f56d166b05cc45d700ea71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/fy-NL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/fy-NL/firefox-68.0b12.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "0c083a9874e07c285829803b37d596d5d3bd3eea84ef385e1a4254f98a301aad0f6f886dec44b479f03d003a880adc1fdbd1516ec09f4a610d974abd983e31c0"; + sha512 = "f0086a1455b5f6b0ba116fec9dc3aad31f0165edec2d8ae84258d624142ca1651dd30a8d4d4ccd7441a81b9def479836643ad9ee753eab125d70932c097c1cd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ga-IE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ga-IE/firefox-68.0b12.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "0ff915cb817d5a9e0e918c57fe09e80c462275536032afe94ed88026d90a8a9976bbe0a837dba536b35a29cbcbd643bf9008b3bc8185a975a24d05cbc7477d5c"; + sha512 = "3488aa241d4eb1af1ae759ee1576fc22e44ba23730b24c78018d5e975b236206d19a1724bcb1b9c28bc3635f3a024f55fc5ddc8211d8803f3a6957e0c3c05011"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/gd/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/gd/firefox-68.0b12.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "f67037b5e635f0089b93e67d8fb1ddead8bd1f2d49bcad15a96ad7431de8bd7242d3c2203a328586c380ec33bde5d38fa7305153afe1688d4137587a0bc4a90d"; + sha512 = "703b0c668354a90ec5960bd529dd017d5fdb5c014ea9b59b4f8491cdb6612421c22c5e14083074e6d17ad5f4293c7cf5db789ba86cd3ad27997619e6cc95aec2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/gl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/gl/firefox-68.0b12.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "5de39628d4498e216034c53cabd16e8c06eb0dd63a164081caa1bcc3511768e3d62abd3deb80840bbf76e4d93c45b82163f98b9bf81ce1232c7a7ef1e4c38654"; + sha512 = "0412e4011dcda241839eddb2ecff5b3e67399891d8ad3caf5538ed7cacee3fd0e5e5dcdec97b6afa92e50e492c4c3b3fb5169aa4f167f4cca58e2adc8d081b3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/gn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/gn/firefox-68.0b12.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "826881fa594838408dde3b5b4f6a07110edfc80e34865621234e88c0761fc52f8ec93bad9597ec830975935a6a79aa8d6def255a64b47a020d89a40fc0dc35c0"; + sha512 = "693aa9153aa73a92b00a56aa331c05f0a09a2c4ef8315cae07a158ae709d9182a07f36722fe2dbf52959fba75cc8494ee81e71a58b69d6a6da8c638381fc746a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/gu-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/gu-IN/firefox-68.0b12.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "85a9574e6ab11ede5727303ac9c7d23c49a26f8686b20cc2b9dccbd42e108d46cccd563e57cb9d7db6e5e35b5e814c6b3f59ddecc996a376e95813fb68881dd6"; + sha512 = "df97e1a087a21d7e8f478a50f8993b34d82f3305b3eab3caccfc72927ca9b6f03e431f9b63aef6d044eb1905f1df1fc81c9cd4bfbca4c67a1d2f92d302ca3e20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/he/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/he/firefox-68.0b12.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "08b21c8ccf0d214270fa555964858bf6499f602c8a1317261f780ba350acf37281bde109af03eb22539300ea3bf9f58221fdeb92644e2f01c63f035add3abc51"; + sha512 = "aa41c1dff2c5e2f8db9557f1632c1cc0739bc02c606775b602ceef7ea2f9f560bdaeaf3785654aca205c5dc6357c29c7292b1fe756ac8fa0ac2d1d01c15663ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/hi-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hi-IN/firefox-68.0b12.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "497a3ca0c5cbcaa6a2f850d1906872f8a2d61dea602bab06ed9a2150134c67f624077f2acc918176231ab594d88e186dbf9b4fc35738d881f476e75870a09587"; + sha512 = "53e4d3fc6741dfe72486ed2ca69ec673419d1d6c518de7cf494a7c8c1165a08f6a6113c5c1c7c86b7cc7b2c6e3413eaa790f26397e28dfa86d69bf91120ba02c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/hr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hr/firefox-68.0b12.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "2dd83d6441d00026a01af5be810940c547f0a8ccd9d06129c057fbe401dcdccbc43c02847a878523e389cb8ae89a9f09af8f299c439c0448b321c0e653262769"; + sha512 = "3c3ea9b770da15c1424a05aff6c87f5699269831c51bbe846caafceeb0a2401201f01cdf4d9cd37b84582b6864a9e53655bbd0f42ad19cb669ca8c28c73a18c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/hsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hsb/firefox-68.0b12.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "537a41c29d81bd7e340296d8ba291a7715b95c32f4f1af15e2e5c014a355541059acbbffcdff36855e27dbc52caa67ddfc5ecb2a0e0d09ed5cfa650edc8a4bdd"; + sha512 = "b1c2285b03472cdf88ac85ea1b623a60d976fef85863e5614c561fcf7e9fa05ddfdbeecb929e01d5508106d51ed2c0c24400b6447bbc357be147e950f0d64339"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/hu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hu/firefox-68.0b12.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d443c9bfd3cab6006e2261df811935cd03ff3a6f8ed9245a4014d18f95d100b832c5fada0963452c9e34109f6d9187f51fdb7afd16761a0ab37305655b617759"; + sha512 = "5a5bb5c7b68af0faa608a9ea8af8cdb0bf8740e77766bfac26cfe25963e6fc8492a88e171e6299cc7c022e2f3d04eaa22df10acfcfd82b42c72bec28466fe449"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/hy-AM/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hy-AM/firefox-68.0b12.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "70d880f20cee438dd1e25febb34d9dec08af65615065dd8983f4d1333863e574b1275c46ed3f19802e78d69edd41f1bfe0f2fff5008f589b7e5c903e798d470e"; + sha512 = "8a3f3d775bb16ca99a58ac819efbf256fc17acc542f7cfc227806b96bdf24ea6ad737a4b749134e00989b7777cb35000dd6b2d78085ed0be3dbe8065f174171b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ia/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ia/firefox-68.0b12.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "767b5d06ea9a0e987a57f7d256e228b46a3b2ece4cd0e42f2be97299c5d4f78a5ebebe5a8e7fb8a8df64312d2ef95989785392c72bd44b35690ba25200e284bd"; + sha512 = "7abc1b715852d94a9b5e8e02b7f235d30d0222a297808dc6cc24f9567fccc3478b8c689e133e0595c5c236b0437a6a546776898a683c34cdcab4707968757c68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/id/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/id/firefox-68.0b12.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "d4fafc3600a217883bf65071b3f3b41f52f6a22eae31d4560774080567d03fd114670064fda0070ba769960cd7de4822333d7794ee5c4722dc7c1abcd33d5775"; + sha512 = "23ad16f9e5d7ffbaf4ee487c75facf91b0a4fce7ce001e67890f87ac805c8f9f54aa6dfb662bcf3a7536d6fbf1eedc5f393ca6382b89039a1b1945f6544216b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/is/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/is/firefox-68.0b12.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "c12a28941afe1eae9108f0b4da4ab05d729b48b66d93e17f4ba3b93f65e91d5442dc61b5f1f56f5408ff0bbfa91797e9f7f0b55bba486e7f47dc7733134235f6"; + sha512 = "567af9d4865c9796dd8c7c2c1b564c897c35b387a7da28ff68d45b6a1a0258121a8ea432e6972e7f47d32c64c3bcc99d16f43547afc8faba21512a64e0191d3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/it/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/it/firefox-68.0b12.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "404639dcf651ad07c5e72f44dcca28c3811c2b404cc1b4ece0979180cb7f12a9bd29d1d0b7f545a38e2c649bba5e20f2f8b927f72e15ee8efb4cefaa63ea5651"; + sha512 = "bf6272b515b54020cc3301136eb134b9ba3943d5b6c97aa7ad92d7b429d69fbaf2abd2af52bf5d111185f0f62cd174a52d89197ba6e22dc7d3a4338acdd737cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ja/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ja/firefox-68.0b12.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "932f783c299862bee50fb1efb3166093feae34221627793dae2d3d29118481d99f51c6ee0099c4c44c3ce688aa38d66270c229ca3c239f8dc8790db0e396c328"; + sha512 = "e60909c2e80c5351f6ca6f00452eef4069b08ddac80aa4d0c2e2dedb2f6a8965fb04e94f0334aae9c8fabf7d611579357251e5931e4cedb5edbff32a6e735539"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ka/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ka/firefox-68.0b12.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "94d3454b5a3b6f15ee135fa4f23850ced0f8a375111a13c119d2445842f8e1b306a34a9ce9b9a47f9c5fe9b288b6caba91f7e48db6391f9bf5d41c9f59bb06df"; + sha512 = "a3f6f68b741f8260adbfdde61fdf6e216c482303f7f10c46355d020db98cc9cc818dec959997384339c1051a5a7eb79371412dbbfbc416ada3c4d291fac70d8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/kab/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/kab/firefox-68.0b12.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "e05e1a181f20c69247fd65fe52970abb6446cd35b7f4b0a0d90cba88a3288cd5b759e3f00a630e0a17bd09265bef69f641aa929c8d41c7406cabc987da2cb3c0"; + sha512 = "ea01ec4928bbc83cc3801fb166062b5875a039046f80337efb62369ae93fa38e0dc9f8170dcaa9699f98557f9cda1b01d007b720f47157f2217c936481645fb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/kk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/kk/firefox-68.0b12.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "0ace59fd99235a4c434bac7d32dd021c75554ccea931de1da0631dfac97e43d112baa2016732c20b780e8aaf1dfca61b4f0fc04d57d9386efc38486a6697bcbd"; + sha512 = "551281239137022acba3426f790369bcce3d8372afd6bf62f4077fcf640222906461527fc7c339d7a2355a36278007180742af74ec0d27b64b25554057562015"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/km/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/km/firefox-68.0b12.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "4f333c635155b28038ff6d6a0a1e8261af33040b0abc774e0e9d5a59869cee102b9bd5013f059fb702574ac47cddad5845f9bc901c2fd613ca0174b976207eaa"; + sha512 = "9e3ef62fb17222b701e3f348fa5d48395a1294f762670b214052d0434865c7b10af3550ceb384437009a940241c4851e7dc57ddbd8a745a7b3e4fa3dceb6c346"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/kn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/kn/firefox-68.0b12.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "7d54dbd9396fd2751d8ab4e256f830e536da56ee20ba938d010847765a32f5b99b17f1ff853faaebca996212b0d120a181f0c412d10d5c06be1aaf884ce10aa0"; + sha512 = "654e866b0f4ed8f2c1582ca229e13f4ae3c5db02849e28bcf25993c4154ee436429e16d265be68c08fc1b328ce5f349b13795f9fa1794346679ffad057f4517e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ko/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ko/firefox-68.0b12.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "2042322f72df7b3165051312d5e35cdc668f2b76185e38bf17e6e9589421ad411709868a808c66cc275fbdac02e163d9af0f89cf3710c312b956d0be51cce10d"; + sha512 = "2cd646fc7261ac381a7132b881ae5bc02e351797a5218f4ce4c227dbf55240fec4cb4351d6302c79365376cb8c0b2b1d5b2c331efe0a80bd36b6d786178598b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/lij/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/lij/firefox-68.0b12.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "69ee300a781792ef200c89a79d973a6231450865d5f0681be28f862c33cd71c1097750242f49f28afdd309de363bcc6072fae2ae101ff7a7af5d81b3f913c7eb"; + sha512 = "22a5705ee4868520fd2e3148a9327777fdf5d87f459c565a88f266cd0bc0347452dfd7c06c784c6f3428dbfb0f682ec50fc080aa17b4c798455c5f9fb417e59f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/lt/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/lt/firefox-68.0b12.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "107b5df8fe4064a9db680d6e2e7fd1638b2e1347166e78fc3f89942dd455914ad94d9330676c874df0ba0a62413e654ea83c49de11362fb6e442dadc1f985e50"; + sha512 = "b420dba741661ee320a0556edf98617f42a9c8bf3759dd13041b8fdf05e82145f1c4d2b59521719124290918fab53dc2182a123e3f1aaf1ab83cb7d187866f1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/lv/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/lv/firefox-68.0b12.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "da6d4ba83c0c2ade76f72b66ada5f3777fe7336a9035c9788adbda052378c634a925cbaeb6b8c4f8fbb5d16c99529519ddd36abf71244dec377eb1b3850ddaf2"; + sha512 = "3ab942e922592771b1c02e93b110e8a757c8bca9061654110d08a2181221d3697a2d385fce484e108bdd44eae4d69043aa02c3781deb297674c2671a87caf874"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/mai/firefox-66.0b7.tar.bz2"; - locale = "mai"; - arch = "linux-x86_64"; - sha512 = "4b014fa50026a8ee87f137c058cd2f5513ac6ae27e2e3d236b6891419754d40ddafb910ce71a9ddf7f10f535ec064aa9e62d19ad784e92d84ae73abe314ee7f7"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/mk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/mk/firefox-68.0b12.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f8e2d4c11410fb5b32a935917562735a8b031277b62fdfa15c58aea7f4455703795e80ef7d44d5ec18c1039461c8c2e43855d5c99c873f476412b7da13ebc05c"; + sha512 = "f595c839941e6b02a6e312842a0a6effe80acb81d69445b5d3a3ccf559c953de20266343362b87480eaee809c5baf9455f30ecfbd7a148b5a7e753e421b97c97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ml/firefox-66.0b7.tar.bz2"; - locale = "ml"; - arch = "linux-x86_64"; - sha512 = "fe98f048980c4382672fa65544c4724f0037afd613dc73def69f0791a2b922781527da4d2918697085c878f4a9f3830e12b0aec1a7c56b5ae9097f147216fc4b"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/mr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/mr/firefox-68.0b12.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "cfe3f8d4d5e5e4f390e39ea5d1aa7b97f5697b1a5d1f37025e4da0015514d1cd22642d64e2e8e949601b06c9770fc8a463ec7bd6d4b738e5d4a7957057d8935e"; + sha512 = "5e7d0ddbc640ba9e9f31c5754842bcaef5d90501f208a387daf5935a9be9d97ff340bb551c7fc5dd9fef9da7877fd3e6558fec5dec9e0eebf0d7ac5a367aed8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ms/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ms/firefox-68.0b12.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "b048b21da4befa8d842b33cbfd0992e93483ab5f4fb32b15bce4d6ab58aac1f686362c0a5b757b9a4709c8b0b5612038fd009968c6390d7ad471bc16881ddee3"; + sha512 = "7c9c34344989bc919b842dbd02c674fcfd18f1357794a91500f237dd7eb58014e135d4124533726a92db69fc6e69b40d6b1e3bea425a9de649b71134e70d16e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/my/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/my/firefox-68.0b12.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "8012f108fde34c1e50a8b703e62577d188684c9c9aeb2ec0aeb49f67c6e1eed6c45d787c29b2181e127b54ae6ea6cb980c791c4b1d544e8b767861c808f6beb7"; + sha512 = "30e13316e102d857b0a2c257910443cd38cac26b0d6b40e9b352a7c6800dd2890231084b04a9ee32f6eb1bb92a811d5cf54a4c4c19f8edf263d5a890d614953d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/nb-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/nb-NO/firefox-68.0b12.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "ae37189e92951d51377574bbe73881493fecce2a4f5e60a72a86f00cf3ff806f35147663c7b2c67b74523ef42fac483e3aa1bd27f78d1390d10ce9345b8f9d82"; + sha512 = "c9550a3c280670f8753dbd308737155f34af95e9622dc0201d96d1a1ca6e326797e6f0c9889893c34dd43daed6f6e6bafcd0b8ce2fabef31dea30bc6804dc95e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ne-NP/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ne-NP/firefox-68.0b12.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "c33298836f9b491f6b127f6451a25941fbb09c392aa76c6f5f1f342c74660e5163967e797fd1c23e9a19f2e8350f50067fda8ff8ac89c93edf4570e06b7f471a"; + sha512 = "82bcd5dbb7e227860e0ac8caacd47a1cc32f1e99664e82e642612c5fbcb7906faa5c853dfa1fc347c4da200064ffdce455935f48d524d0a4c27121d58c1f4bdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/nl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/nl/firefox-68.0b12.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "62b5472f7a77c5deb3e998a23ece98097b4234b56972179c53faf3c58a15d0779d846c46728f517854db45a175bce6261b3062908e0bd3334855fdd56887b08b"; + sha512 = "9760b1e715752ca64e539570c032ed31c45d336540001dc1b7505c082f2f048b52038c5bdb03138e5e7ce291ff5314909e438974dfc848b66fe864fa9d5e5ac2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/nn-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/nn-NO/firefox-68.0b12.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "87a25f1e0f19b03d4844e2850406534414a70ed5954badc22e4960cd2d13d3254c6bca8f126e8fc3225435c80bce20468822e8729379d0c99fdd4ebb3ecbc8e3"; + sha512 = "b1712c4d0e87c77a21f1da15ac86407c4e27a8c1a7ad7882e08fd93f6ff24c029181dc14263fde6f27329ea80e3eaab8023d31fa63c90cc4aa7d5f4a43692f17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/oc/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/oc/firefox-68.0b12.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "f37fb299bb2b56884a6c1f46b316e1fbe8f557b728c5ed4ac2830ef5128ae7adaeac8b20489cf5cbbdbb26914ea60f64e5653fad2b57efc0fc32e609f1833067"; + sha512 = "49b2a7299c9c884d3180513b4e8f325a610c839cca52e8a1b9862a0e759112f1490ce109a7c7fc08aac289adcb73176183d1ff693720737fcfc80296e662ccd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/or/firefox-66.0b7.tar.bz2"; - locale = "or"; - arch = "linux-x86_64"; - sha512 = "5d833da17f2b6c88ef237ddbe303743b8e6301595aa5eed254a9f6d87b9b8106ace055795e2565958fe9662345010a5b6e90e08ab32d6ceeac80dab3e9aafd0e"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/pa-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/pa-IN/firefox-68.0b12.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "d2e0a191707847f74f638a3e1ef32d5dca865b20c6da99554eebbcf3e1633c87fa57160f8f161c73e8785e234aa82cce1cb7b937cee343bcae01b334491449c1"; + sha512 = "a1cb0f0a3502481a5f88cad6bafb82fa177936db8cbd534be954a15bb185d181d0959abb5b2090de6225bb14741971662aa58a3b362a26b27e2b6f805764c2fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/pl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/pl/firefox-68.0b12.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "dfda2a10dadb6233bceb7c6e41079ee3da612f0034cfe7e759d9f347954b7107e3406b63a985c57fe3ffb9c7dc04416393a66d549f844ae03e1e0172da691312"; + sha512 = "f7207b2839d9c948ea15d9063fac22f16824072a4a102bfc41a7e31962f79bb60fea5de01f0c780942f33ad7066ae7ca1b7a03a7be13a195753b1db3ddba659a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/pt-BR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/pt-BR/firefox-68.0b12.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "0fe3234983eaef964d6c043970d4dbb441fd31c3434f39ebc8223bc1dc55bcd45d86a6a691711dfebe67ebc19c7a6b243ed7d69fde80df8046c821384f8ed64a"; + sha512 = "eefb516a3322efd51b046838a86ddbec5e65a87326f3474876f6e42cfd8bb138d2c5bef32e9a2fccff61c01307c39e7611a83acd40a9e9ddbecc473d4b506ede"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/pt-PT/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/pt-PT/firefox-68.0b12.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "08fe35b658c5148467d7cb00899791dbac27d2e01cc4a00532f67bfc3df0bd47dbe6acdae8d46ef3ddcae5ab87ba26c7ed1bc4df64a89f91df783aabe8de6fe4"; + sha512 = "92f417c004802c422474feb25b69cb6530df5c34f36e1a1a2feb62e87d8202618ad033ccac40465e903d9c85bfa7cf30ca87335e082af6518d6cb114bedc4cff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/rm/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/rm/firefox-68.0b12.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "52591ea07542285893ede3c3f74bb831a0eb40f797f33736f35a76e9a920606ed7b140bcafeae9976bf51b452fda95e1125b4ee52985a21c74cc784fe17aa5c2"; + sha512 = "04703dda30160f844f8c1475caebd9f604cbbf05f522fbe1aaf841d4a335e295372a4f26c2d07ef24fe07358699450ea13260de1c97e49797f745a484ba11226"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ro/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ro/firefox-68.0b12.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "f5932a3f0a41b1808620ba46f90222b2e092ae35aa5af127f80f38231afd1cde9c7545ca313d20d91862c65e926a4f76dd7d05013f9b081a1fa607844750c53e"; + sha512 = "c4f5a4a4fd04f2536f3bfa303a05bf78c78c0b7b22f4f1d975baf3fb46cd9f7562db151e7c321e4260dcb2efd9bf81e751a6e2ceaff0e3289c5e54932973cff2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ru/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ru/firefox-68.0b12.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "707453059fdc344cc27c52244be171f2e92c60e4698129f3d184637d936c50f1313821c483ff05a77e484c8347837082f98120b5e15f0c1520912360788a935c"; + sha512 = "f2bfeb0c11cac02047c2bc4d29135cf56a4d67eeae45bbce6394a0b496c62fff54b270f23024031c5770cbaedaf8ea95e806effaa0d026434358e5a593c1b4f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/si/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/si/firefox-68.0b12.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "a05c5b0a63353d6e05860f16e0ea6b1f1c7f5f7b334094b60ee1fccfff2a3170e3421c706da6110ca5838dd217849417a6328409815d8c76cede2b9be8725a1b"; + sha512 = "f5c50ad106a1c9e4c0182c62c23ca088209fee9b5856aa77d399ace75c3800746c9c79e028dfdadb6094aabc680c129c7510d26d7f258a9c9409630081acbec4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/sk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sk/firefox-68.0b12.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "1baf83a04ed4f6dca9cd221c375540dcb3f1c9fe7b902c7bb3eb819ec45db8899da4139c38863573f0f03242d0bb069fb1b0036bea8b4e7939f74d5cc64137dd"; + sha512 = "d251454b2078ae1b6ccb5252a9b88a057ae94f747e207832e3e955c15d9a2b17c5cc203cd5fe7c2ec56e1a326d1758c8012948a42f4c9d7cc5ef2c84fdc2f4df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/sl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sl/firefox-68.0b12.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "316ec5af2d0bd56b6da75412fff22b72daf414877677c72ab1b9c5ccb7a5abbf2a50d2655a2076d8995cbf0723b588ea2add7c45db81ca19485cb52df16ef07c"; + sha512 = "a99e992d5b71a22e5e9ca260b0c45942156474ff48da53b5cc02785dd84dbcc381b94e8b2d44d4568656c588c65a49e75c2d8c6257107e345f867df33a3c8c3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/son/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/son/firefox-68.0b12.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "6ee37f4008590826fb69fc5c05d27164e4b396f6e13521f7f1a0bc7d5f4ff20fc6ca8dc2fd01d2818f96a8be4ba8015b332540d8a7224c5de61705fd0d49ff39"; + sha512 = "3669abce71819235bd489ab54e96107508b8c75ed3c29d010e36033c9ec4e6d2a440e1ab41f212d52436129c7d29209223c5cb8bf7a855bc5c0ebbe4e71edb5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/sq/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sq/firefox-68.0b12.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "c05457e9b6749bbe99938bb408f02b939205b8848fc29fc32071577410c8998c093542c48e5fa7b28e1bc9bc95aefad14d8a1d21b8628350e033599cb5c8a49b"; + sha512 = "2f0ac03412be6e5010ad0647c4be28c9edc547ad73baa509bbfc7fdeb478c9c0ad87ef6698fb0d6a60718109a57f5ab58b0ea16a997258c01dfd463ff5cf09b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/sr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sr/firefox-68.0b12.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "fbc657cdecc9b8d6158bcc64c3b2c988870a8ad57d6bf63acd99a0d036b18303e827fe6c4ef9f878f4e6d56f0d4d98cbb73abe0d9c12b4d03cb709aabdda9873"; + sha512 = "43c708b130e0319e9fe2ae2fa2162aa1caabb3b41856fba34bf0ca1c2e77da6cac5f7c5fa3e8d07c0480634aa04a38b2a5db07433513710e7b04398e9a3360e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/sv-SE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sv-SE/firefox-68.0b12.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "4724bb642e71ac4924eaecae6c0270e696f297f6cef71b696f2aa490a4bb08bcc803f92cb501e26b8f4fd4bb5c3c2b5429ee48523a38b25c3eaf02da115680e4"; + sha512 = "1914a95197db1796ca17e8d8a511ef687329ffbdfcb0dddffc4e1963c1251519b0c120340f730a04171be57f353f5c29e7f3a9c1a7b8c92488a3aeff9bd58d55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ta/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ta/firefox-68.0b12.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "5180d7f3ee75c8991b676c5d59e55cec516083dad194015a2d9977d5d47e87f6cb86a71634679d12bbe42339acfe19403304b704574fc1b2393e29f195e9b354"; + sha512 = "af327044ee1c8738f5e65a231af3e0ef74e82491b62445e5a9fd2bea7ed4a05451e46d2cb572b95d025c18616ffa662c3668ab6b1770abba124b976050db9e2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/te/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/te/firefox-68.0b12.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "862b77c26d086456e4f5cd454105befceb354991780d6f7e3ab4c44d318b0260c5a08cf1909b2297aa259b2ec054babc6e62f10485aef8aed8db25426429825a"; + sha512 = "51f7975194f153c708e2275992daae1b4435a2e8f159ec344585a9ad759719716fd6d8a1ac10a03dd452faf5a960df2a1b580b74e83df6673a87b562ba6308a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/th/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/th/firefox-68.0b12.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "0636cfba363d88db83db6098766313ccd45c36389a2d971dfb7181cd63715d3438eb8e49813fb610f57e5c5bd025c17cba1aff571db0b8e09e26872dd3dba803"; + sha512 = "02b651d278898a400474ac59f5def40eedd8c2502d13882e3309256780be13dce4374c75f68d98db3a7555451a5b7d2baf5a7add1733e359ad30fcd4122e0a44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/tr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/tr/firefox-68.0b12.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "05069f7f4d2bc86b5a0fe0152c52c95511e688806571eae0730360799ca491f702f8b2ea8912f450c62ad7be6947105d3a83b90356a2137979b1594a0c343b2e"; + sha512 = "bf1e0b7170a86a058f117dc10f8b3f23139a7f7f1b93ccc91619590b9b1fac56f525f5924d6ab331cfec1e0e2b48bbb88b78ba184f7a88cdb2d9fb8d78753979"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/uk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/uk/firefox-68.0b12.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "c3a617f20cf33e469156e146d958daca5310001765559a0224d62699c9a8744e0c9d684c550f68f0332c6c6840d41235bf0034cece35f15f8993ea4c3cab86f4"; + sha512 = "aa043dd41d2a3b7e670ac81cc0da3aadb1a461fc6957ce40b53e2f2b37de98a5e04146010f49b6d3a63136efe490bfbbfe4676ea353a161e18f009ac5b760e6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ur/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ur/firefox-68.0b12.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "48e99e02626fd2aa0c58170c9b7704ae23a8548154f1675d4493b70aa66d12ab0b76cd85532055726e59c380d439dafe304150409e5dc416542920e064d27d88"; + sha512 = "e97b0758d937d9fe31888d4f1c12ce090017a2b9457005d5bebb4eb5b384adc570bf79f7574bf5eb292081763179c16e98d7bb54acdb5f8e494930cb58388035"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/uz/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/uz/firefox-68.0b12.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4cd72af0588b154d863e47dc25f00b9dfa2b0f04aabdd445482673e8011c4bad8bf8a50fc69f35b20bdce2e1110b4a86d73f0d0d402ca53ad61454e55c7c5de7"; + sha512 = "0207ed27cd8507fcc35d18602ea45c0a69384800563d5fbb5e11dc02565912fabfd3343910e7ccd5e4b8270f39498886aa9b42a7ff0b46452c5057c4c4388889"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/vi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/vi/firefox-68.0b12.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "444ae520a5b21af082c8beb4ef81ff23b7661b731f71af2227b74c1b7f68025071ce62dc9f02ba14e419617bdd2898ecd4f821a71a7e12c66e1082a8530e612e"; + sha512 = "aa6dc56a32f74543d8b2a382cfd5284a977f1242cb54292f09a46d5a2a7ae7d38b74457a7412355e09f5950d82f095ae3ae0fc4a978511a396524e3e0798e281"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/xh/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/xh/firefox-68.0b12.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "3f541ef8ba26859ef629d0d293367fec7ab8b8d930f19b222e06683cc8d3fe1e520aef0ef6a8e76a0c6e3a401551da9c7fc78c43070c87eb8b1016c6e1a97f2b"; + sha512 = "ac3495cc44f55a5b67cd7f63859349e1433dc6977599a4e2e5195e6920f320732d4f0fe1bb59d4f6124887ae30dce695a120c2427f8b6e6dc5ae33f0ac3f8c39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/zh-CN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/zh-CN/firefox-68.0b12.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "2a426dc720a0bc1fc4ff621349c61b53e011f3cc61bc2bdb8ed8400f5ec824051ba3292115d94180f227bdaffc65bcdc1c9ee009b6ba2d19727110623f2da8d0"; + sha512 = "de166a41754eddc1a6b230b72a649c14c7b0a814c4d72d96c916404cc0330e97a1bff136a618e7dde7069d6d7da9419bd0fa74c005319b3150f0a79cddb73568"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/zh-TW/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/zh-TW/firefox-68.0b12.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "ab9ba389a3a9d01b9dbc56b5d4577bcb82b3531b2933c343adbdcf38992f2813dd59641f46593dd6af44c167ba9f9ee2613a34ecd33e683ee73d012730b93898"; + sha512 = "a37b6e0089130c2f9b8b7d45aa09ed3670fe5f35775aa0c4e99b662dcc7f72f7fc20cf97487f1cd154614ef5bb55ce7d911851a0f0c2813f03a82e3f71390701"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ach/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ach/firefox-68.0b12.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "e0dd9ca35d2ba79bd5180dacd374309638e3406e48ec313f04c730b4772f6234dd64ade42bcf03a98cf1640ba4b29afb32d1a51098eac4d58c41004035e760df"; + sha512 = "788c3814b6d661faf392d9d16ec8c6d709c9d97f21dd5004f3dccab3d776a3394ff5a5b397069b679dd6f41493dbc284502ebb4eaceafcb7ec7064f28ae816e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/af/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/af/firefox-68.0b12.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "be289577eb2c24e51f49fb70b50dcafd9fbfe7a1dea9fc41af39feaa090db981a71d6159b2624bab7a6cb71c84b6d39b4655ce5f0f3a6a51329e1cd55396e187"; + sha512 = "9937eeed4840806481a4705235d1316dc7e1330a2046570ff781097ebea5ba4f1f3462c458c90fad163bdaca0226eee541e7475916323ae25b4f554f4bef828a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/an/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/an/firefox-68.0b12.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "4be89a6cc0642c741d2100e13893edd5cbce321acd5fdff37194c77f28886231e66f8d98d50234c44fc010621d73ed330bf7ab136ad4c7acc1d4ab465c71635a"; + sha512 = "ed447fd2e4391f82ad2d37453429873170a7277ec9fc3ba935dd55d0529b5208a905bf2852758ed23043ca0f63eedf709596f9aef97d1047960951a9cbfca2c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ar/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ar/firefox-68.0b12.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "bb2b1b2dbe12e02809b91c44590eaf1fa9f178f3f2964dbc7fb8e63591659781734cde00fae060dce46cf0b25295ac93be7ddaca089fd790c80b9d8e7f5dcbb5"; + sha512 = "a0ac8fb8b489361eb48cf26d0e9b3b9513cc3f76e38dbe23e44399a3c65c68d8094631656373bac46430572dff54c324a322c3ac6eec3419af2ecd273b7f3e38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/as/firefox-66.0b7.tar.bz2"; - locale = "as"; - arch = "linux-i686"; - sha512 = "8dfb82603e6ecbeec446bd0f5c6ed954b44ed4335794ab1f61dfccec797376c634c6d5ccee691c2933a5a2a7ac98fe202c39bb184ab1150168863c1c5230064b"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ast/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ast/firefox-68.0b12.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "dd0def909ffaf8012cf50618a87f55e09df1351c73c50e68b7ac5932b11df2cfa836cad601190be71d9dde254d4427c466da600dbd3ce017ae430b8e5b200883"; + sha512 = "2efcdac7d506cd1872264e0316bbe02c093f9384301326c8256d2ac6abbd737490a8b93f51a4457c5d4c24485cab5bff149d04bd633164d59b867075c964cdbb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/az/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/az/firefox-68.0b12.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "1303ea9a24dd45980ae09f15c088fe4ee618e63d5a72ba70acbff576459987919811ede25e1379c1a686ddb3de3b3fa999274750224f2d552650258f72dc3e98"; + sha512 = "b48664a259c88ba408797aa597d5580b52cea58f5d4ac8c3b1cf8939bb8bf90024edaefb38626e83dcb566b766a73e8a6739f518f62776f7a27027b0616b7537"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/be/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/be/firefox-68.0b12.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ba9f9d688b5c6f1f38442b06eb8c83ef66ec6280a64ec94180510e0ba5949b6176fdb477c0d975a0611a7bab6aea9a53cfafad9d733b57f0be37de36d7885d2f"; + sha512 = "2e22d3b81946f8ccb95f7431c4505e8120bdf35581708150ec8658fdaecfcac457c2e27d3eff1966ba472ba238b5a145954dc84433c77f626de36897e321c0b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/bg/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/bg/firefox-68.0b12.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "682396cdc83656289299a3dab12595c52067a3b53feebff0e372d99b7382bcf99987b3c88acb92ebd3621e40b50929d7cbb8fb8a856d64c9f2b263383de553bd"; + sha512 = "c41cfa73a86c653948646b15522abf041c82399bfd22ad9c8bb2e2266cc806617238f3852f7f89bc5fbc748d90f28548cf79e86f44703b06bfab36ffa384acb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/bn-BD/firefox-66.0b7.tar.bz2"; - locale = "bn-BD"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/bn/firefox-68.0b12.tar.bz2"; + locale = "bn"; arch = "linux-i686"; - sha512 = "3e0bfd57662e6dbe3ac5d8296235e851602c028ffc02d89bd597345938f9d873913ddb2ddd81037b1fb4b067c52c6f8b8457f369d27964a43ea41765df57f9c0"; + sha512 = "778d4e60b02ee0f52695c513af3a91e15672397ab60516fe5faa9c0168325ea709314e9b650bc767bc15b721af946925d69e42457f4e821ebf55a5c2dc27b7a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/bn-IN/firefox-66.0b7.tar.bz2"; - locale = "bn-IN"; - arch = "linux-i686"; - sha512 = "a762f317a36ed7bf900f12f5f0a25e8d6412bd7983aad4d701228c086cd4a0d14cab69b14cab6aa738fe501abbe941f4b061b87c9cb3843f5b33b7e832f9cf95"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/br/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/br/firefox-68.0b12.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "55954c0569d37e9bbcbcdfda921e4a19172b7a992ce65a7a84360cd401d9a420cc26f7775d0efeec2f87113cd820f1129a92cb5ad7ead45de94be69a90e8e7ca"; + sha512 = "6477cc04626631888fae079b480475520dda775f5e4d9741b82b6bbe8cd0a74845507047fb91ec1d490db77e7f2098bc7798e367aa6ef0687ffe17aca62b9dcc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/bs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/bs/firefox-68.0b12.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "4266d7973eef40651745071951ecd6b71a57e5af10939d10cbf61379fa2a63c470d26b0516e737c890aadeb309d64956ce28fb28166ff3f0e7be1f629e8845ad"; + sha512 = "c51750a16b9da843f9586db8b4c8922a40f946851a52d35b2a52527b6ffcf3ff2535a762168e2af361a374c590d153cdc53cae64521c96ecc51beae88dd00e3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ca/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ca/firefox-68.0b12.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "a7efde7b54d4e5f8a3a65584a83f0f1a0f5116ae3c70b498995f078920144ebbb06f78b5fc28a1f9f471fc8b58460f732acb79b7e9b11d5f7840a17258a24925"; + sha512 = "3208657a8b81a849bff701a95b04898d32016138ea35f10d1c1a707e53bd66c0f0d94a7e546592c6586d94a7350331bcf20bd78c127bef7f5826c93469727e61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/cak/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/cak/firefox-68.0b12.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e782bda3d10ddc740125f934dc8fc1c956df27f681cddf7c951a633cff0a40be56b842462da157b92c33da26c9c9a7deabbe9502e5322df1b22b6baf0472af02"; + sha512 = "e0b62c344e89a66f25e7989774983c02d0b31f258054cc71e5b1566f0d6a0e2c834a2a6c596a07ec2a74f47bc149e4c302e7d17cfd26dc4b8de4918474d0a5c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/cs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/cs/firefox-68.0b12.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "7bbeb4d7198d03a943bf9f09569aafde8005e123a99533ca59e5d20ee42d125200f3e34c8d5f18867341ef9a48b5e703fc0545c8aa64b094d4fa876ebb953716"; + sha512 = "971ff02141f709092e19e88c21f166dd7f8abee8d7a213a0543902dbe602e5d517ecd028731a49ab5e92cec5abfb084ea5b38824cd2856739dfcb7f8ae2063d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/cy/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/cy/firefox-68.0b12.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7402cb6005f8370a0b9ff18fec2a66cb027d48c9a603e00b87c5b1df3233a8a60177c3a2327929b5d1f973dba64d206787a6eee099cb242d9e03936aa9c78581"; + sha512 = "0956b4b06f09dfb714a0a457387f9e39b47f25ba37300c3f7d506ab6cc7e4c87e48992a38f04018efed84fd76d955e0037abb29c9c93210fd06e05cf1f0ce960"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/da/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/da/firefox-68.0b12.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "a527357f0f71bff9ab57e009ebd7aa51b3df122e52ef41be23d6cd93f9bc4914cc4905f53fbf2373c693d5ea30c7ba64e10b09054ec147e9d7a418cb9aa5b593"; + sha512 = "943b0344ab68dfb317fe1fe11deb4af70224de6c5ed34dad4aa5615497bb169a8f815ed2af4c806cf45caa0c1a4ef6df1a9fa7584ae5d3de65574c15727b138c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/de/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/de/firefox-68.0b12.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "630dcc0907c3f07956733d77b1c27323dd143ccb9deccaecabbf457ee5081d529383460e70935be38f5c1da39b779dd44fe9cb4caa12f89383d46c5495a40aa5"; + sha512 = "097ae1d3f44e296402c706782011f87edc2feff98960aee0e4bf180de99be4b066f849907b90d98f4223a5f7475484e1d03294d09a4b97ba094a1548276c004f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/dsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/dsb/firefox-68.0b12.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "e30b241555dec9d02e14d0b269bebeff3101404108df894fc5d212960dcf4f64a5cf09b167ea8d32d29cb0acc99835b4fdc4b273ea7a33a6757ca86f63a37a2b"; + sha512 = "c935a2c8c67a81a064f9441d01bbaf515cd981b7edffaca85b901c8837a51bd76615e17f6ba651c4f00199aded533270a3e3572ae932f113a44e4047e974655d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/el/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/el/firefox-68.0b12.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "607be30a0675f688cdd597c3a2a6e6f6e49051dfc48556f5f922bdf5d71b9eeedb666c3501ccbcd63b7519ceec1af81c82d0c02166699b3a093da8f146c91495"; + sha512 = "ae08f0ebf177e0d5a3d1d68037adba15616a300343707b04fbe1e53e369e85d7362a28eae8864391e8463f8812f6d9990a7a56f66b33983fc3561624da79d5b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/en-CA/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/en-CA/firefox-68.0b12.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "82bf1fc4992291bace80f5182ed267bf25f6dea6ef912d0fd922a9c0ab664923c7dcf45e32f45a1663d397a123d4561ef9ea7304889557230163eec1b2cc3103"; + sha512 = "5b8169dfec0401822ac49f0b6a83d1730b28658f6767c347047d688fe84e09622bdc0320f70506004be66414206b8aea7de7a5fef942d5697fcde71ae2ed7f74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/en-GB/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/en-GB/firefox-68.0b12.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4ec223ec031ffe58f4c1423ce8b0beaf0fe7fe3c894df7c0562b582dd07f31eb3ce6bde8fac3242a3c4c697ce16a4c5b5a920998a5df3f8a71c7cc7756f51c91"; + sha512 = "4a6841b68577dc00131bca9c635243f12ef6df5fd295cf89e9b7aee50abcd765dd08863a49e39e5dee795e1cffde3b48d1719687449d5482f0afbced9dcc8b5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/en-US/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/en-US/firefox-68.0b12.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "4cae702c8f20d51e6674c20f18091ff06982622a6987ff372e226be4f9c4c38a19a427079236f97869360b6e5f3182291cf8b426323367c4616aad9757a3f982"; + sha512 = "4ec83e426ef77701c024a31695ca10a12a88600d01aaa5c4a979c83ef5ad4ff2b378012989311da15e986da0e1022e8dbb9bdf0e2dcdf194c4b990db61e9416d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/en-ZA/firefox-66.0b7.tar.bz2"; - locale = "en-ZA"; - arch = "linux-i686"; - sha512 = "a610c7d5a6c7179da502fa6b6be2ca367fc7f6c8479273be18eda8cd26c28540d2c8c7412646442d628a4d298d41051d4b755de375825dc4199672387f71853f"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/eo/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/eo/firefox-68.0b12.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "a0e1b507bd4c8ad2e0b609d0fcc0da2c53ba4aa9f53f7d1caa73e255130243352a090f2af7a393136c197cd6b3c4b41af8ad974b478249e706b349c1f8340669"; + sha512 = "731260894548db91a501d12417449a6fc9aea0485258df16470e8517e82e44270eb273113b1c06ec973031d2dd3f920e510b1ab0b7addc2fd19959eaa41431ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/es-AR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/es-AR/firefox-68.0b12.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "7addfc66cdbbcb6ec2f0efd0bb550b673bab3695cdc6e17315600620d5252a87395d2f405da67219dbe2faa3dd616fc4b5c2a5b819a0bb3f8f09eb1bf9977b15"; + sha512 = "833e51d3ec511302d86599b1e65ae2c551793f7c09397d93665ebb067d9be1b0e6caf2fab67b96d0af70218a913b359271bc8143a080ec671aa1c19762421a7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/es-CL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/es-CL/firefox-68.0b12.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "50344f4516bf905ffa1fa94af6dc7765b0a2f3bb08259769cb5a2d82e20f101ca6ec0b2e929e78ae6a94c158dea1ba8f04be0209bb29795e54e7f81bd1798d7b"; + sha512 = "f60869d77f08d4ec67d1e240cce766429324de937d7ab0e36590684c46dd7ee9d81add5529fc721d028ad21fe1666fb94f6256a8485fd954c946c172a74c7fa1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/es-ES/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/es-ES/firefox-68.0b12.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "f17b79ab5fbe18c2b821df290a7891795ae126af408f1bdba360272c7d26a3ba9f5554c05855fb94ad7d7f4d9c64d3b58104c121d1df84251b47bda9268d705d"; + sha512 = "67818179412979b5067fb08cd889ec3036d4270cc322a92b67be0fea402b3fdc22a6ad1eb1c768aa7d9a7f89b0b7f2bada19968903e7f2d85aa4a537cb41a6f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/es-MX/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/es-MX/firefox-68.0b12.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "276df9ba273da666b8cc7f5245c31454d3dd124770d9f52f5f071d273c30e39de78102e6a14c51cc058706ff143cd2a041590e5d31d50453e8f0afbf327529e1"; + sha512 = "4b281caff272f08ece0e27ebaf7d7ff5ef26b250a6d33e95f59854386bafea8b5e5fed904dd239f2c4c1473c558c81e15de38fbe4555274c468c30aa2da80476"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/et/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/et/firefox-68.0b12.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "09898b1834303b29c27ce1fd1cb7570f9fdc0dcd77a1d82bf257e56d0f4e872b2e840113a2eef6926d7a5d324ae86698d4c1a057ee5b254e01fa367741f4e432"; + sha512 = "f1d15b73184643b3d47fdb9abbfdc0708f808c804bb287bf892bed370262da4170276675d29e2069737459549f9ff593077b3649ef39920607f61f6a3507cd07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/eu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/eu/firefox-68.0b12.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "60af1ba10467e18f690131a976d15c9feff130b875ffc8c774e2716badb3161e333b25b5bc6b09a8a4560c7ab8b707391356c2282da7158f9fb4b4b42d20ed37"; + sha512 = "0d21e233e25b8200411328987feaa2868a431f3d3702adb2953d72eee46d521cbbf65d2a33e94d1a10b22a2038261137e6124bc843a2447a2895ff9dc17c7ca1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/fa/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/fa/firefox-68.0b12.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a0d424538b55514dd202dab66fdb3cb76836ca64934d5e5ca356250ee9e25716195615f60573cdaacf720c8e2f979319ddc34c38fc5642655b9ac8814b17fbaa"; + sha512 = "27cf9068c191012ffbf32768bcd35b48fdc0d15816f00551e917cc454ad7804094805194d23d7ea216830a91e179b67186627d500f50c0bfdc6449af5a4046e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ff/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ff/firefox-68.0b12.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "88319a298ac8872e6e94210135c99d7c956b7865d2302267f98e4e6e18655d89f2726dd4af76949f21660c3b3f4cdc55f836263e4b8a87d6c50bdace2dfecf5a"; + sha512 = "521878b91b8740ad2a7e7607931dba74f5c26e84e1385563d6d2fe6da2228c18cd0bad5379fb5fd41c0b76be4302775b4f02070882dc6c29683fdba6768adeca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/fi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/fi/firefox-68.0b12.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "f045076c1234deb367aaf4e2057df25c87e2a8c3e7c7460c3e0b4c93ee965c8fddac397f73477d882f1f7498c37ad8b6eb0b561ee5b377b553167e1c02a90463"; + sha512 = "3a470d7385523a01bcfb443cd462a3c26adf3ed50eb54f0b970f2b084f8bd7a020eb0ffb47c95fa85beb4e25226ed3361f4631d74904fcf2d32c7f15d718b788"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/fr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/fr/firefox-68.0b12.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "81a7ab933324f259677cb1a885fe8fe6732ef8c6b501b7b720282e0d25288b8c96f399813d912157a0fbeea7a049caf5e16620f4d92de325db40cb05cab310c0"; + sha512 = "eaaf5b834cc5c71ab901673c0201640d5802773f215062c0472ffadff161fdcb2cfffb70712a8f14b7de2bed06a58f96e795ebe89a8c640e90b13b2bdfa89428"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/fy-NL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/fy-NL/firefox-68.0b12.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "d0f793c39ea81f5c51457f24e17159e038f19e403e93e465dd5f407073a864b578d738b34921276196cb37daa36f21776b12f443873b6cb5047e747d6b658084"; + sha512 = "37bbb5b9c608fd08ce33d76e39aab5c02d2f3befa1e73e12cc241be0dbc107e13a3f5418b87e2291afa08f6801fb804b9c7b45126abcba40c45a6839e0d3bdfb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ga-IE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ga-IE/firefox-68.0b12.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "e8d17eba416dbbad268910b2d4dfc4014e5e2d85fa2ea696e2527cddaf71d4d77b5f758ee89b0acee9226292060cca6cb4413317ebf0ffe66a95b587fe65a2ba"; + sha512 = "09a0b825c831e8dc9bff31c6f9d0c6f08ab56ccd2c680724433dee4af574a0e43604cd1eae54a8728278a7c42d01658e0c511319b1a02ce9e831c96f28fba1e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/gd/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/gd/firefox-68.0b12.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "26a34e017a974e072c5b10c8356062f9fd4a27603af93cf3debe9b1be64e0d5ed12509200b76051e0203e04e0488bb1e5c95e8fd5bb32f797eb65705815ea7b3"; + sha512 = "22f6fcd27ab973d942ebb4fdc6df4855179fd6fe454401f1338ce36fb62ccdd6722c63fcd3e306d5364ef2aec57738112aad005179a01ef4b200f7cb1cd62ca3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/gl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/gl/firefox-68.0b12.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "51f93bcabc735cd4938908f7e0e2bc73dbb6f459ed2d632b359322fc682362bbae324a885ec68cea1e91fd00a4f48dd088b3671ff8714dc8b7250500d6a3540b"; + sha512 = "245b8ec2cceb6a4b9b17bd9c50e834994db593614616a3c2b89dad1198107ec36f73544589852c5c11281dc90f3d4dbb5d2364a30afa3e16999d0a054c3dcebd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/gn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/gn/firefox-68.0b12.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "2d494e7637e388b1d5e309c52a04ec3ce1cdedf4095f686b99cf4e22f601ccabd0f004e0d82ba0898470b26a1c19caa027e8eca75bb60e5029ff44c6319e0be7"; + sha512 = "6b158020ae5035565b1aaafd211e881d094e3b9077e78fc28e2f380303b8c23b1caa4cd3ea0832201026fceb528a5556dc89f7a7de9298b11184287f1c1dfc45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/gu-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/gu-IN/firefox-68.0b12.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "f31322e26f76be2217d29e8b2a45761240e7e8bb6963a3410f994af81b9d10007ff0a7ea2477cc966d61f0464d1ea61f66cf80bf917787016ac43b86f55799c9"; + sha512 = "0bcaf3254813905c546fc229fc8dc384003a0814a09b537d3465cd8cd83b1e9cddae0bf9cad48c4900abc3f76d2842b82119699202f37991b52a016cf8feaf2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/he/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/he/firefox-68.0b12.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "bf78cc400c123fe2c9b1e813a0fb5f8155d08be70df18ac60cb474367fb57468d942b90d2472d56c95bd520dc8ec9fdf0daa3da93d6a703b04a6aff668a5b693"; + sha512 = "69b9baffff76a335915324214ce98dfb418b0a66e3f1895d6c4f808be6029d239e665e33ebf563694e7f5b8c733b85acdc8e131a2948c92a4ab33d015eea85d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/hi-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hi-IN/firefox-68.0b12.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "ebb919eb74747e4588f8fb4aa1bab924a128fa349804e7fafa9c9b7f7513ff99cba265457a9389c2bfa59a598bdca88570055eebaa0643bd23d242e1cfcc9477"; + sha512 = "f6a74baf232baa6602e93ccb83d020958630e169f888594237705f9aa2807d502ec3ce705d5fe55e4f89b1bea44133b11b642b011c15329c380eaf6ae19a5b8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/hr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hr/firefox-68.0b12.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "6894b70c2a350d972409ca9da0525ab4099b6de1c227bb37936d8df9d83d37e2e13e5e3128ccca11b31d80ad0d76b1f25d79ae4f39f44497ea81f01e1cd78a4a"; + sha512 = "1e8ec2487dc44daa07aebcf0660d18b7aebb04f469b236d2a8f7a49817d5361bccacc15d9549bc44a5673a35e9f93871da6c4b5f8360ed5e19eb5c4775a07161"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/hsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hsb/firefox-68.0b12.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "c8c472bef8dad8dc41a9f9e9dad52ca8a654ac9923587a6d5219c1e717db21262d176ab06597d72ef280ac65a5c3bdabffab2de987568185911d8bce3d3639ec"; + sha512 = "bee5a0d34206cbac80e9c54026f5a19630173b7725c9223aa00dbced1ed95010d3995ebc4048d6c32db7ea3a28b25d6f86537e13d3e541103c118f847f199ec6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/hu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hu/firefox-68.0b12.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d21398ad48ec3d4b1ed49b0e32a39d282098719f5cbe9cc9e2dc636898f3dcdb4e000ddf51476e0314dd9c2181f67c74384a96e2388f1795d384c9be87b92046"; + sha512 = "dc8fbfaa7143b05fec1a16c83cd3c366925b38ddb0c5c8621d5c4cfd7163d0715cf3a75d675f665f35a6fe47397403f810ce71eabaef93d1e27bd4ded74da70d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/hy-AM/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hy-AM/firefox-68.0b12.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "c31b0e06a63afcea61fc880f9bf03d1e892d54e936541a9956355a40d782b9454f2179bdfa0a4f28bd010f4022ecab7d49914531219fd07eba4157ab1fc2b01c"; + sha512 = "9e7fb55ec4e3f3ad69a89bca9c50048e7abfe35929b1ce5d0454191ae655c7047a41bb6846b3c12d5098f12ababb2bd6e062cb7cc1eb8605e5d4056880288097"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ia/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ia/firefox-68.0b12.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "afe670c307b528d29ae8e957b3686b25e89812b2c61ea2153110bdc49f08601c3d319ec547b296b6e8efe18e32b95effedfc24101570bf01f5ba1057369e092e"; + sha512 = "19ba064d6ec4442291498378ff7db168fe626b912a4f5fe0f7dbd868e0250c958c1189b575315f287c5216842d05963bff10d412f1c5d2850e5f7382b3e94046"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/id/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/id/firefox-68.0b12.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "3bf8d10779e4864185f08311c604e2c696ed63fe31558a13ee17b841b85518ac354798c999e7f498df563d75b8eaf901cfac4b08680fdf15b79b0826618bf0bb"; + sha512 = "bdf2a45765ca4b34b35d093b4d8dfa86fae7ec7f54ffee7e52f47e2f25801c5364a1e1174f2f12ff67959d209de8bf423d25bffef7185742af1cc4cb62c499cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/is/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/is/firefox-68.0b12.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "cbc28d40a088ee44d06eb27c01dc1f07cf4a5e5f62e81f748f9a031a40be75c858cb3074f64e488a9e1e6775f984f10257d8bba78fbc7704a0ae7c09e1d0c5cf"; + sha512 = "196940b279e680ee674b5ac0c8d2744cd60310d11345ef067aa7c0ccc8c7cc9713bca2b2deadf728acc90f26d23ab4938b4d79f6744a4e357b943a6d2872a35c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/it/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/it/firefox-68.0b12.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "a02199739bad49bab88536e2f35eab6ba1cfd848fc5ea6a45a575806f88bb2f92a3e5ef2b37e96666749cb1724f3b3211ee261b3a8c69435280bd107df8a68f5"; + sha512 = "e42447492b421235810d4746a55777d774c488db6e233507c1c3947ece9902a55eb4390d450eabe4369f65033e9620316cdbfa4bc1dcafcc139e61205083f2b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ja/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ja/firefox-68.0b12.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "7edf5c6f834ea9bc2ee07c2348869d456d189ddc75aa592b983f68c0ae6be48bf6cc32260d2cc45032f764a0716474cd02c7fc6905ffacc5d5f132facb83a152"; + sha512 = "ff4d87e5c3d0a4de6725c48c455f59cb8ffc3646da8bf16113845a6eaa6cb5f7ad25cdb1ae9a8cd4d099db6c65352bbebdb534643550af0ebc6ffd6efb82ce5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ka/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ka/firefox-68.0b12.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "319bc1710d79a998d7ec5b23401b018b5518945eb79a3948ce9163d9bf7774cbbc74587e3ad9cdaeba273f0cf5310d6e9aa863b7d8850c019943b998dbd0d18c"; + sha512 = "5dc95cbb37f035c32442137f713a9e2cce8057b147bc4f410675948cc21e23cab78dbab97b0374fe0ff35caf9d8562832e244086137c40d88b53c8b85ef0c740"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/kab/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/kab/firefox-68.0b12.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ff97e48ac35e86f65ce937c72e1e8588ec592a6627d957b92a989542fbea1ec8f3a4e2af7cf58f2aa7352e834d22f3d89f5639389873f5e9a2a86f2c5176e890"; + sha512 = "3d3ef83ab8390f132edc7c574c8daf18946a9a73c9a8348bc4c5a169dd829f634f4ba5c024b91b7598f7f02cafdbf292887bd1d65f657ede7cee9280673246db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/kk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/kk/firefox-68.0b12.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "69e0d3812a628c86a6718312e06dc2ebe7958b04453a116f6cecfb4703313d574db927e1a52ffc6bab31e6d1caff078b1672ec1dcf014522cf2dd2a3dfb28645"; + sha512 = "11b1581c79c38bd6b85afb60547dd755725aec25459c57c3a62f668ee5d59999e2f0e1629f9d50fbb68a04765a8134b991508d9a0ee3fccd320f8ade0fc7c030"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/km/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/km/firefox-68.0b12.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "b9d80e54fc85f17f070ba1fc1f0feb8b029441581f9f274e939b3fcd9fcf5657d1d4cf8d292a2a36bd2b032ddeb8c881baabae7899f07ce91f3d3ca66284b82e"; + sha512 = "e28f65d21d1b97fccc46339333465c6f3297ae790883ac78bb32bd3ca18344aae70578addbac7b9660f04fea267354e219d952fac7fb0426350d99f648e13637"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/kn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/kn/firefox-68.0b12.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "c2f77903621e9fd45fabb0e30450dba7cdd73a50318c30b70c360ca89c048fa2444d5bce2d79332e3f85da54fadd682e22d64423b1ec4f72284e4f9d3b8ffae8"; + sha512 = "0297aa868255f4d391254c8210142b4c31ab9a966eb800d09dbe5fe593af42d68c52d45c73c32edf6988da3c7902ee324e4e026648c075ab67b389f2f595b761"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ko/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ko/firefox-68.0b12.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "537f3a403df5a6a806aad85021c87c193caa61920cd1b6cf0601ffb18d6a63c1e9bd64bbd664cd8441d7433a4e909b11270e1c6925444d1f851d8be79a731239"; + sha512 = "e5f311b43b253954b5e9e22617dde33d34ee08e03e66be4d95e29d5afc48a755e5f686d769ad4ec12498b5a9c46c47c8284cc7b5b0b923bbdce878263fa28233"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/lij/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/lij/firefox-68.0b12.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "695dd509a943c4c976e0833482f73e12a90ad9b282eab21fb4766e183dbe048ea600f0f0a6eb7504bdbc8a3211feba57a0ba73eda6d05e7ed7d451fd43392ce1"; + sha512 = "26cc5ba51d71a0d277ad908cbc145c3e04ba4d090b4a41103e2c3dc610914194c46de3ca5e635f1b944308fd697ccfdd68c703944a1eaf0d072e34926ec85ffb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/lt/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/lt/firefox-68.0b12.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "bd40ffa8dbbcf94fdf654d2c161aa29a700318aa6fa60bbd72b588c50215bd43827fd4c867403b163ac8e49b9147ec7c4dfeebc2e453aa5686de1f884624716b"; + sha512 = "cfa6be0944df97db783b827df5349a799d67d5369c37508e4d8fcaee5a2e02b7940f54384afadba3ea36a4f3b56ae621d01b35f6d7c7dc8830da34464671c366"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/lv/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/lv/firefox-68.0b12.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "bc744d57e782adcd1a0094aea87f6b8ef9ca9b2bc24af81fbe2c6eb5bd29a3dbfef7886602d59b02e2653ea343748456dbe46ea86bd4fe04696f9750d248fe0e"; + sha512 = "d896152ca7a803bbb80f4108e919addd9a2bb77c78f5a39b521031e703a59fa8874226f87bf2bffc3555620d454b21294839d626c139de6a4ab4639490513268"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/mai/firefox-66.0b7.tar.bz2"; - locale = "mai"; - arch = "linux-i686"; - sha512 = "dcd1f55c885e46eb5040a1029f4e55de35c0fb8dda84cfd825b05e7df0be18ca6b9af4e86d38651f64e25ae1589eca19f49435afaf82e7df5f55851d433eeb75"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/mk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/mk/firefox-68.0b12.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "7381f183be6544770f23eda7446b57f51bc4db88b80ac315acaf28a9115754c8e0d98379f84832616faffb0f08ece31ba33c48f9061ef039851e8b24d449cf2d"; + sha512 = "6a7e88217fae55da91c29f8c895cfcf2732dfae0ca009bfd1af0b0b020b7a3d15f58c6e400e8645a1c675958f67257425fd16a7b45d2ca159bcdacca51a0bbe6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ml/firefox-66.0b7.tar.bz2"; - locale = "ml"; - arch = "linux-i686"; - sha512 = "a1147a41b8f4488a8ea44ba4b22f18f51cf8ffe56357ff5578dce15a22fa583ec071132eef808839103cbecc4339caeb49ea26a39d396826ece640fca8f9f749"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/mr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/mr/firefox-68.0b12.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "8af9862886400dfa46ceb152feef81c1f5356c1a6c51636fa9da71582ddb7893c1e61ec8f3daf65348d01eabd9f88b68f1e56084ebf4fc1198f98499c14e8823"; + sha512 = "1a8d3b92619df25154cb7564375e41b3321c67e309cbd89bf05015a856e45a36024e406a36d27214c149f5c38d2bf4cf07b8be72af8d5b9d6ae02c91f68a1a9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ms/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ms/firefox-68.0b12.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "afe1fd2de336d0b2065abe87dec8917fc88a57ac6c76a96d21168d6c0c19d4ed1f60bba1dd544edd484dd16f8d95b65ecc3f1eebd0c856621d5171980f49a7aa"; + sha512 = "da5defe18a07f890c53f64ee87926c62c70c23ae568fb18cb15ad9729eb432f141e6f5d3f88336ad3a6c30d6c7ab902ca12a86224470151ea8bdb97956239630"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/my/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/my/firefox-68.0b12.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "da39e6ef9dea62d98a6c2fc761a82a774cdcf69a9393f07552086a70e44cc0521913e6949e147c572e66e06ee19cf03f3b9fa1f3d1f4a64bc0cca6da257cdcaa"; + sha512 = "0eec34d82f3dbe7cc6b4b9292fa90e1bbb547fd225aa15ef3d5cfbca79b1702565f709e4b0d5bdb21b895946856547a676cde13a3aa6076e5d293569fc4d04b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/nb-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/nb-NO/firefox-68.0b12.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "59bdf1ec0d89c928da03078933fa332376b7e581078af02b66455cc15640643b3697d81912674492c3e174e28e6c2d3af0401664952e308dfb325907b6a98d74"; + sha512 = "53f2979beec2d9aa4d69e87d3ec708092421f91056c563dd555f6258cd50ac3d0ff70a9857372933ff185a5d22f33c42a400c56e0e834e33e1db6ec8a0e2cbca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ne-NP/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ne-NP/firefox-68.0b12.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "c99bd2039cce00863055f4102de1c73e17c0dc41c09a68418e7bf6f7d0b6668bc2f0a33b33494cb969d9904b7253574fb46b8398612154d43a2e35a124a47f04"; + sha512 = "2e0bf9610afdb65d9e7bb6605ad2cc55a7e00207cd622650e47e089db1e5bcafcffb4e63d48612b5186d46a933956a23502b0f71a1f4fb02973539b1c0cb5bbb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/nl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/nl/firefox-68.0b12.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "599553e97cd68a9e9f1174d16d44d51544c2702a20415f60342fbd962a26e10847fdaebedec51d4ccd6e7bced6408a3fe56a6d0c3d4246b488d4ce0f68eec6f2"; + sha512 = "5ba83f18d2d642e55b97d260ab85a0df446c82a17fc10fa8d2fb89df00d0ed8943ac99bc07f28fd8db1e6af41200058c1e90822bbffc39205bab81fff00a8c87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/nn-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/nn-NO/firefox-68.0b12.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "facd1f9c324e19672056d6b8327ae48c3725e367b5c958c832bce934ba7a5a011580954de956a044afd75d1b92b5ceff574ff38ecad1c351511b33a4f07c72c6"; + sha512 = "2d60bef6c729e82a1864c1c420dfd7bbde8922d93f575fa80d5bade425b10b96ea7ed1f00184ec7960f8553ebd56cc54a2c9645d1517da8db97e03b65b2cc700"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/oc/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/oc/firefox-68.0b12.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "1ab0008822ab659bbd094b3d4bb0768a0145bf81db33a7ce7b5edda76466d4908a91e81b560f98a30c9b0c11527855483413a5f2e1a2b329a81c5979355bbdbc"; + sha512 = "67c9724d01749aa132f38a8c5acb7c603b6186b0ff70c693be66dc1c4d5404bed74c8de23bad5e45eebc27e5decfb26733b0c00acd6f2e283780c56d7fa012e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/or/firefox-66.0b7.tar.bz2"; - locale = "or"; - arch = "linux-i686"; - sha512 = "d4c7746274df0b178640777fb178292366625c7b4faabf63b3ea6322e1fdb4a2bdb41727e75da62f64b704bfcfcb2b6682023bf92f5625c8e74c3cb22df7cecf"; - } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/pa-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/pa-IN/firefox-68.0b12.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "af3270453278160f15285b00f722491b61e0d27a2fa8b6efbd1200e9ac19ead8dfd119352b81f792584d56a03e4a8fe5cf90c091ced0ee5278726d32719807d9"; + sha512 = "9b8495348104147f212246414172030bddfddaffaca9615cf701f210ff410d39a0ee3dc78c6a92fe83a35b32e2b18e528db6b6183a5481f8be20c5b93196ff2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/pl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/pl/firefox-68.0b12.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "8f2ebce9a4a6f0c8a6be05d52679306b79ec4f8cabd69482a8dc4cdc6f042b6037c2ba75060b4d035460de9b4404b793e52ec65e63361f870495c6b14cd22900"; + sha512 = "426fb10742be943737a8c1288500ff5b678fc2d29bb3e2bbf2d55221fcce4616be4e86cd8e60356b20f0f5bec51bc5242fea076607ecedcbf3b27bddfacc88ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/pt-BR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/pt-BR/firefox-68.0b12.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "c373437716555bfb28c163b6e86648891bc77d3ed3c260bd4791a5b2c577f19712eaf22959dcae85e9352699985c3cc598cdcb1a393ccc76c6d06cf26eecfadc"; + sha512 = "3a288a97dfe69e3fcfa6c48ea4c96a5c5d3cacfb5d6179fa420083961c30ce195d4adad693a981d6409978c938dd6a43f4756d3b62f78fff6f954f917515dc45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/pt-PT/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/pt-PT/firefox-68.0b12.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "c97fd8e14b35e0580c2f5fe0d6c165794333475da4aef3d61ab8d8bc996c5db5426ed38eacbc14e720197d2eaf642b3214c68497f3f55845ba91e8703a181716"; + sha512 = "627014dbfe2892da96f76ad180b23126def791bea2a43c431dd418ee6cf4a34edcc352ae710af93f793666aa4e84d88b5b345c341f2b18ad9bdf036797127947"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/rm/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/rm/firefox-68.0b12.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "ba192d6dbe106af3e7bf82731c432c3ca2c45ef3e0b9515b9f03b418c88b0cdbb2e9dadfdcc96177b8e655a6d2ea25d7ca671005e369613eaec33656a135bdf7"; + sha512 = "a54cbeb70b2a0d013bc47f9a09cb549a0b9f5352f3a9bf82483a65dbc6f7b57f48d141ceeaaedface0601c0fd9159c2e8b55e21300962b235a36c29682ab8ffb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ro/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ro/firefox-68.0b12.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "0438b185ee69b1ced92adc8e3f92c96653293e1f36ef644173245202898f16daa1c243c2776b330efe3252c1cf31c958097eb09a60336c9f7008db7f51982331"; + sha512 = "e3b894d8e72ea9fdeb99f40e822e731dbd346a468444de95a6782f8b7b97d6d2b36353ca4c02216662804e5e9843dbe410041a6afa8d51cf1dfc777fbd851216"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ru/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ru/firefox-68.0b12.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "965036260d00935afc0e386951c380e5e1fac7b9908465406efd1aff8aada74bafe0b957901ac3676a7c6ecef30f903ac4166054f75d14e35756454165aa6104"; + sha512 = "2c30a6eceef40e9d0f86172f58f7ac38c3d0bae36c9ca3d0bd262ee1995296b06a38daadfe7a57870623b31aca240e4d1685d6c1513cb297f19e533aa4ff9428"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/si/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/si/firefox-68.0b12.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "9a8f05061cce41c96a47028ba6c0082fecf343c91c718e3de6b1d125fc786b39f4e88231b48cf3dae07657621cd5d0bdceb3cbb2a7ee4e2728e2970cd47a0293"; + sha512 = "c05c7bdaf6e986bfeb99872bc8056c11096e1b961ef418ce88b7a8d386c782fc4b2f8d0d0dafac6fb2c0f68db9e1cd27f323c4d36b16175e1901d8908c7b9f3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/sk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sk/firefox-68.0b12.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "f592aea9178f2802fc29102e46ed49f122c734fb5fcf21f9c59f38564356a570fd3fd758d2651f4a1e095a1d28226a1bcaf93d24ef8b46650e5306a0b15841db"; + sha512 = "cdb5a13a02f45f599e3cee55c8d17437fb2190aae81fe9248e02af7eabb967945fdb5eae8e5ecf59c8586f5e5ad32acabb78abf50a31823add459e815beebf3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/sl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sl/firefox-68.0b12.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "b83008a7fc9ff2fd3073dadad7f6bd3277719bbb945f7ce741cb3c7e59effafdf6436fe4340aaba84ff5f0d89315f152fee06beea1206d9d0bd83e4f9d8d8335"; + sha512 = "ef3d0ffaf4eb051a98044057734742c5b615c9e64043af99a1fee36cbd1456494c01f20df8b53c5094b12bb66711e8db4dd7db2223e6a827f9a2c6cdc3fbf55d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/son/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/son/firefox-68.0b12.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "64b8e3c7701b42fdea997036949999bc41b846c36b2403c7d2f3d5f26d08e2282e04a38fa1751de4df676fe6179c9e79390d1dfd4f5e69e0f3dba1d937d43767"; + sha512 = "d430041041f703b7367963dfe58cba49b8ca23a50ac70f2dd315d4f2e4e5afe66a3656af08be4046a88e0a06901da722451f6f20740fec9e65fc53a6ebd4f104"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/sq/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sq/firefox-68.0b12.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "2bcd1ba640008b38c9b00a5bd1d7262e66a48145dee08870f4f175d2f8639aa30dd67d2ea720c4fe5d7db8c364967d187bad7e1851f241e15e688a0332a2c6b7"; + sha512 = "34042131464d3e29af4d6f9306f8bf20a77a0a1926ecc297a3b587551efcffec5ccf7df82ebbd9cc25cfa9e4598fd15493a8661d61d1ffa9708bf8d706c5e45b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/sr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sr/firefox-68.0b12.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "9c4a686480402299710579ce8e2d40289802cf05f8c188ab65fcf40d236c37e7e4e244f9b5d1e79abb347643b0fa65d16cd5ea2256a7488371e7ef6e7b3a2f8f"; + sha512 = "795dd65257fdf6eb34e822e4ec0b56ad8e1d1536818c7bdae2c4fcd1711fded36ccd168ac22500a071bed37a15e481a4539071b30e9b91159d2ec0f60a428754"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/sv-SE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sv-SE/firefox-68.0b12.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ff0db370979bfe4cc2542a2048b05aa6e10ff8965719a0ae371d196566981ad449c42acb6b6a44aa2a19cca768ac7f4074c27e1741fff8d7908855d1ff8c06bd"; + sha512 = "a905295f59f638d137f729905872aa9da66b035a5bd63d8717043f4a32ba53ada9835fb7aa613ea0b2252a92ed38a404e533d62d7514a13873a68c40c96a02fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ta/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ta/firefox-68.0b12.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "330334037c1f2fdccb8700b3068e6e10ee6a52090b106aceb7f96e3b55cc2797bf3a483cfddf7440f0280e54f3115f280a420ea78d4bc934cc570dd8590d1190"; + sha512 = "c996ac6a419097d2d14400cd050dba33e87ffee5059629f15fd4d666d6abdb02351cb241b03a663fadd85f29a328b311e173d4850d59abf4339a367aa22a94c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/te/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/te/firefox-68.0b12.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "0ab6da55daead9c2e83d4595b3f282f3cf9f5747ab435f098e38cc664c42c1b9490730126cb73a85a2b5a3ee4016739d3d85987ae174a5a63d3921322cc22e54"; + sha512 = "082d663b14641747a927a23ad9c9e135f2179b958f733e2943267a40600a1b3acfe5b132048b3a4e71879ed292793a5592635de9aed547ece695884a129a598c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/th/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/th/firefox-68.0b12.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "2a4b8c5f185e017b01b4e2b54ada5237482dbc83125554e21325a1fee427ad64dbaa887fe02705618c074a51229748e2f091ae62cb2054e0b2c158d9a2c2d04f"; + sha512 = "f3c45ea9333b25094e153faa4e1faefc9497b04bcccff90b514221671d51e0348fe119a091e6a2c1a867c7e3a5727672a1b153f2101ccf56e5bd223ca8af7fe3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/tr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/tr/firefox-68.0b12.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "fe07d4ada692091072ec0e636c95f000c9c5fcd3b403ad216230100bab2b5afd9c76098bd6bca3f1ebdee6189b3ead9b082d77b3fd24d52d0b3f358b24e59ecc"; + sha512 = "91e70c57b698a6b4782f64c81a4482cd6046885da0a41a7f1d05b96fd4b10b69681fbb43e302f97d2b4939215f815a68b368b8ee70b1443c29d90410374253db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/uk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/uk/firefox-68.0b12.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "1f95b06b26b4a1005424640355f93d7a8eb7fe66f93e24f8728c2eb4e1f69919f1431abfcc2b5ef2a1c830b87f4b907f497ac72b28c5a81166878722333818ba"; + sha512 = "217d3d17cca00530179905c5f0c221380af53f03cc01c152e894eee6bcc58d387db244574d23ac62dfdda160f6fd6065c732c863c5684e85ab32d246af381714"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ur/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ur/firefox-68.0b12.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "76e41d84384f47a5d654972babce48b6aa4d17294bf6bd8fd0d47948a4428d5c81b87d6c1f657c5e6a8e84afb94e5dd23c7faa472f3b0104c87c408eb7ec752c"; + sha512 = "527871804b234603c95d06fe4c9d9624610aade70ba3985d37f87125a443fb1efd3afa9370b9ab4dadfbade6cc91ed180e830249b0613d366179733fe5f2c2ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/uz/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/uz/firefox-68.0b12.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "ee582f0c4500844a99e671d2dd18615e0e7faae2a41ca781fe2c8d05dc7256e931d34a559c9e2b976bb7a7347b1e51578727d0b014d59ee8d464279f561ddd47"; + sha512 = "35407d10af3148eeb1c62a1e690f5bd83d623afb24151eab254cdd59c19ccdd6f7fe84b9c68136b3f5736fefef31eaaecbf4ee88a4bb38ba93714e6e1a469e96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/vi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/vi/firefox-68.0b12.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "705eea5171f9059a2ad02d15f58959a6a85656de44e7b301f851a7835ba6a1d8a6b908ddd9048e357141a6bcd9c03075650376eef0f859823604991db19a3671"; + sha512 = "edd451320a4bb5d670896abc788ba7d845a9ad2eaf235a8aadb13bace36773ce51f31d41b94c363278a9868eabae84186adf7df5902770f12a476145641924d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/xh/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/xh/firefox-68.0b12.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "3a737d094a9d70ce72282a286beec8feffb397dec3ce032fc2f5013b0676455b3e8719f569d75a3849e42547752de6124f65bd618b0c629253d6360cd3a2efd0"; + sha512 = "dbc83d9d017ab327dd63a6f42e5fbdfb1d5575c848acc6d8610fa937839e18cf84b43df9ecfbf4cdc6e4390ab24f802a3962e1c58bc09c7ae332aea42b7467c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/zh-CN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/zh-CN/firefox-68.0b12.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "eb79ef6b04a82305faefab6b775a41412d939a91ba819bd327eaccbee3b744f64294d0fc66fefbd848766d07e4fd21dbef2bcc862dc664d7d2367334d7f11750"; + sha512 = "ca19b51389a339e82332640396cd398ab68651ad3c77fcbc60a6e748400bedd88557a49459e573e02038d69bf95a38eba08760e9cb40d25a0a97354b92cc7052"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/zh-TW/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/zh-TW/firefox-68.0b12.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "dbc3b3568bf023830ff6fc009da3737c7609b7204307ca553e629150cecaf5f5e06cbee0fe95e02b040864fbb60b38ab1b319cf5bc9e3568387bfb49251d0b17"; + sha512 = "8c07654fc7a45d3918d2ce9a7732f7b5feb05cda23280385bf363b907b176c6f3414f05324fed9e384c6e5d63d48030234aa3fcc8c12e240266ba1bf89464c16"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index e5e94559af23..cd9d3bd88a09 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,935 @@ { - version = "65.0"; + version = "68.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ach/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ach/firefox-68.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "3bdf982f4646a019f2dc11f5367ab0c23695c9c8fced02927c2d9a862e15f6a1c9c1ef63da3ef6539d802095d0b8b48d6f55a9961a453ddd4a97d828e9372aaa"; + sha512 = "f4ef9741a880475331f3cfd6aa9315d64c6cabc68fcea85e9f04f6a4f6cf9df952c05ef810b1eeaa5afbbc4001735840849c2dc180694bc76b5a3812f83ee50b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/af/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/af/firefox-68.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "2a010ce94b6f0108cfed973dd9c632691d4d2558ed006184ba9ded8ea89933fcc77d21f82fe3add259409861cb65dd12e48aed592fc932411ddc3226c0085d31"; + sha512 = "891d435d29154ebff8caa7942196c593ae350f490a411d05de1af247ca371f8f531d9a90e52c666f530ae5a4145ff99f686629921f908712c7931bf43d21b9c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/an/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/an/firefox-68.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "30f2cd15a3d43c4228aa8b49b44aa4716ce35968cfb63d57141a3c3027e95242f4c724aee50b6d7ffcf77384e101a17cd252beaec75840f59400e0db2c111f95"; + sha512 = "d7f587357777b7bf70add4162cd62364d8c2be0bf7219e4c1b25335b66645ae4c1e5581a7d0a03e30d4eab5c5664cf05b1b85ce0dd13827a29c0ce227549c9e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ar/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ar/firefox-68.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ad9846180c953ffdb73d519f1090a420deefd8b4bea531038318237ad639258bb05f4d9f88cf23650f1507034ce0700cc9e2bdda4ec02eb6e02c2d795b552cfd"; + sha512 = "2b04ba04cdfb1ad488fd5a183a862c2f6d0166d73ee637a25d64a7e9ff962d0fe7ab8970afa83cf28c5976f16257c42f6a26499b49b2d01f4e655499ec85cb0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/as/firefox-65.0.tar.bz2"; - locale = "as"; - arch = "linux-x86_64"; - sha512 = "a9babea676451cb0f0126711592d3d94f57865c520de370194023157a65d5633d26f63aba9aa71472e40885d67de98a694d0bc4b65f4c1c933e3e4feb0e6be71"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ast/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ast/firefox-68.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "03bfbb6635c587c356fe622757b2b7f6e3b85fb04c7477857074cc198efa4e97e960e4d3b7c5d60aa9fda8639e605ae00d398899fdb2d05bd5fcf5dc494f4ded"; + sha512 = "2267f7a3a8a27816e550e567d5b9a9639df31b86e24c17216e9843bf5211e520d3303200f5c15b9a342e90754db9a9646ad87615b6b490d6058f26fd21db6ffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/az/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/az/firefox-68.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "5201abfc1e7333acf0bb8967ba667742dacb2cdb8cab6b3ae60ec3d15cf756a1b48f6bc0904e02d433df5ab80440fe3cdcf4e260c4cd1c1f3da16f51c00c2962"; + sha512 = "69f2e026ddc3c26f7f8a6ee2d239289c1e154a9147a20dcfb07be571bd57ed3492c2b770c768dd0b6ace979410649af5193140757b1d5131391706ce156746d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/be/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/be/firefox-68.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "68f400d8640620f2af6ccf5a3b8e4fe2c94e7169e1b258d875b693dfecb4dbe070a9bd6a97b9fd668362783b73cc2eb21925bbf0159b41c4df910946bbae3f3d"; + sha512 = "11efb3f3a123d29814be1e4f72e2a0424f05d5c2d5da67fd0ae4f23909d8da910e2b9efde472c85fc3c0b2d51492eae2b41575e6a84954073842d210cbc4de5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/bg/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bg/firefox-68.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "6a7b6997b1efb726dfbda25e7f7eb024013ab1c782912e03e258c4fe72adf26ab926a05f88e62255c682e6352ed88b2158f1bc12ce9c8b91714291783397c379"; + sha512 = "75b57ec04a5a56691e31d4d10acca2e28d1d8975f4cd277c4e1e523e9ab0860789c83f63ce2a7c41f8b3308c7f75539d3c833c2cd62bcecf8677114b053322ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/bn-BD/firefox-65.0.tar.bz2"; - locale = "bn-BD"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bn/firefox-68.0.2.tar.bz2"; + locale = "bn"; arch = "linux-x86_64"; - sha512 = "1fe6f67067cc27f4d8b13eaa22a8ef2ca23fd3971a3140432ee389327fd97faf97be802add562b2f4ced0fc83f75b8c8c8c707c160e0ce3ec50648735704f9cd"; + sha512 = "6942ef38de37525233bc24aa993fb9ef3e723fb21a4627f0edd53412b2129c1326b85f3c828383080d7fbff3fecaca63d69e765b61b1d45a2edebc0c037f710f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/bn-IN/firefox-65.0.tar.bz2"; - locale = "bn-IN"; - arch = "linux-x86_64"; - sha512 = "d5ad4b8673ab8c136e3aaf5c2627c7210d670351744d486a896d40dd1599ee17a5cf90fe2c967d1c70989ac644f180c0efe23fa25f5f76ea4ba4f0ca0f3492c2"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/br/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/br/firefox-68.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ca1196a2f2875b86c315a32d9c0091d0c72d8e2dd00d788f24000644028dc0d1f5eba7f9b2888353a2c5fbd16273412cf3737d39fd63ffeff7d0c5bfb7829922"; + sha512 = "d34947348a7e6ebdfc6d4f91f2b567e6623175dc61a774bc79d137e4bc9679dff381d3e454029d35028ee1019fc806b26e7c85ce4fe36868f01978e4540480e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/bs/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bs/firefox-68.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "7fc343375a6f2947d2604d14a764d5cdce77209c6a1770f69cda713fc03662a7e84a6c656d1262148b57c4ec3c9c5172fd910ba424854f35b3b7fe7ce148b699"; + sha512 = "ee1c6343ea3aef7852ca240608f80dc9279469422e6730f0eb2cc8c532ffb5c6eba01bc3f1f2f759724661c53d329be619593d741771187057fdb903100f1153"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ca/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ca/firefox-68.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "d62cfcfa8c575c905fe904f6819e5f82bc139d91186db956050dd82ed3ce65ca4eb407efab9b26049cb28d806c76d9c2516a176157b26608418f06d66167b13f"; + sha512 = "f22b424240fb8858a9960f96384e81f8609deca0adda0deb29e18328b4f4dd71048c4b450121f53c29d6a4b3d63a4cba8a72a7194da3e93645bbcc00d7d7951a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/cak/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cak/firefox-68.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "b1f4bbdf515d8ba548b0e915a53d212e74d099da64631b8f05f21b9914ca2545b4092291d21b28bfdcba75be6eba02b79cdcd57ea4b39a1c05a856aa73134e5c"; + sha512 = "5b4332b617917f5aaeb315f51262cd444e09bf8c0ba6c147c11ffd23a3eadf4a27bc67067baf17424138b3d26760780a0e8a482701dc9ee8b12a1de229fb8026"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/cs/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cs/firefox-68.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "a98915ea6d8a5e1a374e34b836563ad450a48816d374917562078ade754dfb1cd5cfb6cef73de942fbb1c1c1abe41871ec3b9ff17a3a6a6bb2bb36df3a6c3763"; + sha512 = "a9037bd4feceaa7db14d342ba6bcb07526f847650bafbf40615b1f209a8992739ce82729c3b02230a295638292d219c327fc752fa206945261c3897a888ec4f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/cy/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cy/firefox-68.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "ad1e6640cb799acf17b8e151b26e78a86ce21960f2f8b5baca4890e7da2fe1d4739357058a551c161e31c1685d99d988d9715b6eb6a39d785e9e526f60c65009"; + sha512 = "0eef12e6d28dd7b0adeea318eb17fed6325c4417d3b05e72fc106118d43d6d152e2b858888164344dfbced5708adb88615490c8e7f784707b6f9e30f52d877c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/da/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/da/firefox-68.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "983fbde10f8ed3971b2ddc8161d6387b56d8c94ef3724f7db2febcb7160d17b20a6cf406e48c3a266d0e1a74f024faf4950f8dee0bd60967ff1c1ec7bde21450"; + sha512 = "d3f1ee58db717a3b04d1cdda1790243d776bc8c0670501ad74b1871c61fa788f143ac3c43a9b5c6635f4e5d7f2daf15e293994ba0fd6d5d4dc70b3a39c9f872f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/de/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/de/firefox-68.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "59aa726477553aa261fa473b56e610807070999a1b120a3fd82a678ed029fcf2b541a71ec89f1d1a176bd40deda1cd659cc0bc1f486a283f2563a0a0236fe2ea"; + sha512 = "86c38b2a5c8507de6949c153ffc98a2451cc3fb4d35aa534c36ff1b723a0153ccc5c5a92ccdd470826edbd844b02476c58800c2a7c6472a4cfec860e13a7e270"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/dsb/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/dsb/firefox-68.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "cc270b9e372b799e6867a93dc1148e9929d67f4fd9a8b2a1fbf4c0c95b23c6f6fa0444efa95dc545c4906b488f44c1a2eee8d9a8b6c6c5a8a3322f1a9c9cf553"; + sha512 = "2c8bcafe89dbbf2361af22789a3743ecd2c12fea2b457d75bb24b3ba2b7fbd9638c418158ee70961a25b4a273ab07894ca166dbc783199ab406699c42828fbbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/el/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/el/firefox-68.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "170719eb9cac9d1d49be16609e5728bdf9773195196c51c6d4d6c6a1f18f72ab96b4f3124de258186f39a1b1e3a849b5de73d4b5ee48007b22a5e84370d694fc"; + sha512 = "4dd8368090c6af5995d63f84bc2a3fb612fa57acb0c38bea48a7371b4c8fbec22017b665b3801f5419ebfceabca5a7b5eb2fc6d21cbf287d6c2427c89457e7ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/en-CA/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-CA/firefox-68.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "df694bf1dac6656b802285b91ce5fa5fb39e9ae6d4fced3054c7ff3c474aeec8679745f5a820b0975320bfd74108ebac83e5ca33f914c9f0be992295fd7556ed"; + sha512 = "22badc05493fc477984190c5e839b44e8991f4b43592e84eab093fae3b4720de41965d389ab3dd6425a7ea8a44038222c474be57cddfbd5b30e34b49e3aabdd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/en-GB/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-GB/firefox-68.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "f7953b8c20891907e7cfc45d7399be70b58c66710f6070f18c493b5c668d4576919af7dffbe36172ca3d01d711992749201c66457803fdd7a3068e2d7f6be60e"; + sha512 = "7fd1739f7da9aebb19c698b45cae649fd63ae0d573956ce1289c1dc51bd5964d1419f90f4d7c29abf344cf523b8f1ac4063678e70568468db35752ccfd5dfe13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/en-US/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-US/firefox-68.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "482bc1726399663532000749e600ea5c9c490022696b40d869e851951a9983745b26a7c4ec7f306bf174479e4213103996d075c11e2e1f9a721d392c7c615933"; + sha512 = "8742f7831dbb888554532583c0dae319c1e30424901bbfeab62011088755067df63f360e5aed8fe3675706c4a64dbfaafbf832e66f559dd3c1f58afe8468bff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/en-ZA/firefox-65.0.tar.bz2"; - locale = "en-ZA"; - arch = "linux-x86_64"; - sha512 = "bf721a577a1a916779ebf0d8c0f673d0b4d1c0230b776b2045c976ebca96baa4a6856109a837d40f301465d921bbf4622cc4609f31624551cdb056284cb36644"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/eo/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/eo/firefox-68.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "ddeb25f719dee34c186fd1831c1fc5166ce17a413325cda1a3be97b4a1a65b302b84bd9162ef91577fdfb7b82180267026039cbb49d0ee434497eb23ace6ab98"; + sha512 = "93a7d92b10d3927edf5870cc46091933b88372c8ebb55d6a60831671f3501b62557037e38d25e18ee61f4e65c14c057d24a3453083adb9383eb3f21b16550f3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/es-AR/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-AR/firefox-68.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "a81f7e9aa65e516632ecbea14dda6ccd65405388dfac801e179ced1caa9a1da4c671ac7a42c3337907af85612eea46730760707d3f12376d504fc2b1c629aceb"; + sha512 = "4b775586020624d238d7ab0c09a420a9328fc46f6238f397b569fd60bf56cf424c70e016c2f5814c0e9fe42fecb703f68a366ec7de1c68b11e4b43565b3a3929"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/es-CL/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-CL/firefox-68.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "1243a4a02d82fc97bc760197c33c1e4e705ed8c47dd565a725e1c105b22e42b89b19824f7e35e844b4c5c52c78b3fde512a50d3f655ba548144ac2b6d73efa9b"; + sha512 = "172daa90a8062c4d7884aa0d2df32d8a9219ef04bedcbb270f785dbf6a9d3d5369f69f9dee589d95593ef464e4dee84384c39462a81eb87ec7c0679cf415bbd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/es-ES/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-ES/firefox-68.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c44b3a7b0fc6a13ffc075b7f282fa0ab1be16f98df872a7a168c3d479fd701d7e14502215ca6e211deb99c1b38bdb38ff0f4068eb978aad8d1f80b682839fd88"; + sha512 = "96ef9f02a019947e9502abc583389b0f06fff8e8bb00149108c0dc15799bb556326c4d79905348d02860efd3a090af93998206c17dda6e88819f531837c97f27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/es-MX/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-MX/firefox-68.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "3b376e854a2498101fea9de4117f970bf41185b9ce74254d64088a58c77d21845c5a4ebee07c923cc6d8e616922b109cce0d25df9e2d47cf3dc62b726480dbfa"; + sha512 = "8f120aef18b76259f84e43c1a2c82fca04c56bed10891381e875758c53334cc2987e7ad78a3f9d9aa34edc79352dcd1bf4a7d2b1bc03099dce59b5423de9687e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/et/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/et/firefox-68.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "c55706aa897afee00d58741191dc4ef4ef9a0f4296c407770089e488449d95044bd4dc422c3fd79ada093abceea1e649b59a9f5f4e51738617716f497c6753ca"; + sha512 = "227f0bf21042f11ebf33988803274fe6dddc73f9fb357335e24c1c82cb396bd74fcb913fd9c9c848f34de57f518c924a0c1b8952ad9bb3be18f20ad4328cf629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/eu/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/eu/firefox-68.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5384aa5496a9e2e40acf0b014ef71e2e06b45bd9968441715cf38f5c9212c35dd1a5fe3bece97168870dce45bb1a91390fc172c2c170307b543d29d2a7ce6220"; + sha512 = "733f75308c4991f73e6c2dd673d380af1d1c6ad25643aa4994424763df1d25df3df3a9a77dcca5e00176d1dae248373aeac914528d5aaff79f73eddb740dacae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/fa/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fa/firefox-68.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9b83dad076df5af63d4434dee22730770d94747b29ce13e551653b5d008b3741f33aa9819547527654c9667fc79f47d73633a384174cd92d786a02ffeefd5ef5"; + sha512 = "5b863546dddb8c5fa4c59d53cf2f5b622dc4296378290c85926d49685e06231f0cbcc6030257f356af71ccbc6ff32359f387ef70eed9ae3c72a9acd34eb58350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ff/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ff/firefox-68.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "fbe80240ac2347c05bde0a3240df050034777ee52e129165c5d8b11fac94bf9421c3ce413e9d3dd71643e2710b0328096d602795079bdcacf98bdb1fed8cf318"; + sha512 = "5995cca653238629bc6a1930d40550f957b1e3176ccdfad5e65b16584214858fabbe92ad2a4b1aaa3a3fe920b66aab4e0f74646d42174af82d59c0bcdccf8867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/fi/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fi/firefox-68.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "809ebc16baa79ed287b980e211cd7ca3991057b538f70877f599df9447f1f787f9c0fa4fd4f54d12834ddbe35bd9d1162777ff579cc5703ea907cc70f08c93d9"; + sha512 = "32188abe02e4fe36312835a19ab3f76c8e67cfaf0857f98aed4435840acc432a411b8b06727175a8d3d3a1ece6a5baa9ce5249de7019d02d43ef6dd2aaa69e9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/fr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fr/firefox-68.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "98a6dada770067be7cf651b7f2d6e6bb57a0358b6ee54af47003a153844d521b15dbff65afd1ee0b05c23ec9e91aaf434d90065a21d3e729b9abc48fe27bb8b2"; + sha512 = "2035d9a5a078e8fac32604aad679a9f01db60cf872ed3b546fdaeeb7031a8d38db19bd8556fca7377eb10768a53dbc1f70c7e812561cbf0cf926d352a6ccbf8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/fy-NL/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fy-NL/firefox-68.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "2d49ea99934ed637a2e2c90a15c3be55f9470d275af6d1ed9f5868bf3b3eb7c8871728811dba87458c59a843b310f491712d61063b43d36409e8c8d7d5567e75"; + sha512 = "5539c97e6b8a4f51113434df7a75937dcdeaf3ac8acef1ef8b4bf7b500d387051969d13356dd6663c8c0e7a429748160721fb4f864db29fe77087c4f15a652f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ga-IE/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ga-IE/firefox-68.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "2a68fee8dcccb45f9f849eb61d54629a1216a247c246565516425e072387a7e1fd9e382c799e32884d681888563c982ef894276e84ac9e537a008fcd39ced893"; + sha512 = "4c60bc16af21fc552f62cf6e9057871e220f9ad718844e28f8ea60a5122dbd941dbe1b9e4e0a2bc6b7c62798b178134cba15095e31dee6e25341de5e832a791a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/gd/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gd/firefox-68.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "a97c08e8632147d4b2a30ba63295e1d080e97d561163a4e87240667ca69f9094f98a8ebaeca8aa75b4d344e315ab4e72d605e06b800d4156c38fd1deb83b45b6"; + sha512 = "1851d0bc3a21828c4d89a8c2338205a7e7a9aad14f60a33061dd229d96d8681008ead1651f7d5a501868b29fb3b50bce0587c142e9bfc4423e398fbf5dc7fb6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/gl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gl/firefox-68.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "49d4d0afda162e23437f44a5b5ee9a43e1643c0e739bf6b74e662c79b4cd63f7bbbe9c56c73381e0a3756360b03ffef01eb73be1c1b506d20bf4cd4f968b2d47"; + sha512 = "a728a158992d2fbcd292c13df36c2b4599d0972dfcdd84d3885d0146e8435808cb92afec7823388906d46d80431b14aebd7e831eb1d80a6995b4c81a933896c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/gn/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gn/firefox-68.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "7fc62ff745bc14419ecdc11e0cb880cc28f54cadbdb19980f87162e463eb97911858fb7673c2a9c1026ff6b786c01058c975c53c16644881e2a0b0d604a098ae"; + sha512 = "5ccfa691379cfba11e4f11854ebc3eeea7eb6ccd58b4f73b48a631279a99d0848972cbf924335db7b65ecba47605220df53b847eb361d721e1fddde30b1dac49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/gu-IN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gu-IN/firefox-68.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "22a36860d0ed79f36ad804b636cf892c45b7dafe948df151a8a384c6400523617e1a191157f099ee26ae42d06b3ba3ef508f9ab5a4ff6f819f21ecf74f9c3296"; + sha512 = "a5d5fc55935a4e9f66d6a549ac4f64649bb3efb335129f04c0e72e2849fb69153e312987233dd81bd58e23aa610b46af35fcd091a566e604c799d83dbdabd703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/he/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/he/firefox-68.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "2c46bf74a8053337958d37389f1fb457b814d18d27a337bed84d250acdde8c7a445b8dcde8507c1c502a13dea718f1df01895d76b3725e5ebd65290e1e6ce477"; + sha512 = "483850929a93239d40871aae236f698afa4a195d1c42b4f07db1b72c2bf9e7e5ac9a24745c56cdfd2d52e725585be7feed1a3ee9aa4b1516fed85ca33d3874f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hi-IN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hi-IN/firefox-68.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "ba1724eb10d76c3a70a58c72b5f5a6482fd6f5e7e3b4c04283a03765e75eaba9abbd5c6e2d3e350f36d82909078987a4c1a6073d67e2e56456e1954e291fa3ef"; + sha512 = "6d4c3269fd2216c7e9f258fdf0c3ccf01a4fcf1af6113bc91e68f65f0e0a060bb13bcc5f5db24a47870906ae5ae7a3cfc0a5c2e2068308eca6dd1926a7a4936e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hr/firefox-68.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "5fbe87ccc58b16725c10835ecd54d825f71099ab37eb2e4eca343c6cec5f8caa5f40ce8a5b2c6989c36a10a903378e69543d1b9e157f677032c47362db144d5f"; + sha512 = "cb4dbda71d92af15873e849b7c6291132cc1bca6f108f89d07132b1b34d00cc9d3f887c9af593eff4163accb4e645626fa4ca0725d3b81a19f5a52ab944fcca9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hsb/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hsb/firefox-68.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "9bf744b38cac34785f56bc308b2a4024b4973e7f489d4f9f3929fe42aad2872facd967fd35bce452beb40e7c936bf400f1022e0091a375a6c7aaeac2bedeb3a0"; + sha512 = "156b1c20d452edef51a816dc18c57d0baa84add78ea7e507e037d2a78f433351001d85e4da9ec9e70bb93ee439458d23be93438db98f786fe0efa4f6b031dd78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hu/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hu/firefox-68.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "11ead0e258d6a81d5a2b8d3bbbfc5cab8bad7d35e7ec853280f7d559650d121b56bbc66ca8a25416100506300b5ef148fde573609c4a922c775abc106ca59f1a"; + sha512 = "0a5bf1362575ca38a69e790ad34029ae587c8e59b122c86adb3e10762e0633246bd73617a9a7475eca86b30b433c6e958c53206a6c2c9dae37c635ffd8364f00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hy-AM/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hy-AM/firefox-68.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "67a6084fda25da7db2ade9596c6fccbb0cc191a748c8ba089bba68e1c498774a4d309680c8d36b61a49e7bb0795bfbf48d853df1a7846eda65e752d791394079"; + sha512 = "86b8411a12d6d20f85eca026fff9dac6de8c2680708906f551d28bff4adb93a48d6a82db864a609904e9aa73fd3449a38cf1ac74a8c074393f89d9f64aa1e771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ia/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ia/firefox-68.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "fc2ba7e0c87c610018bf1c0705c7d263e301c6b0dfe080f44cb0708bff59e955754b4d0ea167eb5066f38a72c44312fecb13d7fcf855ac6125a7f6a833dff176"; + sha512 = "a323485c9780d46087a9e698d958ac9e8348b00b14b4761dcb86d5f2fb1f9b23ab812a9ef9bfd0a7e7612ee40b505e50569afc3c16b2813065495f0b3e12dae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/id/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/id/firefox-68.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "c678461c38462616f731c2d0aab9c56f5963546f434e4ebcd2fb7b48aa94bdf7d4a7f14481cc4a17ebcea1decb767b27dae914fc3bb2503180106fda7adb74d8"; + sha512 = "76767d2e032973adffa08e0b0e49e233373ce95c94aaf61d0911cf0be45cdd0daa092f5b722cf396956f0f3f2abbf7ff063c76524f8b1e3761afeff6ee02ba80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/is/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/is/firefox-68.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "00e1c27374e5b174ed5bcb335b2b8a0ef8638afbaa707df46952eff48ed94fa9a021af709d8f99169e3ab33c6c763af0673b3a33c30881e09bb12b541dce575a"; + sha512 = "ce9a41ffb2482e0c3049cd3d9984b5094310ed2ee15c60e0bd102f98d9511b3e139ebdd4607c37fcce1c23407fb5c1f969d6ae53816838c32d2ed2b399b710a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/it/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/it/firefox-68.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "19d34371b514f718a6710aa9d00ed1c1b61db770b7974b50702e3a1845cb0e23a9606a3e5714d1dd4dbc13315508b266d1ac9b2876a3fd5311762462aea48b82"; + sha512 = "babc698b40f4d84a6c8f4cb159b676893724a5b1cea2f1b004d74699f8dfc1a7cd3137bbf9ebcc90f89c59c4e9980be95eae25ed152977fa652d5e8a35418742"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ja/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ja/firefox-68.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a909971593687b5b20f614ca51e6e3f37f4fa8bf9464cf714473950ec1f73912f3c3f1bb79410698511f38e86f743705d6cb8a60be6d9e2266464bc301785537"; + sha512 = "1073dea454de8796d7094d99805f05db293a41d871111fb4495745dc6bc9d2199587abd53c7d3bbd09768104d51408dde8e1fc56e85197f5f035e9cbd314e222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ka/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ka/firefox-68.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "8eeeebb0fc993caf80c088d96e2e31e579edfcca5225f622e3b0a592318308f2578998668638594a6f32cb0a984d4cf534532ae2a9418e32cc750df3c33c5361"; + sha512 = "77ea45eb051b34f136f8b295ad05cb14d43e526120c30ad028eb94c28531272563a1db80b164a19de28b3304d364558297be9a1305a1407e1aa644a003722202"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/kab/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kab/firefox-68.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "cbb17638c972bda6fe83460dcd5d320c03888527b56b7d49e929f6ccb0edcc54251aa0a45162457a09929b7640c588aa210cd969ea43c1f9dbd68fc0ab60c55d"; + sha512 = "8e44bb0dd05028c8a3e689ce273360f24bfbba157a9e5d7562b08d8e4f448b7324a5bcc3c0fc878f8783754ba104206ce82efa84d767fd9cabb0f4c25d75513d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/kk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kk/firefox-68.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d3306176c90902b4b2739ff52cbad140bcbb6cc0ae39e9f820781490a35a69428c2cc3b0204c23832bca62833523ba0975d39b3c30d8504301fe64cf7a5af969"; + sha512 = "aa3ce16fb30d08ff1e2d0b27518aa281d559735edf07dbd1471e148bb1fc2d85d9f812870d891e67f96cead4e49be25f66e07e4f52fd1bf08a877da602fa1b27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/km/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/km/firefox-68.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "f36fab6bdade43429941dd43da65a961dfe006001ed8d7a53041e6bdec0d668edbe09d96e383e76fe8d107e87122abda704b9aa14f7d6fa060bcdb283f30643d"; + sha512 = "6e1ad54977f61330d80f310317f1d97d9563e92637c91bdf7a0292e2abceb8f3f1cf3831627ebfa5967061b79ad565d37d2891aa83685ca599d782a4554e586a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/kn/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kn/firefox-68.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "89c40234a72938d441704c4b03af679085294f20cb0065863fab92ab03446b01b7afa3d004a5b3330439682b6f9b44ac078fec3906b5f99b4a07427419442dd9"; + sha512 = "798a1d1b5d3a4f7057d5ad05e5d93f08255ebb302170dc80a8b86238823c8a19a15cfa1368b81187ce389ee3992634ab9be58713e1097bdafdde96bc48dc4036"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ko/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ko/firefox-68.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "17d890cd0ebffcc24eb8b7abb4c9e29063bf8b784e0c603f4b69e3988aaf7c77cf864efc19d9774d94ad9a9610bad27a1adde53efe41240dbaad2b6a8d0ab1bd"; + sha512 = "8ce6490378cc3499155d26db216da44eb51f7b5d0220168882fdd16be63073927eb14fdc4c586c603b049a1be06837290417626f17c17b4620484ebf3e0a0d1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/lij/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lij/firefox-68.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "31265524009f12d22551c5d52cf158a3f7ae0068d10cc744ba18ea3c90e1835d2119951fe11d736809369ab4358f6415e9da7103eddfa90e415c1d721980100a"; + sha512 = "ead703e84f5b7d2dcebe84c86c49f9aa751fcdfcd30d2c9646288a7ec50d8807160e84333743cb4f97ee6f6e45909ee4678cfccc6ff9729461826d228dd1de0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/lt/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lt/firefox-68.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "fd5c8a9cc4cfc5cd9e6539f0482c2dfb413a287811860a6658533865bf71b1d3c60c92c615fe588b982d2f021682776474b1420865eba66bac16cf3495747642"; + sha512 = "0fac4c345e3d543d0cf1b986c5a81d9fbbeb4617f88c679a2230a6f0605e24eda60a4133f38f496d2df0d027fe029cd9f53f17efb60512263d6fbdd55369d239"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/lv/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lv/firefox-68.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "6dc4c5caf27b7ab2191f1e2ca4b22b7ed87b7387759139e4688da174d3382af2cc971fb5735fdbce400c53ff8d9bf294512b173920e2c4a62cb5fdb4e6ceec3b"; + sha512 = "fd172b285d01771aca741f584e101d66190c29df5dda5e6ef120d41a9488a2e5679339c93478d1e86b869d67d54c226f4e1b7756e5040ab71ba415e5319965bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/mai/firefox-65.0.tar.bz2"; - locale = "mai"; - arch = "linux-x86_64"; - sha512 = "afea8c98a60408823d246c4d09d2b9a0ba4c974b02e2e9088e91872d9d4da98d82924c6f486a32274e8a8f99572ee563756c9c9f0596c1d72913a9536c8261e8"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/mk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/mk/firefox-68.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "2d5cec8d0917694c3bac304454aa1770940310f9bfbf6ec233214989577e1f83c1f81326fbebf77fbcd880b3b03c3fb1928a0078925ac343c4b51ff72c481cee"; + sha512 = "370dc43f9bc1b33f3e1babadd16d8fb63850b8e68be13a22843bb09db530dfbdb22218507b04c406f3b386ef683572ba262a3a16b62c4273ff3fa2c014b4ef54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ml/firefox-65.0.tar.bz2"; - locale = "ml"; - arch = "linux-x86_64"; - sha512 = "86585195d41312e5a990a388c14de87fda05c75c3cee02f0af40367a9cda9ec1034f21c4627da5c2fec020850ed94dcbafcbdb0f52302862ab23e8218e715c08"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/mr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/mr/firefox-68.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "f996ec4bd929311cfe481e45813deb1a6fb8667564ed2d63d0d4d2a814ee9f8c5671fce760fade3d6d9ac76e33772e09b5f1ac80e6afb1e4edd4c22c5cc69942"; + sha512 = "533b32b98deedfa31a62c80663b4aa0805c3b2eeb0da8267918f377183b40058a229f6dd357f9226f0149526c0c37e90c4f13b1041496054d662ab805f8d1d88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ms/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ms/firefox-68.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "da9b9b272dc5d33910cf014005b19db7a17fb7306c55cbf77030b1cbac9d9dadebf0ab64845b232c9f9afdd7a47d85b52db9264021e45f5a172dcc2b74c32459"; + sha512 = "9092ed4ac8ec60b55c4b5324ebbd9f7b5940ca66dcaa66eaf9bfd808e3755db931568e4f788b3e2bcdd574de0655af16260a86065394536f916254b366188a42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/my/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/my/firefox-68.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "70c33d409656fb6e9b0c3fd5af1c9411ae6084339bc2c9eac55bd2e9d5d8e0811630e9f3ac5556b816c6fc3518657073f6786134299f5cdd9b3dc0f2c11792a7"; + sha512 = "64759c70abd171c374cc73485a4ce8e4cec21222a4fbd707d03fdac79b983af9d928b516c926a1558cbee1af374171272c04597d0523839befc8bd7659f24c42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/nb-NO/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nb-NO/firefox-68.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "8dcf198e0b120fa5a10e661c83b604a85333699a6a524b340f736e5cfe21ed9a96c9b009db625db0160c9a79c65b62b28a8a44957c07b05b6e576a0280beca84"; + sha512 = "940c9dcd597dd135fc351c09a6c1c1aaf20ef1305c4c9dafd90915a8ef040bdd02321dae130469985faaf871f24e7ab0b164e2cc1a0e661da886b16687cc4951"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ne-NP/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ne-NP/firefox-68.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "fede145ef4f444a28d3d10339134b9dfbdfa8bc5be8a8c390c64ff797e5b38d24cc8a242f64d86b0091b4015a75fbd9589627aa0038da534600a9c68d06dae6d"; + sha512 = "094b0a3b2a38cf9a21698ece463517efdecd9784711220701815b472ca27b6fcd3358e982aba6fd579cd5b256d52cfdfb6cddbae17d08d1ca2818bcd8eba7f07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/nl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nl/firefox-68.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "c128881c182fd29eddde5047623902c3943cc9100add237dbc8f289a1476acd6cb45f82b8e88adfa21ec2e25f111d4dd3ed772c4cd711aad1a4b040e36a9da5b"; + sha512 = "eff62b73a52a649a4072da79dc0cb5bae23f81360c2727bdad2925514c6f9de861b00f2c7310246da8037f1305da1ad6326023e06fb032ae636169ecfc9a33e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/nn-NO/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nn-NO/firefox-68.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "48c706cde9c4f2f521d0e2b1d4ee6a8eb47f5afea1cea8e7424aae816f81d156a1fc08d0e315b5fbb47d9a44d329c458333b333b6c63467460d4e97c49ede199"; + sha512 = "b1351dac5e08a6bbf2ba50baedfe5a6ca6b98de40cf89ebbe0672c98b8c900021b9bae2e8391b3cf55b433bd9c655d2a3be2422a7a0ad2067d4a465a9695fbdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/oc/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/oc/firefox-68.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "88f91a0ef6dc1a234ee2e3ed4bb32bc12feb4dd368805bc837b8bd3f049ebccff535f6f02d2806276d43ba471620a274a51e35edfa8f195e043e85930bd44821"; + sha512 = "8dcb8884541f272cdc97ebb9fbc0ac7cc98c3f3d252ad53cd94aee3c5d9768fd123d87a4b8c111ed92239e90f6d54daf67c5efa3823f8b1b6682eb8ad2c3876a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/or/firefox-65.0.tar.bz2"; - locale = "or"; - arch = "linux-x86_64"; - sha512 = "13c5f6c63bac0acc226e92207ba8c8c6ab06e0c99135965fc9ffec46f2a6867136a42ec488bfad411412a761dd7cbaccc08062376197217eb1d640028ced18bb"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/pa-IN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pa-IN/firefox-68.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "89222f8b28198b53dcffcdcc58e5331b6bd6e099cb4b860b1f4a7804486c741109164f11e0950456b2ab61a4be8db8a81eb67ae3655ae361801835951cbb1890"; + sha512 = "6f8ac6668fc556f051cd735325cfa3b3c16c43298828171b89c17ce22a66a788ec219b7bdad9f9b1d3d0a425778b373962033468f196e999a2ddf8b6ca86233c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/pl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pl/firefox-68.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "780c81135a0e1c2e843518e6690b9e5ea472d90b985bd51588f8bbdf1f920bc07af75d8f294c5b30b627b48319fc89316667fa55e94a8531d5af65369af3e633"; + sha512 = "8518a8eff1920aec34cd0ffdb66b4242d55b805e3b489fb0d5c29986b3d7efc62ee6a014ab3fbbe9b40a54aec9c6c76e052d0982f72a4ea4bed82814ae6ba2f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/pt-BR/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pt-BR/firefox-68.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "213c00695d9b40bb35a02c1ad006da9f42551af1554324df8524318956b9c46f6cb772e6bf7d90c883f97df6be78d527af1601eee42bfc8a5014e46c44af3af5"; + sha512 = "693d6b6227deb670bd3608cd873eccc3848c76a930c3e8922cf80c18350bdb5429b52e7d7551350a8b565d859adf067ebbd553531e00c6da95c480cf932de03e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/pt-PT/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pt-PT/firefox-68.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "56ee6d56f036925be13282db7edd518524b499810ba31289d287d7b6e3e5355cc1b944d1ecca7aab9d37ab55141fe94c3af3f23f175b2136f2ad3c099f201f67"; + sha512 = "c77e539aa7d2175d793c8ae4dca548332d98efb6cad62ba2ca9f3b94982b7a4d180179ad65b89a460e04462210ee201bc2226105ecff27b5a4b78cf1fb0a5b97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/rm/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/rm/firefox-68.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "33821af846c772f6601429a983365f4f79b3fc2df2cd20cb23f61219f544a4520fde8c4e5ec1b4474336c52a2063cfce6660928b0d0aa6336db41055f562c8e6"; + sha512 = "22ec2647ede04fe74dd7e6c99801c15d4ea131f010a75c0a9e5c8b568179f9230208616147e78179b81a7441f720d9f41dc4d784b9dc6c40e00e886612bd68ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ro/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ro/firefox-68.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "bdf7a957ba453a1f50ca1831ec30c2ad3d2620e506ac6b5575304235764593ff9b545719a45f4c1143dc5e4a6e91c6024531be28bfe74904beb2f61f29db7b7e"; + sha512 = "b9e3811280859103e202f0dbaa1c278c8a9cdb451a3cb63a35967bb43625d5f6f6ad2e15871dd727546532edff3f6373013e8bb0eccd83e7f80a31dcbf8e3643"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ru/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ru/firefox-68.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "f77d8516b50dbe597ceb21cc5e643bd0b701718a2a88013338981cc8b7855e601884154fdd3ecc2b1edcd8b19e396d05979039ec7060f70f786aa263d9044a4d"; + sha512 = "a7383beae7ab2514b0e2f5d86d0317ed0c33b5695eed1526457f14b545a63d036dfcab907fb7090055e6ca29144f5f11c7fc2c00bb389d83074a20eda6173df2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/si/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/si/firefox-68.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "ff747f4502626af21eaf008080477b1f19c4a2c6f6303ad96c65eb597b12e10bf1519bcdb09b79775b9e0247b521d73ab390f4930c3b2b174362b705dc65bdd2"; + sha512 = "5d9bee0a705d1250dd07636a0e8bb3dc3e0150607d58f7eee28c5050270e8786fee2f843e4b801e7de6de56f284025bb13f5dbaa131676796f69973ca45a209e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sk/firefox-68.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "ebf11e1a59e06b7394abc671deb59677c4850f9060d8f2c5381cf72c1f7e59079b669b9748bcd13af5b936f7bc49b9f4cbb798f402f47cff48c8631ae77b5c77"; + sha512 = "de0eb221142cce4cf6272be9323b2a851385d539a739b0b2ccbd7b98926673cea695fd7debf11aded37a57b551309a7c93cba244b64128e074c93e23b68942c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sl/firefox-68.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "b31834f097a8089adebb0f60f70803b74d65e824ef63c71a5db57ae1e25efec86e3e31fded1dfdf94f688817c0367c0c3118f15bf8fb01a0de8dd4992f689327"; + sha512 = "09d4936cd5e3f0592751699bda3b4164004e7e2651cd0b28f5eb191677352a61901725357bcdf5f2744b6090d47b6754b910a7c34e611f813b12fc7566bbaa92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/son/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/son/firefox-68.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "c706f1c88cde86e2d66ba8ceedae19ef0d8fedd4dadce72df47b827b8ee8a0cd9da6c05951021b70e0329b2356ab63c35640065a61f5dc85ac2feefe612acc3d"; + sha512 = "564306bc98a0a0a9e54d2f315cbb1414107f49deb4bf25cb729e10ede60620df0a1abdadcc675e531e364d1338c746cd9cb6d4afdf6e46a420b12920db1e304d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sq/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sq/firefox-68.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "ca15bb1c507726920c1d1c554da2c0644c388858e02b6d85407a589d6027391c1145b01bb18cb1bef1cddcec987d5445056b51cb21584e5d9ce41b9540198ce0"; + sha512 = "28c300db3616e510733133f0868cd42e7b05a15fb066575dd7386ac4e53b4526e86ae7d24907e3f7e98b3a9c189ccf2004c958d122b47e476eb3e411f17c29ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sr/firefox-68.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "256b7b6526a9a80faf9bc754c65d2552572595c53322dd5a9b9ee04e923d2bdc42762990cc86b5cd9505d30952d311a9082bffbc90bb8e1538f93e43fdc36655"; + sha512 = "0ca1a926600075e7e8348ee2ad55c435b3775c8aa6d1f27717ce1c35fd1e108c7600547302f072213e7c54903e6c0faa6ad299a9af991c8234ecff454d336427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sv-SE/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sv-SE/firefox-68.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "66295fecef20013a4499f0641d0da2e691cfbe166a5c03734fdbf364717fa8c2b6434a86f2bae48485aa42aa74aa802f743a37c5d9c60218298449d7a8529341"; + sha512 = "ef4fe5ba87db3dfba62490022f1b91ddca96fff6035328b07608e56a3247b4021f6fdc007d65e5adbd52cd0adaea9f0b59dbb5f01d71535655d0bc5e0800202f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ta/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ta/firefox-68.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a021bcf2be37488d6c03ada0f7e8662fc57163d64c51aa17b72bc0e23c56d0be1dccb7f1699735908455ff23d62988f6541cb265050612ffe3782129f0a7d65d"; + sha512 = "6fb48f0c09d74228317eed041b4f8d2670dca7ed043c133e8bd6a01a0d7bb310144434960be9b9916bfdfc3139de2cdcd3b8282d1568e67d29cec425420b1e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/te/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/te/firefox-68.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "140d7b57909bc2f1eb34c88c8283b66183aed6647bea6164582ae45fc9a54c43b18a7455b60df37a2f7ef6028c92668810cb98d4a1bf3d9e6006a85ed2dc391a"; + sha512 = "bea99c4f34bfb5860bb5885d4697f18bd45de423943c5d15952bb99c7e4cccf125f041f1378b693b805ef4d623fed52ba8b13a76b87bb383da95d06a4032f8db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/th/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/th/firefox-68.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "ef73b5976507930a1290b2e7b09c90da219dd376f6e838fd821992cfd1973e4e0c1a21b6da523b050acfb303d8bc28bf29c15e517f36096a88888498a243f7e2"; + sha512 = "4a03397a288a7414ee5ad9f42a7333d30b7a6448321e4507cdff71a2e3b0933292e6ae937ca96c1f6a5ba906e54013b6d6d8501c4a9be4741fd3505dd24b0424"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/tr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/tr/firefox-68.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "00bfe75ff631f08452e3ecec45df2623a15c69ac1e3985b1765f61ba34a7e4ba1bffd62e3f004da83d101a1f78900938472203f3a3d0df3c694ce24e17bf55e8"; + sha512 = "85378409bb2ae8953c1f90736cfc3e00551d77e3aaa6a7fb76a157291e99be18d55f5d07b1171a7137d982442f55ed70ccb3f6f6dfd73869e9cb37019e976590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/uk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/uk/firefox-68.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "8cab20c1a4cc960d15899d165ce0340e8f347155ce131d449dba8cc21bc9c882f8209b109330409eeab5ea149926eba6d0a2eb3a6689f98e4b99af1b4f7d6313"; + sha512 = "5ba9df05480e7852d894925248c7550a36db59c8a4c37792de325aca02b8e5feac0c20719077d718292eb262794668bcfe810dde7229faad6f2370a97c05e973"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ur/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ur/firefox-68.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2265739a66dfd03ce0187decdc5472c2d773590314815e07f445e934ea8dddaea38c3fa44b7d05dd16bb21a0f6034ceaac5e7d277176503836165c6da04d4c8e"; + sha512 = "bef12893d73b1c9583302562781907d0fb121003dd1714ccc4c3b2a27160384795ac8d85cec4858849004b020e0ff5e73f512925b9d5561948ef16bb26e0ceb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/uz/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/uz/firefox-68.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "226ed729da52643b6ba1728e761e69e6f6cd6949f394a18e67bd8b11558d87f15e7ff8a7c6e73eaa402c6839b1a78c34de8fa6a9a10b4f6d52b2a3e44cbad099"; + sha512 = "5961e478d0cfee99edb3a7ec20a0368f8b6604b4449dad835decff54c8a9f3add6bed22a131024682779922686dac0ea6d489ff111dfcdd476f7641e293b40fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/vi/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/vi/firefox-68.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "ed82e87e9afb51d1a4ca78905cc672279877b3dd221e97df245b9ba30e77ee01e48111efbb6b1a21c652802339efdcd979d9d3372fcc18490e86c46e87a7f3fc"; + sha512 = "31efeb8ee3ec4614f0e116e615db97f9836026c0c94f5452cd3c5ce338fb9b35f19c0a15fb6bf17ed945a37832a628e7fc16381d5e6393475d8b9053596a5c4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/xh/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/xh/firefox-68.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "e3554422c28e6e571cf77b2db704f447e0120429d859150a5f1061dbcffc0227e9f1909bbd38aadee61bbc090f6316192948970531fab9388e15d92d581ae27a"; + sha512 = "bf23c18c5a8c13c115e8ceea382eee8e5c7af24552c3feb92a5ffac0d2aa34effb7dffb0b41890d1af23f75b9581ee05451785c5ab2538af9082b13ceba04ed6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/zh-CN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/zh-CN/firefox-68.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "3ec0e98f1b346a9a79c04e86f260f7fafd6fb4f3e71cd5c9de0f8a6f4854c5a67fe694cd2a10deae5f6e4b4e48da320b71b3b925413d6def030b00c7ba3bf60a"; + sha512 = "ff490ea8b3b847343b3b7262154ec8815fe3c38d91c2fa0e92625db793f7d24bfcf3985ba07a5f5724b2463d00934925641bbade9f65f5c55627c15f1eefdb5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/zh-TW/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/zh-TW/firefox-68.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "84cd355bbf75a2d51f7014ad0d407664a5daf5bc5594e9f7a5e1b5cd1c3b5abc91e8acfa8b8972fea94c49149d6227320861d8e2751ae644893167c210360784"; + sha512 = "f3de7f3d53a47532dfded82ce25db7d7d0f89b2026bf3052c42f9b51087ff5905ff487f9dbc7e19b76a5816b9c2d8c1d350d5e9742244adf1c9d0818c6b048e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ach/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ach/firefox-68.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a0aaa0d89be1c32f1f211e813bf42c3cdc1aa21f0980b2a13463227141f92293e05d144cf861b28dd66bf296b39f3c939c951c6997aaa9ab1c984e1adaf5422e"; + sha512 = "515921cf97afec94b5853a7b6a7ed426cb1ba6b875ed1ceb8f6611cf052dddce40e519c4927ea50a02d23c7ed40d6ee882fbddff4293971b1c832e5a38b6573c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/af/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/af/firefox-68.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "4a2d43d08a608a7f91370bed59a57a80359e7cfbf71141a1c960fa035a93fcfa2b2f06711dc2523a9d4aae85f9d23a886930922c9ecd717c45afee17a68317f9"; + sha512 = "1a9b041ddeab4a06257d9313761f288acfb4ca75e0a50edeaeeb7670f4b3fc7719b480a5d673d90ee9478cb1dc9e14ed07c47e2160527874c134db8a85908408"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/an/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/an/firefox-68.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "94cb4579e466e44c134308d9e8bc87fdeffc69f149a31e39d8e185aa86d14932bd41920a6106011a5420bd89b0d639d6fc7416caa53e701373d69a52eac4ceb4"; + sha512 = "8d56691644124b6038c2a61cb74332f38c4648163745d37d37ae07bbf868b0ab6dacafb6c2f1f6d0991a6bf7cb8ffac498f36afad067756b1b8fabcc634c2624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ar/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ar/firefox-68.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "953c47a4585da68f7385f1de7e788fbd0f025434f6f7fee3cc4f8ecb2fa5ef4d711b856fad368fd58b9a655a74e178b29cf5e40403571e36fabebae22d825071"; + sha512 = "f443355a1778e087e14a214524cea2c66a58166c1832a5bff89a783c4ef1e3fcd614fedc00ca7b78a0595d29370da82de6f53c8b58c0fda15c79227ebe317f0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/as/firefox-65.0.tar.bz2"; - locale = "as"; - arch = "linux-i686"; - sha512 = "27008ad76e1a6dc3165a65fa4f3ec6570b21ed17761878bd51c6eb2d0f9592f482ac2ae77c85dde2794ac2398a87bf7b6857d241ba6f70507e322a47b5ba879c"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ast/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ast/firefox-68.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "a6ad5ec3380bc571d4b9bf486d07933996ef12d0fe18030e0decc9b30a3a1827c4ef41d48bb576ac18b5f498e3286aeb8facfc15e76f763bfba5756a4dee34e5"; + sha512 = "50c4ab65a5c85822355fc6c1dfb57aea54f68c9e578784101d233c8d1f2ae678f32646bf36be5c21e0e32bf1ce0c7635be4482aff422100e55e6fd813d0c6343"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/az/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/az/firefox-68.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "d78e00aca8eadbf3008ee89d10495a2dc462598bf3b7a508c4147c97c77861b60681ceb8238c9b22d65498d177b0c230584cf2b9a3d9f0da31a6197254b64c56"; + sha512 = "070840441591f942491f64cf793f2e12d4a5038fef2804d0143c726f33874a06ecae36bc4f2bb3cc04aa6e46791a7f5148900f9aeb1954eb0e0717a5f8a7577f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/be/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/be/firefox-68.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "2585be70036521dd83f68f6f4fb4cf19713c2ff26a4f6907ff01dd0a8216127037f754041637608f715ef14cfbfe7271b4e0632dc26e351b50c00e8eb08358c8"; + sha512 = "4338a55b80c9e9a21570fb49dbf9595d6c0d51390d370cb8dbf541bd4c14605b1daf118193d2ba3f20d2b2f79e2f40f276e079046d8db65ea524f3bcea88d826"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/bg/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bg/firefox-68.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "54d4b4096c679f10f7fcea13302eac7119e4a02f693a8c4880bebc5e4fd331ddef7f66ed67a7585f47f302274e977df237b25c2e0c41bae244e18a4d32f2f0ca"; + sha512 = "0a473653d6ff4b6c604e269243f781704c8fbf9f99b18e3fce83680793622b58de5aa655e5301dca2765d6526fb5aa88ee2caf7d35557047c4329994610d9502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/bn-BD/firefox-65.0.tar.bz2"; - locale = "bn-BD"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bn/firefox-68.0.2.tar.bz2"; + locale = "bn"; arch = "linux-i686"; - sha512 = "9564b72566f535061c5ce2d7acffeaa049e8021adc6dce964c035c55cc5d118565dad54c933db771757429bcb81412a71421cbd52ec2f939bc47957f3e05d623"; + sha512 = "fbaa81947143836f54f84e4e376ce31a21cf59a46debdb61c8a9db2f92703da3ac06218c560a639b5d6076e81d74dffd291f9d773b6b7ae5d65dcd0e77b5d1de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/bn-IN/firefox-65.0.tar.bz2"; - locale = "bn-IN"; - arch = "linux-i686"; - sha512 = "e43676d023a668d215f39b084007812514ff663063b3a16fec72aa79e801a2463d93b292924687341be96101c58954465762dd68a4f44bb18c5f322f59beee3f"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/br/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/br/firefox-68.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "a1321fd5a1940f50eb7dc98feb6ca2795ff6710b8de7874d0726465b66ca5e1c668ec32da3f946511a21e96db8a3851cafd3ff8fe395accd68a3fe730069c6a5"; + sha512 = "a5c69e995213a6f3066e685077b911093db15859e6dafdc2a385d012d0815520fa2e64c7b89deb279e307fa702c9bb57961a3147ff450f91ee8b3b31a2efee90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/bs/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bs/firefox-68.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "c3dec84a9a667046d0509e4c09f8a17209753969c6d0d6aae56fb718f53c700a7d360759a0f04aaa1a575961e1fc70136478ae652b8e6d845f1b5df61c8b4dfa"; + sha512 = "82d585cdd034016265c43f0e70f09ba8cba1429a551491f6e8ef4c8f333a40179c4817ace39cbb4a2376b03c88c54849eb45904e148dbbb4f47f8fa32048d3fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ca/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ca/firefox-68.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "6cebac4c11740848e36dfbb1237816aa1c9c7a698423c7d73e268c74a7407e10107ff8cc8802fcc0bae8c327b4ee6e559067fb78c81866de753ea781fcc10cde"; + sha512 = "9c884ea535c3192fec754dd891ddb2743afa400453d9299f26bac710ad5bd7c7d8cd0ebdce3f1ce88995c13e381701312fd9247b029c73f12ce7940297034e8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/cak/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cak/firefox-68.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "af6623230ae20f3dd7915cb395a200dbc7a5a7358bfd634e4428f978da46ac245b2c8faf0b6f2c0655b377f4472d67b8ce8bd6383cb1993dfcb407604f916413"; + sha512 = "367755d495f3b583a8f09d200f5828c10d8723017d691d6380515d3a4be65e6edcbd1318909c1652dfcc1cacecbe80d6b4e399e2192b335701e17764fe5598eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/cs/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cs/firefox-68.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "854636af5f2a07f2c9cf86549c59f76df6d338f44c02970ed8024519fd8d7ed4e8f2746f62f009fe7cf8d72dc8a57fbb9b62fe8cb3f7f9218e8ef7f47f674730"; + sha512 = "427ff1470de34928ec660d539fb6977145540608b36ac36fa0f7b98af0f814373105d9912681bd70fed069e94f58aa48f441818a3f4cd67dd7a65342133f2d62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/cy/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cy/firefox-68.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "6ec88891cce5878022e377da336010c8818271a4cc543341d2c0585a76184d5ea80f0712bc6a9fa18008670603103136da3195ddb2f7be6d94b4940e3307cb9d"; + sha512 = "8ec2ee32b5dcbe1d9dc80ff8d518c640e9bf8b21b2a8ed2ef215193216b22e17de4d8c102c59eec4c773f0e3dd0eaad6b1502c91367f1bc1b1860e13a2b70151"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/da/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/da/firefox-68.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "d6db78a1e930304bf3629a02637cc2ae375d486654fdc4ed9e4d995049aaae402c9781ac72c6764084df3c87247fa8ba0ded438dc44955e84d90735733e84e89"; + sha512 = "72bb5e0719382aa518b9a427f06946a85e7f8c8c0176a66720d47cd7fed6a85aad370888899553a029db1d841bdecdf55316fc8b4f67fccfd227bb48ac655126"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/de/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/de/firefox-68.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "5e5a817987239c402d141cc7d42a334355b00facc68be1b89c2ca271dc1e9d79de5953dbc1da49254c1c03fc8afbd02cb1258cd2a238007ccb69601c860137b9"; + sha512 = "39add77c78c64d77e052565fe058256fe9ec44886844b664bd9055b940fa0af89a60d4cae5f32523f62eb7909b18dfe2f521dc43b4a24a5d0fb67e0d543de28d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/dsb/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/dsb/firefox-68.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6eda625b31d0ee8f7a245b6a0e769a4a35fff4352d1b33c668a0187708db892a317150d8744d65912f265cc68d72e981f6f26b781782a18f3c7691f746f0cb3c"; + sha512 = "1a0fdd365df8b034a4e05741d450209f685c22e6ef6b2d030f1981c711f46a9d561963c57a4da49c01dc2b92f6867b6296a013560501939788bf2b62ff622d71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/el/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/el/firefox-68.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "d9cbd4b31b216ae65c6cbcb633965fed19010d5b26fb7f1e35c5459cd1bf31b1ceab572056b00bbfd72b5a0d2f126fa3ebc2bf05acd7216e1470370075f6eb0b"; + sha512 = "3bff3c718c77af76bc10b13b7a816eeb37e6c2756249fdf441894350834e69ffe8868ba119f473d1cf07e8569fed6c604bbb1cbf1a1a51d5dccfe3f5018df2b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/en-CA/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-CA/firefox-68.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "b69b7033af141d38377d76202683a5ce362cd8f52f7d01d8d04482908279029a9fe4fb7129e4ccf409eab1eb081d24764a9ae1519796612ac524857a3fc37499"; + sha512 = "8400867a50bb1f677b41d2b030a66857697a95d155c50e0c57711a96ac13f6d236df86ae889d442df805eb56cee80050370df2210503d61c5a3d3a5f0f3a3c84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/en-GB/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-GB/firefox-68.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "3eaa085b84924d24c3e4726fc2e7084cae6a90dbc784d157b7f94b50fd49b02e49d736ae49330a2795938487842a4a8e128ee95d876e73cfdd1ec3c959205bf8"; + sha512 = "b03559560ab0afa718a15bb0ca1e4d9b97eaedfd4b4ca42e3910425bf6bb6a0bf251208b7fc4848eba0285becb5509569bfb7ea609df3f60972e625addd20396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/en-US/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-US/firefox-68.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "d7d8d14d25e4864fe3707d4d2ba7895556b92e2f375b237c73aa011afd952d3163e8492db8ec150337bdcb440c935917b3586240b44c9a5beeecbde545ec2821"; + sha512 = "d6acd7725858a512805676f6fa215b949e631f4493bdb060921bc51c2f2526bd0e69641b41168ce756556510e354cd98fe1d1bced42a1e0a7100ee797c2eec00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/en-ZA/firefox-65.0.tar.bz2"; - locale = "en-ZA"; - arch = "linux-i686"; - sha512 = "ea47abb33631e7d32288a9610d1c9d86f6414867206ad4923d23e8bd2107105a786570e1ef0f253a2ffb90fdbd890c033dcef0302a2a3145d77af51a0f11c0d0"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/eo/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/eo/firefox-68.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "a656bddeab181d503342d0015ab1feaca887894c3335a39f1b4fb3f53c6dbed4ed7ba867e51b478ed651e86e152c7135fbd4419a451a35a5e8c11c82887ea1f4"; + sha512 = "25ba775be4e0329fce2a927174923c69e3dc38b61af4f29ec6e1d0dc74706b8becc6f6d139ca3007f7893f9bfb66cc71d9426cf420695f2494696902d5247d8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/es-AR/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-AR/firefox-68.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "404ef7313904ccd11b8f4885bbf13f3f9c2123fc3789bf983ee225cbee9542b796e700bee82dbb7b32b11f3222e1ac9a39b8a0712a6746e6557eabf7979740db"; + sha512 = "a3616f6c7d9d7005ca8f76560bebf63b3a49f86d58d6c8c145400bb12e1574c1a3986347660c6da2700402c26441754991335bb199eee5a43292644fe935083b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/es-CL/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-CL/firefox-68.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "88b89da9b2d529cf7be8c9fa464fb17717e3f40f8b77bb47843957731aae4e59dd63f691af8fe863d74cb2db6e1fc9e66b514920dd50cedbb6e2a1646ce92df8"; + sha512 = "9dd4f16594d3d53a9c6ab2c24a373dafa1c3d02cf1d2aff5725bdfaf7bdec7c0df254b133f1e1e63f235a69fae687fa261f36b08fa0d09d6bd141d01e4f10c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/es-ES/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-ES/firefox-68.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "33444d60e3366d9875b22b2e99fa8ec674446f78a122c3b0719373a7abc55848bdadcb9f800ef1790531c9b76993ecd80d473dadd838867870f105b5b36a0d7e"; + sha512 = "a560d1c5b2142590d086bb645b76c91c664bb6b849d5a1e90a32feb87691615b7d943612048fc4c248e0c65a7532861a751f9b3a1537eaece9e6604df8388778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/es-MX/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-MX/firefox-68.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "f7d1e5a691a8e629e11059a9bc367c1e91c525a0ed69d88bfbecc3aeb22ebe668c1bb20f307f2256d3782f804490a77ce45cd2a8f55cb547e314b327973b8d74"; + sha512 = "481db1dfc9cdd02963235d5ae74a3fd9bfea1d4d4e2dfff8a15e621e2ed2027ebc4dc14095e1ce0013f1350ee73717393e8db4126e3ac707218eee3f4f7a247e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/et/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/et/firefox-68.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "2399846600fe912de3b057a18b857f688ffd39692b9db5d2a7f70cd31dd35d8c1e09f4b73f058ce61808e22a61033963ed97e029a5170662043f684985e1a82d"; + sha512 = "7286f28029838e9b0ce5070afb9001fe01dcbac24dc85c5c2f93c5b9e5f6635daec7d42f0788c1ea2c03cfa8c03b190200be21bdf44acc2ea2bf9ba9aed62231"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/eu/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/eu/firefox-68.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ffcce3c779c0f139bc47eb1b9782436db17977c6e3b340d0996d228a746d843a1927cdbebbe11955d659b1d39ca285e357e6e41cde09652dd762192dac641ffd"; + sha512 = "472a773ebb672bbe0e523dd08cdd45d310f0ba599dbd2ef720ec9a2b199c77596c746cd1378d2853ab82c289b5b3a2001ef407aa3e250b082dd82072e858a5fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/fa/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fa/firefox-68.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a875e2a656a375f4ccd370078c73e72f8c6a1cf629db277b18928af35be74e10724f7bed1846d418266dd8cba1808a54108aa2a14acbe49a60b8c6d2ec6cd9f5"; + sha512 = "037df8470545afc445f30f269efa4cf981a20593ee3ab180a92dfa7f33affd03a6dcefba47d252275ceae2c9291a743f5cc1060253854d0ff94c5ebfcd81f464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ff/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ff/firefox-68.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "da41d26230041bcebda837d8d4c871f199b1ccdf6d872fb8024bcc4caafa57c2e409977d7c99b443eed8e2ea003210bb6564d8cd3666775cfa88336122b82b74"; + sha512 = "e1293b2b8501bd30344ad54a8fe1ad0fb27292baca43ad791917d06441837004c8591bf54858852a8ca9de52048fd126937c81b2faa822f2140f73bdd8a4838b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/fi/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fi/firefox-68.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "bbb3feeb706693a9f9f9733f9fd3b02aa8114b313af2a40ca00e22a30e8046aec58f91a0d47d6b3b83bec33f118dcf5f0b9f097560f32324ea9deed23b673ea0"; + sha512 = "f9acc483d78fa9e3a97d0d70dedd152f433106fe718198fdaf020bd4184595e0661d8086b2c680bb345165a57ea573a00e7484aaba99ad416c0fe4c08ce7ded7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/fr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fr/firefox-68.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "877f704b152b18163d4dd4962b634b9ac3e8bc218ec8e6a53ae6c13991a06c84727c20012e820213a3698257f53d6007c992e7cf9885503358a46d236a8b18d6"; + sha512 = "bb28397f39be4e61dcb8cf783bdccb2fc0126e006d4fe8a8da7e15985335d5740cb3d41384f0592f0b7b4daa898066bc634397a680555dc720aec08ae0b8c989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/fy-NL/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fy-NL/firefox-68.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "494c5ae227db4c468e5b66fdc480ae0d9adb25f28d76ebd94fb630c096eded631e44af6efd5586aecd5ebdf62f1ed307086f9bf7af0395ca6cb599a2eb9d77d0"; + sha512 = "edbb404ebdb71a2c6b1b66a2fff776ec467b0fd42a0710d1b796388674e62e70679b9490d70b92797bcdb5e32ace3691da88c50acd7e681d89bb9d166ca771cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ga-IE/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ga-IE/firefox-68.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "3e9e921fbaac835dc8745d3e3b46914fa79f64e65d412a39b659ede44ff9810298c8240966440e82a949191ace2207b7e7684530d930d0d1913913a320419c81"; + sha512 = "7f16cd4796525f77fb2faf3ebdc08c61d14c35780107049a4ac2c00c208cdd1c36543933e64ae51c1cc65bf3896ccb2fb546735762762e25dd22c5bed71251ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/gd/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gd/firefox-68.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "b71e3a6f1f060b3132034c435b54a735f8fff377646420b408482cd6dc5440957782aa530285f8bf7d51c56d5df8532cd0fdd826fd8f1faa06ad0badb48fd35f"; + sha512 = "5c875835f2c1a2cbcc97cf623f4a2d57a252d2741707847cdaf4a2fa21cf4a2ad0bbe9c0a075f29306580499a9d9420d77bc8db2da88551e36af006f946e21da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/gl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gl/firefox-68.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "ba2dfa015a3de26750c8b59f3bac8ae395bb36435b4b00b0f30a6a09012c36986c6ab0a7a33d74def2e3cc89c04d34d0d9b65e830502f59b7028fcccdbb43519"; + sha512 = "6a0e069836ee596e9e7c6b08a39ce15b073bff8ceb676f957285d26978d8768d7b60fec011d941b05644474add0ea00e37ced01eb43512037839c010ecd5b637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/gn/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gn/firefox-68.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "24735e13619217c444d6ef5e89f765baaec014a56a5929b0cf4df1d5401a673965bc058d440d80cfef9efb0112cee600ea8e0e030c2f5c40ad738e0c8243a6fc"; + sha512 = "6811327bd3d952ec59ec04cd21567ce347fd53fb401a5017558dee0f89ef0cc5437f9edb8a8e21626a7c379dcdb118fa8a27d5ee7d1bbb14eaf7daad5b08391b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/gu-IN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gu-IN/firefox-68.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e32a73588df2630bdb6e36186eddc7920e5866d1293f9bd7b8a4ecdb9a2d504e4a46810856a731bcdf5bd7852ce6193694330804a58daf82029a9070d2d58542"; + sha512 = "5d8e5d339d350f151c8834d16fd26979b42d3ca32e5c7f72e280923252cea294eb4857725035eb40c282848b38efaaa79b974e795211d3d59598c6a53a6babc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/he/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/he/firefox-68.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "467c77c045760b7de01d0bc25c36527c0cebefb627346359f8b1fbc67d0678d31fdb3339998a596bf183e12378124479b171bcb4b6b8f2f7d10e3215f17e7f42"; + sha512 = "e9e9bdd9698d7288dc89fa03a5461668dd67ba305a2d822a50b1325e797ad233dc727cbecece58da43e104fccf319ae2d884c39bdf4abdb3b5bfc88f989d1f52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hi-IN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hi-IN/firefox-68.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "d879dc631888b32ae06b5f99f1adbdde32e76a5bc3150bffe8f326d0728acf2d9d1b8443657194f2d5c26819017365be6af5525ca9d1b4324eff57b43eb77790"; + sha512 = "5b650fbefccd3768918a8203687e39fac96f3530236a40f1d73ef24ab2a25a58f901ba5cea0dddc9b9623ec84015eb6392182b1f02a14c46d382eb07a2078ced"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hr/firefox-68.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "dec69bf3795f99a070ad268e62414d7ae63f8c747a205289600c4ec4feda63aeffa6398802cddf6787fd17e735f376ca4842457ff45a9cb72c912a2b3cdc6cfe"; + sha512 = "6cd3ab0dfe19ee2bc3725af08dbe54f12f214bf4b41047435f6fa8ff986bfcf45772626c7392858987e01e1fefcd5ba1b28872cf7774ca90413993343367705d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hsb/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hsb/firefox-68.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "120247d2c6bbf44a453a9afcd9175a41c2ba2b927286b33f749f51b6ef4aaa993f6a6d4662ad1eff56ae736ca91d742ce64260de12b493c9dbfc52621dc81b3b"; + sha512 = "ce300da3c7e1787fc205d904694ac84bf4fe4f271d95cadd9539b18c2b0fe8f35d12ba331ac098f56a56786f36e1cc2b2fbb62ae7fac25cd6368d8a66ea8efdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hu/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hu/firefox-68.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "fb9579d7abaab1208ec5a8a8172d57801789eac83445413cd2133c5785515ebec01824dcb76685d5c8507048025c4f9a16fe7f47233a4c5dbb0bd76fe74b6484"; + sha512 = "64d30bf6122ff4598603bca84d4d1ac30c2e84f106e4c68f6a0dc24dceabe67e34e514dcf58acdd8b6d3c4412a5e1a912e184ec13e8ddb5867943b2965a3f1be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hy-AM/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hy-AM/firefox-68.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "28f4436f9a977edd4b30519b98c1842724323df3fe638979839a87153400e806e22d73c9203eb0a2191bfaf4a389d6ea26bd81d498963aae59c926375a61cfa4"; + sha512 = "799faf34055822487b442da86ceecc7dbe36574a76a8e04e4fd76852182bd75d773b69c0ed19fb33c5dc23bc4ac6c0c21a6694256398629a984a1d2ebd63a63d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ia/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ia/firefox-68.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "1bb69219eb12abe2d731d600dfe35511cde083de13d2277868970a52a77a558d5dedac074a45f3bed3d01e18e2b7c5695d4831638ad194217f977efdc38f3e6b"; + sha512 = "ebf9d05baf6b4963b0b5ff25b2747b3a90e4b664bca1c865638190dae85891499e3b1c5b3b656f83896117b430556efee039bd58a5728573e3be47e1da4b77bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/id/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/id/firefox-68.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "87698f7d5ce9f074b2dbcdce00fe864f36621107df7422e053b0db6ae76947238784f7ca0a045517800d3a936e065cca3e74e6bd9cd04a265d7eac3cf2e0ce4e"; + sha512 = "0268c27fac89400ac179778f9e17b8b1e5d1f1e6bb9817576e03f4985f0aa7a57444eecdde69c1f7800e5128cdcb5829f62a4ebdce6124e3f4832a9fd44022cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/is/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/is/firefox-68.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b1ef9f02c286a0ca274367394f72b980b9c59d45e4c629611c3c7dc55677e90bf9f44003038740b22d660e5e950c489acc18ef7317e67f211c629f0b86017264"; + sha512 = "818f4173ff8e9bc01576c0d416b39519bcaf33d83760e91d1b4f8ba8e28389b81816c15f5d19f3fcaf6a8140b2bd8fb92e29a844e2da05f9d6344542c7b5f615"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/it/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/it/firefox-68.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "8507dba0adcf5ecee9224e0b8cc20b5f57ce1392affde80486a3389e04b1cb1543208cbaf151b56ed26e6124af863365805a242c6d1106842fee8547363ba11e"; + sha512 = "6710ac5a6c98dd9010712acc29239f9f102bda2458d16fa3394ff0ef6128486b759c3e68d568614f793eb0959fae908f3fc519dd52fb27a7495956d1e66c6f53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ja/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ja/firefox-68.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "ea41d66d37174c936b56a3bb86d707657814eba1e99daff7be915a4ce53e35ee64d7ce6c2da0d640fd101b7cb79ea41bb49b4dac144d8741b9f217a2a042f85f"; + sha512 = "481206f6a36704b06d207f6b4eda96c307f61a2700a3da6fcf659c6b12c7880ca5ed69f1c3ae9da42d774e84e2e9c621095cfe3fd4c8e175304945272d51bbdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ka/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ka/firefox-68.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "793cfb78a809f8e7acefba260197665980b8b5aef599d9a3a2dceb4e8dc83034c98ed04561abf9e4e6740859ce07f647e544d2bb4244b505ba248c8af3147403"; + sha512 = "ea1bbb5f759060a45a62b605d82db9b560a05ce9f0f92b907bc92da1a30229e312bdaca3e78560ed698100099f1bf261b71abccb353930a77b9908d0b0862ee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/kab/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kab/firefox-68.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "50ce6f27b5ca77048600db7d1f50c04a363dbf5118dc23b06395ec2fee401a205725aaa99dac3b21b5660fabca3ed3bff2a996a15ccbca4d35e73553f46a97a9"; + sha512 = "4855f086d6d4028d18a6dfcb3da366c667e16a84e3b81d6e58408a2dcbeba77fc01668b90290e4ed49334d2afa5454b866dbc2ea3f4b446d5eef861bbb5b03cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/kk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kk/firefox-68.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "8b5de334b237751201679b8d54f2de5ee384182395cfec120bc2eddaf443e0fd896c1594e92e2ba71943f2020fefe44b691e2286fe9ed1c21d3fc9e11c763300"; + sha512 = "e48bb95cdb2361cd274e064e879ffef3d4cf25c15712c716c278a16b31636b3ffe3585999f7477e58b26ec5fa4ba0a3d5c5e80f7af97b305aec3e899867e66ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/km/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/km/firefox-68.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "1a64f732f2c19858cba7e109beb86726d1e51dd2a2b5a09aa380fc515041aada110eb90649c4c6ece5aa8a5857072968f4a2d43f3484dc2e311c61eeb4fb49ee"; + sha512 = "3a987d55f2b113fe7ca2f47457d786b5d851605edc94e3a6467a2ce127075be4a2aa924892e053da6b9f854de60555941a875e0b94c8a8d736d84c791d5d7803"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/kn/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kn/firefox-68.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "149029ae8bd3a81151a17c00b7166e02e22bb9f737bae1150ed8f3fbc28becf19234a1a874ca0aa6400e1b0eb75f14465546ec7e0c5bf09b8c434a5ed9f651da"; + sha512 = "36331d0774b85403d294b1240e1348a1aea9ea52df8ff8013a69f0b82cb5e8c799c87e3fbc9fdf0fc20f3537d0124d7dc291cd8fbc34063e4bd3b17c6810ea7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ko/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ko/firefox-68.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "f7433f3da565969ae1e92ffb4d2fb48a2b513214b08e611de2b8cb3efadf16fc6af871b470916b0611d10eb616fec09e37648c98366ec0f6211693a9f3434df2"; + sha512 = "7534ba3a9df96088180efd8a9c1df50e674f1749edb9103c6efc6db8c72d8e82aee09081ad3a956b07e0ab6c57e8c8194317d39a933da977dc0afdd1142d1c2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/lij/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lij/firefox-68.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "6b20b466ae15b9484c427a65388d099073eabd54f938c75eeaa886ba5db73bd1f91ba207308941b2229ee38f8dee4201599d1c11e228ef6a2e13ba0d74f7c427"; + sha512 = "affa07c2eb1590fddf0c30c670b6c7b6f9f6969dd43858e277a750ac524063f5da5166d7d8326e1823e0258ec5f214d241a08dbe338a3cb979de8b19a9799009"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/lt/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lt/firefox-68.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "61a85a29003930d8deca7ba76269f437ccb47680ce8ae12b9c9913e79d6c6e6594297f890eb5a5e641610a38c1016a1947a866b8f79ca83ff316e925df8a8bd6"; + sha512 = "416a8a66b087dea18c577d839c151f958c084e8ee95fb0fd7f17a45015baed961de0ca138fcc12f58154f480df15d294d822dcf1f218f4c8082c9193ad57710d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/lv/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lv/firefox-68.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "21ca42042d0695c9a7c5c5b5866b1fb54e65f76543f42c45efd0436fba73f5989894e0d7b67e496b101674fe3e7f0c1c374c903c9b6bcf9f9a1c6730c5c865a8"; + sha512 = "1c5359efb53b0d4f0d9f33a321cac45ed112ede997c06b2279546183dd005c186f107701c895ced27a76086ca71374a49a067f5599a0d2ff166432b7eb7629df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/mai/firefox-65.0.tar.bz2"; - locale = "mai"; - arch = "linux-i686"; - sha512 = "7108acddbab96033cf9cf822d93f0ef3c3ba46e75ebe09f5f1d211b7c5cce12fdf7e7bcf06621b1bbde3478441893fae8ff919a0952d76fc0f8e482a2bcd811a"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/mk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/mk/firefox-68.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "6e0c7a12413d351ff5cc95ce56df95e6f1bc4ae320db45dd988d0dd488f525820c62387aa43003744e3cf4040f91497d4f36b4bbe4a636f1a2d010d0a9479d32"; + sha512 = "db44f22e19d505a590749ac98d7b84354106d421e4a45eff70986af2c9d2ac581a0bd84cfa103196ae4cdc17dd1fe5d9f0cf0c710ee0fb5a0ff7701f6de5253f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ml/firefox-65.0.tar.bz2"; - locale = "ml"; - arch = "linux-i686"; - sha512 = "03e6525cc76cc4a1f2333dbb67a3f29976d3d9068d73054711f561bdad0a8da9d14abc3f79df596696ff2c28fb51147010b7351052f3b3a8d0913b94e17b022c"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/mr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/mr/firefox-68.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "43ef1fa19c05096b3465f985ebcd91e7581a29a380574cfa763269ab6c7f760241645d18e9475757069b7680e696be17c2e92028874c57c31b8bc2d1fc5d8be6"; + sha512 = "db73d7706ec4b87e76f5d174f22f9b032d75d9aebe6001ecdaa7c2c8fe5db897efd57f0f2ec482a5ef22e629a6233f5ef7c5df19566a3df0f0ce58ce008a22fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ms/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ms/firefox-68.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ad84ff57cd2a3048862f8572c3084c2fdacf04dfd080f4679cbe5b6cd1efd9535d4fc8298aa1225067f5a3e79a9d512d933e9257d1db2df0875dab8d9259352d"; + sha512 = "23dad70a4757bf8e9c67328bf43b9be2a9d6e7f88ecc9c2980314e68eff269f996535f43f9fb93419d81a2e7c922327e5642c191e15582cdfcd3e420433e4270"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/my/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/my/firefox-68.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "f6b51ce2a6f67193d3410bcf5210fba114d2b4a626bf2cc98930143679cb72e00657ae44116295d3fae92aaa63dbf5393a52b8d2123d024089c5efd0737200da"; + sha512 = "ba595429b7c637d06f703ae6bb1cb5ec6095a7f6fed7ea64a0b39825921f49f5f827c33a5cf3cd0bccc4b6398acbf4119a147014f1d2db1d8bd4b3e72b7733d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/nb-NO/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nb-NO/firefox-68.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "8b416187023963128779f06cfd28db4a7bd6bed7b7bdaadc8396c51acf0964c8a1e1230082c9528e0f3ce2ff54a84383daa36e72bdacb6bf5768214b7a497edf"; + sha512 = "8af331ca56c43c43b42061de4a7686bd2f944de845f9d94d088a4c1c913e1d7376abfd175dcebbb3ee78fac7fbea407cbdb2b81382919d12fca021dfccf59feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ne-NP/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ne-NP/firefox-68.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "0fec4f2b6b6944a29ef2ff0ca30c4d770d2a956564b697fcfb7a72517c488a252d990a31e9dea6ba36d9b5ee9c38f39dc8446edf2ec7caf946244bff3f1d18b8"; + sha512 = "497001fbf28df53edf13aec04de313a1353ce0eae894905d6a33b0c182ef589160eca2f0a8fc18d8e1644f573cd74de3e96dbf43141b05b6884be04fde28be76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/nl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nl/firefox-68.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "7fb3c8c0e441ec55c9a79ba13ac1f7d17ce3612ae6f6ba7e23a31bc2d854fc41abd38a4caa1991b9b45fd58bc2d8386c2875adfcbf40b07cbc8bf0641a4b8b10"; + sha512 = "6c0836da50f14accbf536570bfea5fe4e587e87fe2e4203b2c94052476994949058ee2418f862312a95627730d648832f6a0ca39690513c6d96070108630e43d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/nn-NO/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nn-NO/firefox-68.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "744f32b81f4a4287abc812ebe7209082c4c2f8637c0a135a9ce83377903e97e3d938037827283160a141ab89b51060313bac82fb93af8f24c71b3aabdce9a293"; + sha512 = "89be8b53fdc39bb39431584ea25cd6e5d660f75756d6c45f0157c1eb387cc625e927931c1cf0d1587c0819fef9635cb3ac2319af6a6f35825a6170518070cbd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/oc/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/oc/firefox-68.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "2722d769575b28e581da820a3a6bf8b407a1c4018d97c2e7315b15642f4165efcc44860710141c50829a8d5d57429e9fc47565852ea9c2c018504f3a4f11739e"; + sha512 = "6b34edad11c141398d329d07e126eddf03bfd395bacd6856e947771ea65e274e78f96784f695542280f4530c395ebd0011946f1bdc95c1bf5c0f96ae8d7ea707"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/or/firefox-65.0.tar.bz2"; - locale = "or"; - arch = "linux-i686"; - sha512 = "3f757e2d19540ac963cf14d884079fc648f1ea4c1281c86ff342971fab250c4ec09708c54ce0fef7eb343db057bc6bf5e15971e70123212d8a1a90bdaebcde8d"; - } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/pa-IN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pa-IN/firefox-68.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "35bd0bc1938d6fec372356721236afa3d1a794bda57eb11d7bc86601951825a143c1ff028ad6f0b4cd50e068a5a233a08108d71035abf2cd69213b3af794849f"; + sha512 = "025cdbfa14ae385fd87e71296b67f9b0313c60ac56cb3d0f2734bd803e990b846383d64f65ca9a3d643fe0f2fd678d54a2b2000c7dca1cff73e5ec47acf1e53d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/pl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pl/firefox-68.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "34c91e7c2434a233a6f458b28806ac110e4382a1f685d485a2f338d66e27ec362b0424a107c8bb17dbd22ba58c0a1bded15e1bbe5ee1de76a460aaf2dce9334c"; + sha512 = "569b0dabacb30f8ed02cb1118a062c1e212c4b688a104d9afce8d846572a92723ca1ebbc495dd0e97c3365ab3e5010b9d812e88b111f40a6e87b14c646794dfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/pt-BR/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pt-BR/firefox-68.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "09e247ab05f9c02bb2ede75cc46e321a518629dfe2395be8536af77601a91d4acd1df4c1a34b54193aeaf24b0cda54582ed204258e9754126dc021e04066fe7f"; + sha512 = "36e7914fee752f7cbddce0ec5e48ffc0f45a20dc4b62a825488ddb0b49c36f91d2df257ffe2b551bba2261d7786291a2a7fb3f518cef5c6f9b449205eaa733be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/pt-PT/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pt-PT/firefox-68.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "3ac57c58851403af43cc01010cf8e55b734b5d1d2db60c3b6457dfc1def483d6918ccb0eb6cdc3c4a552ed8cc5975b8534bac3e644a5f7d08fb9f2b168c7c3b4"; + sha512 = "fc6dcdec3e6d53111929a70f3cd22948006d9a5bc2c6e4cb305a07c4bc8ee0469297be01d85b68017a026e011c35252c25032156ff383cc708c470fabcbc7198"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/rm/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/rm/firefox-68.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "b73742b939435bbb8d2a0d307abff82f777ba015b808eb2e7e6789ca93d33f658ed2e550ce917f5318ffd9ee72d92b2a47b43e564a4a79f0293560555a69cf76"; + sha512 = "d5b2631fc3076cc251cb82e6c0930f7890750a73902480033ad0b5ec91aecc6f15c01e1e79b88ee4b2e74588a76cd0017fa520175559e1e68a6edd4149cd556d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ro/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ro/firefox-68.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e53fbee87ed143d5f2f7c4190b648dfebf44881beac3ee866fbac2bb8170d08c2333b8ed634696c08dd18d26acc5bbf80b5dbe9544c5a6da48175acf4708d408"; + sha512 = "d88ea2b05b262e010b0e447f4480149ddc79874dcce3925d3768211d7016cff99a9a0aef594c7185eb81988edfa46497dc442a4d825358c821461cc0f689c593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ru/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ru/firefox-68.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "9a05d119cebb97b022ac038c36dbfd6ecf13054027b419ad37d07d6b6cb84e4bdf77c651603f88da62d116a046dec77e43c333ee370514ddcb63d53b1754c00c"; + sha512 = "cc28f64e1ba7aa4771667a09e3ef9a2dfbe1af3c3ba552f14d16bf338eaa178c32eaafa39b6c0592e690fc10325b88966f555283669d241fe05bef113e533c02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/si/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/si/firefox-68.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "fe70747cdf4329fd860a05ad8f69e452dce9a8a0a4e65c9ab84348b870a628746de1a74f66db42caa15da7ac5d34b071aba6095aacaa818859b041052f8b4df4"; + sha512 = "9119703b2edc30023b0bf81fdf6083a46544273a5b0dbe0f1d76c00020f1a093ea1df2592375bff9e81af1190f7fbd269f0387e311211a8d806e7519164b24af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sk/firefox-68.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "8c76b164b6c2e9431dd23131a46fc613e24896cc2d02d67dde78ad4f7d2dce4baa1e08bb9120c02a243743231a54eeea68e10f2d0e1c44442e53533482afde13"; + sha512 = "fababc6cd6644be1404ee1b6ab6f0c01c161b13539702a932e67062bc6d7ca350d0b7c88957d0617b404d892b93fff1b736d93a4061ca0b154e2cf3fbd0972ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sl/firefox-68.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "26ed90dc4b5e1dcff81301eeb75fd6729b0a94ad0993b438867b8ae4287a03c20efbc425b8130c948bba46e71c654e6aa410a28a20fd407ca922b77f166e0feb"; + sha512 = "5e16fd5446f742f259fcaaab1bf15e7d56cfd412065c268d625d87fb812312e6caffbdf0502d8d20bd9478bb4b2b3444604d8a1aea7a006c0dfe3d8120b2c1fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/son/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/son/firefox-68.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "11809822767088ab739e47b6774374d619384e4ee2a69690fa5624a6168c0a3fa763b85b573a1bbbd0b97f50c5738999307d91880cde14a4fb3c6ae17b484224"; + sha512 = "0a36b7350d7cff22bd583bf7d811fac358046ddb0b85da52750e1687d7b82487ccac8575472683302c9a814abd07f81b227db3f2ecc8562f5d069d95045ba7d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sq/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sq/firefox-68.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "22f699cc9a59332582149087418596dd8e6b138b1c7010344f4471396b3a69ebede79d924dfe5e025d82054f20f240356d4232e284d33f8805e4891bc7b30459"; + sha512 = "b18398395e0ea078117987704c962399a385e0ea2e4568291d8449d9fcf5f1784e4074b990e0e5e8a5b6b9dbd789772eeed689e722f4179e3f451064fb08ac92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sr/firefox-68.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b2431890e7cdf5e1563387d9c566beb3c083d81a0f11c5c1843788b7bceec927cc55bda1a92f605210aaf2960ab4bd0fd42e4d558749b5623eb7f3fab0d7800d"; + sha512 = "469ea3344ef2893333b7c967a72a08a86c24ce511f8d45f95ad159def204e2d5a2665829ddcf6783cb0602f0013f3924045410609b9e2a921f43c79750435648"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sv-SE/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sv-SE/firefox-68.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c2b7399f1b6f75440a725289df834af2defc77c773ba73f0b330689244167abcc32190e185ade9dd3c8340f6a06fa2e026c0d4c426e90471a75cb1e79b45a086"; + sha512 = "4d9080b2bb8d3dbabd2ba6a14d0db8e5a983f5ab077d80dc7ddf892a82c1508b1b9bfe9b346d009b95a1ae89f300e72e37479c905b70ad924fc9d1c34f1317d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ta/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ta/firefox-68.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "b29e0db021afcfb246f980a2f5afb434c52be5324985877d2ee547a097d17ec77a7ea3e2ac9c2dc558236090954b1cba4a0fcaa10698da1425dbd5e31406aa4d"; + sha512 = "347edc360548f3a254c1eeaec47f1ece912fc79a0c19d3d9a1e455ec847749d8d531aef8bb44e2875afc4618a1eabfb77aaf581788138bb0a8607a443699da91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/te/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/te/firefox-68.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "709ae0eeec912c6349bd2b41a5cd10bd58ee5279e50e70623be93d0fef1655c5e0ff74df47d60c6ecae5883c5b6102ad0a4d61924cd848973fbc10bbe112c18e"; + sha512 = "806a97bdf4030dd8de57f3e2af8e06d71ea17891f4cd08df3cb3e71bfef372f1029b78ec6a16bb6ec96dc5113a0e96616e2fb907e11c98b6f33c9b83f67d9c37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/th/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/th/firefox-68.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "032fb59d5a502d593c1ee5f05d51d0d2a88bd3dd081857e27c9d429ae337b37252a0f0bc0c261adc71b8b2b57aa7b4321ed8ce3bac04eeefabcf97ccec4b2f78"; + sha512 = "a453c97807c46eae98a1fef4184dfe06c3101240e5d20c389b9cfdaf4dfb4c2c3c38758d0451789d326c2d76249651c2d1a7aa4134e514b9de3ef966e4bed60c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/tr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/tr/firefox-68.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3ace64d030e0012f9acd06e242c52408f6b8407f65834d34b203910a18c459c6dd8a23e80d4b11b4d4792edb2ff71769c75e90ff919e80d7da71a2341115e571"; + sha512 = "79fc0d00870d27ea7485c5807c5e4753b036364f68f71b3a66e11b23e8a6f5498af35411d5baf1dcebbc8959b3ec1870faed90b136aec6a71ee2ccc59832cd3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/uk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/uk/firefox-68.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "730b747ccdb0b31738e2272f9763b9aad992e241dfee8d067122886b625a5b7f83d53fdcb8052a00ee68ac76512c8ab97097a640cbad0f308dcec1f4cd040503"; + sha512 = "87176598ed9df72c6b05a2469ff404520f8e4171ee42cfdecd4dd461c761bddaaf8735ec9a9d9e651299951a656dc9189c2bf91f2ad896ff387706aaf31614b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ur/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ur/firefox-68.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "d10f6a9f708f27c7d935f190332c7db7d789f72a005a6474e127e6061a1e49776734c6e1a90e84213d8734c2ba1ec39063cafd5518ba482dd82bac323034b883"; + sha512 = "761089a4b9a9df1e8aeb61567db383cc7f1068a56a857f9ddd9f306ae0eadd0f1fd0d911243b86dbd7cf755a1d0d9e2728f710d5e4855286c897fbf1bae3621c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/uz/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/uz/firefox-68.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "223fa76b020c0cb9aa9fc59344b0cb103088f2ae0c3fc8037f8a6c3055898312638769b51e98107864850b1286d11e711d4225b5bf570e0fb3f7c59ee740b197"; + sha512 = "16838912099255e703f45537810f9a125f162da46654356da5d7284cf5976af0ba47e77b5658f7a95ff63287379411356521fca2250daef3f8ec299231c561c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/vi/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/vi/firefox-68.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "e3d1a93bea5f9b7b02e43a54f36544e0e7f6cf5553c5d3e42ff5227396eb66e62570917c5a6317fa21da3510251efc9d3d3524bc64f19fcae590825c75ce6896"; + sha512 = "26c8651de12544aff98d6657bcd3dfce453d394dd0f4e6045d8a29d8ffeded020335bfc958984e1b79dcc4b8bf4c3b3a29c1b20fb62c0df7a6dc76478f72dc65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xh/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xh/firefox-68.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "661183377c558e2355b9ce220f73807818d25b82e9bfc05c013cd58bd35234d73d979a42542b16c46b1c3c3efac0d9524ca28bb9874ad9c969b24c2a96d601e9"; + sha512 = "222a0a22c6e41a6f755ba881097c2c354924bfb809f3a04b588853da667444f8c922fda9bea0f3c7bc82f46938f86810d2cbd5900960180a2a25f9cffaac9088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/zh-CN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/zh-CN/firefox-68.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "227ce1a00441fd3e5914143b00c2815544f989cc918e978700133c1232170a145fc2f0ce139989f3b9857387928439282f44bb735f4ee8dc7ed881fd006dfc62"; + sha512 = "3a3eea1dbb9c42c1740ee67b68e71ce84ef1f3f14a52c069a17956911464570429b3576e29ec7370a857dbcaec143bc4ae65e3f01e319b7ca065899e8f864eee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/zh-TW/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/zh-TW/firefox-68.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "211b738aaeb0716ab60cf2923be9a4cf6bc38f8536a32c05cf713f987249ed3a735fc6ce07689fd8181230039a4b2e2a367b72743730672856fe4b02e41444cd"; + sha512 = "a8d53ff606b7bc82dfbec77b299b8f69985472486706f79c960da988063a0e86d232eefb4734b8a624e97e9849fad3e36a483190b8cbc6c3210b2c2d79bd2b25"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index ee022e329f9f..97163ffa7620 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -8,6 +8,7 @@ , gnugrep , curl , gnupg +, runtimeShell , baseName ? "firefox" , basePath ? "pkgs/applications/networking/browsers/firefox-bin" , baseUrl @@ -18,7 +19,7 @@ let channel != "release"; in writeScript "update-${name}" '' - #!${stdenv.shell} + #!${runtimeShell} PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin set -eux pushd ${basePath} diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 1219f3bb895e..50b1a906519f 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -4,14 +4,14 @@ , isIceCatLike ? false, icversion ? null , isTorBrowserLike ? false, tbversion ? null }: -{ lib, stdenv, pkgconfig, pango, perl, python2, zip, libIDL +{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx , icu, libpng, jemalloc, glib -, autoconf213, which, gnused, cargo, rustc, llvmPackages -, rust-cbindgen, nodejs +, autoconf213, which, gnused, cargo, cargo_1_35, rustc, rustc_1_35, llvmPackages +, rust-cbindgen, nodejs, nasm, fetchpatch , debugBuild ? false ### optionals @@ -92,7 +92,14 @@ let browserPatches = [ ./env_var_for_system_dir.patch - ] ++ patches; + ] + ++ lib.optional (lib.versionAtLeast ffversion "63" && lib.versionOlder ffversion "69") + (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29 + name = "write_error-parallel_make.diff"; + url = "https://hg.mozilla.org/mozilla-central/raw-diff/562655fe/python/mozbuild/mozbuild/action/node.py"; + sha256 = "11d7rgzinb4mwl7yzhidjkajynmxgmffr4l9isgskfapyax9p88y"; + }) + ++ patches; in @@ -121,6 +128,12 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!isTorBrowserLike) [ nspr nss ] ++ lib.optional (lib.versionOlder ffversion "61") hunspell + + # >= 66 requires nasm for the AV1 lib dav1d + # yasm can potentially be removed in future versions + # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 + # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ + ++ lib.optional (lib.versionAtLeast ffversion "66") nasm ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 @@ -145,13 +158,19 @@ stdenv.mkDerivation rec { substituteInPlace js/src/jsmath.cpp --replace 'defined(HAVE___SINCOS)' 0 '' + lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) '' substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h' + '' + lib.optionalString (lib.versionAtLeast ffversion "68") '' + rm -rf obj-x86_64-pc-linux-gnu ''; nativeBuildInputs = - [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ] + [ autoconf213 which gnused pkgconfig perl python2 ] ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] + ++ lib.optional (lib.versionAtLeast ffversion "61.0") [ python3 ] ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ] + ++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0 + # Firefox >=68 requires at least rust 1.35 + ++ (if lib.versionAtLeast ffversion "68.0" then [ rustc_1_35 cargo_1_35 ] else [ cargo rustc ]) ++ extraNativeBuildInputs; preConfigure = '' @@ -188,7 +207,13 @@ stdenv.mkDerivation rec { # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, # please get your own set of keys. echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga - configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga") + # 60.5+ & 66+ did split the google API key arguments: https://bugzilla.mozilla.org/show_bug.cgi?id=1531176 + ${if (lib.versionAtLeast ffversion "60.6" && lib.versionOlder ffversion "61") || (lib.versionAtLeast ffversion "66") then '' + configureFlagsArray+=("--with-google-location-service-api-keyfile=$TMPDIR/ga") + configureFlagsArray+=("--with-google-safebrowsing-api-keyfile=$TMPDIR/ga") + '' else '' + configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga") + ''} '' + lib.optionalString (lib.versionOlder ffversion "58") '' cd obj-* '' @@ -239,8 +264,10 @@ stdenv.mkDerivation rec { # and wants these ++ lib.optionals isTorBrowserLike ([ "--with-tor-browser-version=${tbversion}" + "--with-distribution-id=org.torproject" "--enable-signmar" "--enable-verify-mar" + "--enable-bundled-fonts" ]) ++ flag alsaSupport "alsa" diff --git a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch index a0f581d84733..18d31356989a 100644 --- a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch +++ b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir.patch @@ -1,14 +1,6 @@ -diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -index 380c1c1..255539f 100644 ---- a/toolkit/xre/nsXREDirProvider.cpp -+++ b/toolkit/xre/nsXREDirProvider.cpp -@@ -306,7 +306,8 @@ GetSystemParentDirectory(nsIFile** aFile) - "/usr/lib/mozilla" - #endif - ); +--- a/toolkit/xre/nsXREDirProvider.cpp 2019-02-28 21:00:14.157543388 +0100 ++++ b/toolkit/xre/nsXREDirProvider.cpp 2019-02-28 21:01:28.731128320 +0100 +@@ -302 +302,2 @@ - rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); + const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR"); + rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast(dirname), false, getter_AddRefs(localDir)); - #endif - - if (NS_SUCCEEDED(rv)) { diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 09c1e5dd8f8e..4f5f1623bb9b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3 }: +{ lib, callPackage, fetchurl, fetchFromGitHub, fetchpatch }: let @@ -10,18 +10,16 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "65.0.1"; + ffversion = "68.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2crb46l5r0rwmzr1m8cn9f6xgajwcvansnplqg4kg91rf6x8q0zqzfnmyli9ccsbqvh7bqd31dmy14gwjskasqc4v103x9hchzshxnc"; + sha512 = "2xzakpb6mp9hjqkim353afv059i4zfpmhflhv3l3qzajgjz36cacbmp4bkn4cghinm8krhp8z02264ww0bcraryjjwn5q0dzljrha2w"; }; patches = [ ./no-buildconfig-ffx65.patch ]; - extraNativeBuildInputs = [ python3 ]; - meta = { description = "A web browser built from Firefox source tree"; homepage = http://www.mozilla.com/en-US/firefox/; @@ -67,10 +65,11 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - ffversion = "60.5.1esr"; + ffversion = "60.8.0esr"; + src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0fvjw5zd8a9ki0a8phavi6xxfxbck21vj0k8415c5sxv48fwhqdhlnv3wx7riss4rjy9dylhr5xpa99dj9q98z735r8fxb7s3x3vrjz"; + sha512 = "0332b6049b97e488e55a3b9540baad3bd159e297084e9a625b8492497c73f86eb3e144219dabc5e9f2c2e4a27630d83d243c919cd4f86b7f59f47133ed3afc54"; }; patches = [ @@ -91,6 +90,28 @@ rec { }; }; + firefox-esr-68 = common rec { + pname = "firefox-esr"; + ffversion = "68.0.2esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; + sha512 = "0dyjayrbcq6dg8vmzbf7303aixnhpd6r777chxpdvqq892rgvw5q4f8yfb6pr8j978hahn4dz968vzmi6sp40y3hf62hnzdqpzd2bx1"; + }; + + patches = [ + ./no-buildconfig-ffx65.patch + ]; + + meta = firefox.meta // { + description = "A web browser built from Firefox Extended Support Release source tree"; + }; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-68-unwrapped"; + versionSuffix = "esr"; + versionKey = "ffversion"; + }; + }; + } // (let iccommon = args: common (args // { @@ -236,20 +257,20 @@ in rec { gtk3Support = false; }; - tor-browser-8-0 = tbcommon rec { - ffversion = "60.5.1esr"; - tbversion = "8.0.6"; + tor-browser-8-5 = tbcommon rec { + ffversion = "60.8.0esr"; + tbversion = "8.5.4"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.5.1esr-8.0-1-slnos" - rev = "89be91fc7cbc420b7c4a3bfc36d2b0d500dd3ccf"; - sha256 = "022zjfwsdl0dkg6ck2kha4nf91xm3j9ag5n21zna98szg3x82dj1"; + # branch "tor-browser-60.8.0esr-8.5-1-slnos" + rev = "9ec7e4832a68ba3a77f5e8e21dc930a25757f55d"; + sha256 = "10x9h2nm1p8cs0qnd8yjp7ly5raxagqyfjn4sj2y3i86ya5zygb9"; }; }; - tor-browser = tor-browser-8-0; + tor-browser = tor-browser-8-5; }) diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix index 07ae2c040e6e..b03720f988a6 100644 --- a/pkgs/applications/networking/browsers/firefox/update.nix +++ b/pkgs/applications/networking/browsers/firefox/update.nix @@ -8,13 +8,14 @@ , gnugrep , curl , attrPath +, runtimeShell , baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/" , versionSuffix ? "" , versionKey ? "version" }: writeScript "update-${attrPath}" '' - #!${stdenv.shell} + #!${runtimeShell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]} url=${baseUrl} diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index bc3a1ed844a4..9e9d10df02a9 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2 +, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd , jrePlugin, icedtea_web , bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ @@ -75,6 +75,7 @@ let libs = lib.optional stdenv.isLinux udev ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos + ++ lib.optional gdkWayland libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash @@ -127,11 +128,12 @@ let --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ + --set SNAP_NAME "firefox" \ ${lib.optionalString gdkWayland '' --set GDK_BACKEND "wayland" \ ''}${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' + --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' '' } diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 6043744f296c..b0ae61c761df 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { gsettings-desktop-schemas glib gtk # needed for XDG_ICON_DIRS - gnome.defaultIconTheme + gnome.adwaita-icon-theme ]; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 290810198ade..131209033836 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr +{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas , gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr - (libsoup.override { gnomeSupport = true; }) gnome3.libpeas + (libsoup.override { gnomeSupport = true; }) libpeas glib-networking ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index c48c36ad7a06..66c20d91fcab 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "32.0.0.142"; + version = "32.0.0.238"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1g3c0hzpf6lwfvlh8h3fl1vwfxc909nkpvrymwlc3vi3zpqwv4r7" + "1f5i64nzkvxy20vi7kldaamwp6pi2zgmjiw061cgqrwf7hj45wkg" else - "14pyhynmjb88n5r9ds7v59vsrlzxfkr8zqnzgf6bj0h0x9grzhdv" + "09jvxqp83hpk89ak8flq14s3s3nhy3ary91jc6k47v325axh1cl9" else if arch == "x86_64" then - "102ixxh2sq7bmasnifm9arvlqqvmmm4bazzdppib3pz2yh4yy7m2" + "05gvssjdz43pvgivdngrf8qr5b30p45hr2sr97cyl6b87581qw9s" else - "1hg03fb4xc7h7lbx57wn1xvkhq096aijaxkb4b60wna04p62bdim"; + "06l7zhgh5rfxxw46b500zdgcqsk2h7kivng5b0b74s3vy7f0g270"; }; 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 dd7b931b9405..fd5ae81d2f84 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "32.0.0.142"; + version = "32.0.0.238"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1vp1nfys9pjmh3fmyp95yymmyvwrbmwjsmjhl5rnpwv5a0xn9nc6" + "1vhfjpwsmg96irfvz81ldzn2m4qcjnql5psg4cifjay423yxabvy" else - "05r1z87zpllyb2hvj0fbps39hvkx5jzsqafyg62am8qm9khzs2qh"; + "0am95xi2jasvxj5b2i12wzpvl3bvxli537k1i04698cg0na6x0y0"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix index 9a47e18fad12..b7118b49dae6 100644 --- a/pkgs/applications/networking/browsers/otter/default.nix +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -1,5 +1,5 @@ { stdenv, cmake, fetchFromGitHub -, qtbase, qtmultimedia, qtwebengine +, qtbase, qtmultimedia, qtwebengine, qtxmlpatterns , version ? "1.0.01" , sourceSha ? "1jw8bj3lcqngr0mqwvz1gf47qjxbwiyda7x4sm96a6ckga7pcwyb" }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qtmultimedia qtwebengine ]; + buildInputs = [ qtbase qtmultimedia qtwebengine qtxmlpatterns ]; meta = with stdenv.lib; { homepage = https://otter-browser.org; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 1be4f1c4c524..4eeef72a4e12 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.5.2"; + version = "1.6.2"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0ki19mynq91aih3kxhipnay3jmn56s7p6rilws0gq0k98li6a4my"; + sha256 = "1yzwrpqpghlpy2d7pbjgcb73dbngw835l4xbimz5aa90mvqkbwg1"; }; # Needs tox @@ -53,7 +53,13 @@ in python3Packages.buildPythonApplication rec { pyreadability pykeepass stem ]; + patches = [ + ./fix-restart.patch + ]; + postPatch = '' + substituteInPlace qutebrowser/app.py --subst-var-by qutebrowser "$out/bin/qutebrowser" + sed -i "s,/usr/share/,$out/share/,g" qutebrowser/utils/standarddir.py '' + lib.optionalString withPdfReader '' sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py diff --git a/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch b/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch new file mode 100644 index 000000000000..56f6bcebf280 --- /dev/null +++ b/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch @@ -0,0 +1,29 @@ +diff --git a/qutebrowser/app.py b/qutebrowser/app.py +index 2b6896b76..ee05f379d 100644 +--- a/qutebrowser/app.py ++++ b/qutebrowser/app.py +@@ -555,22 +555,8 @@ class Quitter: + args: The commandline as a list of strings. + cwd: The current working directory as a string. + """ +- if os.path.basename(sys.argv[0]) == 'qutebrowser': +- # Launched via launcher script +- args = [sys.argv[0]] +- cwd = None +- elif hasattr(sys, 'frozen'): +- args = [sys.executable] +- cwd = os.path.abspath(os.path.dirname(sys.executable)) +- else: +- args = [sys.executable, '-m', 'qutebrowser'] +- cwd = os.path.join( +- os.path.abspath(os.path.dirname(qutebrowser.__file__)), '..') +- if not os.path.isdir(cwd): +- # Probably running from a python egg. Let's fallback to +- # cwd=None and see if that works out. +- # See https://github.com/qutebrowser/qutebrowser/issues/323 +- cwd = None ++ args = ['@qutebrowser@'] ++ cwd = None + + # Add all open pages so they get reopened. + page_args = [] 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 cdee8111b549..4eeb65826721 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -39,7 +39,7 @@ # Wrapper runtime , coreutils , glibcLocales -, defaultIconTheme +, gnome3 , runtimeShell , shared-mime-info , gsettings-desktop-schemas @@ -89,7 +89,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.0.6"; + version = "8.5.4"; lang = "en-US"; @@ -99,7 +99,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 = "14i32r8pw749ghigqblnbr5622jh5wp1ivnwi71vycbgp9pds4f7"; + sha256 = "0nnzynk3nlnd847c8jjghs9anmr5a2hv7nk1qxigigxqa5vqy96z"; }; "i686-linux" = fetchurl { @@ -107,7 +107,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0g9sd104b6xnbl2j3gbq1ga6j2h0x3jccays0gpbd235bxpjs39a"; + sha256 = "1b34skl3hwvpy0r4l5ykgnnwhbz7cvly2gi9ib4h7lijjfafiys1"; }; }; in @@ -252,7 +252,7 @@ stdenv.mkDerivation rec { EOF WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - defaultIconTheme + gnome3.adwaita-icon-theme shared-mime-info ]} WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ @@ -302,10 +302,12 @@ stdenv.mkDerivation rec { # easily generated by firefox at startup. rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json} + # XDG + : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" + : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}" + ${optionalString pulseaudioSupport '' # Figure out some envvars for pulseaudio - : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" - : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}" : "\''${PULSE_SERVER:=\$XDG_RUNTIME_DIR/pulse/native}" : "\''${PULSE_COOKIE:=\$XDG_CONFIG_HOME/pulse/cookie}" ''} @@ -336,9 +338,9 @@ stdenv.mkDerivation rec { \ TMPDIR="\''${TMPDIR:-/tmp}" \ HOME="\$HOME" \ - XAUTHORITY="\''${XAUTHORITY:-}" \ + XAUTHORITY="\''${XAUTHORITY:-\$HOME/.Xauthority}" \ DISPLAY="\$DISPLAY" \ - DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \ + DBUS_SESSION_BUS_ADDRESS="\''${DBUS_SESSION_BUS_ADDRESS:-unix:path=\$XDG_RUNTIME_DIR/bus}" \\ \ XDG_DATA_HOME="\$HOME/.local/share" \ XDG_DATA_DIRS="$WRAPPER_XDG_DATA_DIRS" \ @@ -387,7 +389,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tor Browser Bundle built by torproject.org"; longDescription = tor-browser-bundle.meta.longDescription; - homepage = https://www.torproject.org/; + homepage = "https://www.torproject.org/"; platforms = attrNames srcs; maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ]; hydraPlatforms = []; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 8c8212e9e2c8..2c6940e037cd 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -340,9 +340,7 @@ stdenv.mkDerivation rec { `tor-browser-bundle` needs for the bundling using a much simpler patch. See the longDescription and expression of the `firefoxPackages.tor-browser` package for more info. ''; - homepage = https://torproject.org/; - license = licenses.free; - platforms = [ "x86_64-linux" ]; + inherit (tor-browser-unwrapped.meta) homepage platforms license; hydraPlatforms = [ ]; maintainers = with maintainers; [ joachifm ]; }; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ad145583d49c..9537f1365bd1 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "2.3.1440.41-1"; + version = "2.3.1440.60-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "0wrq7c0sw1b41bshwgzji4pwl0raj0l5h2r7gkcg952rcn0wl9bs"; + sha256 = "1vw4lyqs87cw7v1jy3dcsgnb56s61zl21q95a3kiavqw7412sips"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index b303bf2188bd..ec2646440b31 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi-ffmpeg-codecs"; - version = "72.0.3626.96"; + version = "72.0.3626.122"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - sha512 = "2hawkyydcd0b6ipfigkf5n6c1ha1vknaqd4mgw381pi0ayq8skxbjazqabfcg9gcj84cnksi8j4dylfcrbgrmlnmc479fix0m0xx7cl"; + sha512 = "1477g5dgi4m0zbiqwm9w6jqkmjfmgjlbl3qs9ljldx8bif8my1jbz4hzws954aqxyxdbf5rjpvmrrqqppk5347prvsyl37rbsndaaqf"; }; buildInputs = [ ]; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 3f019d177023..98d4e25ef872 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -1,48 +1,68 @@ -{ stdenv, fetchurl, makeDesktopItem, jre, makeWrapper }: +{ +stdenv +, makeWrapper +, makeDesktopItem +, fetchurl +, jre +}: let - desktopItem = makeDesktopItem { - categories = "Network;Development;WebDevelopment;Java;"; - desktopName = "Charles"; - exec = "charles %F"; - genericName = "Web Debugging Proxy"; - icon = "charles-proxy"; - mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace"; - name = "Charles"; - startupNotify = "true"; - }; + generic = { version, sha256, ... }@attrs: + let + desktopItem = makeDesktopItem { + categories = "Network;Development;WebDevelopment;Java;"; + desktopName = "Charles"; + exec = "charles %F"; + genericName = "Web Debugging Proxy"; + icon = "charles-proxy"; + mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace"; + name = "Charles"; + startupNotify = "true"; + }; -in stdenv.mkDerivation rec { - name = "charles-${version}"; - version = "4.2.7"; + attrs' = builtins.removeAttrs attrs ["version" "sha256"]; + in stdenv.mkDerivation rec { + name = "charles-${version}"; + inherit version; - src = fetchurl { - url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz"; + src = fetchurl { + url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz"; + inherit sha256; + }; + buildInputs = [ makeWrapper ]; + + installPhase = '' + makeWrapper ${jre}/bin/java $out/bin/charles \ + --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" + + for fn in lib/*.jar; do + install -D -m644 $fn $out/share/java/$(basename $fn) + done + + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + + mkdir -p $out/share/icons + cp -r icon $out/share/icons/hicolor + ''; + + meta = with stdenv.lib; { + description = "Web Debugging Proxy"; + homepage = https://www.charlesproxy.com/; + maintainers = [ maintainers.kalbasit ]; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; + }; + +in rec { + charles4 = (generic { + version = "4.2.7"; sha256 = "1nycw3wpbfwj4ijjaq5k0f4xipj8j605fs0yjzgl66gmv7r583rd"; - }; - - buildInputs = [ makeWrapper ]; - - installPhase = '' - makeWrapper ${jre}/bin/java $out/bin/charles \ - --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" - - for fn in lib/*.jar; do - install -D -m644 $fn $out/share/java/$(basename $fn) - done - - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications/ - - mkdir -p $out/share/icons - cp -r icon $out/share/icons/hicolor - ''; - - meta = with stdenv.lib; { - description = "Web Debugging Proxy"; - homepage = https://www.charlesproxy.com/; - maintainers = [ maintainers.kalbasit ]; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - }; + }); + charles3 = (generic { + version = "3.12.3"; + sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss"; + }); } + diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix index 6a83ac34f3f9..cd0ef728f83e 100644 --- a/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "heptio-ark-${version}"; - version = "0.9.6"; + version = "0.10.0"; goPackagePath = "github.com/heptio/ark"; @@ -10,10 +10,10 @@ buildGoPackage rec { rev = "v${version}"; owner = "heptio"; repo = "ark"; - sha256 = "0q353a6f3hvg1gr6rmg8pbqnkrbgjchdr7f6f9503l1qbyyf95fz"; + sha256 = "18h9hvp95va0hyl268gnzciwy1dqmc57bpifbj885870rdfp0ffv"; }; - postInstall = "rm $bin/bin/generate"; + postInstall = "rm $bin/bin/issue-template-gen"; meta = with stdenv.lib; { description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index c9edaae1e536..a521f394ebfb 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -1,9 +1,8 @@ - { stdenv, buildGoPackage, fetchFromGitHub, go-bindata }: buildGoPackage rec { name = "kops-${version}"; - version = "1.11.0"; + version = "1.11.1"; goPackagePath = "k8s.io/kops"; @@ -11,7 +10,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "1z67jl66g79q6v5kjy9qxx2xp656ybv5hrc10h3wmzy0b0n30s4n"; + sha256 = "0jia8dhawh786grnbpn64hvsdm6wz5p7hqir01q5xxpd1psnzygj"; }; buildInputs = [go-bindata]; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 597c2c183092..e8adfb09ac11 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.13.3"; + version = "1.13.9"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1fcp27c501ql4v7fl7rl5qyjlw1awk139rwwm0jqdpgh3sd22l2z"; + sha256 = "0dnwxd38ixl5czv2g1qix3gfxmyh2ig0zbalgvc3lq9c57wd0yg8"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index c44b7ac1dc76..4263abf0771d 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -14,9 +14,9 @@ let in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.30.0"; + version = "1.0.0"; - kubernetesVersion = "1.11.2"; + kubernetesVersion = "1.14.0"; goPackagePath = "k8s.io/minikube"; @@ -24,7 +24,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "02jxwh8qrvjn31rzjwx23908nd1i592drfdykxbc5b6a62fwp02z"; + sha256 = "170iy0h27gkz2hg485rnawdw069gxwgkwsjmfj5yag2kkgl7gxa3"; }; buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet; @@ -35,7 +35,9 @@ in buildGoPackage rec { go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... - ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//") + VERSION_MAJOR=$(grep "^VERSION_MAJOR" Makefile | sed "s/^.*\s//") + VERSION_MINOR=$(grep "^VERSION_MINOR" Makefile | sed "s/^.*\s//") + ISO_VERSION=v$VERSION_MAJOR.$VERSION_MINOR.0 ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//") KUBERNETES_VERSION=${kubernetesVersion} @@ -66,7 +68,7 @@ in buildGoPackage rec { homepage = https://github.com/kubernetes/minikube; description = "A tool that makes it easy to run Kubernetes locally"; license = licenses.asl20; - maintainers = with maintainers; [ ebzzry copumpkin ]; + maintainers = with maintainers; [ ebzzry copumpkin vdemeester ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index bb10349470f6..a8161ed30771 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -4,10 +4,10 @@ }: let - version = "1.31.0"; + version = "1.33.0"; # Update these on version bumps according to Makefile - centOsIsoVersion = "v1.14.0"; + centOsIsoVersion = "v1.15.0"; openshiftVersion = "v3.11.0"; in buildGoPackage rec { @@ -18,7 +18,7 @@ in buildGoPackage rec { owner = "minishift"; repo = "minishift"; rev = "v${version}"; - sha256 = "0v5hngfz393yi3x4c328g5bjazw02jr59ljqh6ws0j6wzxzm8jxf"; + sha256 = "0n3pj410bgjblv27p55piln0vi618mnyzzswcyfc2v73bfnzrydf"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 765d16844991..9e55c2f8a0f3 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://www.nomadproject.io/; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mpl20; maintainers = with maintainers; [ rushmorem pradeepchhetri ]; }; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index f730329d0725..dd57add14af9 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -33,8 +33,6 @@ in buildGoPackage rec { goPackagePath = "github.com/openshift/origin"; - # go > 1.10 - # [FATAL] [14:44:02+0000] Please install Go version go or use PERMISSIVE_GO=y to bypass this check. buildInputs = [ which rsync go-bindata kerberos clang ]; patchPhase = '' @@ -83,6 +81,6 @@ in buildGoPackage rec { license = licenses.asl20; homepage = http://www.openshift.org; maintainers = with maintainers; [offline bachp moretea]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix index bb179606b367..052797db2f3f 100644 --- a/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { description = "Agent to enable remote management of your Amazon EC2 instance configuration"; homepage = "https://github.com/aws/amazon-ssm-agent"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 0922bd7b8a9f..c542de912f34 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -24,6 +24,7 @@ let }; in { + elasticsearch = callPackage ./elasticsearch {}; gandi = callPackage ./gandi {}; ibm = callPackage ./ibm {}; libvirt = callPackage ./libvirt {}; diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix new file mode 100644 index 000000000000..b9f28cbd6cb0 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: +buildGoPackage rec { + name = "terraform-provider-elasticsearch-${version}"; + version = "0.6.0"; + + goPackagePath = "github.com/phillbaker/terraform-provider-elasticsearch"; + + # ./deps.nix was generated using the work-around described in: + # https://github.com/kamilchm/go2nix/issues/19 + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "phillbaker"; + repo = "terraform-provider-elasticsearch"; + rev = "v${version}"; + sha256 = "04i7jwhm1mg4m8p7y6yg83j76fx0ncallzbza1g1wc5cjjbkvgs2"; + }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/terraform-provider-elasticsearch{,_v${version}}"; + + meta = with stdenv.lib; { + description = "Terraform provider for elasticsearch"; + homepage = "https://github.com/phillbaker/terraform-provider-elasticsearch"; + license = licenses.mpl20; + maintainers = with maintainers; [ basvandijk ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/deps.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/deps.nix new file mode 100644 index 000000000000..b89e20cd4864 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/deps.nix @@ -0,0 +1,75 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "512bdaf8bec30abd545b440447cebb57b53d3af9"; + sha256 = "1j7kjk6i8vg4nwlsxjypqz3gc9j1a9x8r3bg99w1x2ap3vrh7sl8"; + }; + } + { + goPackagePath = "github.com/deoxxa/aws_signing_client"; + fetch = { + type = "git"; + url = "https://github.com/deoxxa/aws_signing_client"; + rev = "c20ee106809eacdffcc81ac7cb984261f8e3067e"; + sha256 = "01cw1f6hzgx1df730vdwd7vhbn7yl6zv3sr42iz4sd1dcdqwzlkq"; + }; + } + { + goPackagePath = "github.com/hashicorp/terraform"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/terraform"; + rev = "dbce85d85ff0beebc660b3d1805b4ef15361af00"; + sha256 = "17kd3ln1i40qb8fll5918rvgackzf1ibmr7li1p9vky4ki3iwr0l"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; + sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; + }; + } + { + goPackagePath = "github.com/olivere/elastic"; + fetch = { + type = "git"; + url = "https://github.com/olivere/elastic"; + rev = "2a5234d20b058173aaea6835e671fc83eee777b0"; + sha256 = "08r62d29m6f7d5hwb9zm5b612wbvzd9sn97nb48q174gbk8685yw"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; + sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; + }; + } + { + goPackagePath = "gopkg.in/olivere/elastic.v5"; + fetch = { + type = "git"; + url = "https://gopkg.in/olivere/elastic.v5"; + rev = "b708306d715bea9b983685e94ab4602cdc9f988b"; + sha256 = "0ks0h0ik0aqjm8dm2imbyd1z7rfmqiwilf3bc9nnplp9hc07471y"; + }; + } + { + goPackagePath = "gopkg.in/olivere/elastic.v6"; + fetch = { + type = "git"; + url = "https://gopkg.in/olivere/elastic.v6"; + rev = "e6cae211ee802eab70248a68fe2cb03b616744c9"; + sha256 = "0nbf4mr31gxm4zn5w362y22mh98ckl3d0bxli4f3rwx6zw12arfg"; + }; + } +] diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a9d8faf62b56..abf9f889c6ce 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -88,8 +88,8 @@ let plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"]; in rec { terraform_0_11 = pluggable (generic { - version = "0.11.11"; - sha256 = "1hsi5sibs0fk1620wzzxrc1gqjs6slqrjvlqcgvgg1yl22q9g7f5"; + version = "0.11.14"; + sha256 = "1bzz5wy13gh8j47mxxp6ij6yh20xmxd9n5lidaln3mf1bil19dmc"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.0-alpha4"; - sha256 = "16cwqxxb19m91d7rx7awri1awz7d8cfnrv0rbql9rbg5qjyqxcp9"; + version = "0.12.3"; + sha256 = "190bvd1q6h2hgi6s2ca6wnaib4k90rjq5g5l93vcbfjcczcgbv5q"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 113d6a2e5f46..34ebc84cea28 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -20,6 +20,6 @@ buildGoPackage rec { homepage = https://github.com/odeke-em/drive; description = "Google Drive client for the commandline"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index ce3141f0ef3a..234975681a1d 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -36,7 +36,7 @@ buildFHSUserEnv { libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender libXxf86vm libxcb xkeyboardconfig curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt - procps zlib mesa libxshmfence libpthreadstubs + procps zlib mesa libxshmfence libpthreadstubs libappindicator ]; extraInstallCommands = '' diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 87e0584c931e..708d3c1ed800 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: +{ stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation rec { - name = "esniper-2.35.0"; + name = "esniper-2.35.0-15-g91d2665"; - src = fetchurl { - url = "mirror://sourceforge/esniper/${stdenv.lib.replaceStrings ["."] ["-"] name}.tgz"; - sha256 = "04iwjb42lw90c03125bjdpnm0fp78dmwf2j35r7mah0nwcrlagd9"; - }; + src = fetchgit { + url = "https://git.code.sf.net/p/esniper/git"; + rev = "91d2665539beaeac21fb4c0cc2fd39c44e771ed7"; + sha256 = "0dixcsvbcj9jbfjfv50nwvw7w90c4s6gnkrpilaan984i6y45rw0"; + }; buildInputs = [ openssl curl ]; diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index a7cfc6058244..980173edd432 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,44 +1,33 @@ -{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala_0_40, gettext, python3 +{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala, gettext, python3 , appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook -, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo +, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas +, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: stdenv.mkDerivation rec { pname = "feedreader"; - version = "2.6.2"; + version = "2.8.2"; src = fetchFromGitHub { owner = "jangernert"; repo = pname; rev = "v${version}"; - sha256 = "1x5milynfa27zyv2jkzyi7ikkszrvzki1hlzv8c2wvcmw60jqb8n"; + sha256 = "1qm7scrz8xm68zizcfn13ll4ksdd004fahki7gbwqagsr1fg62y8"; }; - patches = [ - # See: https://github.com/jangernert/FeedReader/pull/842 - (fetchpatch { - url = "https://github.com/jangernert/FeedReader/commit/f4ce70932c4ddc91783309708402c7c42d627455.patch"; - sha256 = "076fpjn973xg2m35lc6z4h7g5x8nb08sghg94glsqa8wh1ig2311"; - }) - ]; - nativeBuildInputs = [ - meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils - python3 glibcLocales wrapGAppsHook + meson ninja pkgconfig vala gettext appstream-glib desktop-file-utils + libxml2 python3 wrapGAppsHook ]; buildInputs = [ - curl glib json-glib libnotify libsecret sqlite gumbo - ] ++ (with gnome3; [ - gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts + curl glib json-glib libnotify libsecret sqlite gumbo gtk3 + libgee libpeas gnome3.libsoup librest webkitgtk gnome3.gnome-online-accounts gsettings-desktop-schemas - ]) ++ (with gst_all_1; [ + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]); - # vcs_tag function fails with UnicodeDecodeError - LC_ALL = "en_US.UTF-8"; - postPatch = '' patchShebangs meson_post_install.py ''; @@ -47,7 +36,7 @@ stdenv.mkDerivation rec { description = "A modern desktop application designed to complement existing web-based RSS accounts"; homepage = https://jangernert.github.io/FeedReader/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo worldofpeace ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 49ac1d26dda6..ad3d19f18d2f 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext -, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: +, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle +, makeWrapper +}: let version = "3.31.0"; in stdenv.mkDerivation { @@ -17,7 +19,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus gnutls wxGTK30 libidn tinyxml gettext xdg_utils gtk2 sqlite - pugixml libfilezilla nettle ]; + pugixml libfilezilla nettle makeWrapper ]; + + enableParallelBuilding = true; + + postInstall = '' + wrapProgram $out/bin/filezilla --set FZ_DATADIR $out + ''; meta = with stdenv.lib; { homepage = https://filezilla-project.org/; diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index 9252b95a00c7..25ec5d29613a 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3 -, gtk3, gnome3, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: +, gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "taxi"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ pantheon.granite - gnome3.libgee + libgee gtk3 libsecret libsoup diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index f39fac2605a4..d5ef1d7beaab 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://github.com/prasmussen/gdrive; description = "A command line utility for interacting with Google Drive"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; maintainers = [ maintainers.rzetterberg ]; }; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 8daa5d166c52..8207c2cecfa4 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -1,9 +1,9 @@ { stable, branch, version, sha256Hash }: -{ stdenv, python36, fetchFromGitHub }: +{ stdenv, python3, fetchFromGitHub, fetchpatch }: let - python = if stable then python36.override { + python = if stable then python3.override { packageOverrides = self: super: { async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec { version = "2.0.1"; @@ -31,7 +31,7 @@ let ++ stdenv.lib.optional (pythonOlder "3.5") typing; }); }; - } else python36; + } else python3; in python.pkgs.buildPythonPackage { pname = "gns3-server"; @@ -44,9 +44,14 @@ in python.pkgs.buildPythonPackage { sha256 = sha256Hash; }; + postPatch = '' + # "typing" is only required for Python 3.4 and breaks Python 3.7: + sed -iE "s/.*typing.*//" requirements.txt + ''; + propagatedBuildInputs = with python.pkgs; [ aiohttp-cors yarl aiohttp multidict - jinja2 psutil zipstream raven jsonschema typing + jinja2 psutil zipstream raven jsonschema (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) ] ++ stdenv.lib.optional (!stable) python.pkgs.distro; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 1e88456e6b24..86fb3d7de2c1 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -1,5 +1,5 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, - cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook }: + cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: buildGoPackage rec { name = "coyim-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gtk3 gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { description = "a safe and secure chat client"; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 0ee051a87fbd..6e57ae85ef57 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -2,7 +2,7 @@ , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon -, libnotify, libsoup +, libnotify, libsoup, libgee , libgcrypt , epoxy , at-spi2-core @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { gobject-introspection glib-networking glib - gnome3.libgee - gnome3.defaultIconTheme + libgee + gnome3.adwaita-icon-theme sqlite gdk_pixbuf gtk3 diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2f563cc07a85..1eba34423426 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,12 +7,11 @@ stdenv.mkDerivation rec { pname = "discord"; - version = "0.0.8"; - name = "${pname}-${version}"; + version = "0.0.9"; src = fetchurl { url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; - sha256 = "1p786ma54baljs0bw8nl9sr37ypbpjblcndxsw4djgyxkd9ii16r"; + sha256 = "1i0f8id10rh2fx381hx151qckvvh8hbznfsfav8w0dfbd1bransf"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 18d593bbdecb..0fea8f0574b2 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool evolution-data-server gnome-doc-utils avahi libsigcxx gtk dbus-glib libnotify libXext xorgproto sqlite - gnome3.libsoup glib gnome3.defaultIconTheme boost + gnome3.libsoup glib gnome3.adwaita-icon-theme boost autoreconfHook pkgconfig libxml2 unixODBC db nspr nss zlib libsecret libXrandr which libxslt libtasn1 gmp nettle makeWrapper ] diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index cf4e6358dff3..8c1af783602a 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, gettext, wrapGAppsHook # Native dependencies -, python3, gtk3, gobject-introspection, defaultIconTheme +, python3, gtk3, gobject-introspection, gnome3 # Test dependencies , xvfb_run, dbus @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { ''; buildInputs = [ - gobject-introspection gtk3 defaultIconTheme + gobject-introspection gtk3 gnome3.adwaita-icon-theme ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ] ++ lib.optional enableSecrets libsecret ++ lib.optional enableSpelling gspell diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 12348fe548c7..8b6863384b3f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -62,7 +62,7 @@ let unwrapped = stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/pidgin \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index ae2f6f103049..e131e4c7a3ca 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid , cmocka, libmicrohttpd, stabber, expat, libmesode +, autoconf-archive , autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null , notifySupport ? true, libnotify ? null, gdk_pixbuf ? null @@ -32,7 +33,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook glibcLocales pkgconfig ]; + nativeBuildInputs = [ + autoreconfHook autoconf-archive glibcLocales pkgconfig + ]; buildInputs = [ expect readline libuuid glib openssl expat ncurses libotr @@ -58,12 +61,6 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.utf8"; - NIX_CFLAGS_COMPILE = [ ] - ++ optionals pythonPluginSupport [ "-I${python}/include/${python.libPrefix}" ]; - - LDFLAGS = [ ] - ++ optionals pythonPluginSupport [ "-L${python}/lib" "-l${python.libPrefix}" ]; - meta = { description = "A console based XMPP client"; longDescription = '' diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 29ed30dd27f6..a9ee4dd6aea2 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "rambox-bare-${version}"; - version = "0.6.3"; + version = "0.6.9"; src = fetchFromGitHub { owner = "ramboxapp"; repo = "community-edition"; rev = version; - sha256 = "1ghk29d0x6i3j8b1b4xxgyf961lp17qsvvhnilnkh1nhmvxpwmw5"; + sha256 = "1h44srl2gzkhjaazpwz1pwy4dp5x776fc685kahlvjlsfls0fvy9"; }; nativeBuildInputs = [ nodejs-8_x ruby sencha ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit src; nodejs = nodejs-8_x; - sha256 = "03h1kfiaflwbrvcd8v0bsymn7n2dxi3yj4pxkwcigqg4jgcf56k6"; + sha256 = "0qsgr8cq81yismal5sqr02skakqpynwwzk5s98dr5bg91y361fgy"; }; patches = [ ./isDev.patch ]; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 5a2d3b220327..8453f5811da5 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "1.0.1"; + version = "1.2.1"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0p2aj8zj1ynn75g0rjyx7dkhvcmvh3d38wpx0hf4fvg9q13vby85"; + sha256 = "1h96c4yy06ag5lmsbm5h2ws1l7sp4qm5dcchw25k3937fdhwq840"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 668f466cf976..2c4c99d3374f 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -2,7 +2,7 @@ , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib -, cups, expat, udev, libnotify +, cups, expat, udev, libnotify, libuuid # Unfortunately this also overwrites the UI language (not just the spell # checking language!): , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" @@ -37,6 +37,7 @@ let gtk3 pango libnotify + libuuid libX11 libXScrnSaver libXcomposite @@ -56,11 +57,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.21.2"; + version = "1.26.2"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0nr9d4z9c451nbzhjz3a1szx490rw1r01qf84xw72z7d7awn25ci"; + sha256 = "08qx7k82x6ybqi3lln6ixzmdz4sr8yz8vfx0y408b85wjfc7ncjk"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 49e5a12d447c..4e57abf84fe4 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, dpkg , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3 -, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg }: +, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg +, at-spi2-atk }: let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.32.0.44"; + version = "8.50.0.38"; rpath = stdenv.lib.makeLibraryPath [ alsaLib atk + at-spi2-atk cairo cups curl @@ -56,7 +58,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "0yzh4bmv8mrfp0ml9nhcpcy0lhi8jp1fnmnxy0krvnphkp8750c7"; + sha256 = "1g0aacp4qgzp3018w1s685yr3ssqlw0z2x6ifrj01k4ig82jfkn6"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; @@ -97,8 +99,7 @@ in stdenv.mkDerivation { # Fix the desktop link substituteInPlace $out/share/applications/skypeforlinux.desktop \ - --replace /usr/bin/ $out/bin/ \ - --replace /usr/share/ $out/share/ + --replace /usr/bin/ $out/bin/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index ece9c1089fad..76880c92c133 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -5,7 +5,7 @@ let - version = "3.3.7"; + version = "3.3.8"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -48,7 +48,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1q3866iaby8rqim8h2m398wzi0isnnlsxirlq63fzz7a4g1hnc8p"; + sha256 = "02435zvpyr95fljx3xgqz0b0npim1j0611p4rc1azwgdf8hjn11p"; } else throw "Slack is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix index 5dd8bf5f69ab..884bf415a11b 100644 --- a/pkgs/applications/networking/instant-messengers/spectral/default.nix +++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix @@ -1,33 +1,49 @@ { stdenv, fetchgit -, pkgconfig +, pkgconfig, makeWrapper , qmake, qtbase, qtquickcontrols2, qtmultimedia , libpulseaudio # Not mentioned but seems needed , qtgraphicaleffects -# Unsure but needed by similar -, qtdeclarative, qtsvg +, qtdeclarative }: -stdenv.mkDerivation rec { - name = "spectral-${version}"; - version = "2018-09-24"; +let + # Following "borrowed" from yubikey-manager-qt + qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}"; + + inherit (stdenv) lib; + + qml2ImportPath = lib.concatMapStringsSep ":" qmlPath [ + qtbase.bin qtdeclarative.bin qtquickcontrols2.bin qtgraphicaleffects qtmultimedia + ]; + +in stdenv.mkDerivation rec { + pname = "spectral"; + version = "2019-03-03"; src = fetchgit { url = "https://gitlab.com/b0/spectral.git"; - rev = "c9d1d6887722860a52b597a0f74d0ce39c8622e1"; - sha256 = "1ym8jlqls4lcq5rd81vxw1dni79fc6ph00ip8nsydl6i16fngl4c"; + rev = "0473f25d38a064ee4e18203ec16eeae84fea4866"; + sha256 = "1n09ginw6g0p42xj3zgxm52dvyyvj5psllv70vx21i50lvkbh9rw"; fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig qmake ]; - buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative qtsvg ] + qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ]; + + postInstall = '' + wrapProgram $out/bin/spectral \ + --set QML2_IMPORT_PATH "${qml2ImportPath}" + ''; + + nativeBuildInputs = [ pkgconfig qmake makeWrapper ]; + buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ] ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio; meta = with stdenv.lib; { description = "A glossy client for Matrix, written in QtQuick Controls 2 and C++"; homepage = https://gitlab.com/b0/spectral; license = licenses.gpl3; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; linux; maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix index 3c9157081d3d..2b744c61ccb5 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchgit, bash, libconfig, libevent, openssl, - readline, zlib, lua5_2, python, pkgconfig, jansson +{ stdenv, fetchgit, bash, libconfig, libevent, openssl +, readline, zlib, lua5_2, python, pkgconfig, jansson +, runtimeShell }: stdenv.mkDerivation rec { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { cp ./bin/telegram-cli $out/bin/telegram-wo-key cp ./tg-server.pub $out/ cat > $out/bin/telegram-cli < libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "2.7.162522.0121"; + version = "2.8.183302.0415"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "01i4g4kmawk3mclifh4bwcqpdnbvrz0sz49b6l33n0k5ysky20r1"; + sha256 = "07afq614fy09mjymmv3cf8vwa8ps78s2s4909g1a2rwvgkj8bw2x"; }; }; diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index 23c9d7df8120..45835248d0d8 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/pkgs/applications/networking/ipget/default.nix @@ -2,25 +2,25 @@ buildGoPackage rec { name = "ipget-${version}"; - version = "0.2.5"; + version = "0.3.2"; rev = "v${version}"; goPackagePath = "github.com/ipfs/ipget"; - + extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "1d4w8zl5mcppn3d4bl7qdkiqlf8gi3z2a62nygx17bqpa3da8cf3"; + sha256 = "07l9hpkhk5phr95zp1l5wd3ii38bw91hy4dlw2rsfbzcsc8bq4s8"; }) ]; - + goDeps = ../../../tools/package-management/gx/deps.nix; src = fetchFromGitHub { owner = "ipfs"; repo = "ipget"; inherit rev; - sha256 = "0a8yxqhl469ipiznrgkp3yi1xz3xzcbpx60wabqppq8hccrdiybk"; + sha256 = "1ljf5ddvc1p5swmgn4m1ivfj74fykk56myk2r9c4grdjzksf4a15"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 7802a898d4c7..5c345f08c36b 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }: stdenv.mkDerivation rec { - version = "1.1.2"; + version = "1.1.3"; name = "irssi-${version}"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "0jbhd4aad3bn61svnb2rwa4dwj8qyrb2dmzribi2hfn1f719wzfv"; + sha256 = "05x4kgprbbdhiyvdrch9gyaal6qjivxbsjm8285ng3hlps03yjdj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index d52d8b6b31e4..6bdade7198ab 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -10,6 +10,7 @@ , rubySupport ? true, ruby , tclSupport ? true, tcl , extraBuildInputs ? [] +, fetchpatch }: let @@ -27,14 +28,22 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.3"; + version = "2.4"; name = "weechat-${version}"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0mi4pfnyny0vqc35r0scn6yy21y790a5iwq8ms7kch7b7z11jn9w"; + sha256 = "1z80y5fbrb56wdcx9njrf203r8282wnn3piw3yffk5lvhklsz9k1"; }; + patches = [ + (fetchpatch { + url = https://github.com/weechat/weechat/commit/6a9937f08ad2c14aeb0a847ffb99e652d47d8251.patch; + sha256 = "1blhgxwqs65dvpw3ppxszxrsg02rx7qck1w71h61ljinyjzri3bp"; + excludes = [ "ChangeLog.adoc" ]; + }) + ]; + outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix index faf069cebf14..81073222c2b4 100644 --- a/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, lib, runCommand, writeScriptBin, buildEnv -, pythonPackages, perlPackages +, pythonPackages, perlPackages, runtimeShell }: weechat: @@ -60,7 +60,7 @@ let in "${scripts};${init}"; mkWeechat = bin: (writeScriptBin bin '' - #!${stdenv.shell} + #!${runtimeShell} export WEECHAT_EXTRA_LIBDIR=${pluginsDir} ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init} diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 0139a3f3a93d..be010c471790 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt }: +{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, makeWrapper }: stdenv.mkDerivation rec { name = "linssid-${version}"; @@ -9,25 +9,29 @@ stdenv.mkDerivation rec { sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkgconfig qmake makeWrapper ]; buildInputs = [ qtbase qtsvg boost qwt ]; patches = [ ./0001-unbundled-qwt.patch ]; postPatch = '' + sed -e "s|/usr/include/qt5.*$|& ${qwt}/include|" -i linssid-app/linssid-app.pro sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \ -e "s|/usr|$out|g" \ -i linssid-app/linssid-app.pro linssid-app/linssid.desktop sed -e "s|\.\./\.\./\.\./\.\./usr|$out|g" -i linssid-app/*.ui - sed -e "s|iwlist|${wirelesstools}/sbin/iwlist|g" -i linssid-app/Getter.cpp - sed -e "s|iw dev|${iw}/sbin/iw dev|g" -i linssid-app/MainForm.cpp - # Remove bundled qwt rm -fr qwt-lib ''; + postInstall = '' + wrapProgram $out/bin/linssid \ + --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} \ + --prefix PATH : ${stdenv.lib.makeBinPath [ wirelesstools iw ]} + ''; + meta = with stdenv.lib; { description = "Graphical wireless scanning for Linux"; homepage = https://sourceforge.net/projects/linssid/; diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index bdf39de0651c..29f44e53333a 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "afew"; - version = "1.3.0"; + version = "2.0.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0105glmlkpkjqbz350dxxasvlfx9dk0him9vwbl86andzi106ygz"; + sha256 = "0j60501nm242idf2ig0h7p6wrg58n5v2p6zfym56v9pbvnbmns0s"; }; nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ]; @@ -15,20 +15,23 @@ pythonPackages.buildPythonApplication rec { pythonPackages.notmuch chardet dkimpy ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32; - postBuild = '' - make -C docs man - ''; - - postInstall = '' - mandir="$out/share/man/man1" - mkdir -p "$mandir" - cp docs/build/man/* "$mandir" - ''; - makeWrapperArgs = [ ''--prefix PATH ':' "${notmuch}/bin"'' ]; + outputs = [ "out" "doc" ]; + + postBuild = '' + python setup.py build_sphinx -b html,man + ''; + + postInstall = '' + install -D -v -t $out/share/man/man1 build/sphinx/man/* + mkdir -p $out/share/doc/afew + cp -R build/sphinx/html/* $out/share/doc/afew + ''; + + meta = with stdenv.lib; { homepage = https://github.com/afewmail/afew; description = "An initial tagging script for notmuch mail"; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 006684ecc102..41f3a271a699 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable +, gtkmm3, libpeas, gsettings-desktop-schemas , makeWrapper, python3, python3Packages , vim ? vim_configurable.override { features = "normal"; @@ -21,10 +22,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas - python3 python3Packages.pygobject3 - notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme - glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]); + buildInputs = [ + gtkmm3 gmime3 webkitgtk libsass libpeas + python3 python3Packages.pygobject3 + notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme + glib-networking protobuf + ] ++ (if vim == null then [] else [ vim ]); postPatch = '' sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 2b62db069bc9..6c39dc78e57a 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -18,13 +18,14 @@ in pythonPackages.buildPythonApplication rec { }; buildInputs = [ - gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer + gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3; nativeBuildInputs = [ + gettext wrapGAppsHook ]; diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 86f945f369a0..6356fcfc2094 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "mblaze-${version}"; - version = "0.4"; + version = "0.5"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,11 +10,15 @@ stdenv.mkDerivation rec { owner = "chneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "15ac213a17mxni3bqvzxhiln65s4almrlmv72bbcgi7cymb303rp"; + sha256 = "0fyvydafpz7vmwgn7hc4drm9sb7367smrd07wfyizpas0gmxw2j8"; }; makeFlags = "PREFIX=$(out)"; + postInstall = '' + install -Dm644 -t $out/share/zsh/site-functions contrib/_mblaze + ''; + meta = with stdenv.lib; { homepage = https://github.com/chneukirchen/mblaze; description = "Unix utilities to deal with Maildir"; diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index 6e2e8d58c676..88e573f6cf42 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, unzip, jre }: +{ stdenv, fetchurl, makeWrapper, unzip, jre, runtimeShell }: let version = "1.9"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { mv $dir/${uname}/* $dir rmdir $dir/${uname} cat <<_EOF > $out/bin/msgviewer - #!${stdenv.shell} -eu + #!${runtimeShell} -eu exec ${stdenv.lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@" _EOF chmod 755 $out/bin/msgviewer diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 3afabb8bafb1..dde0d480391b 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "08w7lbhj5ba2zkjcd0cxkgfiy9y82yhg731xjg9i9292kz1x8p6s"; + sha256 = "0h8rmcc62n1pagm7mjjccd5fxyhhi4vbvp8m88digkdf5z0g8hm5"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index a8c322b42b83..0da451ed51e2 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl -, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap +, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell }: let muttWrapper = writeScript "mutt" '' - #!${stdenv.shell} -eu + #!${runtimeShell} -eu echo 'The neomutt project has renamed the main binary from `mutt` to `neomutt`.' echo "" diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 2fff46a17373..b6d552d96d50 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { description = "Mail indexer"; homepage = https://notmuchmail.org/; license = licenses.gpl3; - maintainers = with maintainers; [ chaoflow flokli garbas the-kenny ]; + maintainers = with maintainers; [ flokli garbas the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index ed798ee92331..7f32e45f5d31 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -30,7 +30,7 @@ , libcanberra-gtk2 , libgnome , libgnomeui -, defaultIconTheme +, gnome3 , libGLU_combined , nspr , nss @@ -41,6 +41,7 @@ , gnused , gnugrep , gnupg +, runtimeShell }: # imports `version` and `sources` @@ -117,7 +118,7 @@ stdenv.mkDerivation { stdenv.cc.cc ]; - buildInputs = [ gtk3 defaultIconTheme ]; + buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ makeWrapper ]; @@ -159,7 +160,7 @@ stdenv.mkDerivation { ''; passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { - inherit name stdenv writeScript xidel coreutils gnused gnugrep curl gnupg; + inherit name stdenv writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; baseName = "thunderbird"; channel = "release"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 1baa173010ad..8e1f2a0f65f8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,585 +1,585 @@ { - version = "60.5.1"; + version = "60.8.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ar/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ar/thunderbird-60.8.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "42bba29f92dd86f1dbbb0ffd2e13c464b62b418c387f83167e82f9a2d6f4953329bb3cc772dc1d2dac10471c1ca1004f17f0923160485802fb8676677ac73912"; + sha512 = "a10386c0c55e52571c5b922a1531a891a98caa9a1b118ffa6e5e0655b838c207ba2638988d6fdeeb62135bbd19b071f9c2dfd2c52379e4f8ca2012c17aa5a065"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ast/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ast/thunderbird-60.8.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "3e15886ac06c83d33d33dd49afd4256ae52ccaf17a9b5cab69fde9ea4598803a4e8b8048f1132d7f07d6fc15ae65e272ce1ded92adfbffca0c9ca28d56904483"; + sha512 = "fecf4367234a794e22ccc6665622bf083bbaf8ecb1f8e03bf64c2bfa91028ff6a02497ae5ebdf474b4073fff121b23a55d8373ce16e282b9630bf6bd6223b555"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/be/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/be/thunderbird-60.8.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "f1ce8a443ee22e6ef9aeddd609408c75f66fd162cdc68dc8bdc70c301e5937d1ab6c3bdc021646e36e7d6c39b284d74742049a1eb0f9349c3d3c11b2b49a90fc"; + sha512 = "3ffc3ab21f3a070d8f465591db242b5cc0485cb2655373fc697298825f46a5f2f93301684ff69510ea2d74743a8e00e23e7f56e2a29638484bed40089714b7ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/bg/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/bg/thunderbird-60.8.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "be7c25bcb9688c4f90e6496b1c8a1ec3e58753aa4d9eb63e84863013a4ff7dae92e3d9e299c509191bd8336deb94d30ebcb44ea39b881e5bd974427d8cc2de72"; + sha512 = "e789ca25f887bc9b228fd29796b38cb061ba931ebb0e2d2b15b290771b2312d4051d248dd467c64acc5cbdc1d5c1ae23e0d5b5dba4a35983ffa44062c7632bbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/br/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/br/thunderbird-60.8.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ed4ac8a3ad7b1b6b4b553b52b1b00c8590872bac407ecb539f3f8f3f94579af85ace6196525a93e1f726ec8ac9a72c873d438737a09401673970e923ddd0dc02"; + sha512 = "5088057f31b2ff77f89b25e9c1638b2080981a489a392d928f259cce38916b9b7da89132d931363fc652c1711250e1e77fc56b0427674f0648229688ba3285dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ca/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ca/thunderbird-60.8.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "74303a6784bf8cd6a40c3dc548476f67bc1bfbee163999c873635af7df712139a216e5047c61ff3613391f10b1ede6b7d1520e9e30b9d100f731607a5314e56f"; + sha512 = "3eb939b9a811254487eca4920ae84d33773d0963c77dfd84df7cf02a98b975d13d9088a70c2e8863f3290c6c7bfe6c7a240eda8e3bfdf3de28883c5d1e842e5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/cs/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/cs/thunderbird-60.8.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "cd3a2f34c084c6e8bb628a73979940d5c0a37608173faee08cbba289af283eb2f9b6db494beceb72ccbc235f2ddf71b2bd966f9935d90efebe6042d463a50dbf"; + sha512 = "867706fc4e459d0e7723e9ef0e86176822623ca85f446f1ab9935f7f7a95292da637d57ab6046a8ef4d8a40bd5fc37451a32cad71a2d45bf4e4cf7adccd44775"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/cy/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/cy/thunderbird-60.8.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "d0fc024e76e496fc159e70efc7e50416375c8666ee07ec858c15de9013b8e4ccf4fdac33ba5b2969c76e7a0e8ed4474377528ca46ed5701b17deef3940b971fa"; + sha512 = "56d6485c397984b3394831169efe8bc2d7078d958358a37f1c9775b17bef0a4a347429838f122291f10e3dbc289865aaa475d3d3f4e7deaa2d22205690110c05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/da/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/da/thunderbird-60.8.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "700e73df23ac5e3d193d147f317c55a6a356b8a87b2bd35816946a8c9a4ffeab857f0c9461a8a0e2568827bab92cad388010a540e0959d14fb1fb36d5d7b683c"; + sha512 = "6d35e77a03b0a44e8629baa80eb1889892a0dcd7a1a7ef5f016a6133fd8c5555474fa3bae79e3c5c25b0618832e680ea505cdf82de268bb4cecad7187830ff4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/de/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/de/thunderbird-60.8.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "bf3bd905e89680a2ed6f123d45f9fb554ef1b1d93d9048aa0680f2d9a0d2c882f8100ab45f0b9d16fd0411b3c93e884561bc37680019c4a1cc90d5014144d199"; + sha512 = "7b6f65c2146eccd91db9f2a050722c28ff3c9ed8a9e7a822fc1558c6b56761ba68ee5fdbbf1324c35dc98b0b33e8e54709664b972ad2318dcdf4472251ef1d1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/dsb/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/dsb/thunderbird-60.8.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "58d016161ff90489ec090cb5f62593f22a29bf87bfee689f9a5489f9ca711d1a08199e48fa7624af324e051b96bf4cb1fea8c25f0cac5a13e2120067966a8133"; + sha512 = "fef020d88b4560b8eae5b81d9d36179719389c742a462682ca0afff942474158b1cdedeca6f348598ca89268bae3d953ac63debd972f7349ed8a7cb56e96cdd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/el/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/el/thunderbird-60.8.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "8edb85baac50532067832341fc15fb01d6ad5338c1298293926aca2f3bb604623de495f95dde78a1d31b669cefec7c62b870f3d324e1d18787bf9a4b17483436"; + sha512 = "fae21025f07a7d0be663d6dda4cb43cdc2b4b488a76e4ab0bae304284b17598689ed32554066e1d00097479e1ca4f163473cee854b853acedc46887256a45d02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/en-GB/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/en-GB/thunderbird-60.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "39d7b7996d46cbba174780ccd31e86b8f168d5c7af9f3753ffd6c6b6050aa72d6863c5287db3f7f9c30fe80a4f20ce8a9918b9f37471d8520682ea4c34bbcc16"; + sha512 = "cfb8f7770d1fa2ad12ac19a2f069840a37f13c352d4271c4dc479cf4cc1d3ac381053ef9046b4b0fe891b67097f5db674ed6281853b2ebab1fe9744bd113bb08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/en-US/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/en-US/thunderbird-60.8.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "99588bd58ef55ff7f9b8b248bc0cbe04707e0f94ccd248f0dd7caa4c1f21945e694deee3b41258c818c33cf845d9a38854a6ded5e225332752942da7dd0bfdc9"; + sha512 = "c0eeec28c235be86760dca83941a202475846153a1b186ad948eb673e0c6b1e870cb1c485f5a1dd9ed885eaac52f36cdde4417ba86dca388c43c03299b0adcea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/es-AR/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/es-AR/thunderbird-60.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "e0e28a36de8eb088c4f56044198175fe87968fb977cfe515aad3abf28b9846f76c575a03670a9a618cf46f9906c0086f5a671fd4440b3aa4614bfae0799743ba"; + sha512 = "151e9ecb12ee13dc9cf87040c5f90d9dfeb528e25889fb48d7bd5a9a47f7a6166402c1c4ebf96c9a4184d27e89cc13ff31079151f7ca2860ac91100d2dc7f6a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/es-ES/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/es-ES/thunderbird-60.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "846ca3ff9847106cfa23a74ca3add2d7a12e5b192734ce0f2a027fff037e8ef8344b60fbf36ac678f20dc2292f7d4cc44b80fdd644af6ba839f2648fa996cafd"; + sha512 = "0209584bf7d1396d3d3f754e4f6cf3a6cfee2f7aeea9869edb60bdc832e87b9437f4962fe59a19df78ecd53681981e68bb6efc98e05f7ef50883a59983ddbb66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/et/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/et/thunderbird-60.8.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "9a5c4616a40df5c35629cfecb1086f43b7a159ba4c966b52022e2f7a6b9d3437a0b933cbf3b857b708b349e2dada43dc82cdbeb2824a9b3c49fd466bd1dde89d"; + sha512 = "766656029454d89be4fa8ac8ebfc61f25d86c6f8974abe1426cd96dd5b7492bbdf4f8568ac18a69fa4ac3acf4a28486f1184c0852d4ee29416d6dbf3ddee097f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/eu/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/eu/thunderbird-60.8.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "72950cf78c2016f6c7679c6d4a45c39a3b325c491de0def38758556f945867d8299678abdf1de052e5a18079753a820b7329935ea373b0c5cf32063efe953471"; + sha512 = "db312b24b48677e47fa9ade4f04e219ec6a1aefb03239b60ba63c46659e86eadbec32513c494d48c90e303a87bcdd7280d7c4ae5be4df1a2c30159516bca5abd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/fi/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fi/thunderbird-60.8.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ba815c3de1a894cf616c2172528c045aeb4768c237abc6c11234c8e6d10aa80b7578e2c9e562957bf6e5f757c0fb5fedf65a905a2c49836e08fe18029bef5065"; + sha512 = "003a0ca468ed7a7ab19065ef4a45504c9e95724112c6bb277c6e1964f8f642d5d1a7a4b135e412c81db5896eb00a831b089104563a9237c0594c2ad5c31c4814"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/fr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fr/thunderbird-60.8.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "3da8f0eed4096f64ac297feb87e902a943ac025d8db66ba48a56456d450fc6bf4f00c729b4b72bdde4688991a1a6eafe8f71f91859bf3d3b0db80b9953035d42"; + sha512 = "5097831b1d77046583bd86dd124c48f2389a676a902cbdd4e408508452400f9d981c14475e43276ba31efa70bd3fe1bce5193bc9624de40e34a57319d6ede80f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/fy-NL/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/fy-NL/thunderbird-60.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b49c4b191651d8f22e23c7ba1a7a4bf28613162bcbe9926dab9ac42a9c4a96e26bfa74bcd6ca5e0fe8c43070559990f885300c71cb3638eb96efdcb307f9b513"; + sha512 = "bb1170342797ccb3cada48fe654cbba2c02391f30666f3c14891d813692c21400c24f0f1e02d6cf975b88b8e92943feff8da5daf05b9535ae4730272b104d43e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ga-IE/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ga-IE/thunderbird-60.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "fe360cbd6e9b4cec554f0f9e72501707aeb7b52c9dd783c028b447d79a0172c6b42ca52593e5a6251c4090fddbf15ed21d2ae97f055c2a1d77efc60e5c63eb80"; + sha512 = "a65089b76bb09f78bdd7c8c63e0fe4e68468a210a18069621d4b9fb3ef7cd54abe849fae983dd3e8f05bc5f7dfc3a03a64051587a9e65439fc5cb2c15836f13b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/gd/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/gd/thunderbird-60.8.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "29b6589c431ea3f5e229a2868220ddf2ec4a9146cca6cfe02cb471eeddf193d8795c1944582047cb58036be97a83a1dc87797623bf46fe856f7bf6f52d2a73c0"; + sha512 = "bca1e964554eccf2c69968380954dedd9e76fe2952becd06b0cd56ddf0e3936d6c40f7cfa5d9c8719cdb4b5181d47048d10a47e6c549e74b2ab72a0d7b89d1ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/gl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/gl/thunderbird-60.8.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "60cc4f02e9e67fb774eaa21ed6c4525b0bcf3ea59c52934b043921b690405d53185336acd3c47a34f03efc2585b29384764614c6bd24359a32f5294872208fb4"; + sha512 = "d8ec696e056b44059ce713dfb86980da72441d9c53e17f30d0ce43408a16d3e4b2c8700e595639f7bbe3b59082fbdca49a1ecc47bdfa7704ba189198efeb1909"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/he/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/he/thunderbird-60.8.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "5f0252d6e36de08da28520b72b2d43539652c8e38b12db525e69c8cc459244e7304904d334730728e1887fcaeeefc45ffa8998a59d07e32cc219d9b437dbedb4"; + sha512 = "bf9d9db17930dae863bc8803d7f8e39fad79c74712d16d3912968b8605372521cd1ec23f2cb4c8d05e67341176749c97e85072cef40a899570811b594a5d994c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/hr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hr/thunderbird-60.8.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "fb986a942ea25800f2eba0f98fa14f1fca71d7fbe55040d4ecf70013be413cd3afb6c323e35a76b085daa6ff2defb062e2d27c8590231ab5b0d87125a8f3d1f9"; + sha512 = "62c626a6dbc65e69443e0e33bbcca131f2b0c3ab521ad74c9de355328fef0e26689e99f7e41111cee688400ffeb2f749f1fc73cf35dff8908f3661218e5df29c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/hsb/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hsb/thunderbird-60.8.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "f7ce5acaaeb88a1322d78e9d66378dbde4a628fecf1e196efaf42ccc6ca02d99192dd3b8271399d288cdf74233f7c42df5e4a2a6e44d22d5c177c876d857e4be"; + sha512 = "72a7c2356748b59103457fdb22ebe471b68bbdb4c8e61b53c83e14a64f25bfc781070242f2bb04dccbacb52387ee3b7a2b5a66c2bb01d653b4d78ee5a4d3aa86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/hu/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hu/thunderbird-60.8.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "9319cf8f6e297bcd8d263bd6528adf6eb63560469509482d0c9bb24488c91865d97084ce6fdf2aefcca4585d64c83991438021bfcacf26861eb5db42cd6bdd9e"; + sha512 = "b6e9b086b065555b2fdf3c243e72a37c1f7d1708b130ca060fc72cc4715514aed5a40ac19b497fdfc7b6d067d8a065ad16e077e8f1b6aa4f2f7204b47699c2a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/hy-AM/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/hy-AM/thunderbird-60.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "ca4efc6abea252c4637966718fe7ce7015325edefd4209216de3fcd501b86744349be48fb19ae21a8bccb98848cad8604afcd48518a7a42016a999adac5b0c0d"; + sha512 = "7b4690527883906a6a6e2d2b6347b8d2bc1b6a16576b6970c2b7dd0a04b6f046337e191aeaae4b07e37b29a9e24db3848a2683c6f0d10923c1c7ccf4bc8a38f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/id/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/id/thunderbird-60.8.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "deec3df7b9a25e450000976fb03389d06befa0429ed4970327f9265d6576b3a914646c192bf857c47cc1881a0e71ad3b52f98c6e66cbbdc43103715cd983f118"; + sha512 = "d6446e829d5126386535463e4b44551529108c22c1f5ea054cbced5d6ecae56c31d8a6af99620edfad62acf54844a3a0484b8892ee85fe7cf8676aa2010bc0f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/is/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/is/thunderbird-60.8.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "1d88b0917f636a48af360003d57f30b9e4eca4d6ed026184a475f980abe7f1ad011306dc542ac124fbc1787f386421ef1fcc1937e06432daed92b835fe4a7865"; + sha512 = "8527f8adbce559195b3487ac11b9ff7a716d4efbe4139289093b49e07b0767b99d90560695773433ccd838affe2e34f488e1051059213d79ef2c604aa5c239e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/it/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/it/thunderbird-60.8.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "2a4028b462dd764e20f14cb97667466d548482ca28d621e4e830b8aa29ccace76389f0bd9892b5ad4fb54908bc83a7975a0dde1129ee54d7331fbf0682fc445e"; + sha512 = "3d376e4f8efeffae16c2a39fba40cf29433af35ffbcfc5d0a7491355a211ca25fd5157f64a4d9f4611ac0cfc7659cb7118f0e4db15f594767d0e8a7fca9bfa03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ja/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ja/thunderbird-60.8.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "89568859a275424d00581bc596172fd8c5fe562c01087d9d63b734874e91f5933d80123d66fabb34a09f11638a5552200ce32ce13a4eb5464af380332687381e"; + sha512 = "b9623d6902ad5f5d77b67b490d8df6f312c895257965580cf1108a4d9c3da78f3d021551f9e48ab56b92eb691c3c4007a7584b4681683b261bab7b6b7139ead3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/kab/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/kab/thunderbird-60.8.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d20004efd3285670ee253d519cf1cc0d6f0fb6f3b95b0c4b96e56a9bd1d8c6183accaa1989b1038fd69683fd2aa3f5ea68a545a965c6c4d9a194eae2941d7d55"; + sha512 = "33417e6604f706ff3bfab521c5bd890fcffd0f524e11d29fedafaf89ad5a7f6284598ef994059c00aed70ef921a08dfa763f57694976b365d3317aeab8209c6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/kk/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/kk/thunderbird-60.8.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9d3963346b80e8877a5edc49a76dd0b2d26737ff887a3f2847df8e9ca359966575beea15b9390c1086c1a31690f0d70a60726eeecace1bd0f9490f2fe5d99c96"; + sha512 = "05910b83e3c65b2be6c6382bb27f819f9d02e3a1f89c00afa22eb1e68ff04d6f39edf31468be245be1756f20e09cf9982ff0175017e91ff1fe08b62b2edea4f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ko/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ko/thunderbird-60.8.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3d7b645f5fa84bb6d22bbcd5d4d963f56613836e3da1396188645c82c5b3519723bfd041f9f3b74b7da966c6700a0ce8071662683791583ef09ba252a053c5e2"; + sha512 = "f12a92b58c02dba4cb2fc8e8a9f90025d23c3849590bb149a50416aac3e3c15e0c2817e7a4bc518f24e796ea851bb5746b7611e2faeea2767e0f63dc67f2cb37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/lt/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/lt/thunderbird-60.8.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "c8efa6c786c9075c8abcc9c544ece1dd25b299bac3444ff510858c32c9ab7e162104bad236edebb7b56b4a1fcedc9c1794acb2c2b907398d3244439750cc0d04"; + sha512 = "06d12d4dffaaf863d77ab1fcc59517bec26732db4b81f6114602b9ad06a77d86d52a0b21066d93854459fc3087dce8d8087df635151f672194edf55d7903bacd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ms/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ms/thunderbird-60.8.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "42bfcc826317bb07bc54fc2c14b27f784faa05fe17c5ca1a5e7724a47490488856172a595aaa4f56b01ff6f702c3eeb6715da5e48df2af67832d2b4bdb979e1b"; + sha512 = "021f1843a788cd6285e4d56559b7042e161f0279b9b64234bb7cc39847f7f2011265e86a738b5926413f2e98e293fbb478d36322c9071b0f7346dbd07eb05a7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/nb-NO/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nb-NO/thunderbird-60.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "a4b21d7fb17a73f9e75a7d4d9e21ab87d276200e346f3078a70ebbd2e270a73120ca34d1c15c8e06416a57aa4a3cdc4c72dcdda0892abc657a9aa089dc25f04d"; + sha512 = "9913898a8b6ae8745f76aae51f82aa1fc9f71e410f458c3deaef5879521bbf1e25067709999a4c7722b42ae152eeed7016e5aa0437b8b3fc81d246b297f92f22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/nl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nl/thunderbird-60.8.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "9847949b60ad60848dcd200acd4b4b4de32f9f605740c9fe24dbaa79f6e17de2ca5f2d50a70cbe2b823cd25ab9e1221a475be6ac87ba0124b0ad2c6ecf87a30a"; + sha512 = "006e2332079d8a837c42b44df7b7af01bf9363109a47158357438140a068a9a17b2eb1ecba351b49b3300dae5a8e3abb0938fa1222012a886e6a123f7612dfa7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/nn-NO/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/nn-NO/thunderbird-60.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "38b0c5f3d48e5ac17e76b6ab018913a3af2470b59cb82e21dd044104ae84fe0354fd212210bf36cea0c13b9d500ba6ce41c6d55da6f22a71d0b9e9ae4ee45448"; + sha512 = "022fb45fd0305cad23853277f2b18d22879a4d0523cbbb73a65209ac3d2a87782667e71c6903a6b944aa824ebe8d30421d511f346df7a511ae1f7c325d53de41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/pl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pl/thunderbird-60.8.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "2d7952a4cc934da58697dc2ae8067a6ecc3dc1112ab32e9592c8837919c55487a9e4c84ead5520bdcd551d5dc656cb9b1a913913f8e0f2b2b79c07e4889f46cd"; + sha512 = "ecbad62e54f5b49fa89d0f8d00ccc3315cae71e0a46b25e3bb72b117ef4a8271d9374d82352a7ed75bb93fed9504ac883165911cb6423c5c993d75ee620e27c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/pt-BR/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pt-BR/thunderbird-60.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "e26d527c462e4682375ca21827a8d4decfea599af0e8e0dd399de0e511f9ca0d41584847067f787f5df0e9956b65c0f9da5edd68e9edfbe4283e5fa3ec6d019d"; + sha512 = "e9f2180eef290f0d0fb3b91eafafa7ea0a8cbbb7acc01758fafb56d6c56caa0ac5455b728013ac88d50757830a7f65a3e77423417abd3ee77238657c94461381"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/pt-PT/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/pt-PT/thunderbird-60.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "815769609ee977104f0819099233c4d8ef0a7ad87219e09dab564d1a6b98534e26fd0f6f07458d762cbd03e1a74f152fb4bb4707430c06e3b6322c4f23b17673"; + sha512 = "20e448cdc26b9a27b2c42b7baa09d299ea9ea834bb3bfba284d5f907bdfe0170ba7ef611e0e7ddc1ccdf296781401fe32b80f5e909b68c12a23652c06b3c93c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/rm/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/rm/thunderbird-60.8.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8e0bd0cf42206ccfe5de8e4a5a3632b67603e88acbf72f7b4154d1a4d220458e1d6aa57877da728d9677b6fbcb88ce8c71ec1fe7a153a3db82267533a2f15634"; + sha512 = "62d71bc39dc895514eb2cb957205ad7379ce95bacf6d75e193e0d9eca34df300dbbbb9df3e4cf200a5c1266b1747949df54a969edae62b720b10d0d756ff4c08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ro/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ro/thunderbird-60.8.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "046706f9701bed310895bb39704e6852a4323efe25425355cfb816033814682b5150880fb77e72361bb4893f52be08598ba29323fbf25242dece1ffdf4fba570"; + sha512 = "2a506e9c7d1f752452201ff78c0a2d678115404294200ad07317672220674eb32227dd7b1f8af65ee91ffb4051beadbdbf2da2dbc243d14d22ecb81dd004549e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ru/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/ru/thunderbird-60.8.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "3e348bfe2fa4fd8a27f5aa5e7d32b320577cbf5b64975392dc8a9fadbd5ce1ca2927b4a9563b7a3b578df80d6b0636c032380a1da6d750d165a20df5bc898d7d"; + sha512 = "c76e85ae89f1d6f878f5ff745f76860a18d053d13c4deb6774de9e653e841273c09fd7297ade76ea390a30ab0d2af280a0e6b2d929a50ada2ea37c32c2d68d7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/si/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/si/thunderbird-60.8.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "378a9ccdb98cbc0df37663880a141080ab1f312d17b9ddcfc3ab7102c55bc130f46b79a84ebcad0fc0844b1f511bf910db644b9aa2ceaeaf0191d079cbf9ac43"; + sha512 = "92617456dd89e933130992a15247bffc9c8ebabbec41b061320ae6be8d86ef1af38c1469e633ef9dd312da8f8bcac99545077fb23665add9c82c0a38f538e56d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sk/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sk/thunderbird-60.8.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c0c3e097f4b23cd3c2d184bf03a4e8027003a0c143b09e89dec457df372b239f7d045aeea0b3e106c1ea60b9100103c17d82e611011488275c735e25b632c0b6"; + sha512 = "8ab573b0cf04ae24f0ce5f1b8e79024fac5e33da2e80ef28837b7bb941512d01396759b34ba4fe87bef74a9385d5b7fb8d656429c110a38e0ec30ba21c01dd48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sl/thunderbird-60.8.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "af5cdbbe141e5e913d5dbee9afd02d1aa452683655224091ea4956f4caa28a92ba1a3bf4d7325011181e11f377aeb0990be30c0409e3839b693040b9f0154ca8"; + sha512 = "4ca6019ec3420487ac141bed30efe310d4c01aa2d7adf16fd97ad543cc90d14611d270074c5ab1c52b90c6ac9cfde5f5957c323189965ea60c2f1110abf4bca8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sq/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sq/thunderbird-60.8.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3cc134a77f4235c09ba95ea60e40db7a0be5b3663dd655ecf8cd8e490804e9c22d467783348bec53c4e73f9521e063e6b6e55ea5508ecd7687536bf1bf173ec7"; + sha512 = "1a47ea68a8435099883a502e65e31aa0e7c14564f86e6b4e4937362fbad3b9771efc74df4ef92994c1ac77130fef228a1c131d0eb4508a5c655e2a4b3800d1ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sr/thunderbird-60.8.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "f0ecea0810eb21b78c099d5cfac3c9825114fabc608a52244d3394b8af1e296bb76f5b8656d164faf80d770c2be84ad74f0cbb8a71029fe6fbd0a1da4c193444"; + sha512 = "dbcf13d0333d1ea714b85e542f5bdcbc83bdb2b3f8c3dca829d4b224a0741fee36ac9d2df9bd12cd5505fc972454b990ccf830d71926f65a4f460be2fb7ca937"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sv-SE/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/sv-SE/thunderbird-60.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "a0676f15038b5aa4323dd0a5c4769b55da3450b72982bd0a08b24a1c07ec27c5c267042508109111e6aab181904680072aceda154af0363ccac1f572215100d7"; + sha512 = "7602c9dab1202e84822d537c0aec36d1705c259e3d5f34ce6212363450e1e0dda508ed36ea999467be2f39b991cd21a6f8a153b0aca87aa70ba62f01f078bbb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/tr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/tr/thunderbird-60.8.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "02be00e15e625119621eda8c8204cedc13bc6a71ed020bca4d2fa4f0c2267150638ea01b88adab61b6ce76e91ea6e197e3ab981f85a253b253f652ceb74f6dba"; + sha512 = "0fbec00596ccd59e54aaf23058e96abc6ae672ab55d2a7ebd0bb20c37c03f47daa70acfb981d9edf48c45a75d0b0a02328025e100dc4b344c03e3540089b1cbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/uk/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/uk/thunderbird-60.8.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "3a785b5569bf9d5c95cd3b8bbf7d8c07b0e994a2bc239a755106cb21e51032a29039f0fa5a1395a803fda106b2bd2b8a7d802acc48c406fee698f2d7c2c3cf37"; + sha512 = "4f1b0608f55f945552bfb3ff28fb93b52ba8a180426e6a101c7c849a48a65c13c78cdd707c8bcd6bc02f55942750c3d34151a4f674bbf53d5e1aeb4fa5d8b974"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/vi/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/vi/thunderbird-60.8.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "fc684e3f3d9614a386e1f2dfe6fe7b3880be13335b567c27ef7c593dae97b6d4d2d272a14747de77d09b5ef9ffb2d860e2cd1b2f4a833a9f570c1d56a2548fd0"; + sha512 = "e3fbe83460505e135427c773650151e8d7d4d14df5a432392625871c561f6cb0c4eacbeb73d1078f4e3b195014373735a1383a472f6a85d9adf76d4b98929689"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/zh-CN/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/zh-CN/thunderbird-60.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "748c1fedb6b1caa3f6037c1554af8870ebd8ade3b242f5a7561c8085b70f13aa4452e0ad61ba5d9430455246468f21edb92d2651f36dfb466529feebba662c66"; + sha512 = "050cf6cddd3a4f7f56af9f271114d6aa10e032644a958e62f3957d0df61e6f6d92e2a21fcd203a1f45dab7127a652a0dc192993477570ed82726fc9765372dce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/zh-TW/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-x86_64/zh-TW/thunderbird-60.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "bb25cbdd2ff483c20d3fed558567c82aaba2eefff5919bf7f513d25e44f1918377e17c65028642436f7c5f178249a5fa389235268e3b2b1ff00a85275ea8ab2f"; + sha512 = "566a7288a7819ac3bf72ae97fc10470530656c2c4bd75f9b06b4e4c1c07e0e80534fd3dc14081c828a7aff3319d83ca482e4d8d15aa6e3dd02201ce0038a1de2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ar/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ar/thunderbird-60.8.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1976c20e7c5686ccc96da87ef5afe3dfb8d5fd5a9a0a24322fad8c09fcca7cf2613c2a029792799d417b6d1ef88d79e15697cfc41d7c7656f17685cfc4593c12"; + sha512 = "fa10e2e513050f8c62a0e53530a3ce99cc74aecb0b93090207531556a394d41308c599c469380b39daf178e775c61cf5c279b8fb26429652368ab0468dee4ad8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ast/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ast/thunderbird-60.8.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "7327b5cfc0331811e932e1748c01e3365c02bc0e2a1a59620f066b5e02aa55b97b7d0d62f7c45d920f0d9fcfbb30684d8ea504ae404494e19173cfe5dd3ada52"; + sha512 = "a88c415580fe8b5a1f83468afdcc55714abc13eb53c6b4a8b6b4779837b0668934c58ce40928b8a215a099fa06cce957754ac714a941172ded5087f09b8b2abc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/be/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/be/thunderbird-60.8.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "7188c82333bae58b88ff4dbaff493161dcaa0f515d26d7bc15984556265d11efb526a0597d84e6db95d2a65384745a4229945f3f82d26e62d853bb8faba7ee11"; + sha512 = "d0c7edde8c6d2b2daa4d2389781962ebbb8b11e2b6ff4f0c79a15052cb65e869711cc18c5ed86310800dd5fdacb4d594347663a440ad7caf874599bf9aa696d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/bg/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/bg/thunderbird-60.8.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "979c588c3a6bee2c712310879ef2f971731f2bae504d5631d30ce53fe201bd22ba0d5dce0a4b2758c994f6ddecf3a3d4c04b3c173f575d39579fa8961d60b28e"; + sha512 = "f5fa777606c529b5d5d85af9ea1bc9d7bae55571d11cb02fd46903643bd2fb9bde0dba0eb9e3b8a0276b004e40a12bcfc8b35f0a5d0445b1d6989caaffca2ed4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/br/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/br/thunderbird-60.8.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "fe36fb26ab14c7da712a077199ac24c22e7d8a892f35246e76579a70062476dce362fdc13911332b8a017d57a51e580227a5ab774ee1b8156711ce432e1c958b"; + sha512 = "673478f9995d4b43c3a67abfe876004e71871a45b9b13fa89b5266fca48d1edd69b601d34ce4d007080346f99d8a6ad61a47bc891b61364b239b24a1066da75e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ca/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ca/thunderbird-60.8.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2a3ae6a3e3297abed7d1202c55019dcfcc71658345cf0e35ebdab765ab9d35408450e5d7121fb5767409f6923e07ada832221785546a417ae390bc1c8b376cc0"; + sha512 = "336e500bad4e173a675f24ea05a2507c8729a30c9bbea2659135808bc04fa31b0306ade3073c70de22c76827f0494d517d9ad95fbe03a5526d14bf3e492001ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/cs/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/cs/thunderbird-60.8.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "5195590d7687e942c6a46e11c3493d00c0e4362cc9dc1e4fef5427ff18161f48caff02f700c862da00753d8b9b7929505d1626a1f33b40c56b0ebd965cf00d04"; + sha512 = "abb309d772ba27eaea1cbf79436d21cb18eca0733f2ecbaab18778daa7ad55ead8471e76c46ef0e86cc0c95d4877fed61553a8d195c8ab835be24cd55af0e923"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/cy/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/cy/thunderbird-60.8.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "311b612736dcb1b70934f0df4f8fa6b58f01530abb41944eb7cd135b353839af39ee40ee8a8e3f337d1e5d0e2bde706d9c3454019e37ec09e1780b07f040adbe"; + sha512 = "cd1ad0258585f14ee8c5243f18841f80b1cfab41934efdc92871ad4c3d71708f1397836bc2f3843f769f2232c05ea9e8f3cc25c1b76f86b7658934e4a331a6e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/da/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/da/thunderbird-60.8.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "6bc22359bac0a2d16a25eaf4d0d43fd08922870a36c437f5476d945f2c2988b749e46210b61c1b78952a907d10d1c5604a55585d08a4b1808bf59ee32cd6f816"; + sha512 = "7d9fb57f9681934f8e564c92d80acf3ffc8df1341346adfb5c4fc13738a5068aba7cdf6ecaea2937bff076b66a6103cff95fea27e2a6a7b4b545b78b2c423a4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/de/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/de/thunderbird-60.8.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "9e88dd66eeea5f77720698d163108e1205dd05c15b6170a7dc8a66c39d85aa58ab07f5f8a55e5db3660056bcdc697500cd64ca720893a54d9737bd34ce099ac8"; + sha512 = "f5c1c01677f4605f9e4731681d1e9e1395d2fee6fc32f88ae8f207750859887e0a49b2d95bc27e4311b05c6af2a390866662f79094e9c3a55e4f2bcbb92f60cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/dsb/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/dsb/thunderbird-60.8.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "d94f8ed0d637cdc444459d5e79d9f753d290ed0fea0557a0e53603ff1f1d861b9c436219b000783be67acc0bc1ea5d226e024faa8ddd73b259a10807705996bc"; + sha512 = "92171f0c8140b360953c6b5310f260503d17d1da71e795c91a4ec80fc4cc15ac43405db8f345c0675233dde4d89f57a1db3177c3699f241fc2d4d6f43cde71eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/el/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/el/thunderbird-60.8.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "e632ded7de7e269af5e8dc2dc14c17dce3b15fdd33c00423ecc51e5067a98fc694d600022ae9d0126630c9c9d6768f805dd6bb6492d658524f37ecf5a27dcba7"; + sha512 = "1062d28a437aa854dc213e632afc0e41edbe00d4398601db671d14e39fa2ee832c1fe6d263e7fab3d8347b4b2cacd541cb9f4b1fd640aa4bf97c3bd1fe23a2ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/en-GB/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/en-GB/thunderbird-60.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "00b958aa333c0ecf1048051be9c9767949a2c21e52005134ced1e2f25ff1dc4a15b73225fe0fcf7297dbbedbd0a02a75262c100e2f59ee8fac6403e8bcabf6b8"; + sha512 = "61dd1c410b5c87ca41eaf303f85a5c90b5c65fcba5a75d93654b3a5ff898991fd59b89ae772876c707dd7d5a2767fa607b3ea0c2f2c57ccb73a7a75720157f43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/en-US/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/en-US/thunderbird-60.8.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "150f6674dd95932c713c275eb24194197ae52cb4ac08aac49c1c6302e3734cd3de5580878b8d73c2dfdcc18df311654920914d9562ca85f580d560c372f5807e"; + sha512 = "5f989316cfe29ff75adae5feb34e6914f25e6e7980c17fe902d70deede44ebe54052d2540cfbe3d4629e927d9f2129edf19f659bb2cae9f09ab984be7d47aaaa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/es-AR/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/es-AR/thunderbird-60.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "eafefac3a5626c713d39f032ffd11cf65b733dad78f6157a0c83e55b0103301066d825d1cc47017101f8b09e757ef92f30654adea538a00f9e0f0d60b1248c72"; + sha512 = "45e0eb7e51110bc892cab458286e5c37f0aca4bfc88b01801c184521eb3bde33bdfc78758a67e7337be157b7507891874def8e7456fde8483054fd9671f068b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/es-ES/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/es-ES/thunderbird-60.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "3dbc541e002c2954e427327eb20bafaf126e157449c4f68f2cab2781097faa5a15c73a07bf27c9a841c02842f028bef3f43618781e9b29a1cb86bdb533c2c91e"; + sha512 = "a8dca85c7ecc2678cf48de000fa4e46432a28a02ec200447789da0213d01841f142de45c0c93b52c8952248eed7e0afb12c1f84026dcbaa0b47ce8b907bee779"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/et/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/et/thunderbird-60.8.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "3ab361983dd178f1fbeb97a79dcb4fd13841d1556821a732e29543071b5d8de054da7488cdbb4fd12b80e2b9c7409c0fe177d9677b0d2333ad49d1dfc6fb03e1"; + sha512 = "d212bf0d4881094835f156c277015e37f1de4d1927d2f89bc993071f50eaeb604913022c3db948baabb1d76b17a982bfd1911050c46bab54fd3ffd4f374ce378"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/eu/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/eu/thunderbird-60.8.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "e17f1e2248eb6a48e74780b1a908427656af1cf7f9b3cc3a1c3539c80dcb870126e90908b419b56c1cba7e445431b3802ba8e19a5516fc704c383a31c1ffbd5d"; + sha512 = "14602ea4b22210049756484646fe538cece02d7a23e6079e7020ff30d08868d353f9d59fc831e1b600c061faf18f5af93a67ac95cc2f2f64a137c430d6ea6bd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/fi/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fi/thunderbird-60.8.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3e054a95162fb3469ae4cbcccd8c285058fedc661b63cbc43d94359341d971a86f69cfcad307ead734ce22d62c8235a817f943ad111a13e5d7af445bfd905431"; + sha512 = "aaf723df2d042c7fca5457b0646998c7ed799d0d24021fb6de3b66d35519a7c189844bbd4a2840b884915995be4ec191455bbdbda7f5711831fc7702232a5d12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/fr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fr/thunderbird-60.8.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "61a3766fdedfd5dc45c203616c7c99c2d72d172d3e9577234d9539e841fce33c495518460262a2ba4c636ed9495a734d13e7ecbf193edbf5ddd81a767e03f8dd"; + sha512 = "9dd7e8c61049f4de1d03c73e1b7a1b38e244ad67be84dc6e4a53b94dc810d98b35e49b199662672f0954cf87cba7e3df75ba11fada1b74e8096d866131b08550"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/fy-NL/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/fy-NL/thunderbird-60.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "3068d8570dada0655f5429064903cb9218fe82e472978f269a91600dfff7a322a3cb3dae9dd24183c7a7ea0184fe520ec32bded34ec640ad3fff7d721b96c69a"; + sha512 = "aba1031a349f835577a06cbb8452760c4ab65fb1c8a7183e92556b6d140814f16e794f4a5305e789aba3b0c10703006641546751460fa5fe2a822835881d8e6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ga-IE/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ga-IE/thunderbird-60.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "ed51255886ccef985c9f684fc7a5f1ba902f8ad256673e4348ac3b5e67445f470e8f62fb5281ff63c4976c92b8f6461f4ed1f5da920e7911b2bfc36d7c86b716"; + sha512 = "9172d99e57d02a676f9bfe3373fef7448a2d6f70f3de8139205c55a37c73c5b70133373763daf8c58adf2acf4916cfb34aee60a431d55aa94cbe95e8e58430f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/gd/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/gd/thunderbird-60.8.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "4a0daf723de4828687c9dd0b037a8aa9d0acecfbcd72e21b50b737fab5dc8c4689cb8574f8093c1f468f6c52b3f4f05ec0106fb48e005a533fe4f81d94345542"; + sha512 = "f8449e20680cf02220e009f19b2cb66d1354941c0deda60086ae80f1d3bdf2159a8b5bb45a45c480528437e78d8c71c00a8ee42827b3254e37c83cb8af1d3de1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/gl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/gl/thunderbird-60.8.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "046e04f0d9a1c8d1666d81d4fb26a479ad84a243365dc8df50034df3a7e504244eeac7cc0710d81edb122faf022ed94665d77af70fb01ff43be0c7d1dd056e2f"; + sha512 = "04d8babded176785625add5bc9c457a0ff380c293579a18146924e57fb3782017c12d5569d10d2a3f1fa872fa8eaa87bbe5f1ac5f44f05cf5d5f3936fb12706e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/he/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/he/thunderbird-60.8.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "aa6be15596e35530ea8bcef9739d462b1836d5d7d11e540e307e08034458efd0bd890d61dd72aafa4ee93c8295e2f08181f498579fd01e686205a28152488290"; + sha512 = "2b77c7c4044c73257f24f1961d431ae50cc9dd0b0f2a58464a745ed3888e957467e6f35dba904a47c3d8d84aba81827184070ac6c12ecccf02760202b831b578"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/hr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hr/thunderbird-60.8.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "28ce82024616656b4a81a2ff82be23a243306c4209f2522bef63b2b4e1315c3dd007a73c20065972d3ef05938411489b4cd2a63d1e79c7fdeac4e7d752ad4675"; + sha512 = "17d68b938531b89eb8972fa315fb6951821a1a55478a801b5697afe5b84450841ac66c8aef49a43c4aa6acec4f81652a1de32a3acbbb41ee6cf0a4ed9f03acd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/hsb/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hsb/thunderbird-60.8.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "70c9095d1e8d63df6aa1544d4fdbf2642679cdbc20ca610de2e66bc15c6013287d079c65b93d4a04566d116b160f0e82136e2d9706083a96aea6045eff74e240"; + sha512 = "556b441cbd6e9a34e101385484fc292e3a2edefd39dc8286b5880c66ad558beecc9206084ed0ee35aced87ba0325fe737f6595cf3ddbe4d3842b10bfb535ed36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/hu/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hu/thunderbird-60.8.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "fe965925e424ba1023443c5a77e362f1c8880c04a2801c8956ee9873a3027eb1bdc61cbdb2d016781df6388a853a754827c70a2aa200917c854fb04865da7495"; + sha512 = "7a355c9ab063d6b6d8c17d1df4e30a3c2511c4f9d78be578a1a0b73e4728bb08d917190249baff08e30fe76eda16bc889d64ddba673f51067dc3b1957f8ebba3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/hy-AM/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/hy-AM/thunderbird-60.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "b2f47f578df59beb27200421229b147d83a1cb6caebf6796ea8edf52a0ea6890386d48ad53ada738fa9e6b7a5232851d52c4c656f740d4735dd550c47d3a781f"; + sha512 = "b5a94db363d6a16507e71fa0d6d8928b4c8d14b7b6a35e287232fca511caaf9f7852db37502ed9ac0fcba65cfc9d3185db8f08d7dd3941df660e083f0bc6c6a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/id/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/id/thunderbird-60.8.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "ac1719151c4f729bb66f4e2654b5159de27c6d22a6776f24615938e769a01036273ba551fe38fd0ed4560fb853427be0c65c387f76ad3c01aca144e90b7e9c48"; + sha512 = "6a94778d20665c901005150fab16c4fbcf86bba10b7a1833b7d89d3e76a7b90a0c1e755617ade294fb3c86611a0f2bb0e812d1b282e66d2a63e11a2f25b9da1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/is/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/is/thunderbird-60.8.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e28e6a3691cbdfd1b03e88afe747cc51aceffb7a0014fc9c86c7403ee96d3d12f9bd6f49ed4916d8ff281d1913ee39ad9b41851f8cc285f8834db9c50545c4c4"; + sha512 = "c6f89a98f956ab17bddc6250af88b1422a347733c15d12a720a8d84ffbd00142afd09b80bbac39dd14907558dc97f33890a091203c1f907dbe0df5f5f12a87f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/it/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/it/thunderbird-60.8.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "b1ae4c0952871bfbaf673793e02a9c3c283be87523e421ed97502a36377f1388b15ab77370b757daf411714803fcedbad1c8a4aa21241cedca394429ecad5990"; + sha512 = "38bcd03bf02276feef2321503bedbd7b8e8c609f48a038e660e522af5cad603ac642622f8b08b7aa870c1bf50b136d09034995941d14fa574ff9ca4f11d3cc66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ja/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ja/thunderbird-60.8.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "b6b1d702f446aaf50b83fdc5019d7130613cca4f9c9be363701c897f33cdfd4c794c147e7e3ff85b61da54125458a2da4f84aeef76b4f8abf4fd3faeff4301bc"; + sha512 = "e91f0e3ee53575d9e3fd02be22c46a8aebfe2e12998db77f3bf73c4756d4d615341c20fed031ee0b146aa1e9200bae3bb92c02da18bbca6e99574c46e2049f01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/kab/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/kab/thunderbird-60.8.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "9b0c45f7478bd2ec0668d0c4238b2f8229da7d12f4d6e56d65c22323bb54a6ac55d18acee22b13caf63bda73bf097a039b2aa85bd96befa2169845706083fd55"; + sha512 = "a858c81c5fc9110757328df3705cfd8ca1bc61ca173448f411a849bc3799b586e7119e6c4ecafd12d0522ba37463092271b76744bc0a7fe603702627f598ad36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/kk/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/kk/thunderbird-60.8.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "12fa4f57e1b0579ead0c7f7f223fe9328898ae999b8949e0dc1f20142eabbfaad03c16a53966d2c0966d9db44133c001f56c97c10a6f4a5acb51e6e30b922f78"; + sha512 = "1bf45fa38562308f4285c5bea746bafee65f498e5b4f4d1971e7ff68cbc5b8d3e6c7a32a4318100f1fa6bb203a12e3dde14df25a70aa1aad5d6279766b398c2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ko/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ko/thunderbird-60.8.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "a6979bf472fdca68df1067ca8341353561741e27afbad18a96ad6e810313f54a8ac5f96c58955ab4d5fa6f4b4ec468d6e711139073f35e9bac45de81555b345e"; + sha512 = "56e59aeb1286ec53ee558ab029476b72ed4094504123bb93abb3e3425f60065d66c9de83190d6f00528045f934d4775dfa555243f13fcdd540ca522e9f825740"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/lt/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/lt/thunderbird-60.8.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "47ea6c107bfbd196ec6ca5fafa0c856ac86bf16872ccf259afeec384f5f2157c9a7263bb2177ef79c876ba9f3a33209cb6ef7ceee0bae8877f0272e1a8fd4a9e"; + sha512 = "4572fe9803b28c6f94ac4e1fc5283d2569723698c4295279099bd33358a33cf50c1a49bec70c001dad65d19d30bcb215d50f2084b458143d338b8ecbcea1ebe5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ms/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ms/thunderbird-60.8.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "fda7fd25d3d72dee67e0e51c1d2c50ea66e1c574cb0b22c4c8476a7252a61209d5dd7ff5c5e918c9dc959064d048c75339fed5215a5bff53e4954f6ef56aeb14"; + sha512 = "fd1a58ebb66a39fc00ba20eaf555cfaa6124cc2e2fa7b44e1d4d7f1e914d86a0617f1be8d461f952196fa6dd8d29ae622769e5e6f8e4c0eb30b757da62d3864d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/nb-NO/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nb-NO/thunderbird-60.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "0940d7d24612f7e526a2c4d21c7d23a2a6577c5599abd98e73be338cc7b9c1efa33af69d644e62e1e903443b8458786899052bd176bb7e99ce44f4ed846cc532"; + sha512 = "bf4663ffe717d07b37e4f6741c9d6a804420f0104ac9adf152f73900d89818dddd67b1d047bf3f095d1a6ca7ac9da8e2132567e11caf486588f262e84e87905b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/nl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nl/thunderbird-60.8.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "9af66d8294797aa2586b7520e20f88110c7fd807ba4e27ff62fe70308f8f5ea94dcf2d17b9a2fb8e19f10961e470736932b785ba936656582fd4a48071afb43f"; + sha512 = "b7f7a989fe70860eec8349cbf85a943c0a5e7e4c9f7ae2010309adf96778797b036847e6860c0d89213c51c3c01ee1e9e4dfc6ba4a45d31c6ec4b6e9cc7e76bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/nn-NO/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/nn-NO/thunderbird-60.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "94240443b68053b4ffb7a256362a6183f43b6241ebfe479ce41b14b5bb9e1973a1c027f73baff35be9b448490cb0bedcf2b458049d84cac2082eb196ae5fbbd9"; + sha512 = "b2a8a72ce49d15c0629e038deaa8fef4b93893da9198e712daaddaadd2169c4781fe6c2544f33954d28e4be30048716a80c20063a13ea78f0ff3c466ee814cce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/pl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pl/thunderbird-60.8.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "3af095626b358f4e9074554539b8e204a47108bccb02a90e9f07c78285a05ca2c64d8a2e06935090d8de4ba50765546d7cf9e55cbab8cc3d3eca674569df3d8c"; + sha512 = "e6d0f12754182f5bcfaead0bce7183a7f6527983f8a4ece9b9f7968d87d9c55b06257c20e1dd4bcd82be56961a08f6e20d7140cd8239531e2f346bd4c6aaba1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/pt-BR/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pt-BR/thunderbird-60.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "cc5357923dcee1979760a889dd53512e3bb63db085349ecae02f4909353a2518799cb24bc36de6ed35853e8317d71672539a52998a62f968ff4c4e484cdd0489"; + sha512 = "bf1fa8c66264ef98b4d192e794cb789ea0f062f342bc3aa664fd8e228acae045dbff4673e31b5b65754eb80e6af2581b3b540b3fbd3e1042439caad9177f7499"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/pt-PT/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/pt-PT/thunderbird-60.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "a9fd7ffcb7633f17b183a12b4d290822e480f59e01c8e3fcc2e6fea0cf051c73396c2a5e41dd5d897e98a8199aeb4dbff737f06b748c57690541abefa42bd283"; + sha512 = "2b503e6b87230e4939c09774d9e7b70130e42ef4bdc0e3500563fc0848f138b7b569d37ba09eb676efa6e0d9b245d49acca8c740ec44abbe25b57a8546095871"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/rm/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/rm/thunderbird-60.8.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "5cc3f2fc6f84ebdaa298e96b0a56d0d6b0ea87a1df68eca17c558cf603296e83e7644d90e29183107eef1cd045084730f4311c603f546a29a495c7a443ddcc30"; + sha512 = "fbb4192fa466549313d874d5b48258d3d133040449f96c55270a5ad25798067b921d0336e577081985e1e0cff28aa17d8b1890e77aa3cdc9c369e5e416ac20dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ro/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ro/thunderbird-60.8.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "ed57227fac6e43ddf68837de7252fa8f57df399122653a533e2e5826a8fc48abe0bd1ec4f1c213473b9764d69b65ec905963554aa3b05676ae0cd87e64ff9f8e"; + sha512 = "5e6ca640f36f44b8d6594aa13847acf16b7f5d96d21761fc43b38b16d39deebf6dd30cc2eae778ec1f8f37408451acb19485f52ae3e701833103e59b6e0615e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ru/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/ru/thunderbird-60.8.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "9f520da05a7968e632fd262cef964ac65e3e1afc0e70b279af667cff144784adde796862b5d4a66d64826bea70e2d4a76fab69c1fb5181d9038f9d2a4f81cd31"; + sha512 = "4bdaf5e71f18d75554a4d954a802390ca6689d07b3ba16de8654b6557c874622ad2b2d587d8306edecfad47c1bf89550378d478377fe49b0e87b5d4417d05840"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/si/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/si/thunderbird-60.8.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "1a9d8a911bea3ff6e13e02ce3b26271dd9b0755b5ff78982b82ea00fed6e760b067a3a8733c3397fa1bde300f44c7078c37638e79ac18bdef08c820a6dded86b"; + sha512 = "096ca4b2efe21c92d041b5fbcb5ac19351d39b339b0686fbefd1b127f7fe1da8b31dcd9135149006a71b664eb9f98d729a48da4f138af250330b60f80ea07f11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sk/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sk/thunderbird-60.8.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "0220c4ff8a2dbdbfba5dbb381983a4394f0ec4d246407d7d70d035bf13b8b9d220a73d1f10782c9612ae5521865761ac169cc96d19e4a903b785dfebf762760b"; + sha512 = "101363485e58e8a733523f103994c0abaa520ffe758a0ca39db9d5cebea273bde9a93be489d49db67a37130191a3e54ab9454e74cc392c5e0a163020a740149a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sl/thunderbird-60.8.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "3eaca0ba175d97478171269c6027fc7e67780e97dc9a15dc966c8d22c7ac26984f041ba2f94470d4cfc2988f13af29d9afc7940339f3bbd3ea3ed0712855a916"; + sha512 = "7060e6918d9818be407fe568caedf7e65738ce6335e287ca9ecee9d7f7be9d00599364b8d7b1033c7943d3a417fef32cd2e6912e832ce0e5eefe6e04db3a7dcf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sq/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sq/thunderbird-60.8.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "006b17fdc8201c493e77465ece97373fb23fdcc6d79ee9b9d88c544f338b88dbe51c1bc9f27fc41052c1838eacb604abe04c7b43ead49a0ee02b6591a74dd410"; + sha512 = "56c297aa61bb50517a5cf126e506cd7fbedda6250434a21423581b2a2cd79352f21c51265f7e3fa9b60636c8e3bd6dfedbf81c058daa8545f5da0f02837e0719"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sr/thunderbird-60.8.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "4908bb89bf199ef0e8767ddba6defe78c42ecbdfeac5c040811d1cd2b445407a0365cfeaff39cee5610a15194878d1700da194efdb6de570188ba7e5f77197da"; + sha512 = "95f8bb13b4ecc9774452b799a8ec06dc6abbb585471f5f2f9ce38e4af733fcc99132b66df73df96159872ca6e6285a62c86e61e4d389c2c96da547f875cb9841"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sv-SE/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/sv-SE/thunderbird-60.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c149b2a11dac65d98c64fa4b548573587ddf540c7de925d983cc9da63a9f55cc9138988adb32fd189a25f6f5baec85542fe8663eada1f7e16dd80e50069795fa"; + sha512 = "fc48493a7873299d4c284c806fe2ba856ff197e5f50bb57d3fdbc95eda062b035f98318c0f5bb4d1bec63dedae486b9872e3f1718b922a1ec8da311796794121"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/tr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/tr/thunderbird-60.8.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "dc45e7cf29f2b3798c83ccabc9d110bf622e0920ca7bee8bb6cd9a4d793fe7df5e7f78677b11c00e43714111bfc2ea2a74a8446026612afb0d54e58fd4e97797"; + sha512 = "649527a4c603798b0f726eec995d721156c36279b1aa5afb956fe64ef40298956e1abf6eee2d15eb3f5e4c9c5d48ed804eb425483456adf068084114b6d5cae5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/uk/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/uk/thunderbird-60.8.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "c1d04517a50c0882cb442221e71e171993015a36e597361708f858989ca1b538c8a48c6f40637a382879e394c471157e05543494095560d1c5d60a4d31d56398"; + sha512 = "2b4ae669b99ac9a7b20eef71b7dd6d5ad2b20ddb516ba1b3fce7dfbc783f0aa945e8f319b71e8912b2d72b78025fbdcb355ff96be43ffe828d2ba1ac4fa00d41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/vi/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/vi/thunderbird-60.8.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "186869df9def5f892851496c5a8f3784d5f0ed5a845d8330906c1242c5c856dc284ada045a802f83d1841007eb6aa9ea7098e3ca5d8d17ca85530890e2b3f13e"; + sha512 = "5808e5e2a75cf63366b190dc67177c8f1b2998b2001972412a760eac3c6a370aaf7e60d3fc7978783469163c55f69756637b4436593530d518dab27dddb6c295"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/zh-CN/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/zh-CN/thunderbird-60.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "8cd3250b0eef5018dc5129bcf4d1dae9acb2226fab784e66f63f6224cc197d7863338ba134f0523f1e17dce53f0db5cb23206ad98c8e754766f6f51ef15ac33e"; + sha512 = "95cf6871aacf5d36ca04673fe23277dcc4674dd5b2d215c1f453fb6e5f82d64774efee4a0538e7c451b8807bf930912a31eaada65248416c24e8e1382923d09f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/zh-TW/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/zh-TW/thunderbird-60.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "bde2b2bed5a1498fef39ea1da0c260a9876fd672282ccac6cc983973fd2a1d8cdc889e4439c4b9acc4b9016bf13d892e2dc387c3a9fa8166cabcdcee8fe9cf8b"; + sha512 = "8429305258abecd306e01417bff356a536ad7f6982705a51b4c35b26a83c18f661ae743029597d69466e3618f99ed71070071743c5821264143f78cad2b7aeed"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 99a76d434b8a..7490d8c0603b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -5,7 +5,7 @@ , hunspell, libevent, libstartup_notification , icu, libpng, jemalloc , autoconf213, which, m4 -, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl +, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl, runtimeShell , cargo, rustc, llvmPackages , enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper , enableCalendar ? true @@ -24,11 +24,11 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "60.5.1"; + version = "60.8.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "1y8r96rzp1rv6ycn98l2c1bpa26gszhbijhrwk6llw8aq33xhx9dpqpbgfsnrsbn4a5ff14h8m9g82snqysrzb7ldd2i5lbas0pryys"; + sha512 = "1cd1ps4r70bnxn9kydljsp776dazfzfsghc5zwp1xz6p3cwb9g0gybj677sac7y3ma2wsq1xbqk20q35n7gjz3k1zzhmpxyii558rdl"; }; # from firefox, but without sound libraries @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { hunspell libevent libstartup_notification /* cairo */ icu libpng jemalloc ] - ++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ]; + ++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ]; # from firefox + m4 + wrapperTool nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; @@ -193,6 +193,6 @@ in stdenv.mkDerivation rec { passthru.updateScript = import ./../../browsers/firefox/update.nix { attrPath = "thunderbird"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; - inherit stdenv writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl; + inherit stdenv writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl runtimeShell; }; } diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index 421a3cfbe3b7..9ce51657031f 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0wfj9kkhar6jb5639f5wxpwsraxw4v9yzg71rsdidvj5fyncjjq2"; }; - buildInputs = [ libsmbios ]; + buildInputs = stdenv.lib.optional (stdenv.hostPlatform.isx86) libsmbios; nativeBuildInputs = [ autoreconfHook ]; autoreconfPhase = '' autoreconf -i -I src/missing/m4 diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index a131355963ce..0bf2cfce6e4b 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,35 +1,22 @@ { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite , inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret, fetchpatch +, libcloudproviders }: stdenv.mkDerivation rec { name = "nextcloud-client-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchgit { url = "git://github.com/nextcloud/desktop.git"; rev = "refs/tags/v${version}"; - sha256 = "0r6jj3vbmwh7ipv83c8w1b25pbfq3mzrjgcijdw2gwfxwx9pfq7d"; + sha256 = "1brpxdgyy742dqw6cyyv2257d6ihwiqhbzfk2hb8zjgbi6p9lhsr"; fetchSubmodules = true; }; - # Patches contained in next (>2.5.1) release - patches = [ - (fetchpatch { - name = "fix-qt-5.12-build"; - url = "https://github.com/nextcloud/desktop/commit/071709ab5e3366e867dd0b0ea931aa7d6f80f528.patch"; - sha256 = "14k635jwm8hz6i22lz88jj2db8v5czwa3zg0667i4hwhkqqmy61n"; - }) - (fetchpatch { - name = "fix-qtwebengine-crash"; - url = "https://patch-diff.githubusercontent.com/raw/nextcloud/desktop/pull/959.patch"; - sha256 = "00qx976az2rb1gwl1rxapm8gqj42yzqp8k2fasn3h7b30lnxdyr0"; - }) - ]; - nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; - buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools ]; + buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools libcloudproviders ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index c142661fd033..6b85dbfa3ccd 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { name = "owncloud-client-${version}"; - version = "2.4.3"; + version = "2.5.3.11470"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "1gz6xg1vm054ksrsakzfkzxgpskm0xkhsqwq0fj3i2kas09zzczk"; + sha256 = "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n"; }; - patches = [ ./find-sql.patch ]; - nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]; diff --git a/pkgs/applications/networking/owncloud-client/find-sql.patch b/pkgs/applications/networking/owncloud-client/find-sql.patch deleted file mode 100644 index 44dea6414e92..000000000000 --- a/pkgs/applications/networking/owncloud-client/find-sql.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** a/cmake/modules/QtVersionAbstraction.cmake ---- b/cmake/modules/QtVersionAbstraction.cmake -*************** -*** 8,13 **** ---- 8,14 ---- - find_package(Qt5Core REQUIRED) - find_package(Qt5Network REQUIRED) - find_package(Qt5Xml REQUIRED) -+ find_package(Qt5Sql REQUIRED) - find_package(Qt5Concurrent REQUIRED) - if(UNIT_TESTING) - find_package(Qt5Test REQUIRED) diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 8d0022e3c8b3..d6e25ae4e7b5 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -38,51 +38,30 @@ let }; }); - versionInfo = { - "13.8.0" = { - major = "13"; - minor = "8"; - patch = "0"; - x64hash = "FDF5991CCD52B2B98289D7B2FB46D492D3E4032846D4AFA52CAA0F8AC0578931"; - x86hash = "E0CFB43312BF79F753514B11F7B8DE4529823AE4C92D1B01E8A2C34F26AC57E7"; - x64suffix = "10299729"; - x86suffix = "10299729"; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-138.html; + versionInfo = let + supportedVersions = { + "13.10.0" = { + major = "13"; + minor = "10"; + patch = "0"; + x64hash = "7025688C7891374CDA11C92FC0BA2FA8151AEB4C4D31589AD18747FAE943F6EA"; + x86hash = "2DCA3C8EDED11C5D824D579BC3A6B7D531EAEDDCBFB16E91B5702C72CAE9DEE4"; + x64suffix = "20"; + x86suffix = "20"; + homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; + }; }; - "13.9.0" = { - major = "13"; - minor = "9"; - patch = "0"; - x64hash = "00l18s7i9yky3ddabwljwsf7fx4cjgjn9hfd74j0x1v4gl078nl9"; - x86hash = "117fwynpxfnrw98933y8z8v2q4g6ycs1sngvpbki2qj09bjkwmag"; - x64suffix = "102"; - x86suffix = "102"; - homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # This version has disappeared from Citrix's website... *sigh* - }; - - "13.9.1" = { - major = "13"; - minor = "9"; - patch = "1"; - x64hash = "A9A9157CE8C287E8AA11447A0E3C3AB7C227330E9D8882C6F7B938A4DD5925BC"; - x86hash = "A93E9770FD10FDD3586A2D47448559EA037265717A7000B9BD2B1DCCE7B0A483"; - x64suffix = "6"; - x86suffix = "6"; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-1391.html; - }; - - "13.10.0" = { - major = "13"; - minor = "10"; - patch = "0"; - x64hash = "7025688C7891374CDA11C92FC0BA2FA8151AEB4C4D31589AD18747FAE943F6EA"; - x86hash = "2DCA3C8EDED11C5D824D579BC3A6B7D531EAEDDCBFB16E91B5702C72CAE9DEE4"; - x64suffix = "20"; - x86suffix = "20"; - homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; - }; - }; + # break an evaluation for old Citrix versions rather than exiting with + # an "attribute name not found" error to avoid confusion. + deprecatedVersions = let + versions = [ "13.8.0" "13.9.0" "13.9.1" ]; + in + lib.listToAttrs + (lib.flip map versions + (v: lib.nameValuePair v (throw "Unsupported citrix_receiver version: ${v}"))); + in + deprecatedVersions // supportedVersions; citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 13613774b7c2..fdd367f97c03 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - version = "0.70"; + version = "0.71"; name = "putty-${version}"; src = fetchurl { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://the.earth.li/~sgtatham/putty/${version}/${name}.tar.gz" "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${name}.tar.gz" ]; - sha256 = "1gmhwwj1y7b5hgkrkxpf4jddjpk9l5832zq5ibhsiicndsfs92mv"; + sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg"; }; preConfigure = lib.optionalString stdenv.hostPlatform.isUnix '' diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 4caa9ae63f75..25e87b2abe4f 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,16 +1,19 @@ -{stdenv, fetchurl, openssl, libX11, libgssglue, pkgconfig} : +{ stdenv, fetchFromGitHub, openssl, libX11, libgssglue, pkgconfig +, autoreconfHook }: stdenv.mkDerivation (rec { pname = "rdesktop"; - version = "1.8.3"; + version = "1.8.6"; name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "02sbhnqbasa54c75c86qw9w9h9sxxbnldj7bjv2gvn18lmq5rm20"; }; - nativeBuildInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig autoreconfHook]; buildInputs = [openssl libX11 libgssglue]; configureFlags = [ diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index c2ae02e01491..2c72248c5751 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -6,7 +6,7 @@ , libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib # The themes here are soft dependencies; only icons are missing without them. -, hicolor-icon-theme, adwaita-icon-theme +, hicolor-icon-theme, gnome3 }: with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pcre libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core - openssl hicolor-icon-theme adwaita-icon-theme json-glib + openssl hicolor-icon-theme gnome3.adwaita-icon-theme json-glib ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 9bfaad8a5bc4..8a8ee2407809 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "14.1.3399"; + version = "14.2.2558"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb"; - sha256 = "166ndijis2i3afz3l6nsnrdhs56v33w5cnjd0m7giqj0fbq43ws5"; + sha256 = "1wfdvs0jfhm1ri1mni4bf9qszzca17p07w6ih7k4k0x4j8ga18cs"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index c855277e2259..1844711066b0 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { name = "resilio-sync-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "0vq8jz4v740zz3pvgqfya8mhy35fh49wpn8d08xjrs5062hl1yc2"; - "i686-linux" = "1gvq29bkdqvbcgnnhl3018h564rswk3r88s33lx5iph1rpxc6v5h"; + "x86_64-linux" = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz"; + "i686-linux" = "1dh0hxbd33bs51xib3qwxw58h9j30v0dc10b4x4rwkbgsj11nc83"; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index db093310ca1a..b050117258f5 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.6.6"; + version = "2.6.9"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0qz8a1ays63712pq1v7nnw7c57zlqkcifq7himfv5nsv0zm36ya8"; + sha256 = "1gh6a4xiq2ck3rzk5ndhi89ri8ai27xfga5iyqi9548mm6aim30d"; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index af01b89dc764..c4b434dcaa49 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { - name = "rclone-${version}"; - version = "1.45"; + pname = "rclone"; + version = "1.46"; goPackagePath = "github.com/ncw/rclone"; subPackages = [ "." ]; @@ -11,11 +11,19 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "06xg0ibv9pnrnmabh1kblvxx1pk8h5rmkr9mjbymv497sx3zgz26"; + sha256 = "1fl52dl41n76r678nzkxa2kgk9khn1fxraxgk8jd3ayc787qs9ia"; }; outputs = [ "bin" "out" "man" ]; + # https://github.com/ncw/rclone/issues/2964 + patches = [ + (fetchpatch { + url = "https://github.com/ncw/rclone/commit/1c1a8ef24bea9332c6c450379ed3c5d953e07508.patch"; + sha256 = "0mq74z78lc3dhama303k712xkzz9q6p7zqlbwbl04bndqlkny03k"; + }) + ]; + postInstall = '' install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1 ''; diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 4a1f71f4b4f7..70a6f64e880b 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchFromGitHub, makeWrapper, lib , dnsutils, coreutils, openssl, nettools, utillinux, procps }: -let - version = "2.9.5-7"; - -in stdenv.mkDerivation rec { - name = "testssl.sh-${version}"; +stdenv.mkDerivation rec { + pname = "testssl.sh"; + version = "2.9.5-8"; src = fetchFromGitHub { owner = "drwetter"; repo = "testssl.sh"; rev = "v${version}"; - sha256 = "02xp0yi53xf6jw6v633zs2ws2iyyvq3mlkimg0cv3zvj7nw9x5wr"; + sha256 = "1fpakzm2gsv8yva58s23lhlgxkkvi3pixil2mjrlkmr0qk66rc32"; }; nativeBuildInputs = [ makeWrapper ]; @@ -31,12 +29,10 @@ in stdenv.mkDerivation rec { ''; installPhase = '' - install -Dt $out/bin testssl.sh - - wrapProgram $out/bin/testssl.sh \ - --prefix PATH ':' ${lib.makeBinPath buildInputs} - + install -D testssl.sh $out/bin/testssl.sh cp -r etc $out + + wrapProgram $out/bin/testssl.sh --prefix PATH ':' ${lib.makeBinPath buildInputs} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 149e126d6e87..b5b8445df45d 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -1,24 +1,21 @@ { stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 -, gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk -, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }: +, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk, geocode-glib +, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "meteo"; - version = "0.8.5"; - - name = "${pname}-${version}"; + version = "0.9.6"; src = fetchFromGitLab { owner = "bitseater"; repo = pname; rev = version; - sha256 = "1mc2djhkg0nzcjmy87l1wqwni48vgpqh8s1flr90pipk12a1mh7n"; + sha256 = "1786s5637hc3dnnkf5vr2ngfiq73dyvx8187gx7qkh7cr8xrl50w"; }; nativeBuildInputs = [ appstream desktop-file-utils - gobject-introspection meson ninja pkgconfig @@ -30,11 +27,11 @@ stdenv.mkDerivation rec { buildInputs = [ clutter clutter-gtk - gnome3.geocode-glib + geocode-glib gtk3 + hicolor-icon-theme json-glib libappindicator - libchamplain libsoup webkitgtk ]; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 2f736dd5856d..deb768e6feb6 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "znc-${version}"; - version = "1.7.1"; + version = "1.7.3"; src = fetchurl { url = "https://znc.in/releases/archive/${name}.tar.gz"; - sha256 = "1i1r1lh9q2mr1bg520zrvrlwhrhy6wibrin78wjxq1gab1qymks4"; + sha256 = "0g8i5hsl4kinpz1wp0a2zniidv3w2sd6awq8676fds516wcc6k0y"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 8dd127715aeb..6808a81bec1d 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl -, boost, libxslt, goffice, wrapGAppsHook, iconTheme +, boost, libxslt, goffice, wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 librsvg bzip2 fribidi libpng popt - libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme + libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index cfd7a4eda202..9eec315217cb 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # The (only) source file states: # License: "Do what you feel is right, but don't be a jerk" public license. - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index a7c6165bdd2b..4a050eb5d749 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -65,5 +65,7 @@ mkDerivation rec { maintainers = with maintainers; [ phreedom ebzzry zraexy ]; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; + hydraPlatforms = []; + broken = true; # fails to start, kde home not found }; } diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 6f0fcca480ae..5459859150c3 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -32,6 +32,6 @@ buildPythonApplication rec { homepage = https://beancount.github.io/fava; description = "Web interface for beancount"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index e42777bdd006..87aaf85d950c 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { # ToDo: optional libgda, introspection? buildInputs = [ - goffice gtk3 gnome3.defaultIconTheme + goffice gtk3 gnome3.adwaita-icon-theme python pygobject3 ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 7c07082b3041..f901123065fa 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { description = "A personnal accounting application."; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 12b5aef898d1..32c4aafe28fd 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,15 +2,15 @@ , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.2.2"; + name = "homebank-5.2.3"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "19cm49p2x6nwia2yvwj3fv7jxbhw0vx4bs1zqbfvdr5vzwgj5j5c"; + sha256 = "1wdg86gwd0rc9m3mni9qlh746kxmjn4mk5q7fplxrcp2ajdcqr3a"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index aabdacd6198f..07f30a5525d5 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -2,8 +2,8 @@ rec { major = "6"; - minor = "1"; - patch = "4"; + minor = "2"; + patch = "6"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1zip7clhh3bp9smlxx1y5zpnwhaa6p0xlxg7k5d644q8gqbyk3v4"; + sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index b60874e7c3ca..b3151a402d5b 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -2,9 +2,9 @@ , IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, cups, xorg, libcmis +, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux -, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw +, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mariadb , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses, epoxy, gpgme +, gnome3, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false @@ -48,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1lgyns8zmwky1p78rvilnixqmicpfaal6x6286l4m7hv46pha181"; + sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0ia490xksnhh4m5fas6irr7qbnkaap7zs3fg8jbq4qrfjh81bcpm"; + sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz"; }; }; @@ -70,18 +70,21 @@ in stdenv.mkDerivation rec { patches = [ ./xdg-open-brief.patch - ./poppler.patch ]; + tarballPath = "external/tarballs"; + postUnpack = '' - mkdir -v $sourceRoot/src + mkdir -v $sourceRoot/${tarballPath} '' + (lib.flip lib.concatMapStrings srcs.third_party (f: '' - ln -sfv ${f} $sourceRoot/src/${f.md5name} - ln -sfv ${f} $sourceRoot/src/${f.name} + ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name} + ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name} '')) + '' - ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name} - ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} + ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name} + ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name} + tar -xf ${srcs.help} + tar -xf ${srcs.translations} ''; postPatch = '' @@ -130,6 +133,9 @@ in stdenv.mkDerivation rec { # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html echo > ./sd/CppunitTest_sd_tiledrendering.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk + # Pivot chart tests. Fragile. + sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx + sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx # this I actually hate, this should be a data consistency test! @@ -138,6 +144,8 @@ in stdenv.mkDerivation rec { sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx # tilde expansion in path processing checks the existence of $HOME sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx + # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 + sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' # rendering-dependent: on my computer the test table actually doesn't fit… # interesting fact: test disabled on macOS by upstream sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx @@ -149,6 +157,7 @@ in stdenv.mkDerivation rec { sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx + sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -156,6 +165,77 @@ in stdenv.mkDerivation rec { sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx # not sure about this fragile test sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx + # bunch of new Fresh failures. Sigh. + sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx' + sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(test);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testConditionalFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF16LErtlSHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256ODF12);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256W3C);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_XL_SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testColorScaleExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testDataBarExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testNamedRangeBugfdo62729);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRichTextExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testFormulaRefSheetNameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellValuesExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellNoteExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedChartODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellAnchoredGroupXLS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCeilingFloorODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRelativePathsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testSheetProtectionODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testSwappedOutImageExport);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testLinkedGraphicRT);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testImageWithSpecialID);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testAbsNamedRangeHTML);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testMoveCellAnchoredShapesODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRefStringUnspecified);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHeaderImageODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testTdf88657ODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testExponentWithoutSignFormatXLSX);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHiddenRepeatedRowsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHyperlinkTargetFrameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx" '' # This to avoid using /lib:/usr/lib at linking + '' @@ -230,6 +310,10 @@ in stdenv.mkDerivation rec { "--disable-libnumbertext" # system-libnumbertext" + # We do tarball prefetching ourselves + "--disable-fetch-external" + "--enable-build-opensymbol" + # I imagine this helps. Copied from go-oo. # Modified on every upgrade, though "--disable-odk" @@ -271,16 +355,16 @@ in stdenv.mkDerivation rec { libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base glib + gst_all_1.gst-plugins-base glib mariadb neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme gettext + libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] ++ lib.optional kdeIntegration kdelibs4; - nativeBuildInputs = [ wrapGAppsHook gdb ]; + nativeBuildInputs = [ wrapGAppsHook gdb fontforge ]; passthru = { inherit srcs jdk; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index 4ab15a3a91e6..adec14748088 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -28,11 +28,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_65_1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2"; - sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; + name = "boost_1_66_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2"; + sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; md5 = ""; - md5name = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81-boost_1_65_1.tar.bz2"; + md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2"; } { name = "breakpad.zip"; @@ -105,11 +105,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.61.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.61.1.tar.gz"; - sha256 = "eaa812e9a871ea10dbe8e1d3f8f12a64a8e3e62aeab18cb23742e2f1727458ae"; + name = "curl-7.63.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.63.0.tar.gz"; + sha256 = "d483b89062832e211c887d7cf1b65c902d591b48c11fe7d174af781681580b41"; md5 = ""; - md5name = "eaa812e9a871ea10dbe8e1d3f8f12a64a8e3e62aeab18cb23742e2f1727458ae-curl-7.61.1.tar.gz"; + md5name = "d483b89062832e211c887d7cf1b65c902d591b48c11fe7d174af781681580b41-curl-7.63.0.tar.gz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -133,18 +133,18 @@ md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; } { - name = "libepubgen-0.1.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2"; - sha256 = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633"; + name = "libepubgen-0.1.1.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"; + sha256 = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad"; md5 = ""; - md5name = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633-libepubgen-0.1.0.tar.bz2"; + md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz"; - sha256 = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac"; + name = "libetonyek-0.1.8.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.8.tar.xz"; + sha256 = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d"; md5 = ""; - md5name = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac-libetonyek-0.1.7.tar.xz"; + md5name = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d-libetonyek-0.1.8.tar.xz"; } { name = "expat-2.2.5.tar.bz2"; @@ -266,11 +266,11 @@ md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { - name = "amiri-0.109.zip"; - url = "http://dev-www.libreoffice.org/src/amiri-0.109.zip"; - sha256 = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6"; + name = "Amiri-0.111.zip"; + url = "http://dev-www.libreoffice.org/src/Amiri-0.111.zip"; + sha256 = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166"; md5 = ""; - md5name = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6-amiri-0.109.zip"; + md5name = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166-Amiri-0.111.zip"; } { name = "ttf-kacst_2.01+mry.tar.gz"; @@ -280,11 +280,11 @@ md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; } { - name = "ReemKufi-0.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz"; - sha256 = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b"; + name = "ReemKufi-0.7.zip"; + url = "http://dev-www.libreoffice.org/src/ReemKufi-0.7.zip"; + sha256 = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f"; md5 = ""; - md5name = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b-ReemKufi-0.6.tar.gz"; + md5name = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f-ReemKufi-0.7.zip"; } { name = "Scheherazade-2.100.zip"; @@ -329,11 +329,11 @@ md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; } { - name = "harfbuzz-1.7.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2"; - sha256 = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029"; + name = "harfbuzz-1.8.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2"; + sha256 = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd"; md5 = ""; - md5name = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029-harfbuzz-1.7.0.tar.bz2"; + md5name = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd-harfbuzz-1.8.4.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -357,18 +357,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-60_2-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-60_2-src.tgz"; - sha256 = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418"; + name = "icu4c-61_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-61_1-src.tgz"; + sha256 = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef"; md5 = ""; - md5name = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418-icu4c-60_2-src.tgz"; + md5name = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef-icu4c-61_1-src.tgz"; } { - name = "icu4c-60_2-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-60_2-data.zip"; - sha256 = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9"; + name = "icu4c-61_1-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-61_1-data.zip"; + sha256 = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a"; md5 = ""; - md5name = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9-icu4c-60_2-data.zip"; + md5name = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a-icu4c-61_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -455,11 +455,11 @@ md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; } { - name = "language-subtag-registry-2018-03-30.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2"; - sha256 = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854"; + name = "language-subtag-registry-2018-04-23.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2"; + sha256 = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878"; md5 = ""; - md5name = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854-language-subtag-registry-2018-03-30.tar.bz2"; + md5name = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878-language-subtag-registry-2018-04-23.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -469,18 +469,18 @@ md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { - name = "lcms2-2.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz"; - sha256 = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22"; + name = "lcms2-2.9.tar.gz"; + url = "http://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; + sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20"; md5 = ""; - md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz"; + md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz"; } { - name = "libassuan-2.4.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2"; - sha256 = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71"; + name = "libassuan-2.5.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; + sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"; md5 = ""; - md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2"; + md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; } { name = "libatomic_ops-7_2d.zip"; @@ -517,6 +517,13 @@ md5 = ""; md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } + { + name = "libnumbertext-1.0.4.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.4.tar.xz"; + sha256 = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b"; + md5 = ""; + md5name = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b-libnumbertext-1.0.4.tar.xz"; + } { name = "ltm-1.0.zip"; url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; @@ -532,18 +539,18 @@ md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz"; } { - name = "libxml2-2.9.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.8.tar.gz"; - sha256 = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732"; + name = "libxml2-2.9.9.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz"; + sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"; md5 = ""; - md5name = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732-libxml2-2.9.8.tar.gz"; + md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz"; } { - name = "libxslt-1.1.32.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.32.tar.gz"; - sha256 = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460"; + name = "libxslt-1.1.33.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz"; + sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"; md5 = ""; - md5name = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460-libxslt-1.1.32.tar.gz"; + md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -552,6 +559,13 @@ md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } + { + name = "lxml-4.1.1.tgz"; + url = "http://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"; + sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e"; + md5 = ""; + md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz"; + } { name = "mariadb_client-2.0.0-src.tar.gz"; url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; @@ -574,18 +588,18 @@ md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz"; } { - name = "libmspub-0.1.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz"; - sha256 = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97"; + name = "libmspub-0.1.4.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; + sha256 = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba"; md5 = ""; - md5name = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97-libmspub-0.1.3.tar.xz"; + md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.13.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz"; - sha256 = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea"; + name = "libmwaw-0.3.14.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz"; + sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9"; md5 = ""; - md5name = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea-libmwaw-0.3.13.tar.xz"; + md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz"; } { name = "mysql-connector-c++-1.1.4.tar.gz"; @@ -644,18 +658,18 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2m.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz"; - sha256 = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f"; + name = "openssl-1.0.2p.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2p.tar.gz"; + sha256 = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00"; md5 = ""; - md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz"; + md5name = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00-openssl-1.0.2p.tar.gz"; } { - name = "liborcus-0.13.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.13.3.tar.gz"; - sha256 = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9"; + name = "liborcus-0.13.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.13.4.tar.gz"; + sha256 = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b"; md5 = ""; - md5name = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9-liborcus-0.13.3.tar.gz"; + md5name = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b-liborcus-0.13.4.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -672,11 +686,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3235.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2"; - sha256 = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f"; + name = "pdfium-3426.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3426.tar.bz2"; + sha256 = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957"; md5 = ""; - md5name = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f-pdfium-3235.tar.bz2"; + md5name = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957-pdfium-3426.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -693,11 +707,11 @@ md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz"; } { - name = "poppler-0.66.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz"; - sha256 = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7"; + name = "poppler-0.73.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.73.0.tar.xz"; + sha256 = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03"; md5 = ""; - md5name = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7-poppler-0.66.0.tar.xz"; + md5name = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03-poppler-0.73.0.tar.xz"; } { name = "postgresql-9.2.1.tar.bz2"; @@ -763,11 +777,11 @@ md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz"; - sha256 = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982"; + name = "libstaroffice-0.0.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz"; + sha256 = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4"; md5 = ""; - md5name = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982-libstaroffice-0.0.5.tar.xz"; + md5name = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4-libstaroffice-0.0.6.tar.xz"; } { name = "swingExSrc.zip"; @@ -776,6 +790,13 @@ md5 = "35c94d2df8893241173de1d16b6034c0"; md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; } + { + name = "twaindsm_2.4.1.orig.tar.gz"; + url = "http://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; + sha256 = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6"; + md5 = ""; + md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; + } { name = "ucpp-1.3.2.tar.gz"; url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; @@ -805,11 +826,11 @@ md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz"; } { - name = "libwps-0.4.8.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz"; - sha256 = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e"; + name = "libwps-0.4.9.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.9.tar.xz"; + sha256 = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922"; md5 = ""; - md5name = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e-libwps-0.4.8.tar.xz"; + md5name = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922-libwps-0.4.9.tar.xz"; } { name = "xsltml_2.1.2.zip"; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index ce3b3533bec3..b5a721b5679b 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -56,18 +56,18 @@ md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { - name = "cairo-1.14.10.tar.xz"; - url = "http://dev-www.libreoffice.org/src/cairo-1.14.10.tar.xz"; - sha256 = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09"; + name = "cairo-1.16.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; + sha256 = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"; md5 = ""; - md5name = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09-cairo-1.14.10.tar.xz"; + md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { - name = "libcdr-0.1.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz"; - sha256 = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d"; + name = "libcdr-0.1.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz"; + sha256 = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48"; md5 = ""; - md5name = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d-libcdr-0.1.4.tar.xz"; + md5name = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48-libcdr-0.1.5.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -77,11 +77,11 @@ md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; } { - name = "libcmis-0.5.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz"; - sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e"; + name = "libcmis-0.5.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; + sha256 = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2"; md5 = ""; - md5name = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e-libcmis-0.5.1.tar.gz"; + md5name = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2-libcmis-0.5.2.tar.xz"; } { name = "CoinMP-1.7.6.tgz"; @@ -105,11 +105,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.61.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.61.1.tar.gz"; - sha256 = "eaa812e9a871ea10dbe8e1d3f8f12a64a8e3e62aeab18cb23742e2f1727458ae"; + name = "curl-7.65.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/curl-7.65.0.tar.xz"; + sha256 = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd"; md5 = ""; - md5name = "eaa812e9a871ea10dbe8e1d3f8f12a64a8e3e62aeab18cb23742e2f1727458ae-curl-7.61.1.tar.gz"; + md5name = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd-curl-7.65.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -119,11 +119,11 @@ md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { - name = "libepoxy-1.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2"; - sha256 = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64"; + name = "libepoxy-1.5.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; + sha256 = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d"; md5 = ""; - md5name = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64-libepoxy-1.3.1.tar.bz2"; + md5name = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d-libepoxy-1.5.3.tar.xz"; } { name = "epm-3.7.tar.gz"; @@ -140,11 +140,11 @@ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.8.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.8.tar.xz"; - sha256 = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d"; + name = "libetonyek-0.1.9.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; + sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"; md5 = ""; - md5name = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d-libetonyek-0.1.8.tar.xz"; + md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { name = "expat-2.2.5.tar.bz2"; @@ -196,18 +196,18 @@ md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; } { - name = "liberation-fonts-ttf-1.07.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"; - sha256 = "61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c"; - md5 = "134d8262145fc793c6af494dcace3e71"; - md5name = "134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"; + name = "liberation-narrow-fonts-ttf-1.07.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz"; + sha256 = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3"; + md5 = ""; + md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { - name = "liberation-fonts-ttf-2.00.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"; - sha256 = "7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504"; - md5 = "5c781723a0d9ed6188960defba8e91cf"; - md5name = "5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"; + name = "liberation-fonts-ttf-2.00.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; + sha256 = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45"; + md5 = ""; + md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz"; } { name = "LinLibertineG-20120116.zip"; @@ -230,6 +230,13 @@ md5 = "edc4d741888bc0d38e32dbaa17149596"; md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } + { + name = "source-serif-font-2.007R.tar.gz"; + url = "http://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz"; + sha256 = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb"; + md5 = ""; + md5name = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb-source-serif-font-2.007R.tar.gz"; + } { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; @@ -343,11 +350,11 @@ md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { - name = "hunspell-1.6.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/hunspell-1.6.2.tar.gz"; - sha256 = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4"; + name = "hunspell-1.7.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; + sha256 = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951"; md5 = ""; - md5name = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4-hunspell-1.6.2.tar.gz"; + md5name = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951-hunspell-1.7.0.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; @@ -357,18 +364,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-61_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-61_1-src.tgz"; - sha256 = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef"; + name = "icu4c-63_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz"; + sha256 = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"; md5 = ""; - md5name = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef-icu4c-61_1-src.tgz"; + md5name = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d-icu4c-63_1-src.tgz"; } { - name = "icu4c-61_1-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-61_1-data.zip"; - sha256 = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a"; + name = "icu4c-63_1-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-63_1-data.zip"; + sha256 = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c"; md5 = ""; - md5name = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a-icu4c-61_1-data.zip"; + md5name = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c-icu4c-63_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -448,18 +455,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-1.5.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.2.tar.gz"; - sha256 = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528"; + name = "libjpeg-turbo-1.5.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; + sha256 = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523"; md5 = ""; - md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; + md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2018-04-23.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2"; - sha256 = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878"; + name = "language-subtag-registry-2019-04-03.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2"; + sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d"; md5 = ""; - md5name = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878-language-subtag-registry-2018-04-23.tar.bz2"; + md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -469,11 +476,11 @@ md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { - name = "lcms2-2.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz"; - sha256 = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22"; + name = "lcms2-2.9.tar.gz"; + url = "http://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; + sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20"; md5 = ""; - md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz"; + md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz"; } { name = "libassuan-2.5.1.tar.bz2"; @@ -483,11 +490,11 @@ md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; } { - name = "libatomic_ops-7_2d.zip"; - url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"; - sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad"; + name = "libatomic_ops-7.6.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz"; + sha256 = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665"; md5 = ""; - md5name = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad-libatomic_ops-7_2d.zip"; + md5name = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665-libatomic_ops-7.6.8.tar.gz"; } { name = "libeot-0.01.tar.bz2"; @@ -518,11 +525,11 @@ md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { - name = "libnumbertext-1.0.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.4.tar.xz"; - sha256 = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b"; + name = "libnumbertext-1.0.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz"; + sha256 = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7"; md5 = ""; - md5name = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b-libnumbertext-1.0.4.tar.xz"; + md5name = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7-libnumbertext-1.0.5.tar.xz"; } { name = "ltm-1.0.zip"; @@ -532,25 +539,25 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.25.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz"; - sha256 = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2"; + name = "xmlsec1-1.2.27.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz"; + sha256 = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6"; md5 = ""; - md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz"; + md5name = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6-xmlsec1-1.2.27.tar.gz"; } { - name = "libxml2-2.9.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.8.tar.gz"; - sha256 = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732"; + name = "libxml2-2.9.9.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz"; + sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"; md5 = ""; - md5name = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732-libxml2-2.9.8.tar.gz"; + md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz"; } { - name = "libxslt-1.1.32.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.32.tar.gz"; - sha256 = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460"; + name = "libxslt-1.1.33.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz"; + sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"; md5 = ""; - md5name = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460-libxslt-1.1.32.tar.gz"; + md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -574,18 +581,18 @@ md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; } { - name = "mdds-1.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2"; - sha256 = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1"; + name = "mdds-1.4.3.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2"; + sha256 = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81"; md5 = ""; - md5name = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1-mdds-1.3.1.tar.bz2"; + md5name = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81-mdds-1.4.3.tar.bz2"; } { - name = "mDNSResponder-576.30.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz"; - sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0"; + name = "mDNSResponder-878.200.35.tar.gz"; + url = "http://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"; + sha256 = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0"; md5 = ""; - md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz"; + md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz"; } { name = "libmspub-0.1.4.tar.xz"; @@ -601,13 +608,6 @@ md5 = ""; md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz"; } - { - name = "mysql-connector-c++-1.1.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"; - sha256 = "a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585"; - md5 = "7239a4430efd4d0189c4f24df67f08e5"; - md5name = "7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"; - } { name = "mythes-1.2.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; @@ -623,11 +623,11 @@ md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.38-with-nspr-4.19.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.38-with-nspr-4.19.tar.gz"; - sha256 = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9"; + name = "nss-3.45-with-nspr-4.21.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; + sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; md5 = ""; - md5name = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9-nss-3.38-with-nspr-4.19.tar.gz"; + md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; @@ -637,11 +637,11 @@ md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; - sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769"; + name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; + sha256 = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504"; md5 = ""; - md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + md5name = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; } { name = "officeotron-0.7.4-master.jar"; @@ -658,18 +658,18 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2p.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2p.tar.gz"; - sha256 = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00"; + name = "openssl-1.0.2r.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; + sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; md5 = ""; - md5name = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00-openssl-1.0.2p.tar.gz"; + md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; } { - name = "liborcus-0.13.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.13.4.tar.gz"; - sha256 = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b"; + name = "liborcus-0.14.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz"; + sha256 = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f"; md5 = ""; - md5name = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b-liborcus-0.13.4.tar.gz"; + md5name = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f-liborcus-0.14.1.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -686,11 +686,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3426.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3426.tar.bz2"; - sha256 = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957"; + name = "pdfium-3550.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2"; + sha256 = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679"; md5 = ""; - md5name = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957-pdfium-3426.tar.bz2"; + md5name = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679-pdfium-3550.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -700,39 +700,39 @@ md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; } { - name = "libpng-1.6.34.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz"; - sha256 = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6"; + name = "libpng-1.6.37.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; + sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca"; md5 = ""; - md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz"; + md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-0.66.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz"; - sha256 = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7"; + name = "poppler-0.74.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz"; + sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f"; md5 = ""; - md5name = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7-poppler-0.66.0.tar.xz"; + md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz"; } { - name = "postgresql-9.2.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; - sha256 = "db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461"; - md5 = "c0b4799ea9850eae3ead14f0a60e9418"; - md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; + name = "postgresql-9.2.24.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; + sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126"; + md5 = ""; + md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.5.tar.xz"; - sha256 = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009"; + name = "Python-3.5.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz"; + sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc"; md5 = ""; - md5name = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009-Python-3.5.5.tar.xz"; + md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz"; } { - name = "libqxp-0.0.1.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz"; - sha256 = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73"; + name = "libqxp-0.0.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"; + sha256 = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c"; md5 = ""; - md5name = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73-libqxp-0.0.1.tar.xz"; + md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz"; } { name = "raptor2-2.0.15.tar.gz"; @@ -812,25 +812,25 @@ md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; } { - name = "libwpd-0.10.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz"; - sha256 = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610"; + name = "libwpd-0.10.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"; + sha256 = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09"; md5 = ""; - md5name = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610-libwpd-0.10.2.tar.xz"; + md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz"; } { - name = "libwpg-0.3.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz"; - sha256 = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33"; + name = "libwpg-0.3.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; + sha256 = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c"; md5 = ""; - md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz"; + md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; } { - name = "libwps-0.4.9.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.9.tar.xz"; - sha256 = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922"; + name = "libwps-0.4.10.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz"; + sha256 = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca"; md5 = ""; - md5name = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922-libwps-0.4.9.tar.xz"; + md5name = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca-libwps-0.4.10.tar.xz"; } { name = "xsltml_2.1.2.zip"; diff --git a/pkgs/applications/office/libreoffice/poppler.patch b/pkgs/applications/office/libreoffice/poppler.patch deleted file mode 100644 index 29defb679422..000000000000 --- a/pkgs/applications/office/libreoffice/poppler.patch +++ /dev/null @@ -1,289 +0,0 @@ -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index 06e4faead..d4174e208 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -298,7 +298,7 @@ void writePpm_( OutputBuffer& o_rOutputBuf, - o_rOutputBuf.resize(header_size); - - // initialize stream -- Guchar *p; -+ unsigned char *p; - GfxRGB rgb; - std::unique_ptr imgStr( - new ImageStream(str, -@@ -401,7 +401,7 @@ void writeImage_( OutputBuffer& o_rOutputBuf, - oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) }; - if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray ) - { -- Guchar nIndex = 0; -+ unsigned char nIndex = 0; - colorMap->getRGB( &nIndex, &zeroColor ); - nIndex = 1; - colorMap->getRGB( &nIndex, &oneColor ); -@@ -514,7 +514,7 @@ void PDFOutDev::printPath( GfxPath* pPath ) - PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : - m_pDoc( pDoc ), - m_aFontMap(), -- m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ), -+ m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ), - m_bSkipImages(false) - { - } -@@ -555,7 +555,11 @@ void PDFOutDev::processLink(Link* link, Catalog*) - LinkAction* pAction = link->getAction(); - if (pAction && pAction->getKind() == actionURI) - { -+#if POPPLER_CHECK_VERSION(0, 72, 0) -+ const char* pURI = static_cast(pAction)->getURI()->c_str(); -+#else - const char* pURI = static_cast(pAction)->getURI()->getCString(); -+#endif - - std::vector aEsc( lcl_escapeLineFeeds(pURI) ); - -@@ -578,7 +582,11 @@ void PDFOutDev::restoreState(GfxState*) - printf( "restoreState\n" ); - } - -+#if POPPLER_CHECK_VERSION(0, 71, 0) -+void PDFOutDev::setDefaultCTM(const double *pMat) -+#else - void PDFOutDev::setDefaultCTM(double *pMat) -+#endif - { - assert(pMat); - -@@ -752,8 +760,11 @@ void PDFOutDev::updateFont(GfxState *state) - printf( " %lld", fontID ); - - aFont = it->second; -- -+#if POPPLER_CHECK_VERSION(0, 72, 0) -+ std::vector aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) ); -+#else - std::vector aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) ); -+#endif - printf( " %d %d %d %d %f %d %s", - aFont.isEmbedded, - aFont.isBold, -@@ -939,11 +950,11 @@ void PDFOutDev::endTextObject(GfxState*) - } - - void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, -- int width, int height, GBool invert, -+ int width, int height, poppler_bool invert, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ poppler_bool /*interpolate*/, - #endif -- GBool /*inlineImg*/ ) -+ poppler_bool /*inlineImg*/ ) - { - if (m_bSkipImages) - return; -@@ -972,9 +983,9 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, - void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, - int width, int height, GfxImageColorMap* colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ poppler_bool /*interpolate*/, - #endif -- int* maskColors, GBool /*inlineImg*/ ) -+ int* maskColors, poppler_bool /*inlineImg*/ ) - { - if (m_bSkipImages) - return; -@@ -1023,13 +1034,13 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str, - int width, int height, - GfxImageColorMap* colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ poppler_bool /*interpolate*/, - #endif - Stream* maskStr, - int maskWidth, int maskHeight, -- GBool maskInvert -+ poppler_bool maskInvert - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool /*maskInterpolate*/ -+ , poppler_bool /*maskInterpolate*/ - #endif - ) - { -@@ -1045,13 +1056,13 @@ void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str, - int width, int height, - GfxImageColorMap* colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ poppler_bool /*interpolate*/, - #endif - Stream* maskStr, - int maskWidth, int maskHeight, - GfxImageColorMap* maskColorMap - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool /*maskInterpolate*/ -+ , poppler_bool /*maskInterpolate*/ - #endif - ) - { -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index 7e65f085d..4b5c14d15 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -129,6 +129,12 @@ namespace pdfi - GooString & getFamilyName() const - { return const_cast(familyName); } - }; -+ // Versions before 0.15 defined GBool as int; 0.15 redefined it as bool; 0.71 dropped GBool -+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 71 -+typedef GBool poppler_bool; -+#else -+typedef bool poppler_bool; -+#endif - - class PDFOutDev : public OutputDev - { -@@ -151,22 +157,26 @@ namespace pdfi - - // Does this device use upside-down coordinates? - // (Upside-down means (0,0) is the top left corner of the page.) -- virtual GBool upsideDown() override { return gTrue; } -+ virtual poppler_bool upsideDown() override { return true; } - - // Does this device use drawChar() or drawString()? -- virtual GBool useDrawChar() override { return gTrue; } -+ virtual poppler_bool useDrawChar() override { return true; } - - // Does this device use beginType3Char/endType3Char? Otherwise, - // text in Type 3 fonts will be drawn with drawChar/drawString. -- virtual GBool interpretType3Chars() override { return gFalse; } -+ virtual poppler_bool interpretType3Chars() override { return false; } - - // Does this device need non-text content? -- virtual GBool needNonText() override { return gTrue; } -+ virtual poppler_bool needNonText() override { return true; } - - //----- initialization and control - - // Set default transform matrix. -+#if POPPLER_CHECK_VERSION(0, 71, 0) -+ virtual void setDefaultCTM(const double *ctm) override; -+#else - virtual void setDefaultCTM(double *ctm) override; -+#endif - - // Start a page. - virtual void startPage(int pageNum, GfxState *state -@@ -233,40 +243,40 @@ namespace pdfi - - //----- image drawing - virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, -- int width, int height, GBool invert, -+ int width, int height, poppler_bool invert, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ poppler_bool interpolate, - #endif -- GBool inlineImg) override; -+ poppler_bool inlineImg) override; - virtual void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ poppler_bool interpolate, - #endif -- int *maskColors, GBool inlineImg) override; -+ int *maskColors, poppler_bool inlineImg) override; - virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ poppler_bool interpolate, - #endif - Stream *maskStr, int maskWidth, int maskHeight, -- GBool maskInvert -+ poppler_bool maskInvert - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool maskInterpolate -+ , poppler_bool maskInterpolate - #endif - ) override; - virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ poppler_bool interpolate, - #endif - Stream *maskStr, - int maskWidth, int maskHeight, - GfxImageColorMap *maskColorMap - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool maskInterpolate -+ , poppler_bool maskInterpolate - #endif - ) override; - -@@ -279,7 +289,7 @@ extern FILE* g_binary_out; - - // note: if you ever change Output_t, please keep in mind that the current code - // relies on it being of 8 bit size --typedef Guchar Output_t; -+typedef unsigned char Output_t; - typedef std::vector< Output_t > OutputBuffer; - - #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX -diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx -index 44f30c0ba..66c175165 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx -@@ -242,7 +242,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, - appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image - - // initialize stream -- Guchar *p, *pm; -+ unsigned char *p, *pm; - GfxRGB rgb; - GfxGray alpha; - ImageStream* imgStr = -@@ -328,7 +328,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, - appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image - - // initialize stream -- Guchar *p; -+ unsigned char *p; - GfxRGB rgb; - ImageStream* imgStr = - new ImageStream(str, -@@ -374,7 +374,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, - { - for( int x = 0; x < maskWidth; ++x ) - { -- Guchar aPixel = 0; -+ unsigned char aPixel = 0; - imgStrMask->getPixel( &aPixel ); - int nIndex = (y*height/maskHeight) * (width*4+1) + // mapped line - (x*width/maskWidth)*4 + 1 + 3 // mapped column -diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx -index 16db05afe..cd559cab0 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx -@@ -69,7 +69,7 @@ int main(int argc, char **argv) - - // read config file - globalParams = new GlobalParams(); -- globalParams->setErrQuiet(gTrue); -+ globalParams->setErrQuiet(true); - #if defined(_MSC_VER) - globalParams->setupBaseFonts(nullptr); - #endif -@@ -143,7 +143,7 @@ int main(int argc, char **argv) - i, - PDFI_OUTDEV_RESOLUTION, - PDFI_OUTDEV_RESOLUTION, -- 0, gTrue, gTrue, gTrue); -+ 0, true, true, true); - rDoc.processLinks(&aOutDev, i); - } - diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index 29f8006d63ee..8049a664e138 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -2,9 +2,9 @@ rec { major = "6"; - minor = "0"; - patch = "7"; - tweak = "3"; + minor = "1"; + patch = "5"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0wjcnra06d9z51kjb5njlpy4d8zd8wqfvkif2kc6mzhrsz5kqqxr"; + sha256 = "1wh8qhqkmb89nmfcb0w6iwpdzxwqr7c5kzxgpk4gy60xin6gwjgb"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index ff8823e3d9cf..1da6160e85bb 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses, epoxy, gpgme +, gnome3, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false @@ -48,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1rk8f77gwqyrnrxpfrvmr03n49bb09idxwzzindxxgcagh3d0p5f"; + sha256 = "15fdni68b3kyl6115v0d24cl0dp1hdjhkx571w086lrpz0fk9mfi"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "076xq1vlsyi2fv3r7rw595075pi08slbzwwc5h9gda3frx1jkj4i"; + sha256 = "0bfjg14bnqlqwjcc3lkax0nfrhpm6nrqn7ycrmf4r3dzn10lgr64"; }; }; @@ -68,17 +68,23 @@ in stdenv.mkDerivation rec { # of rasqal/rasqal.h NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ]; - patches = [ ./xdg-open-brief.patch ]; + patches = [ + ./xdg-open-brief.patch + ]; + + tarballPath = "external/tarballs"; postUnpack = '' - mkdir -v $sourceRoot/src + mkdir -v $sourceRoot/${tarballPath} '' + (lib.flip lib.concatMapStrings srcs.third_party (f: '' - ln -sfv ${f} $sourceRoot/src/${f.md5name} - ln -sfv ${f} $sourceRoot/src/${f.name} + ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name} + ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name} '')) + '' - ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name} - ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} + ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name} + ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name} + tar -xf ${srcs.help} + tar -xf ${srcs.translations} ''; postPatch = '' @@ -225,6 +231,11 @@ in stdenv.mkDerivation rec { # Without these, configure does not finish "--without-junit" + "--disable-libnumbertext" # system-libnumbertext" + + # We do tarball prefetching ourselves + "--disable-fetch-external" + # I imagine this helps. Copied from go-oo. # Modified on every upgrade, though "--disable-odk" @@ -272,7 +283,7 @@ in stdenv.mkDerivation rec { mdds bluez5 libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme gettext + libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] ++ lib.optional kdeIntegration kdelibs4; nativeBuildInputs = [ wrapGAppsHook gdb ]; @@ -284,7 +295,7 @@ in stdenv.mkDerivation rec { requiredSystemFeatures = [ "big-parallel" ]; meta = with lib; { - description = "Comprehensive, professional-quality productivity suite (Still/stable release)"; + description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; homepage = https://libreoffice.org/; license = licenses.lgpl3; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 9c4c22dabe97..892ebcee99f9 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -32,6 +32,7 @@ , autorunLinkHandler ? true # Update script , writeScript +, runtimeShell }: let @@ -130,7 +131,7 @@ stdenv.mkDerivation { dontStrip = true; dontPatchElf = true; - updateScript = import ./update.nix { inherit stdenv writeScript; }; + updateScript = import ./update.nix { inherit stdenv writeScript runtimeShell; }; meta = with stdenv.lib; { homepage = http://www.mendeley.com; diff --git a/pkgs/applications/office/mendeley/update.nix b/pkgs/applications/office/mendeley/update.nix index 147c95b8e7bd..c174e7dc668d 100644 --- a/pkgs/applications/office/mendeley/update.nix +++ b/pkgs/applications/office/mendeley/update.nix @@ -1,7 +1,7 @@ -{ stdenv, writeScript }: +{ stdenv, writeScript, runtimeShell }: writeScript "update-mendeley" '' - #!${stdenv.shell} + #!${runtimeShell} function follow() { local URL=$1 while true; do diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 9f4ed80e6d80..ad621303d7d3 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, patchelf, coreutils, pcsclite -, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl }: +, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl +, runtimeShell }: let libPath = stdenv.lib.makeLibraryPath [ @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { mkdir "$out/bin" cat > $out/bin/moneyplex < /etc/alliance-install.log ''; allianceUnInstaller = '' - #!${stdenv.shell} + #!${runtimeShell} awk '{print \$3}' /etc/alliance-install.log | xargs rm awk '{print \$3}' /etc/alliance-install.log | xargs rmdir rm /etc/alliance-install.log diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index d5720440f7cc..69b111562ab2 100644 --- a/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig , openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi -, libxcb, cups, xkeyboardconfig +, libxcb, cups, xkeyboardconfig, runtimeShell }: let @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)" mkdir -p "$out"/bin cat > "$out"/bin/eagle << EOF - #!${stdenv.shell} + #!${runtimeShell} export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:${libPath}" export LD_PRELOAD="$out/lib/eagle_fixer.so" export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb" diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index b5a6a5b963e5..eddc4b9b2080 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { name = "elan-${version}"; - version = "0.7.2"; + version = "0.7.5"; cargoSha256 = "0vv7kr7rc3lvas7ngp5dp99ajjd5v8k5937ish7zqz1k4970q2f1"; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "kha"; repo = "elan"; rev = "v${version}"; - sha256 = "0844fydfxvacyx02gwxbzpmiamsp22malyy5m4wpvrky4dkpn3qj"; + sha256 = "1147f3lzr6lgvf580ppspn20bdwnf6l8idh1h5ana0p0lf5a0dn1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index ffd25b6238b7..099e2102c517 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, num, camlp5 }: +{ stdenv, runtimeShell, fetchFromGitHub, ocaml, num, camlp5 }: let load_num = @@ -11,7 +11,7 @@ let start_script = '' - #!${stdenv.shell} + #!${runtimeShell} cd $out/lib/hol_light exec ${ocaml}/bin/ocaml \ -I \`${camlp5}/bin/camlp5 -where\` \ diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix index a3834dc70b6d..dcea9c27acb4 100644 --- a/pkgs/applications/science/logic/leo3/binary.nix +++ b/pkgs/applications/science/logic/leo3/binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openjdk}: +{stdenv, fetchurl, openjdk, runtimeShell}: stdenv.mkDerivation rec { pname = "leo3"; version = "1.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/{bin,lib/java/leo3} cp "${jar}" "$out/lib/java/leo3/leo3.jar" - echo "#!${stdenv.shell}" > "$out/bin/leo3" + echo "#!${runtimeShell}" > "$out/bin/leo3" echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" > "$out/bin/leo3" chmod a+x "$out/bin/leo3" ''; diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index 426f1928938c..8e94356f376a 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ghc, spass }: +{ stdenv, fetchurl, haskell, spass }: stdenv.mkDerivation { name = "system-for-automated-deduction-2.3.25"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "http://nevidal.org/download/sad-2.3-25.tar.gz"; sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b"; }; - buildInputs = [ ghc spass ]; + buildInputs = [ haskell.compiler.ghc844 spass ]; patches = [ ./patch # Since the LTS 12.0 update, <> is an operator in Prelude, colliding with diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index c22c15b3a4b9..a3b369ad54a3 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "why3-${version}"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37842/why3-1.1.1.tar.gz; - sha256 = "065ix1ill009bxg7w27s8wq47vn03vbr63hsaa79arv31d96izny"; + url = https://gforge.inria.fr/frs/download.php/file/37903/why3-1.2.0.tar.gz; + sha256 = "0xz001jhi71ja8vqrjz27v63bidrzj4qvg1yqarq6p4dmpxhk348"; }; buildInputs = (with ocamlPackages; [ diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 802a03bd4c7a..340073b016e3 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -6,6 +6,9 @@ url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz"; sha256 = "126kc4r7xm9170kh7snqsfkkc868m5bcnswrv7b4cq9ivlrdwbm4"; }; + nativeBuildInputs = with python2Packages; [ + pyqt4 + ]; propagatedBuildInputs = with python2Packages; [ pyqt4 lxml diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index ced075ff432e..c0536b36cfe3 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -33,8 +33,9 @@ in stdenv.mkDerivation rec { cp -r . "$out" rm -r $out/Libs - cp -r "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \ - "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* "$out"/Maps/ + cp -ur "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \ + "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* \ + "${maps.ladder2018season3}"/* "${maps.ladder2018season4}"/* "${maps.ladder2019season1}"/* "$out"/Maps/ ''; preFixup = '' diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix index 228bafe3f7c5..b4ff9fc18218 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix @@ -1,7 +1,7 @@ -{ fetchzip +{ fetchzip, unzip }: let - fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-P iagreetotheeula"; }); + fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-j -P iagreetotheeula"; }); in { minigames = fetchzip { @@ -12,37 +12,52 @@ in melee = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Melee.zip"; - sha256 = "0w050yah5rybx3m5zvpr09jv01r0xsazpyrc76338b2sd8pdxv3y"; + sha256 = "0z44pgy10jklsvgpr0kcn4c2mz3hw7nlcmvsy6a6lzpi3dvzf33i"; stripRoot = false; }; ladder2017season1 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season1.zip"; - sha256 = "194p0mb0bh63sjy84q21x4v5pb6d7hidivfi28aalr2gkwhwqfvh"; + sha256 = "0ngg4g74s2ryhylny93fm8yq9rlrhphwnjg2s6f3qr85a2b3zdpd"; stripRoot = false; }; ladder2017season2 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season2.zip"; - sha256 = "1pvp7zi16326x3l45mk7s959ggnkg2j1w9rfmaxxa8mawr9c6i39"; + sha256 = "01kycnvqagql9pkjkcgngfcnry2pc4kcygdkk511m0qr34909za5"; stripRoot = false; }; ladder2017season3 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season3_Updated.zip"; - sha256 = "1sjskfp6spmh7l2za1z55v7binx005qxw3w11xdvjpn20cyhkh8a"; + sha256 = "0wix3lwmbyxfgh8ldg0n66i21p0dbavk2dxjngz79rx708m8qvld"; stripRoot = false; }; ladder2017season4 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season4.zip"; - sha256 = "1zf4mfq6r1ylf8bmd0qpv134dcrfgrsi4afxfqwnf39ijdq4z26g"; + sha256 = "1sidnmk2rc9j5fd3a4623pvaika1mm1rwhznb2qklsqsq1x2qckp"; stripRoot = false; }; ladder2018season1 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season1.zip"; - sha256 = "0p51xj98qg816qm9ywv9zar5llqvqs6bcyns6d5fp2j39fg08v6f"; + sha256 = "0mp0ilcq0gmd7ahahc5i8c7bdr3ivk6skx0b2cgb1z89l5d76irq"; stripRoot = false; }; ladder2018season2 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season2_Updated.zip"; - sha256 = "1wjn6vpbymjvjxqf10h7az34fnmhb5dpi878nsydlax25v9lgzqx"; + sha256 = "176rs848cx5src7qbr6dnn81bv1i86i381fidk3v81q9bxlmc2rv"; + stripRoot = false; + }; + ladder2018season3 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season3.zip"; + sha256 = "1r3wv4w53g9zq6073ajgv74prbdsd1x3zfpyhv1kpxbffyr0x0zp"; + stripRoot = false; + }; + ladder2018season4 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season4.zip"; + sha256 = "0k47rr6pzxbanlqnhliwywkvf0w04c8hxmbanksbz6aj5wpkcn1s"; + stripRoot = false; + }; + ladder2019season1 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2019Season1.zip"; + sha256 = "1dlk9zza8h70lbjvg2ykc5wr9vsvvdk02szwrkgdw26mkssl2rg9"; stripRoot = false; }; } diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 694c621db00b..76e5071908f1 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.1.3"; in +let version = "4.1.5"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "0padylvicyhcm4vqkizpknjfw8qxh39scw3mj5xbs9bs8c442kmx"; + sha256 = "654d38203f76035a281006b77dcb838987a44fd549287f11c53a1e9cdf598f46"; }; buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index fb0ea2067355..c2f8ba1d55ec 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -2,45 +2,45 @@ , fetchFromGitHub , pkgconfig , gtk3 +, glib , pantheon -, gnome3 +, libsoup +, gtksourceview +, libgee , cmake , libqalculate -, gobject-introspection -, wrapGAppsHook }: +, cln +, wrapGAppsHook +}: stdenv.mkDerivation rec { - name = "nasc-${version}"; - version = "0.5.1"; + pname = "nasc"; + version = "0.5.4"; src = fetchFromGitHub { owner = "parnold-x"; - repo = "nasc"; + repo = pname; rev = version; - sha256 = "13y5fnm7g3xgdxmdydlgly73nigh8maqbf9d6c9bpyzxkxq1csy5"; + sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn"; }; - postPatch = '' - # libqalculatenasc.so is not installed, and nasc fails to start - substituteInPlace libqalculatenasc/CMakeLists.txt --replace SHARED STATIC - ''; - nativeBuildInputs = [ cmake pantheon.vala - gobject-introspection # for setup-hook pkgconfig wrapGAppsHook ]; buildInputs = [ - pantheon.elementary-icon-theme - gnome3.gtksourceview - gnome3.libgee - gnome3.libsoup - pantheon.granite + cln + libsoup gtk3 + glib + gtksourceview + libgee libqalculate + pantheon.elementary-icon-theme + pantheon.granite ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index 5b431f419261..d1dc5aa17d93 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -1,4 +1,8 @@ -{stdenv, fetchurl}: +{ stdenv +, lib +, fetchurl +, optimize ? false # impure +}: stdenv.mkDerivation rec { name = "nauty-${version}"; version = "26r11"; @@ -7,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "05z6mk7c31j70md83396cdjmvzzip1hqb88pfszzc6k4gy8h3m2y"; }; outputs = [ "out" "dev" ]; + configureFlags = lib.optionals (!optimize) [ + # Prevent nauty from sniffing some cpu features. While those are very + # widely available, it can lead to nasty bugs when they are not available: + # https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA + "--disable-popcnt" + "--disable-clz" + ]; buildInputs = []; installPhase = '' mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty} diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 32e4d81acec0..6d329669bc3f 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,5 +1,10 @@ -{ stdenv, fetchurl -, gmp, readline, libX11, tex, perl +{ stdenv +, fetchurl +, gmp +, readline +, libX11 +, tex +, perl , withThread ? true, libpthreadstubs }: @@ -8,11 +13,11 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { name = "pari-${version}"; - version = "2.11.1"; + version = "2.11.2"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "1jfax92jpydjd02fwl30r6b8kfzqqd6sm4yx94gidyz9lqjb7a94"; + sha256 = "0fck8ssmirl8fy7s4mspgrxjs5sag76xbshqlqzkcl3kqyrk4raa"; }; buildInputs = [ diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index ddb22bcb1ef2..43d908b29349 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -33,7 +33,7 @@ let # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { inherit flint ecl arb; - inherit sage-src pynac singular; + inherit sage-src env-locations pynac singular; linbox = pkgs.linbox.override { withSage = true; }; pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig }; diff --git a/pkgs/applications/science/math/sage/patches/ignore-pip-deprecation.patch b/pkgs/applications/science/math/sage/patches/ignore-pip-deprecation.patch new file mode 100644 index 000000000000..95b377dc9550 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/ignore-pip-deprecation.patch @@ -0,0 +1,22 @@ +diff --git a/src/sage/misc/package.py b/src/sage/misc/package.py +index 689e5a23b9..4e16fe3a8d 100644 +--- a/src/sage/misc/package.py ++++ b/src/sage/misc/package.py +@@ -142,9 +142,14 @@ def pip_installed_packages(): + sage: d['beautifulsoup'] # optional - beautifulsoup + u'...' + """ +- proc = subprocess.Popen(["pip", "list", "--no-index", "--format", "json"], stdout=subprocess.PIPE) +- stdout = proc.communicate()[0].decode() +- return {package['name'].lower():package['version'] for package in json.loads(stdout)} ++ with open(os.devnull, 'w') as devnull: ++ proc = subprocess.Popen( ++ ["pip", "list", "--no-index", "--format", "json"], ++ stdout=subprocess.PIPE, ++ stderr=devnull, ++ ) ++ stdout = proc.communicate()[0].decode() ++ return {package['name'].lower():package['version'] for package in json.loads(stdout)} + + def list_packages(*pkg_types, **opts): + r""" diff --git a/pkgs/applications/science/math/sage/patches/threejs-offline.patch b/pkgs/applications/science/math/sage/patches/threejs-offline.patch new file mode 100644 index 000000000000..62b2f114bd62 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/threejs-offline.patch @@ -0,0 +1,64 @@ +diff --git a/build/pkgs/threejs/spkg-src b/build/pkgs/threejs/spkg-src +index 91780d813c..254b850a24 100755 +--- a/build/pkgs/threejs/spkg-src ++++ b/build/pkgs/threejs/spkg-src +@@ -20,9 +20,17 @@ URL3="https://raw.githubusercontent.com/mrdoob/three.js/${GIT_VERSION}/LICENSE" + echo "Downloading $URL3" + curl -OL "$URL3" + ++# Set up directory structure ++ ++mkdir build ++mv three.min.js build ++ ++mkdir -p examples/js/controls ++mv OrbitControls.js examples/js/controls ++ + # Package +-tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" 'three.min.js' 'OrbitControls.js' 'LICENSE' +-rm -rf 'three.min.js' 'OrbitControls.js' 'LICENSE' ++tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" build examples 'LICENSE' ++rm -rf 'build' 'examples' 'LICENSE' + + # Update package info + echo "${GIT_VERSION}" > 'package-version.txt' +diff --git a/src/sage/repl/rich_output/backend_ipython.py b/src/sage/repl/rich_output/backend_ipython.py +index 7c27d48a21..8bf4861a35 100644 +--- a/src/sage/repl/rich_output/backend_ipython.py ++++ b/src/sage/repl/rich_output/backend_ipython.py +@@ -411,10 +411,15 @@ class BackendIPythonCommandline(BackendIPython): + sage: backend.threejs_offline_scripts() + '... +- ++ ++ + diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index b9d0a9ef4486..a23619311448 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -1,6 +1,7 @@ { stdenv , fetchFromGitHub , fetchpatch +, runtimeShell }: # This file is responsible for fetching the sage source and adding necessary patches. @@ -49,6 +50,37 @@ stdenv.mkDerivation rec { # Fixes a potential race condition which can lead to transient doctest failures. ./patches/fix-ecl-race.patch + + # Parallelize docubuild using subprocesses, fixing an isolation issue. See + # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE + (fetchpatch { + name = "sphinx-docbuild-subprocesses.patch"; + url = "https://salsa.debian.org/science-team/sagemath/raw/8a215b17e6f791ddfae6df8ce6d01dfb89acb434/debian/patches/df-subprocess-sphinx.patch"; + sha256 = "07p9i0fwjgapmfvmi436yn6v60p8pvmxqjc93wsssqgh5kd8qw3n"; + stripLen = 1; + }) + + # https://trac.sagemath.org/ticket/28007 + ./patches/threejs-offline.patch + ]; + + # Since sage unfortunately does not release bugfix releases, packagers must + # fix those bugs themselves. This is for critical bugfixes, where "critical" + # == "causes (transient) doctest failures / somebody complained". + bugfixPatches = [ + # Transient doctest failure in src/sage/modular/abvar/torsion_subgroup.py + # https://trac.sagemath.org/ticket/27477 + (fetchpatch { + name = "sig_on_in_matrix_sparce.patch"; + url = "https://git.sagemath.org/sage.git/patch?id2=10407524b18659e14e184114b61c043fb816f3c2&id=c9b0cc9d0b8748ab85e568f8f57f316c5e8cbe54"; + sha256 = "0wgp7yvn9sm1ynlhcr4l0hzmvr2n28llg4xc01p6k1zz4im64c17"; + }) + # https://trac.sagemath.org/ticket/27224 + (fetchpatch { + name = "sig_on_in_matrix_misc.patch"; + url = "https://git.sagemath.org/sage.git/patch?id=85d25bf2eb73f7d3c6de4ee6222b0c399be43b07"; + sha256 = "1ciwhh57pnb9b4i8m3vb07wfsibsay5sg0jp5giq1pzc5zc79a4p"; + }) ]; # Patches needed because of package updates. We could just pin the versions of @@ -111,9 +143,19 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch?id=a05b6b038e1571ab15464e98f76d1927c0c3fd12"; sha256 = "05yq97pq84xi60wb1p9skrad5h5x770gq98ll4frr7hvvmlwsf58"; }) + + # https://trac.sagemath.org/ticket/27405 + ./patches/ignore-pip-deprecation.patch + + # https://trac.sagemath.org/ticket/26718 + (fetchpatch { + name = "threejs-r100.patch"; + url = "https://git.sagemath.org/sage.git/patch/?h=86c5bb000259e6de5d7c60afc608a4b0d010b690"; + sha256 = "0sgqqd4df2bxsq19b6kfy7dvgyxprlpg7f3xx7g3fs8ij937m352"; + }) ]; - patches = nixPatches ++ packageUpgradePatches; + patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; postPatch = '' # make sure shebangs etc are fixed, but sage-python23 still works @@ -121,7 +163,7 @@ stdenv.mkDerivation rec { -e 's/sage-python23/python/g' \ -i {} \; - echo '#!${stdenv.shell} + echo '#!${runtimeShell} python "$@"' > build/bin/sage-python23 # Do not use sage-env-config (generated by ./configure). diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 18060f342a92..02e020d4f4d6 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -99,6 +99,13 @@ stdenv.mkDerivation rec { for pkg in ${lib.concatStringsSep " " input_names}; do touch "installed/$pkg" done + + # threejs version is in format 0..minor, but sage currently still + # relies on installed_packages for the online version of threejs to work + # and expects the format r. This is a hotfix for now. + # upstream: https://trac.sagemath.org/ticket/26434 + rm "installed/threejs"* + touch "installed/threejs-r${lib.versions.minor three.version}" ''; installPhase = '' diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 814eef9560e9..d5b272b950c8 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -1,4 +1,5 @@ { sage-src +, env-locations , perl , buildPythonPackage , arb @@ -65,11 +66,13 @@ buildPythonPackage rec { perl jupyter_core pkg-config + pip # needed to query installed packages ]; buildInputs = [ gd readline + iml ]; propagatedBuildInputs = [ @@ -119,8 +122,11 @@ buildPythonPackage rec { export SAGE_ROOT="$PWD" export SAGE_LOCAL="$SAGE_ROOT" export SAGE_SHARE="$SAGE_LOCAL/share" - export JUPYTER_PATH="$SAGE_LOCAL/jupyter" + # set locations of dependencies (needed for nbextensions like threejs) + . ${env-locations}/sage-env-locations + + export JUPYTER_PATH="$SAGE_LOCAL/jupyter" export PATH="$SAGE_ROOT/build/bin:$SAGE_ROOT/src/bin:$PATH" export SAGE_NUM_THREADS="$NIX_BUILD_CORES" diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 67cdaa4055ac..d9de12d45763 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa"; }; - buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ]; + buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 1f0fc663647a..871f5ece9cfe 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2 +{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 , libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lzma, gsl_1 , Cocoa, OpenGL, cf-private, noSplash ? false }: @@ -19,11 +19,30 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers_root5.patch + + (fetchpatch { + name = "enable_new_gcc.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/enable_new_gcc.patch?h=root5&id=91c50876081a0af36f84ec4f0f9dba869107fa4f"; + sha256 = "1rnp0xlw0yqi7mjs4w145njd79i8kkir1qik7zwicdik9axf8ygm"; + }) + + # prevents rootcint from looking in /usr/includes and such + ./purify_include_paths_root5.patch + + # disable dictionary generation for stuff that includes libc headers + # our glibc requires a modern compiler + ./disable_libc_dicts_root5.patch ]; preConfigure = '' patchShebangs build/unix/ ln -s ${stdenv.lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/ + '' + # Fix CINTSYSDIR for "build" version of rootcint + # This is probably a bug that breaks out-of-source builds + + '' + substituteInPlace cint/cint/src/loadfile.cxx\ + --replace 'env = "cint";' 'env = "'`pwd`'/cint";' '' + stdenv.lib.optionalString noSplash '' substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" ''; @@ -73,8 +92,5 @@ stdenv.mkDerivation rec { description = "A data analysis framework"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; - # needs to be adapted to work with modern glibc - # it works on darwin by impurely picking up system's libc headers - broken = stdenv.isLinux; }; } diff --git a/pkgs/applications/science/misc/root/disable_libc_dicts_root5.patch b/pkgs/applications/science/misc/root/disable_libc_dicts_root5.patch new file mode 100644 index 000000000000..abd6222847ef --- /dev/null +++ b/pkgs/applications/science/misc/root/disable_libc_dicts_root5.patch @@ -0,0 +1,27 @@ +diff --git a/cint/ROOT/CMakeLists.txt b/cint/ROOT/CMakeLists.txt +--- a/cint/ROOT/CMakeLists.txt ++++ b/cint/ROOT/CMakeLists.txt +@@ -47,21 +47,13 @@ set(CINTSTLDLLHEADERS + ${CMAKE_SOURCE_DIR}/cint/cint/lib/stdstrct/stdcxxfunc.h + ) + set(CINTINCDLLNAMES +- stdfunc ++# stdfunc + # stdcxxfunc + ) + set(CINTINCDLLHEADERS +- ${CMAKE_SOURCE_DIR}/cint/cint/lib/stdstrct/stdfunc.h ++# ${CMAKE_SOURCE_DIR}/cint/cint/lib/stdstrct/stdfunc.h + # ${CMAKE_SOURCE_DIR}/cint/cint/lib/stdstrct/stdcxxfunc.h + ) +-if(NOT WIN32) +- set(CINTSTLDLLNAMES ${CINTSTLDLLNAMES} valarray) +- set(CINTSTLDLLHEADERS ${CINTSTLDLLHEADERS} ${CINTDLLDIR}/vary.h) +- set(CINTINCDLLNAMES ${CINTINCDLLNAMES} posix ipc) +- set(CINTINCDLLHEADERS ${CINTINCDLLHEADERS} +- ${CMAKE_SOURCE_DIR}/cint/cint/lib/posix/exten.h +- ${CMAKE_SOURCE_DIR}/cint/cint/lib/ipc/ipcif.h) +-endif() + + set(CINTBUILDLOADER + vector diff --git a/pkgs/applications/science/misc/root/purify_include_paths_root5.patch b/pkgs/applications/science/misc/root/purify_include_paths_root5.patch new file mode 100644 index 000000000000..6773603b8ad3 --- /dev/null +++ b/pkgs/applications/science/misc/root/purify_include_paths_root5.patch @@ -0,0 +1,204 @@ +diff --git a/cint/cint/src/loadfile.cxx b/cint/cint/src/loadfile.cxx +--- a/cint/cint/src/loadfile.cxx ++++ b/cint/cint/src/loadfile.cxx +@@ -1365,92 +1365,6 @@ int G__statfilename(const char *filenamein, struct stat *statBuf, + } + } + #endif /* G__EDU_VERSION */ +- +-#ifdef G__VISUAL +- /********************************************** +- * try /msdev/include +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- workname.Format("/msdev/include/%s%s",filename(),addpost[i2]); +- res = stat( workname, statBuf ); +- if (res==0) { +- if (fullPath) fullPath->Swap(workname); +- return res; +- } +- } +-#endif /* G__VISUAL */ +- +-#ifdef G__SYMANTEC +- /********************************************** +- * try /sc/include +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- workname.Format("/sc/include/%s%s",filename(),addpost[i2]); +- res = stat( workname, statBuf ); +- if (res==0) { +- if (fullPath) fullPath->Swap(workname); +- return res; +- } +- } +-#endif // G__SYMANTEC +- +-#ifndef G__WIN32 +- /********************************************** +- * try /usr/include/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- workname.Format("/usr/include/%s%s",filename(),addpost[i2]); +- res = stat( workname, statBuf ); +- if (res==0) { +- if (fullPath) fullPath->Swap(workname); +- return res; +- } +- } +-#endif +- +-#ifdef __GNUC__ +- /********************************************** +- * try /usr/include/g++/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- workname.Format("/usr/include/g++/%s%s",filename(),addpost[i2]); +- res = stat( workname, statBuf ); +- if (res==0) { +- if (fullPath) fullPath->Swap(workname); +- return res; +- } +- } +-#endif /* __GNUC__ */ +- +-#ifndef G__WIN32 +- /* #ifdef __hpux */ +- /********************************************** +- * try /usr/include/CC/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- workname.Format("/usr/include/CC/%s%s",filename(),addpost[i2]); +- res = stat( workname, statBuf ); +- if (res==0) { +- if (fullPath) fullPath->Swap(workname); +- return res; +- } +- } +-#endif +- +-#ifndef G__WIN32 +- /********************************************** +- * try /usr/include/codelibs/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- workname.Format("/usr/include/codelibs/%s%s" +- ,filename(),addpost[i2]); +- res = stat( workname, statBuf ); +- if (res==0) { +- if (fullPath) fullPath->Swap(workname); +- return res; +- } +- } +-#endif + } + return -1; + } +@@ -1960,107 +1874,6 @@ int G__loadfile(const char *filenamein) + } + if(G__ifile.fp) break; + #endif /* G__EDU_VERSION */ +- +-#ifdef G__VISUAL +- /********************************************** +- * try /msdev/include +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- G__snprintf(G__ifile.name,G__MAXFILENAME,"/msdev/include/%s%s",filename(),addpost[i2]); +-#ifndef G__WIN32 +- G__ifile.fp = fopen(G__ifile.name,"r"); +-#else +- G__ifile.fp = fopen(G__ifile.name,"rb"); +-#endif +- G__globalcomp=G__store_globalcomp; +- } +- if(G__ifile.fp) break; +-#endif /* G__VISUAL */ +- +-#ifdef G__SYMANTEC +- /********************************************** +- * try /sc/include +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- G__snprintf(G__ifile.name,G__MAXFILENAME,"/sc/include/%s%s",filename(),addpost[i2]); +-#ifndef G__WIN32 +- G__ifile.fp = fopen(G__ifile.name,"r"); +-#else +- G__ifile.fp = fopen(G__ifile.name,"rb"); +-#endif +- G__globalcomp=G__store_globalcomp; +- } +- if(G__ifile.fp) break; +-#endif /* G__SYMANTEC */ +- +-#ifndef G__WIN32 +- /********************************************** +- * try /usr/include/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- G__snprintf(G__ifile.name,G__MAXFILENAME,"/usr/include/%s%s",filename(),addpost[i2]); +-#ifndef G__WIN32 +- G__ifile.fp = fopen(G__ifile.name,"r"); +-#else +- G__ifile.fp = fopen(G__ifile.name,"rb"); +-#endif +- G__globalcomp=G__store_globalcomp; +- } +- if(G__ifile.fp) break; +-#endif +- +-#ifdef __GNUC__ +- /********************************************** +- * try /usr/include/g++/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- G__snprintf(G__ifile.name,G__MAXFILENAME,"/usr/include/g++/%s%s",filename(),addpost[i2]); +-#ifndef G__WIN32 +- G__ifile.fp = fopen(G__ifile.name,"r"); +-#else +- G__ifile.fp = fopen(G__ifile.name,"rb"); +-#endif +- G__globalcomp=G__store_globalcomp; +- } +- if(G__ifile.fp) break; +-#endif /* __GNUC__ */ +- +-#ifndef G__WIN32 +-/* #ifdef __hpux */ +- /********************************************** +- * try /usr/include/CC/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- G__snprintf(G__ifile.name,G__MAXFILENAME,"/usr/include/CC/%s%s",filename(),addpost[i2]); +-#ifndef G__WIN32 +- G__ifile.fp = fopen(G__ifile.name,"r"); +-#else +- G__ifile.fp = fopen(G__ifile.name,"rb"); +-#endif +- G__globalcomp=G__store_globalcomp; +- } +- if(G__ifile.fp) break; +-/* #endif __hpux */ +-#endif +- +-#ifndef G__WIN32 +-/* #ifdef __hpux */ +- /********************************************** +- * try /usr/include/codelibs/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- G__snprintf(G__ifile.name,G__MAXFILENAME,"/usr/include/codelibs/%s%s" +- ,filename(),addpost[i2]); +-#ifndef G__WIN32 +- G__ifile.fp = fopen(G__ifile.name,"r"); +-#else +- G__ifile.fp = fopen(G__ifile.name,"rb"); +-#endif +- G__globalcomp=G__store_globalcomp; +- } +- if(G__ifile.fp) break; +-/* #endif __hpux */ +-#endif + } + } + diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index 2d579a803698..761766ffdf0d 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -5,6 +5,7 @@ stdenv.mkDerivation rec { name = "apmplanner2-${version}"; + # TODO revert Qt59 to Qt5 in pkgs/top-level/all-packages.nix on next release version = "2.0.26"; src = fetchFromGitHub { owner = "ArduPilot"; diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 71def712db6c..417d5544d6c8 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,22 +1,44 @@ { stdenv, python3, makeDesktopItem }: -python3.pkgs.buildPythonApplication rec { +let + + spyder-kernels = with python3.pkgs; buildPythonPackage rec { + pname = "spyder-kernels"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b"; + }; + + propagatedBuildInputs = [ + cloudpickle + ipykernel + wurlitzer + ]; + + # No tests + doCheck = false; + + meta = { + description = "Jupyter kernels for Spyder's console"; + homepage = https://github.com/spyder-ide/spyder-kernels; + license = stdenv.lib.licenses.mit; + }; + }; + +in python3.pkgs.buildPythonApplication rec { pname = "spyder"; - version = "3.2.8"; + version = "3.3.3"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5"; + sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba"; }; - # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing? - postPatch = '' - sed -i -e '/pyqt5/d' setup.py - ''; - propagatedBuildInputs = with python3.pkgs; [ - jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint - numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle + jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring + numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels ]; # There is no test for spyder diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix index 7c41a60a7253..6301acdf1342 100644 --- a/pkgs/applications/version-management/bugseverywhere/default.nix +++ b/pkgs/applications/version-management/bugseverywhere/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { homepage = http://www.bugseverywhere.org/; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } 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 5bfd74344e8c..ee32b50a65e6 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt +{ stdenv, fetchurl, fetchpatch, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xsl, pkgconfig, luajit , groff, gzip, bzip2, xz , python, wrapPython, pygments, markdown @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b"; }; + patches = [ + (fetchpatch { + name = "prevent-dos-limit-path-length.patch"; + url = "https://git.zx2c4.com/cgit/patch/?id=54c407a74a35d4ee9ffae94cc5bc9096c9f7f54a"; + sha256 = "1qlbpqsc293lmc9hzwf1j4jr5qlv8cm1r249v3yij5s4wki1595j"; + }) + ]; + nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e7199543ad74..0797d75a8377 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -82,6 +82,8 @@ let git-hub = callPackage ./git-hub { }; + git-ignore = callPackage ./git-ignore { }; + git-imerge = callPackage ./git-imerge { }; git-octopus = callPackage ./git-octopus { }; 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 index 7a47ed9a992d..2d171df8bf24 100644 --- 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 @@ -15,6 +15,8 @@ python2Packages.buildPythonApplication rec { buildInputs = [ git graphviz ]; + checkInputs = [ git ]; + postFixup = '' wrapProgram $out/bin/git-big-picture \ --prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs } diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 9c362276383c..473f0b1c450d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -49,6 +49,6 @@ buildRustPackage rec { inherit (src.meta) homepage; description = "Decentralized Issue Tracking for git"; license = licenses.gpl2; - maintainers = with maintainers; [ Profpatsch ]; + maintainers = with maintainers; [ Profpatsch matthiasbeyer ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix new file mode 100644 index 000000000000..9edcf4c3ac47 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }: + +with rustPlatform; + +buildRustPackage rec { + name = "git-ignore-${version}"; + version = "0.2.0"; + + cargoSha256 = "1fqfy8lnvpn5sd3l73x2p359zq4303vsrdgw3aphvy6580yjb84d"; + + src = fetchFromGitHub { + owner = "sondr3"; + repo = "git-ignore"; + rev = "v${version}"; + sha256 = "1nihh5inh46r8jg9z7d6g9gqfyhrznmkn15nmzpbnzf0653dl629"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with stdenv.lib; { + description = "Quickly and easily fetch .gitignore templates from gitignore.io"; + homepage = https://github.com/sondr3/git-ignore; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.sondr3 ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix index 331b020d8ca7..b5edd256256b 100644 --- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix @@ -1,11 +1,12 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { - pname = "pre_commit"; - version = "1.11.1"; + pname = "pre-commit"; + version = "1.14.2"; src = fetchPypi { - inherit pname version; - sha256 = "1kjrq8z78b6aqhyyw07dlwf6cqls88kik6f5l07hs71fj5ddvs9w"; + inherit version; + pname = "pre_commit"; + sha256 = "010fwih91gbc20hm2hmkyicm2a2xwrjjg4r4wv24x3n7zn4abdrc"; }; propagatedBuildInputs = [ @@ -17,7 +18,9 @@ with python3Packages; buildPythonApplication rec { six toml virtualenv - ]; + importlib-metadata + ] ++ stdenv.lib.optional (pythonOlder "3.7") importlib-resources + ++ stdenv.lib.optional (pythonOlder "3.2") futures; # Tests fail due to a missing windll dependency doCheck = false; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 366314490966..3cc6d9b2a7ec 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -6,14 +6,14 @@ with stdenv.lib; buildGoPackage rec { - name = "gitea-${version}"; - version = "1.7.1"; + pname = "gitea"; + version = "1.9.2"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1r13l7h4146729lwif45bkzn36sgg6an0qbhgvj8w3zp035c00k3"; + sha256 = "1i7h6scycwzil87fcx1a19w5pl0986g5ax7y030w0wgmrq3zj53a"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' @@ -58,6 +58,6 @@ buildGoPackage rec { description = "Git with a cup of tea"; homepage = https://gitea.io; license = licenses.mit; - maintainers = [ maintainers.disassembler ]; + maintainers = with maintainers; [ disassembler kolaente ]; }; } diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 3298bc167517..d20236e9f5bf 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,32 +1,32 @@ { "ce": { - "version": "11.7.5", - "repo_hash": "0bbyx9zmscf9273fgypb82gw166psy7d3p7dnwb6f5r9yz7rmhbn", - "deb_hash": "1m6hdvrz467q33z626l9f3d5pssl0bbj2hkqy5g0b05wvdznmldy", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.5-ce.0_amd64.deb/download.deb", + "version": "12.1.6", + "repo_hash": "0zyqxzyb1m8qa94iiyqf5ivqxrg60y378r94fsixy17fbh4y7sa6", + "deb_hash": "14bwcmwar44pjnjr6fdn2h9y92vyfva0kb76d4pz8pqc9pfm2hmg", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_12.1.6-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.7.5", + "rev": "v12.1.6", "passthru": { - "GITALY_SERVER_VERSION": "1.12.2", - "GITLAB_PAGES_VERSION": "1.3.1", - "GITLAB_SHELL_VERSION": "8.4.4", - "GITLAB_WORKHORSE_VERSION": "8.0.2" + "GITALY_SERVER_VERSION": "1.53.2", + "GITLAB_PAGES_VERSION": "1.7.1", + "GITLAB_SHELL_VERSION": "9.3.0", + "GITLAB_WORKHORSE_VERSION": "8.7.0" } }, "ee": { - "version": "11.7.5", - "repo_hash": "05dzvqrdgxbzsrf9rbis5m3iic04midx2arxgg3g4f78qfjxzylm", - "deb_hash": "1nfd68vzy3zc6a3xn5lhr83kqv9d7aaxvzv4ca9awcz4va5b33kc", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.5-ee.0_amd64.deb/download.deb", + "version": "12.1.6", + "repo_hash": "1lxci1hwcccgw567c5733yl95xsxr4gnw41m48igdw9y8p6g7zbc", + "deb_hash": "0yjilhf4bjhl1a596x6n4cvjklfbrwhymslhx977nfjazfb5slx3", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_12.1.6-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.7.5-ee", + "rev": "v12.1.6-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.12.2", - "GITLAB_PAGES_VERSION": "1.3.1", - "GITLAB_SHELL_VERSION": "8.4.4", - "GITLAB_WORKHORSE_VERSION": "8.0.2" + "GITALY_SERVER_VERSION": "1.53.2", + "GITLAB_PAGES_VERSION": "1.7.1", + "GITLAB_SHELL_VERSION": "9.3.0", + "GITLAB_WORKHORSE_VERSION": "8.7.0" } } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 2ffe1141b5a0..20f0937274ed 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,14 +1,29 @@ { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv -, ruby, tzdata, git, procps, nettools +, ruby, tzdata, git, nettools, nixosTests , gitlabEnterprise ? false }: let - rubyEnv = bundlerEnv { + rubyEnv = bundlerEnv rec { name = "gitlab-env-${version}"; inherit ruby; gemdir = ./rubyEnv- + "${if gitlabEnterprise then "ee" else "ce"}"; - groups = [ "default" "unicorn" "ed25519" "metrics" ]; + gemset = + let x = import (gemdir + "/gemset.nix"); + in x // { + # grpc expects the AR environment variable to contain `ar rpc`. See the + # discussion in nixpkgs #63056. + grpc = x.grpc // { + patches = [ ./fix-grpc-ar.patch ]; + dontBuild = false; + }; + }; + groups = [ + "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" + ]; + # N.B. omniauth_oauth2_generic and apollo_upload_server both provide a + # `console` executable. + ignoreCollisions = true; }; flavour = if gitlabEnterprise then "ee" else "ce"; @@ -35,7 +50,7 @@ stdenv.mkDerivation rec { src = sources.gitlab; buildInputs = [ - rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git procps nettools + rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools ]; patches = [ ./remove-hardcoded-locations.patch ]; @@ -49,9 +64,6 @@ stdenv.mkDerivation rec { rm config/initializers/gitlab_shell_secret_token.rb - substituteInPlace app/controllers/admin/background_jobs_controller.rb \ - --replace "ps -U" "${procps}/bin/ps -U" - sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb ''; @@ -64,6 +76,7 @@ stdenv.mkDerivation rec { # Work around unpacking deb containing binary with suid bit tar -f gitlab-deb-data.tar --delete ./opt/gitlab/embedded/bin/ksu tar -xf gitlab-deb-data.tar + rm gitlab-deb-data.tar mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public rm -rf opt # only directory in data.tar.gz @@ -95,6 +108,9 @@ stdenv.mkDerivation rec { GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION; GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION; GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION; + tests = { + nixos-test-passes = nixosTests.gitlab; + }; }; meta = with lib; { diff --git a/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch b/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch new file mode 100644 index 000000000000..9b95e668e045 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch @@ -0,0 +1,10 @@ +--- a/src/ruby/ext/grpc/extconf.rb ++++ b/src/ruby/ext/grpc/extconf.rb +@@ -27,6 +27,7 @@ ENV['MACOSX_DEPLOYMENT_TARGET'] = '10.7' + if ENV['AR'].nil? || ENV['AR'].size == 0 + ENV['AR'] = RbConfig::CONFIG['AR'] + ' rcs' + end ++ENV['AR'] = ENV['AR'] + ' rcs' + if ENV['CC'].nil? || ENV['CC'].size == 0 + ENV['CC'] = RbConfig::CONFIG['CC'] + end diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 81f1864099f3..1a6eb99b678d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -1,30 +1,41 @@ source 'https://rubygems.org' # Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537 -gem 'bundler', '>= 1.16.5' +gem 'bundler', '>= 1.17.3' -gem 'rugged', '~> 0.27' +gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 6.1', require: 'linguist' -gem 'gitlab-markup', '~> 1.6.5' -gem 'gitaly-proto', '~> 1.3.0' -gem 'activesupport', '~> 5.0.2' +gem 'gitlab-markup', '~> 1.7.0' +gem 'activesupport', '~> 5.1.7' +gem 'gitaly-proto', '~> 1.36.0' gem 'rdoc', '~> 4.2' -gem 'gitlab-gollum-lib', '~> 4.2', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false -gem 'grpc', '~> 1.15.0' -gem 'sentry-raven', '~> 2.7.2', require: false +gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false +gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false +gem 'grpc', '~> 1.19.0' +gem 'sentry-raven', '~> 2.9.0', require: false gem 'faraday', '~> 0.12' +gem 'rbtrace', require: false + +# Labkit provides observability functionality +gem 'gitlab-labkit', '~> 0.3.0' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 8.9.0' -gem 'google-protobuf', '~> 3.6' +gem 'google-protobuf', '~> 3.7.1' group :development, :test do - gem 'rubocop', '~> 0.50', require: false + gem 'rubocop', '~> 0.69', require: false gem 'rspec', require: false gem 'rspec-parameterized', require: false gem 'timecop', require: false gem 'factory_bot', require: false + gem 'pry', '~> 0.12.2', require: false + + # gitlab-shell spec gems + gem 'listen', '~> 0.5.0' + gem 'simplecov', '~> 0.9.0', require: false + gem 'vcr', '~> 4.0.0' + gem 'webmock', '~> 3.4.0' end diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 59f8ad69f223..0a86273f7cb1 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,7 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - activesupport (5.0.7) + actionpack (5.1.7) + actionview (= 5.1.7) + activesupport (= 5.1.7) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.7) + activesupport (= 5.1.7) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activesupport (5.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -10,35 +23,41 @@ GEM adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) ast (2.4.0) - binding_of_caller (0.8.0) - debug_inspector (>= 0.0.1) + binding_ninja (0.2.3) + builder (3.2.3) charlock_holmes (0.7.6) coderay (1.1.2) concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.5) + crack (0.4.3) + safe_yaml (~> 1.0.0) crass (1.0.4) - debug_inspector (0.0.3) diff-lcs (1.3) + docile (1.1.5) equalizer (0.0.11) + erubi (1.8.0) escape_utils (1.2.1) - factory_bot (4.11.1) - activesupport (>= 3.0.0) - faraday (0.15.3) + factory_bot (5.0.2) + activesupport (>= 4.2.0) + faraday (0.15.4) multipart-post (>= 1.2, < 3) + ffi (1.10.0) gemojione (3.3.0) json - gitaly-proto (1.3.0) + gitaly-proto (1.36.0) grpc (~> 1.0) - github-linguist (6.2.0) + github-linguist (6.4.1) charlock_holmes (~> 0.7.6) escape_utils (~> 1.2.0) mime-types (>= 1.19) rugged (>= 0.25.1) github-markup (1.7.0) - gitlab-gollum-lib (4.2.7.5) + gitlab-gollum-lib (4.2.7.7) gemojione (~> 3.2) github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) @@ -46,7 +65,7 @@ GEM rouge (~> 3.1) sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.1) + gitlab-gollum-rugged_adapter (0.4.4.2) mime-types (>= 1.15) rugged (~> 0.25) gitlab-grit (2.8.2) @@ -54,118 +73,172 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) - gitlab-markup (1.6.5) + gitlab-labkit (0.3.0) + actionpack (~> 5) + activesupport (~> 5) + grpc (~> 1.19.0) + jaeger-client (~> 0.10) + opentracing (~> 0.4) + gitlab-markup (1.7.0) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - google-protobuf (3.6.1) - googleapis-common-protos-types (1.0.2) + google-protobuf (3.7.1) + googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) - grpc (1.15.0) + grpc (1.19.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) - i18n (1.1.1) + hashdiff (0.3.9) + i18n (1.6.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) - json (2.1.0) + jaeger-client (0.10.0) + opentracing (~> 0.3) + thrift + jaro_winkler (1.5.2) + json (2.2.0) licensee (8.9.2) rugged (~> 0.24) + listen (0.5.3) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) + method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) - mini_portile2 (2.3.0) + mime-types-data (3.2019.0331) + mini_portile2 (2.4.0) minitest (5.11.3) + msgpack (1.2.10) + multi_json (1.13.1) multipart-post (2.0.0) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri - parallel (1.12.1) - parser (2.5.3.0) + opentracing (0.5.0) + optimist (3.0.0) + parallel (1.17.0) + parser (2.6.3.0) ast (~> 2.4.0) posix-spawn (0.3.13) - powerpack (0.1.2) proc_to_ast (0.1.0) coderay parser unparser procto (0.0.3) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + public_suffix (3.0.3) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rainbow (3.0.0) + rbtrace (0.4.11) + ffi (>= 1.0.6) + msgpack (>= 0.4.3) + optimist (>= 3.0.0) rdoc (4.3.0) - rouge (3.3.0) - rspec (3.7.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + rouge (3.5.1) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-parameterized (0.4.0) - binding_of_caller + rspec-support (~> 3.8.0) + rspec-parameterized (0.4.2) + binding_ninja (>= 0.2.3) parser proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-support (3.7.1) - rubocop (0.54.0) + rspec-support (3.8.0) + rubocop (0.69.0) + jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5) - powerpack (~> 0.1) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) + unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.0) - rugged (0.27.5) + rugged (0.28.1) + safe_yaml (1.0.5) sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) - sentry-raven (2.7.2) + sentry-raven (2.9.0) faraday (>= 0.7.6, < 1.0) - stringex (2.8.4) + simplecov (0.9.2) + docile (~> 1.1.0) + multi_json (~> 1.0) + simplecov-html (~> 0.9.0) + simplecov-html (0.9.0) + stringex (2.8.5) thread_safe (0.3.6) + thrift (0.11.0.0) timecop (0.9.1) tzinfo (1.2.5) thread_safe (~> 0.1) - unicode-display_width (1.4.0) - unparser (0.2.8) + unicode-display_width (1.6.0) + unparser (0.4.5) abstract_type (~> 0.0.7) adamantium (~> 0.2.0) concord (~> 0.1.5) diff-lcs (~> 1.3) equalizer (~> 0.0.9) - parser (>= 2.3.1.2, < 2.6) + parser (~> 2.6.3) procto (~> 0.0.2) + vcr (4.0.0) + webmock (3.4.2) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff PLATFORMS ruby DEPENDENCIES - activesupport (~> 5.0.2) - bundler (>= 1.16.5) + activesupport (~> 5.1.7) + bundler (>= 1.17.3) factory_bot faraday (~> 0.12) - gitaly-proto (~> 1.3.0) + gitaly-proto (~> 1.36.0) github-linguist (~> 6.1) - gitlab-gollum-lib (~> 4.2) - gitlab-gollum-rugged_adapter (~> 0.4.4) - gitlab-markup (~> 1.6.5) - google-protobuf (~> 3.6) - grpc (~> 1.15.0) + gitlab-gollum-lib (~> 4.2.7.7) + gitlab-gollum-rugged_adapter (~> 0.4.4.2) + gitlab-labkit (~> 0.3.0) + gitlab-markup (~> 1.7.0) + google-protobuf (~> 3.7.1) + grpc (~> 1.19.0) licensee (~> 8.9.0) + listen (~> 0.5.0) + pry (~> 0.12.2) + rbtrace rdoc (~> 4.2) rspec rspec-parameterized - rubocop (~> 0.50) - rugged (~> 0.27) - sentry-raven (~> 2.7.2) + rubocop (~> 0.69) + rugged (~> 0.28) + sentry-raven (~> 2.9.0) + simplecov (~> 0.9.0) timecop + vcr (~> 4.0.0) + webmock (~> 3.4.0) BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 349b75f19347..b8a71f828699 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,20 +1,30 @@ -{ stdenv, fetchFromGitLab, buildGoPackage, ruby, bundlerEnv }: +{ stdenv, fetchFromGitLab, buildGoPackage, ruby, bundlerEnv, pkgconfig, libgit2_0_27 }: let - rubyEnv = bundlerEnv { + rubyEnv = bundlerEnv rec { name = "gitaly-env"; inherit ruby; gemdir = ./.; + gemset = + let x = import (gemdir + "/gemset.nix"); + in x // { + # grpc expects the AR environment variable to contain `ar rpc`. See the + # discussion in nixpkgs #63056. + grpc = x.grpc // { + patches = [ ../fix-grpc-ar.patch ]; + dontBuild = false; + }; + }; }; in buildGoPackage rec { - version = "1.12.2"; + version = "1.53.2"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "0pg3pm34jnssvh8m99d6w3ap1kn6kn3akqaa17zxv9y0xryvchpy"; + sha256 = "0x4dhqaxx6n5jlcvf69rglxiz11037ghgcnskks6qnlcbkd85j3d"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; @@ -23,11 +33,21 @@ in buildGoPackage rec { inherit rubyEnv; }; - buildInputs = [ rubyEnv.wrappedRuby ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ rubyEnv.wrappedRuby libgit2_0_27 ]; + goDeps = ./deps.nix; + preBuild = "rm -r go/src/gitlab.com/gitlab-org/labkit/vendor"; postInstall = '' mkdir -p $ruby - cp -rv $src/ruby/{bin,lib} $ruby + cp -rv $src/ruby/{bin,lib,git-hooks,gitlab-shell} $ruby + + # gitlab-shell will try to read its config relative to the source + # code by default which doesn't work in nixos because it's a + # read-only filesystem + substituteInPlace $ruby/gitlab-shell/lib/gitlab_config.rb --replace \ + "File.join(ROOT_PATH, 'config.yml')" \ + "'/run/gitlab/shell-config.yml'" ''; outputs = [ "bin" "out" "ruby" ]; @@ -35,7 +55,7 @@ in buildGoPackage rec { meta = with stdenv.lib; { homepage = http://www.gitlab.com/; platforms = platforms.unix; - maintainers = with maintainers; [ roblabla ]; + maintainers = with maintainers; [ roblabla globin fpletz ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix new file mode 100644 index 000000000000..5522185783d3 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -0,0 +1,669 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "v0.26.0"; + sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "v1.0.0"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + }; + } + { + goPackagePath = "github.com/certifi/gocertifi"; + fetch = { + type = "git"; + url = "https://github.com/certifi/gocertifi"; + rev = "ee1a9a0726d2"; + sha256 = "08l6lqaw83pva6fa0aafmhmy1mhb145av21772zfh3ij809a37i4"; + }; + } + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + { + goPackagePath = "github.com/cloudflare/tableflip"; + fetch = { + type = "git"; + url = "https://github.com/cloudflare/tableflip"; + rev = "8392f1641731"; + sha256 = "0by5hk8s0bhhl3kiw658p5g53zvc61k4q2wxnh1w64p5ghd1rfn8"; + }; + } + { + goPackagePath = "github.com/codahale/hdrhistogram"; + fetch = { + type = "git"; + url = "https://github.com/codahale/hdrhistogram"; + rev = "3a0bb77429bd"; + sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/getsentry/raven-go"; + fetch = { + type = "git"; + url = "https://github.com/getsentry/raven-go"; + rev = "v0.1.2"; + sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z"; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.8.0"; + sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.3.0"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/lint"; + fetch = { + type = "git"; + url = "https://github.com/golang/lint"; + rev = "06c8688daad7"; + sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.1.1"; + sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.3.1"; + sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.1"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/go-grpc-middleware"; + rev = "v1.0.0"; + sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; + rev = "v1.2.0"; + sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/kelseyhightower/envconfig"; + fetch = { + type = "git"; + url = "https://github.com/kelseyhightower/envconfig"; + rev = "v1.3.0"; + sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw"; + }; + } + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/libgit2/git2go"; + fetch = { + type = "git"; + url = "https://github.com/libgit2/git2go"; + rev = "ecaeb7a21d47"; + sha256 = "14r7ryff93r49g94f6kg66xc0y6rwb31lj22s3qmzmlgywk0pgvr"; + }; + } + { + goPackagePath = "github.com/lightstep/lightstep-tracer-go"; + fetch = { + type = "git"; + url = "https://github.com/lightstep/lightstep-tracer-go"; + rev = "v0.15.6"; + sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "v1.7.0"; + sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg"; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "v1.4.3"; + sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; + }; + } + { + goPackagePath = "github.com/opentracing/opentracing-go"; + fetch = { + type = "git"; + url = "https://github.com/opentracing/opentracing-go"; + rev = "v1.0.2"; + sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; + }; + } + { + goPackagePath = "github.com/philhofer/fwd"; + fetch = { + type = "git"; + url = "https://github.com/philhofer/fwd"; + rev = "v1.0.0"; + sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v1.0.0"; + sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fd36f4220a90"; + sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "v0.4.1"; + sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "v0.0.2"; + sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + }; + } + { + goPackagePath = "github.com/tinylib/msgp"; + fetch = { + type = "git"; + url = "https://github.com/tinylib/msgp"; + rev = "v1.1.0"; + sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff"; + }; + } + { + goPackagePath = "github.com/uber-go/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "v1.3.2"; + sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; + }; + } + { + goPackagePath = "github.com/uber/jaeger-client-go"; + fetch = { + type = "git"; + url = "https://github.com/uber/jaeger-client-go"; + rev = "v2.15.0"; + sha256 = "0ki23m9zrf3vxp839fnp9ckr4m28y6mpad8g5s5lr5k8jkl0sfwj"; + }; + } + { + goPackagePath = "github.com/uber/jaeger-lib"; + fetch = { + type = "git"; + url = "https://github.com/uber/jaeger-lib"; + rev = "v1.5.0"; + sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q"; + }; + } + { + goPackagePath = "gitlab.com/gitlab-org/gitaly-proto"; + fetch = { + type = "git"; + url = "https://gitlab.com/gitlab-org/gitaly-proto.git"; + rev = "v1.36.0"; + sha256 = "0xma8ys3lf1bdhlkmcis31xs1h1dshcr5796wwfwnzijwk6422m3"; + }; + } + { + goPackagePath = "gitlab.com/gitlab-org/labkit"; + fetch = { + type = "git"; + url = "https://gitlab.com/gitlab-org/labkit.git"; + rev = "0c3fc7cdd57c"; + sha256 = "0fpn37v7dhhdgd63v4mq9cna9wdzrsfams13qmjmps3xpdw2wr9i"; + }; + } + { + goPackagePath = "go.uber.org/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "v1.3.2"; + sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "06c8688daad7"; + sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d28f0bde5980"; + sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "d2e6202438be"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "37e7f081c4d4"; + sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "6cd1fcedba52"; + sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.1.0"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "bd91e49a0898"; + sha256 = "1f5q04h03q6fksbfkhz13ai5849rkkb8xrmmi7cxs4lzsi6ixkg8"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "v1.16.0"; + sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg"; + }; + } + { + goPackagePath = "gopkg.in/DataDog/dd-trace-go.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/DataDog/dd-trace-go.v1"; + rev = "v1.7.0"; + sha256 = "0j45skiiayfsaw8id4g20k51zfr0raj47a03q2icka5xrh3qj6yq"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "88497007e858"; + sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; + }; + } +] diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index c06be7891ffb..fd1af22dd78e 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -7,14 +7,38 @@ }; version = "0.0.7"; }; - activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + actionpack = { + dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yx73l984y3ri5ndj37l1dfarcdvbhra7vhz9fcww4za24is95d5"; + sha256 = "0zyi3dc50ii2msdkawaf11y4xw645ig57ha2jfnr8lpr8s1nlh52"; type = "gem"; }; - version = "5.0.7"; + version = "5.1.7"; + }; + actionview = { + dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i2j580njb767yhf0k5ih3qqg38ybiah80ai8dsr6kjjw35aj747"; + type = "gem"; + }; + version = "5.1.7"; + }; + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0znhiy90hdlx66jqhaycin4qrphrymsw68c36a1an7g481zvfv91"; + type = "gem"; + }; + version = "5.1.7"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -25,6 +49,17 @@ }; version = "0.2.0"; }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; + type = "gem"; + }; + version = "2.6.0"; + }; ast = { source = { remotes = ["https://rubygems.org"]; @@ -33,14 +68,25 @@ }; version = "2.4.0"; }; - binding_of_caller = { - dependencies = ["debug_inspector"]; + binding_ninja = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g"; + sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa"; type = "gem"; }; - version = "0.8.0"; + version = "0.2.3"; + }; + builder = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + type = "gem"; + }; + version = "3.2.3"; }; charlock_holmes = { source = { @@ -68,12 +114,23 @@ version = "0.1.5"; }; concurrent-ruby = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18q9skp5pfq4jwbxzmw8q2rn4cpw6mf4561i2hsjcl1nxdag2jvb"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.1.3"; + version = "1.1.5"; + }; + crack = { + dependencies = ["safe_yaml"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; + type = "gem"; + }; + version = "0.4.3"; }; crass = { source = { @@ -83,14 +140,6 @@ }; version = "1.0.4"; }; - debug_inspector = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0"; - type = "gem"; - }; - version = "0.0.3"; - }; diff-lcs = { source = { remotes = ["https://rubygems.org"]; @@ -99,6 +148,14 @@ }; version = "1.3"; }; + docile = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + type = "gem"; + }; + version = "1.1.5"; + }; equalizer = { source = { remotes = ["https://rubygems.org"]; @@ -107,6 +164,16 @@ }; version = "0.0.11"; }; + erubi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1"; + type = "gem"; + }; + version = "1.8.0"; + }; escape_utils = { source = { remotes = ["https://rubygems.org"]; @@ -117,21 +184,33 @@ }; factory_bot = { dependencies = ["activesupport"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13q1b7imb591068plg4ashgsqgzarvfjz6xxn3jk6klzikz5zhg1"; + sha256 = "02ijqa3g6lb8l8mvi40z1zgh9bb3gr08p2r2ym159ghhfbcrmbwk"; type = "gem"; }; - version = "4.11.1"; + version = "5.0.2"; }; faraday = { dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16hwxc8v0z6gkanckjhx0ffgqmzpc4ywz4dfhxpjlz2mbz8d5m52"; + sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; type = "gem"; }; - version = "0.15.3"; + version = "0.15.4"; + }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + type = "gem"; + }; + version = "1.10.0"; }; gemojione = { dependencies = ["json"]; @@ -144,21 +223,25 @@ }; gitaly-proto = { dependencies = ["grpc"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17fg29j089k94ssim9hfzpd5lycvhimbpvz12d73ywrbwz7a7680"; + sha256 = "11bkrf2z5ppp55cipawdpinrva42x12grp2gl1dp1jdb35crqick"; type = "gem"; }; - version = "1.3.0"; + version = "1.36.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fs0i5xxsl91hnfa17ipk8cwxrg84kjg9mzxvxkd4ykldfdp353y"; + sha256 = "0nqsprsy4xd6yxzk3b54815hv0gk2r1xn0vsm81pkyy61bbm35hf"; type = "gem"; }; - version = "6.2.0"; + version = "6.4.1"; }; github-markup = { source = { @@ -170,21 +253,25 @@ }; gitlab-gollum-lib = { dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn"; + sha256 = "13m26b32iznp0lbq984dijx7n4ckg99zckwp80gv1knq8n0bpfbf"; type = "gem"; }; - version = "4.2.7.5"; + version = "4.2.7.7"; }; gitlab-gollum-rugged_adapter = { dependencies = ["mime-types" "rugged"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi"; + sha256 = "1d32d3yfadzwrarv0biwbfbkz2bqcc0dc3q0imnk962jaay19gc4"; type = "gem"; }; - version = "0.4.4.1"; + version = "0.4.4.2"; }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; @@ -195,13 +282,26 @@ }; version = "2.8.2"; }; - gitlab-markup = { + gitlab-labkit = { + dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy"; + sha256 = "0dvapmdc9axm9dq2gg89qrqb318rkrsabpyybrqvcx1ipbi5k3a1"; type = "gem"; }; - version = "1.6.5"; + version = "0.3.0"; + }; + gitlab-markup = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d"; + type = "gem"; + }; + version = "1.7.0"; }; gollum-grit_adapter = { dependencies = ["gitlab-grit"]; @@ -213,39 +313,57 @@ version = "1.0.1"; }; google-protobuf = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf"; + sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2"; type = "gem"; }; - version = "3.6.1"; + version = "3.7.1"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq"; + sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.4"; }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb"; + sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs"; type = "gem"; }; - version = "1.15.0"; + version = "1.19.0"; + }; + hashdiff = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qji49afni3c90zws617x514xi7ik70g2iwngj9skq68mjcq6y4x"; + type = "gem"; + }; + version = "0.3.9"; }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7"; + sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; type = "gem"; }; - version = "1.1.1"; + version = "1.6.0"; }; ice_nine = { source = { @@ -255,13 +373,36 @@ }; version = "0.11.2"; }; - json = { + jaeger-client = { + dependencies = ["opentracing" "thrift"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l"; type = "gem"; }; - version = "2.1.0"; + version = "0.10.0"; + }; + jaro_winkler = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l"; + type = "gem"; + }; + version = "1.5.2"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + type = "gem"; + }; + version = "2.2.0"; }; licensee = { dependencies = ["rugged"]; @@ -272,6 +413,25 @@ }; version = "8.9.2"; }; + listen = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl"; + type = "gem"; + }; + version = "0.5.3"; + }; + loofah = { + dependencies = ["crass" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg"; + type = "gem"; + }; + version = "2.2.3"; + }; memoizable = { dependencies = ["thread_safe"]; source = { @@ -281,6 +441,14 @@ }; version = "0.4.2"; }; + method_source = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + type = "gem"; + }; + version = "0.9.2"; + }; mime-types = { dependencies = ["mime-types-data"]; source = { @@ -291,20 +459,22 @@ version = "3.2.2"; }; mime-types-data = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; + sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; type = "gem"; }; - version = "3.2018.0812"; + version = "3.2019.0331"; }; mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { source = { @@ -314,6 +484,24 @@ }; version = "5.11.3"; }; + msgpack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w38hilm3dk42dwk8ygiq49bl4in7y80hfqr63hk54mj4gmzi6ch"; + type = "gem"; + }; + version = "1.2.10"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + type = "gem"; + }; + version = "1.13.1"; + }; multipart-post = { source = { remotes = ["https://rubygems.org"]; @@ -324,12 +512,14 @@ }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.3"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -340,22 +530,44 @@ }; version = "1.5.0"; }; - parallel = { + opentracing = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; + sha256 = "11lj1d8vq0hkb5hjz8q4lm82cddrggpbb33dhqfn7rxhwsmxgdfy"; type = "gem"; }; - version = "1.12.1"; + version = "0.5.0"; + }; + optimist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + type = "gem"; + }; + version = "3.0.0"; + }; + parallel = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; + type = "gem"; + }; + version = "1.17.0"; }; parser = { dependencies = ["ast"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f"; + sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn"; type = "gem"; }; - version = "2.5.3.0"; + version = "2.6.3.0"; }; posix-spawn = { source = { @@ -365,14 +577,6 @@ }; version = "0.3.13"; }; - powerpack = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv"; - type = "gem"; - }; - version = "0.1.2"; - }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; source = { @@ -390,6 +594,66 @@ }; version = "0.0.3"; }; + pry = { + dependencies = ["coderay" "method_source"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; + type = "gem"; + }; + version = "0.12.2"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + type = "gem"; + }; + version = "3.0.3"; + }; + rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; + type = "gem"; + }; + version = "2.0.7"; + }; + rack-test = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + type = "gem"; + }; + version = "1.1.0"; + }; + rails-dom-testing = { + dependencies = ["activesupport" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + type = "gem"; + }; + version = "2.0.3"; + }; + rails-html-sanitizer = { + dependencies = ["loofah"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr"; + type = "gem"; + }; + version = "1.0.4"; + }; rainbow = { source = { remotes = ["https://rubygems.org"]; @@ -398,6 +662,15 @@ }; version = "3.0.0"; }; + rbtrace = { + dependencies = ["ffi" "msgpack" "optimist"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; + type = "gem"; + }; + version = "0.4.11"; + }; rdoc = { source = { remotes = ["https://rubygems.org"]; @@ -407,74 +680,90 @@ version = "4.3.0"; }; rouge = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; + sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; type = "gem"; }; - version = "3.3.0"; + version = "3.5.1"; }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01"; + sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; rspec-core = { dependencies = ["rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zvjbymx3avxm3lf8v4gka3a862vnaxldmwvp6767bpy48nhnvjj"; + sha256 = "1p1s5bnbqp3sxk67y0fh0x884jjym527r0vgmhbm81w7aq6b7l4p"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.0"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy"; + sha256 = "1c4gs5ybf7km0qshdm92p38zvg32n1j2kr5fgs2icacz7xf2y6fy"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.3"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3"; + sha256 = "06y508cjqycb4yfhxmb3nxn0v9xqf17qbd46l1dh4xhncinr4fyp"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; rspec-parameterized = { - dependencies = ["binding_of_caller" "parser" "proc_to_ast" "rspec" "unparser"]; + dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0arynbr6cfjhccwc8gy2xf87nybdnncsnmfwknnh8s7d4mj730p0"; + sha256 = "1c0892jbaznnldk1wi24qxm70g4zhw2idqx516rhgdzgd7yh5j31"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.2"; }; rspec-support = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nl30xb6jmcl0awhqp6jycl01wdssblifwy921phfml70rd9flj1"; + sha256 = "0p3m7drixrlhvj2zpc38b11x145bvm311x6f33jjcxmvcm0wq609"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.0"; }; rubocop = { - dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "106y99lq0fg62k3vk1w5wwb4vq16pnh4l61skc82xck627z0h8is"; + sha256 = "1cmw8ajaiidvrzjcsljh47f4l3lmcazqrzljgalj3szkr8ibkk5i"; type = "gem"; }; - version = "0.54.0"; + version = "0.69.0"; }; ruby-progressbar = { source = { @@ -485,12 +774,24 @@ version = "1.10.0"; }; rugged = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6"; + sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6"; type = "gem"; }; - version = "0.27.5"; + version = "0.28.1"; + }; + safe_yaml = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56"; + type = "gem"; + }; + version = "1.0.5"; }; sanitize = { dependencies = ["crass" "nokogiri" "nokogumbo"]; @@ -503,20 +804,41 @@ }; sentry-raven = { dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4"; + sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483"; type = "gem"; }; - version = "2.7.2"; + version = "2.9.0"; + }; + simplecov = { + dependencies = ["docile" "multi_json" "simplecov-html"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12"; + type = "gem"; + }; + version = "0.9.2"; + }; + simplecov-html = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc"; + type = "gem"; + }; + version = "0.9.0"; }; stringex = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1"; + sha256 = "15ns7j5smw04w6w7bqd5mm2qcl7w9lhwykyb974i4isgg9yc23ys"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; thread_safe = { source = { @@ -526,6 +848,16 @@ }; version = "0.3.6"; }; + thrift = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv"; + type = "gem"; + }; + version = "0.11.0.0"; + }; timecop = { source = { remotes = ["https://rubygems.org"]; @@ -544,20 +876,41 @@ version = "1.2.5"; }; unicode-display_width = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57"; + sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.0"; }; unparser = { dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rh1649846ac17av30x0b0v9l45v0x1j2y1i8m1a7xdd0v4sld0z"; + sha256 = "03vjj74kj86vlazhiclf63kf6gajs66k8ni34q70fdhf97d7b60c"; type = "gem"; }; - version = "0.2.8"; + version = "0.4.5"; + }; + vcr = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr"; + type = "gem"; + }; + version = "4.0.0"; + }; + webmock = { + dependencies = ["addressable" "crack" "hashdiff"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib"; + type = "gem"; + }; + version = "3.4.2"; }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 895e1e13bec8..faeed38c918b 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "8.4.4"; + version = "9.3.0"; name = "gitlab-shell-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1a6p13g38f4gqqfjgymcvf09k4mnr2bfpj8mqz0x6rz7q67lllcq"; + sha256 = "1r000h4sgplx7giqvqs5iy0zh3drf6qa1iiq0mxlk3h9fshs1348"; }; buildInputs = [ ruby bundler go ]; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { patches = [ ./remove-hardcoded-locations.patch ]; installPhase = '' + export GOCACHE="$TMPDIR/go-cache" + ruby bin/compile mkdir -p $out/ cp -R . $out/ diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch index 7819c863a359..d8337ebb9ea4 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -1,16 +1,16 @@ diff --git a/go/internal/config/config.go b/go/internal/config/config.go -index 435cb29..078c1df 100644 +index f951fe6..b422fe3 100644 --- a/go/internal/config/config.go +++ b/go/internal/config/config.go -@@ -2,7 +2,6 @@ package config - +@@ -3,7 +3,6 @@ package config import ( "io/ioutil" + "net/url" - "os" "path" + "strings" - yaml "gopkg.in/yaml.v2" -@@ -26,16 +25,13 @@ type Config struct { +@@ -30,16 +29,13 @@ type Config struct { } func New() (*Config, error) { @@ -28,12 +28,25 @@ index 435cb29..078c1df 100644 + return newFromFile("/run/gitlab/shell-config.yml") } - func newFromFile(filename string) (*Config, error) { + func (c *Config) FeatureEnabled(featureName string) bool { +diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb +index 0600a18..c46f2d7 100644 +--- a/lib/gitlab_keys.rb ++++ b/lib/gitlab_keys.rb +@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength + attr_accessor :auth_file, :key + + def self.command(whatever) +- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}" ++ "/run/current-system/sw/bin/gitlab-shell #{whatever}" + end + + def self.command_key(key_id) diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb -index 57c70f5..700569b 100644 +index 2cb76a8..f59ad5e 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb -@@ -187,7 +187,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength +@@ -190,7 +190,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength args = [executable, gitaly_address, json_args] # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. @@ -43,16 +56,16 @@ index 57c70f5..700569b 100644 end def api -diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb -index 0600a18..6814f0a 100644 ---- a/lib/gitlab_keys.rb -+++ b/lib/gitlab_keys.rb -@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength - attr_accessor :auth_file, :key - - def self.command(whatever) -- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}" -+ "/run/current-system/sw/bin/gitlab-shell #{whatever}" - end - - def self.command_key(key_id) +diff --git a/go/internal/command/fallback/fallback.go b/go/internal/command/fallback/fallback.go +index 2cb76a8..f59ad5e 100644 +--- a/go/internal/command/fallback/fallback.go ++++ b/go/internal/command/fallback/fallback.go +@@ -21,7 +21,7 @@ + ) + + func (c *Command) Execute() error { +- rubyCmd := filepath.Join(c.RootDir, "bin", RubyProgram) ++ rubyCmd := filepath.Join("/run/current-system/sw/bin", RubyProgram) + + // Ensure rubyArgs[0] is the full path to gitlab-shell-ruby + rubyArgs := append([]string{rubyCmd}, c.Args[1:]...) diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index ad3b11f3b2ce..abe80685c7e4 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "8.0.2"; + version = "8.7.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "12xwr9yl59i58gnf0yn5yjp7zwz3s46042lk7rihvvzsa0kax690"; + sha256 = "1zlngc498hnzbxwdjn3ymr0xwrnfgnzzhn9lyf37yfbjl8x28n3z"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile index f59e61208ac3..8bffc2a973d9 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile @@ -1,7 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '5.0.7.1' -gem 'rails-deprecated_sanitizer', '~> 1.0.3' +gem 'rails', '5.2.3' # Improves copy-on-write performance for MRI gem 'nakayoshi_fork', '~> 0.0.4' @@ -12,19 +11,19 @@ gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' +gem 'default_value_for', '~> 3.2.0' # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql -gem 'pg', '~> 0.18.2', group: :postgres +gem 'pg', '~> 1.1', group: :postgres -gem 'rugged', '~> 0.27' -gem 'grape-path-helpers', '~> 1.0' +gem 'rugged', '~> 0.28' +gem 'grape-path-helpers', '~> 1.1' gem 'faraday', '~> 0.12' # Authentication libraries -gem 'devise', '~> 4.4' +gem 'devise', '~> 4.6' gem 'doorkeeper', '~> 4.3' gem 'doorkeeper-openid_connect', '~> 1.5' gem 'omniauth', '~> 1.8' @@ -42,11 +41,14 @@ gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.3.3' -gem 'rack-oauth2', '~> 1.2.1' +gem 'omniauth_openid_connect', '~> 0.3.1' +gem "omniauth-ultraauth", '~> 0.0.2' +gem 'omniauth-salesforce', '~> 1.0.5' +gem 'rack-oauth2', '~> 1.9.3' gem 'jwt', '~> 2.1.0' # Spam and anti-bot protection -gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' +gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'akismet', '~> 2.0' # Two-factor authentication @@ -58,6 +60,8 @@ gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.6' gem 'rubyzip', '~> 1.2.2', require: 'zip' +# GitLab Pages letsencrypt support +gem 'acme-client', '~> 2.0.2' # Browser detection gem 'browser', '~> 2.5' @@ -68,7 +72,7 @@ gem 'gpgme', '~> 2.0.18' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'net-ldap' # API @@ -79,6 +83,8 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' # GraphQL API gem 'graphql', '~> 1.8.0' gem 'graphiql-rails', '~> 1.4.10' +gem 'apollo_upload_server', '~> 2.0.0.beta3' +gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] # Disable strong_params so that Mash does not respond to :permitted? gem 'hashie-forbidden_attributes' @@ -94,13 +100,15 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick' # for backups -gem 'fog-aws', '~> 2.0.1' -gem 'fog-core', '~> 1.44' -gem 'fog-google', '~> 1.7.1' -gem 'fog-local', '~> 0.3' -gem 'fog-openstack', '~> 0.1' +gem 'fog-aws', '~> 3.5' +# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. +# Also see config/initializers/fog_core_patch.rb. +gem 'fog-core', '= 2.1.0' +gem 'fog-google', '~> 1.8' +gem 'fog-local', '~> 0.6' +gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' -gem 'fog-aliyun', '~> 0.2.0' +gem 'fog-aliyun', '~> 0.3' # for Google storage gem 'google-api-client', '~> 0.23' @@ -113,22 +121,22 @@ gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' -gem 'deckar01-task_list', '2.0.0' -gem 'gitlab-markup', '~> 1.6.5' +gem 'deckar01-task_list', '2.2.0' +gem 'gitlab-markup', '~> 1.7.0' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.0' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 1.5.8' -gem 'asciidoctor-plantuml', '0.0.8' -gem 'rouge', '~> 3.1' -gem 'truncato', '~> 0.7.9' -gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.5' +gem 'asciidoctor', '~> 2.0.10' +gem 'asciidoctor-include-ext', '~> 0.3.1', require: false +gem 'asciidoctor-plantuml', '0.0.9' +gem 'rouge', '~> 3.5' +gem 'truncato', '~> 0.7.11' +gem 'bootstrap_form', '~> 4.2.0' +gem 'nokogiri', '~> 1.10.3' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -138,38 +146,36 @@ gem 'icalendar' gem 'diffy', '~> 3.1.0' # Application server -# The 2.0.6 version of rack requires monkeypatch to be present in -# `config.ru`. This can be removed once a new update for Rack -# is available that contains https://github.com/rack/rack/pull/1201. -gem 'rack', '2.0.6' +gem 'rack', '~> 2.0.7' group :unicorn do - gem 'unicorn', '~> 5.1.0' + gem 'unicorn', '~> 5.4.1' gem 'unicorn-worker-killer', '~> 0.4.4' end group :puma do gem 'puma', '~> 3.12', require: false gem 'puma_worker_killer', require: false + gem 'rack-timeout', require: false end # State machine gem 'state_machines-activerecord', '~> 0.5.1' # Issue tags -gem 'acts-as-taggable-on', '~> 5.0' +gem 'acts-as-taggable-on', '~> 6.0' # Background jobs -gem 'sidekiq', '~> 5.2.1' -gem 'sidekiq-cron', '~> 0.6.0' +gem 'sidekiq', '~> 5.2.7' +gem 'sidekiq-cron', '~> 1.0' gem 'redis-namespace', '~> 1.6.0' gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' # Cron Parser -gem 'rufus-scheduler', '~> 3.4' +gem 'fugit', '~> 1.2.1' # HTTP requests -gem 'httparty', '~> 0.13.3' +gem 'httparty', '~> 0.16.4' # Colored output to console gem 'rainbow', '~> 3.0' @@ -185,10 +191,10 @@ gem 're2', '~> 1.1.1' # Misc -gem 'version_sorter', '~> 2.1.0' +gem 'version_sorter', '~> 2.2.4' # Export Ruby Regex to Javascript -gem 'js_regex', '~> 2.2.1' +gem 'js_regex', '~> 3.1' # User agent parsing gem 'device_detector' @@ -206,7 +212,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false # HipChat integration gem 'hipchat', '~> 1.5.0' -# JIRA integration +# Jira integration gem 'jira-ruby', '~> 1.4' # Flowdock integration @@ -225,7 +231,7 @@ gem 'asana', '~> 0.8.1' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 4.0.0' +gem 'kubeclient', '~> 4.2.2' # Sanitize user input gem 'sanitize', '~> 4.6' @@ -259,25 +265,25 @@ gem 'chronic_duration', '~> 0.10.6' gem 'webpack-rails', '~> 0.9.10' gem 'rack-proxy', '~> 0.6.0' -gem 'sass-rails', '~> 5.0.6' -gem 'sass', '~> 3.5' +gem 'sassc-rails', '~> 2.1.0' gem 'uglifier', '~> 2.7.2' gem 'addressable', '~> 2.5.2' gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.2' -gem 'jquery-atwho-rails', '~> 1.3.2' gem 'request_store', '~> 1.3' -gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' gem 'base32', '~> 0.3.0' # Sentry integration -gem 'sentry-raven', '~> 2.7' +gem 'sentry-raven', '~> 2.9' gem 'premailer-rails', '~> 1.9.7' +# LabKit: Tracing and Correlation +gem 'gitlab-labkit', '~> 0.3.0' + # I18n gem 'ruby_parser', '~> 3.8', require: false gem 'rails-i18n', '~> 5.1' @@ -285,7 +291,7 @@ gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.2.2', require: false, group: :development -gem 'batch-loader', '~> 1.2.2' +gem 'batch-loader', '~> 1.4.0' # Perf bar gem 'peek', '~> 1.0.1' @@ -295,13 +301,16 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' +# Memory benchmarks +gem 'derailed_benchmarks', require: false + # Metrics group :metrics do gem 'method_source', '~> 0.8', require: false gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.9.4' + gem 'prometheus-client-mmap', '~> 0.9.8' gem 'raindrops', '~> 0.18' end @@ -309,7 +318,7 @@ group :development do gem 'foreman', '~> 0.84.0' gem 'brakeman', '~> 4.2', require: false - gem 'letter_opener_web', '~> 1.3.0' + gem 'letter_opener_web', '~> 1.3.4' gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false # Better errors handler @@ -321,7 +330,7 @@ group :development do end group :development, :test do - gem 'bootsnap', '~> 1.3' + gem 'bootsnap', '~> 1.4' gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.4' @@ -331,8 +340,8 @@ group :development, :test do gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 4.8.2' - gem 'rspec-rails', '~> 3.7.0' - gem 'rspec-retry', '~> 0.4.5' + gem 'rspec-rails', '~> 3.8.0' + gem 'rspec-retry', '~> 0.6.1' gem 'rspec_profiling', '~> 0.0.5' gem 'rspec-set', '~> 0.1.3' gem 'rspec-parameterized', require: false @@ -343,22 +352,24 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.10' - gem 'capybara', '~> 2.16.1' - gem 'capybara-screenshot', '~> 1.0.18' - gem 'selenium-webdriver', '~> 3.12' + gem 'capybara', '~> 3.22.0' + gem 'capybara-screenshot', '~> 1.0.22' + gem 'selenium-webdriver', '~> 3.141' gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 2.4', require: false + gem 'gitlab-styles', '~> 2.7', require: false # Pin these dependencies, otherwise a new rule could break the CI pipelines - gem 'rubocop', '~> 0.54.0' + gem 'rubocop', '~> 0.69.0' + gem 'rubocop-performance', '~> 1.1.0' gem 'rubocop-rspec', '~> 1.22.1' gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.28.0', require: false - gem 'simplecov', '~> 0.14.0', require: false + gem 'haml_lint', '~> 0.31.0', require: false + gem 'simplecov', '~> 0.16.1', require: false gem 'bundler-audit', '~> 0.5.0', require: false + gem 'mdl', '~> 0.5.0', require: false gem 'benchmark-ips', '~> 2.3.0', require: false @@ -375,10 +386,10 @@ group :development, :test do end group :test do - gem 'shoulda-matchers', '~> 3.1.2', require: false + gem 'shoulda-matchers', '~> 4.0.1', require: false gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' - gem 'webmock', '~> 2.3.2' + gem 'webmock', '~> 3.5.1' gem 'rails-controller-testing' gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.1' @@ -395,6 +406,9 @@ gem 'html2text' gem 'ruby-prof', '~> 0.17.0' gem 'rbtrace', '~> 0.4', require: false +gem 'memory_profiler', '~> 0.9', require: false +gem 'benchmark-memory', '~> 0.1', require: false +gem 'activerecord-explain-analyze', '~> 0.1', require: false # OAuth gem 'oauth2', '~> 1.4' @@ -407,8 +421,8 @@ gem 'vmstat', '~> 2.3.0' gem 'sys-filesystem', '~> 1.1.6' # SSH host key support -gem 'net-ssh', '~> 5.0' -gem 'sshkey', '~> 1.9.0' +gem 'net-ssh', '~> 5.2' +gem 'sshkey', '~> 2.0' # Required for ED25519 SSH host key support group :ed25519 do @@ -417,10 +431,11 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly' -gem 'grpc', '~> 1.15.0' +gem 'gitaly-proto', '~> 1.37.0', require: 'gitaly' -gem 'google-protobuf', '~> 3.6' +gem 'grpc', '~> 1.19.0' + +gem 'google-protobuf', '~> 3.7.1' gem 'toml-rb', '~> 1.0.0', require: false diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index 77b4360cf413..60939ae918c8 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -4,47 +4,56 @@ GEM RedCloth (4.3.2) abstract_type (0.0.7) ace-rails-ap (4.1.2) - actioncable (5.0.7.1) - actionpack (= 5.0.7.1) - nio4r (>= 1.2, < 3.0) - websocket-driver (~> 0.6.1) - actionmailer (5.0.7.1) - actionpack (= 5.0.7.1) - actionview (= 5.0.7.1) - activejob (= 5.0.7.1) + acme-client (2.0.2) + faraday (~> 0.9, >= 0.9.1) + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7.1) - actionview (= 5.0.7.1) - activesupport (= 5.0.7.1) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) rack (~> 2.0) - rack-test (~> 0.6.3) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7.1) - activesupport (= 5.0.7.1) + actionview (5.2.3) + activesupport (= 5.2.3) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.7.1) - activesupport (= 5.0.7.1) + activejob (5.2.3) + activesupport (= 5.2.3) globalid (>= 0.3.6) - activemodel (5.0.7.1) - activesupport (= 5.0.7.1) - activerecord (5.0.7.1) - activemodel (= 5.0.7.1) - activesupport (= 5.0.7.1) - arel (~> 7.0) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activerecord-explain-analyze (0.1.0) + activerecord (>= 4) + pg activerecord_sane_schema_dumper (1.0) rails (>= 5, < 6) - activesupport (5.0.7.1) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - acts-as-taggable-on (5.0.0) - activerecord (>= 4.2.8) + acts-as-taggable-on (6.0.0) + activerecord (~> 5.0) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -52,20 +61,25 @@ GEM public_suffix (>= 2.0.2, < 4.0) aes_key_wrap (1.0.1) akismet (2.0.0) - arel (7.1.4) + apollo_upload_server (2.0.0.beta.3) + graphql (>= 1.8) + rails (>= 4.2) + arel (9.0.0) asana (0.8.1) faraday (~> 0.9) faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.8) - asciidoctor-plantuml (0.0.8) - asciidoctor (~> 1.5) + asciidoctor (2.0.10) + asciidoctor-include-ext (0.3.1) + asciidoctor (>= 1.5.6, < 3.0.0) + asciidoctor-plantuml (0.0.9) + asciidoctor (>= 1.5.6, < 3.0.0) ast (2.4.0) atomic (1.1.99) attr_encrypted (3.1.0) encryptor (~> 3.0.0) - attr_required (1.0.0) + attr_required (1.0.1) awesome_print (1.8.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -73,21 +87,25 @@ GEM thread_safe (~> 0.3, >= 0.3.1) babosa (1.0.2) base32 (0.3.2) - batch-loader (1.2.2) + batch-loader (1.4.0) bcrypt (3.1.12) bcrypt_pbkdf (1.0.0) benchmark-ips (2.3.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) better_errors (2.5.0) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) bindata (2.4.3) - binding_ninja (0.2.2) + binding_ninja (0.2.3) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.3.2) + bootsnap (1.4.1) msgpack (~> 1.0) - bootstrap_form (2.7.0) + bootstrap_form (4.2.0) + actionpack (>= 5.0) + activemodel (>= 5.0) brakeman (4.2.1) browser (2.5.3) builder (3.2.3) @@ -98,13 +116,14 @@ GEM bundler (~> 1.2) thor (~> 0.18) byebug (9.1.0) - capybara (2.16.1) + capybara (3.22.0) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.5) + xpath (~> 3.2) capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy @@ -113,6 +132,7 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) + character_set (1.1.2) charlock_holmes (0.7.6) childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) @@ -129,9 +149,9 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.3) - concurrent-ruby-ext (1.1.3) - concurrent-ruby (= 1.1.3) + concurrent-ruby (1.1.5) + concurrent-ruby-ext (1.1.5) + concurrent-ruby (= 1.1.5) connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) @@ -143,14 +163,24 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) - deckar01-task_list (2.0.0) + deckar01-task_list (2.2.0) html-pipeline declarative (0.0.10) declarative-option (0.1.0) + default_value_for (3.2.0) + activerecord (>= 3.2.0, < 6.0) + derailed_benchmarks (1.3.5) + benchmark-ips (~> 2) + get_process_mem (~> 0) + heapy (~> 0) + memory_profiler (~> 0) + rack (>= 1) + rake (> 10, < 13) + thor (~> 0.19) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) device_detector (1.0.0) - devise (4.4.3) + devise (4.6.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -166,7 +196,7 @@ GEM diffy (3.1.0) discordrb-webhooks-blackst0ne (3.3.0) rest-client (~> 2.0) - docile (1.1.5) + docile (1.3.1) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) doorkeeper (4.3.2) @@ -182,15 +212,16 @@ GEM mail (~> 2.7) encryptor (3.0.0) equalizer (0.0.11) - erubi (1.7.1) - erubis (2.7.0) + erubi (1.8.0) escape_utils (1.2.1) - et-orbi (1.0.3) + et-orbi (1.2.1) tzinfo eventmachine (1.2.7) excon (0.62.0) execjs (2.6.0) expression_parser (0.9.0) + extended-markdown-filter (0.6.0) + html-pipeline (~> 2.0) factory_bot (4.8.2) activesupport (>= 3.0.0) factory_bot_rails (4.8.2) @@ -206,7 +237,7 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.9.25) + ffi (1.10.0) flipper (0.13.0) flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) @@ -217,32 +248,33 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aliyun (0.2.0) - fog-core (~> 1.27) - fog-json (~> 1.0) + fog-aliyun (0.3.3) + fog-core + fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (2.0.1) - fog-core (~> 1.38) - fog-json (~> 1.0) + fog-aws (3.5.2) + fog-core (~> 2.1) + fog-json (~> 1.1) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.45.0) + fog-core (2.1.0) builder excon (~> 0.58) formatador (~> 0.2) - fog-google (1.7.1) - fog-core - fog-json - fog-xml + mime-types + fog-google (1.8.2) + fog-core (<= 2.1.0) + fog-json (~> 1.2) + fog-xml (~> 0.1.0) google-api-client (~> 0.23.0) - fog-json (1.0.2) - fog-core (~> 1.0) + fog-json (1.2.0) + fog-core multi_json (~> 1.10) - fog-local (0.3.1) - fog-core (~> 1.27) - fog-openstack (0.1.21) - fog-core (>= 1.40) + fog-local (0.6.0) + fog-core (>= 1.27, < 3.0) + fog-openstack (1.0.8) + fog-core (~> 2.1) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -253,17 +285,21 @@ GEM fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) - font-awesome-rails (4.7.0.1) - railties (>= 3.2, < 5.1) + font-awesome-rails (4.7.0.4) + railties (>= 3.2, < 6.0) foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) + fugit (1.2.1) + et-orbi (~> 1.1, >= 1.1.8) + raabro (~> 1.1) fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) + gemoji (3.0.1) gemojione (3.3.0) json - get_process_mem (0.2.0) + get_process_mem (0.2.3) gettext (3.2.9) locale (>= 2.0.5) text (>= 1.3.0) @@ -274,24 +310,29 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.5.0) + gitaly-proto (1.37.0) grpc (~> 1.0) github-markup (1.7.0) - gitlab-default_value_for (3.1.1) - activerecord (>= 3.2.0, < 6.0) - gitlab-markup (1.6.5) + gitlab-labkit (0.3.0) + actionpack (~> 5) + activesupport (~> 5) + grpc (~> 1.19.0) + jaeger-client (~> 0.10) + opentracing (~> 0.4) + gitlab-markup (1.7.0) gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) - gitlab-styles (2.4.1) - rubocop (~> 0.54.0) + gitlab-styles (2.7.0) + rubocop (~> 0.69.0) rubocop-gitlab-security (~> 0.1.0) + rubocop-performance (~> 1.1.0) rubocop-rspec (~> 1.19) - gitlab_omniauth-ldap (2.0.4) + gitlab_omniauth-ldap (2.1.1) net-ldap (~> 0.16) omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) gon (6.2.0) actionpack (>= 3.0) @@ -304,8 +345,8 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.6.1) - googleapis-common-protos-types (1.0.2) + google-protobuf (3.7.1) + googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) googleauth (0.6.6) faraday (~> 0.12) @@ -326,8 +367,8 @@ GEM grape-entity (0.7.1) activesupport (>= 4.0) multi_json (>= 1.3.2) - grape-path-helpers (1.0.6) - activesupport (>= 4, < 5.1) + grape-path-helpers (1.1.0) + activesupport grape (~> 1.0) rake (~> 12) grape_logging (1.7.0) @@ -336,13 +377,21 @@ GEM railties sprockets-rails graphql (1.8.1) - grpc (1.15.0) + graphql-docs (1.6.0) + commonmarker (~> 0.16) + escape_utils (~> 1.2) + extended-markdown-filter (~> 0.4) + gemoji (~> 3.0) + graphql (~> 1.6) + html-pipeline (~> 2.8) + sass (~> 3.4) + grpc (1.19.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) haml (5.0.4) temple (>= 0.8.0) tilt - haml_lint (0.28.0) + haml_lint (0.31.0) haml (>= 4.0, < 5.1) rainbow rake (>= 10, < 13) @@ -353,12 +402,13 @@ GEM thor tilt hangouts-chat (0.0.5) - hashdiff (0.3.4) + hashdiff (0.3.8) hashie (3.5.7) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) rails (>= 4.0) + heapy (0.1.4) hipchat (1.5.2) httparty mimemagic @@ -377,11 +427,11 @@ GEM domain_name (~> 0.5) http-form_data (2.1.1) http_parser.rb (0.6.0) - httparty (0.13.7) - json (~> 1.8) + httparty (0.16.4) + mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.2.0) + i18n (1.6.0) concurrent-ruby (~> 1.0) icalendar (2.4.1) ice_nine (0.11.2) @@ -389,13 +439,18 @@ GEM cause json ipaddress (0.8.3) + jaeger-client (0.10.0) + opentracing (~> 0.3) + thrift + jaro_winkler (1.5.2) jira-ruby (1.4.1) activesupport multipart-post oauth (~> 0.5, >= 0.5.0) - jquery-atwho-rails (1.3.2) - js_regex (2.2.1) - regexp_parser (>= 0.4.11, <= 0.5.0) + js_regex (3.1.1) + character_set (~> 1.1) + regexp_parser (~> 1.1) + regexp_property_values (~> 0.3) json (1.8.6) json-jwt (1.9.4) activesupport @@ -416,18 +471,19 @@ GEM activerecord kaminari-core (= 1.0.1) kaminari-core (1.0.1) - kgio (2.10.0) + kgio (2.11.2) knapsack (1.17.0) rake - kubeclient (4.0.0) + kramdown (1.17.0) + kubeclient (4.2.2) http (~> 3.0) recursive-open-struct (~> 1.0, >= 1.0.4) rest-client (~> 2.0) launchy (2.4.3) addressable (~> 2.3) - letter_opener (1.4.1) + letter_opener (1.7.0) launchy (~> 2.2) - letter_opener_web (1.3.0) + letter_opener_web (1.3.4) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) @@ -452,19 +508,29 @@ GEM mail (2.7.1) mini_mime (>= 0.1.1) mail_room (0.9.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + mdl (0.5.0) + kramdown (~> 1.12, >= 1.12.0) + mixlib-cli (~> 1.7, >= 1.7.0) + mixlib-config (~> 2.2, >= 2.2.1) memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) + memory_profiler (0.9.13) method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) + mime-types-data (3.2019.0331) mimemagic (0.3.2) mini_magick (4.8.0) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.4) + mixlib-cli (1.7.0) + mixlib-config (2.2.18) + tomlrb + msgpack (1.2.10) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -474,11 +540,11 @@ GEM mysql2 (0.4.10) nakayoshi_fork (0.0.4) net-ldap (0.16.0) - net-ssh (5.0.1) + net-ssh (5.2.0) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri numerizer (0.1.1) @@ -532,6 +598,9 @@ GEM omniauth (~> 1.9) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) + omniauth-salesforce (1.0.5) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.0) omniauth-saml (1.10.0) omniauth (~> 1.3, >= 1.3.2) ruby-saml (~> 1.7) @@ -540,16 +609,34 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack + omniauth-ultraauth (0.0.2) + omniauth_openid_connect (~> 0.3.0) omniauth_crowd (2.2.3) activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) + omniauth_openid_connect (0.3.1) + addressable (~> 2.5) + omniauth (~> 1.3) + openid_connect (~> 1.1) + openid_connect (1.1.6) + activemodel + attr_required (>= 1.0.0) + json-jwt (>= 1.5.0) + rack-oauth2 (>= 1.6.1) + swd (>= 1.0.0) + tzinfo + validate_email + validate_url + webfinger (>= 1.0.1) + opentracing (0.5.0) + optimist (3.0.0) org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) os (1.0.0) - parallel (1.12.1) - parser (2.5.3.0) + parallel (1.17.0) + parser (2.6.3.0) ast (~> 2.4.0) parslet (1.8.2) peek (1.0.1) @@ -575,10 +662,9 @@ GEM atomic (>= 1.0.0) peek redis - pg (0.18.4) + pg (1.1.4) po_to_json (1.0.1) json (>= 1.6.0) - powerpack (0.1.1) premailer (1.10.4) addressable css_parser (>= 1.4.10) @@ -591,7 +677,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.9.4) + prometheus-client-mmap (0.9.8) pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -600,48 +686,49 @@ GEM pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) - public_suffix (3.0.3) + public_suffix (3.1.0) puma (3.12.0) puma_worker_killer (0.1.0) get_process_mem (~> 0.2) puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) - rack (2.0.6) + raabro (1.1.6) + rack (2.0.7) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.4.1) rack rack-cors (1.0.2) - rack-oauth2 (1.2.3) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - multi_json (>= 1.3.6) - rack (>= 1.1) - rack-protection (2.0.4) + rack-oauth2 (1.9.3) + activesupport + attr_required + httpclient + json-jwt (>= 1.9.0) + rack + rack-protection (2.0.5) rack rack-proxy (0.6.0) rack - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.7.1) - actioncable (= 5.0.7.1) - actionmailer (= 5.0.7.1) - actionpack (= 5.0.7.1) - actionview (= 5.0.7.1) - activejob (= 5.0.7.1) - activemodel (= 5.0.7.1) - activerecord (= 5.0.7.1) - activesupport (= 5.0.7.1) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rack-timeout (0.5.1) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) bundler (>= 1.3.0) - railties (= 5.0.7.1) + railties (= 5.2.3) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) actionview (~> 5.x, >= 5.0.1) activesupport (~> 5.x) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -650,30 +737,29 @@ GEM rails-i18n (5.1.1) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.0.7.1) - actionpack (= 5.0.7.1) - activesupport (= 5.0.7.1) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - raindrops (0.18.0) + raindrops (0.19.0) rake (12.3.2) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) - rbtrace (0.4.10) + rbtrace (0.4.11) ffi (>= 1.0.6) msgpack (>= 0.4.3) - trollop (>= 1.16.2) + optimist (>= 3.0.0) rdoc (6.0.4) re2 (1.1.1) - recaptcha (3.0.0) + recaptcha (4.13.1) json recursive-open-struct (1.1.0) - redcarpet (3.4.0) redis (3.3.5) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) @@ -693,7 +779,8 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.6.0) redis (>= 2.2, < 5) - regexp_parser (0.5.0) + regexp_parser (1.5.1) + regexp_property_values (0.3.4) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -709,41 +796,41 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.3.0) + rouge (3.5.1) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) - rspec (3.7.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.2) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.4) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-parameterized (0.4.1) - binding_ninja (>= 0.2.1) + rspec-support (~> 3.8.0) + rspec-parameterized (0.4.2) + binding_ninja (>= 0.2.3) parser proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (3.7.2) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-support (~> 3.7.0) - rspec-retry (0.4.5) - rspec-core + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-retry (0.6.1) + rspec-core (> 3.3) rspec-set (0.1.3) - rspec-support (3.7.1) + rspec-support (3.8.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.5) @@ -751,15 +838,17 @@ GEM pg rails sqlite3 - rubocop (0.54.0) + rubocop (0.69.0) + jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5) - powerpack (~> 0.1) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) + unicode-display_width (>= 1.4.0, < 1.7) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) + rubocop-performance (1.1.0) + rubocop (>= 0.67.0) rubocop-rspec (1.22.2) rubocop (>= 0.52.1) ruby-enum (0.7.2) @@ -767,17 +856,15 @@ GEM ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-prof (0.17.0) - ruby-progressbar (1.9.0) + ruby-progressbar (1.10.0) ruby-saml (1.7.2) nokogiri (>= 1.5.10) - ruby_parser (3.11.0) + ruby_parser (3.13.1) sexp_processor (~> 4.9) rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (1.2.2) - rufus-scheduler (3.4.0) - et-orbi (~> 1.0) - rugged (0.27.5) + rugged (0.28.1) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -788,12 +875,15 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.6) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + sassc (2.0.1) + ffi (~> 1.9) + rake + sassc-rails (2.1.0) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) @@ -803,25 +893,24 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.9.3) - thor (~> 0.14) - selenium-webdriver (3.12.0) + selenium-webdriver (3.141.0) childprocess (~> 0.5) - rubyzip (~> 1.2) - sentry-raven (2.7.4) + rubyzip (~> 1.2, >= 1.2.2) + sentry-raven (2.9.0) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) - sexp_processor (4.11.0) + sexp_processor (4.12.0) sham_rack (1.3.6) rack - shoulda-matchers (3.1.2) - activesupport (>= 4.0.0) - sidekiq (5.2.3) + shoulda-matchers (4.0.1) + activesupport (>= 4.2.0) + sidekiq (5.2.7) connection_pool (~> 2.2, >= 2.2.2) + rack (>= 1.5.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) - sidekiq-cron (0.6.0) - rufus-scheduler (>= 3.3.0) + sidekiq-cron (1.0.4) + fugit (~> 1.1) sidekiq (>= 4.2.1) signet (0.11.0) addressable (~> 2.3) @@ -829,11 +918,11 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_po_parser (1.1.2) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.2) slack-notifier (1.5.1) spring (2.0.2) activesupport (>= 4.2) @@ -847,7 +936,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkey (1.9.0) + sshkey (2.0.0) stackprof (0.2.10) state_machines (0.5.0) state_machines-activemodel (0.5.1) @@ -856,6 +945,10 @@ GEM state_machines-activerecord (0.5.1) activerecord (>= 4.1, < 6.0) state_machines-activemodel (>= 0.5.0) + swd (1.1.2) + activesupport (>= 3) + attr_required (>= 0.0.5) + httpclient (>= 2.4) sys-filesystem (1.1.6) ffi sysexits (1.2.0) @@ -868,6 +961,7 @@ GEM rack (>= 1, < 3) thor (0.19.4) thread_safe (0.3.6) + thrift (0.11.0.0) tilt (2.0.8) timecop (0.8.1) timfel-krb5-auth (0.8.3) @@ -875,10 +969,10 @@ GEM parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) - trollop (2.1.3) - truncato (0.7.10) + tomlrb (1.2.8) + truncato (0.7.11) htmlentities (~> 4.3.1) - nokogiri (~> 1.8.0, >= 1.7.0) + nokogiri (>= 1.7.0, <= 2.0) tzinfo (1.2.5) thread_safe (~> 0.1) u2f (0.2.1) @@ -889,26 +983,32 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.3.2) - unicorn (5.1.0) + unicode-display_width (1.6.0) + unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) uniform_notifier (1.10.0) - unparser (0.4.2) + unparser (0.4.5) abstract_type (~> 0.0.7) adamantium (~> 0.2.0) concord (~> 0.1.5) diff-lcs (~> 1.3) equalizer (~> 0.0.9) - parser (>= 2.3.1.2, < 2.6) + parser (~> 2.6.3) procto (~> 0.0.2) + validate_email (0.1.6) + activemodel (>= 3.0) + mail (>= 2.2.5) + validate_url (1.0.8) + activemodel (>= 3.0.0) + public_suffix validates_hostname (1.0.6) activerecord (>= 3.0) activesupport (>= 3.0) - version_sorter (2.1.0) + version_sorter (2.2.4) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -917,13 +1017,16 @@ GEM vmstat (2.3.0) warden (1.2.7) rack (>= 1.0) - webmock (2.3.2) + webfinger (1.1.0) + activesupport + httpclient (>= 2.4) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff webpack-rails (0.9.11) railties (>= 3.2.0) - websocket-driver (0.6.5) + websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) wikicloth (0.8.1) @@ -932,8 +1035,8 @@ GEM rinku with_env (1.1.0) xml-simple (1.1.5) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -941,30 +1044,35 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) + acme-client (~> 2.0.2) + activerecord-explain-analyze (~> 0.1) activerecord_sane_schema_dumper (= 1.0) - acts-as-taggable-on (~> 5.0) + acts-as-taggable-on (~> 6.0) addressable (~> 2.5.2) akismet (~> 2.0) + apollo_upload_server (~> 2.0.0.beta3) asana (~> 0.8.1) - asciidoctor (~> 1.5.8) - asciidoctor-plantuml (= 0.0.8) + asciidoctor (~> 2.0.10) + asciidoctor-include-ext (~> 0.3.1) + asciidoctor-plantuml (= 0.0.9) attr_encrypted (~> 3.1.0) awesome_print babosa (~> 1.0.2) base32 (~> 0.3.0) - batch-loader (~> 1.2.2) + batch-loader (~> 1.4.0) bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) + benchmark-memory (~> 0.1) better_errors (~> 2.5.0) binding_of_caller (~> 0.8.0) - bootsnap (~> 1.3) - bootstrap_form (~> 2.7.0) + bootsnap (~> 1.4) + bootstrap_form (~> 4.2.0) brakeman (~> 4.2) browser (~> 2.5) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) - capybara (~> 2.16.1) - capybara-screenshot (~> 1.0.18) + capybara (~> 3.22.0) + capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) @@ -974,9 +1082,11 @@ DEPENDENCIES connection_pool (~> 2.0) creole (~> 0.5.0) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.0.0) + deckar01-task_list (= 2.2.0) + default_value_for (~> 3.2.0) + derailed_benchmarks device_detector - devise (~> 4.4) + devise (~> 4.6) devise-two-factor (~> 3.0.0) diffy (~> 3.1.0) discordrb-webhooks-blackst0ne (~> 3.3) @@ -994,39 +1104,41 @@ DEPENDENCIES flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) flowdock (~> 0.7) - fog-aliyun (~> 0.2.0) - fog-aws (~> 2.0.1) - fog-core (~> 1.44) - fog-google (~> 1.7.1) - fog-local (~> 0.3) - fog-openstack (~> 0.1) + fog-aliyun (~> 0.3) + fog-aws (~> 3.5) + fog-core (= 2.1.0) + fog-google (~> 1.8) + fog-local (~> 0.6) + fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.7) foreman (~> 0.84.0) + fugit (~> 1.2.1) fuubar (~> 2.2.0) gemojione (~> 3.3) gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.5.0) + gitaly-proto (~> 1.37.0) github-markup (~> 1.7.0) - gitlab-default_value_for (~> 3.1.1) - gitlab-markup (~> 1.6.5) + gitlab-labkit (~> 0.3.0) + gitlab-markup (~> 1.7.0) gitlab-sidekiq-fetcher (~> 0.4.0) - gitlab-styles (~> 2.4) - gitlab_omniauth-ldap (~> 2.0.4) + gitlab-styles (~> 2.7) + gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.23) - google-protobuf (~> 3.6) + google-protobuf (~> 3.7.1) gpgme (~> 2.0.18) grape (~> 1.1.0) grape-entity (~> 0.7.1) - grape-path-helpers (~> 1.0) + grape-path-helpers (~> 1.1) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) graphql (~> 1.8.0) - grpc (~> 1.15.0) - haml_lint (~> 0.28.0) + graphql-docs (~> 1.6.0) + grpc (~> 1.19.0) + haml_lint (~> 0.31.0) hamlit (~> 2.8.8) hangouts-chat (~> 0.0.5) hashie-forbidden_attributes @@ -1034,23 +1146,24 @@ DEPENDENCIES hipchat (~> 1.5.0) html-pipeline (~> 2.8) html2text - httparty (~> 0.13.3) + httparty (~> 0.16.4) icalendar influxdb (~> 0.2) jira-ruby (~> 1.4) - jquery-atwho-rails (~> 1.3.2) - js_regex (~> 2.2.1) + js_regex (~> 3.1) json-schema (~> 2.8.0) jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) - kubeclient (~> 4.0.0) - letter_opener_web (~> 1.3.0) + kubeclient (~> 4.2.2) + letter_opener_web (~> 1.3.4) license_finder (~> 5.4) licensee (~> 8.9) lograge (~> 0.5) loofah (~> 2.2) mail_room (~> 0.9.1) + mdl (~> 0.5.0) + memory_profiler (~> 0.9) method_source (~> 0.8) mimemagic (~> 0.3.2) mini_magick @@ -1058,8 +1171,8 @@ DEPENDENCIES mysql2 (~> 0.4.10) nakayoshi_fork (~> 0.0.4) net-ldap - net-ssh (~> 5.0) - nokogiri (~> 1.8.5) + net-ssh (~> 5.2) + nokogiri (~> 1.10.3) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1073,10 +1186,13 @@ DEPENDENCIES omniauth-google-oauth2 (~> 0.6.0) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) + omniauth-salesforce (~> 1.0.5) omniauth-saml (~> 1.10) omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) + omniauth-ultraauth (~> 0.0.2) omniauth_crowd (~> 2.2.0) + omniauth_openid_connect (~> 0.3.1) org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) @@ -1084,21 +1200,21 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - pg (~> 0.18.2) + pg (~> 1.1) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.9.4) + prometheus-client-mmap (~> 0.9.8) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) puma (~> 3.12) puma_worker_killer - rack (= 2.0.6) + rack (~> 2.0.7) rack-attack (~> 4.4.1) rack-cors (~> 1.0.0) - rack-oauth2 (~> 1.2.1) + rack-oauth2 (~> 1.9.3) rack-proxy (~> 0.6.0) - rails (= 5.0.7.1) + rack-timeout + rails (= 5.2.3) rails-controller-testing - rails-deprecated_sanitizer (~> 1.0.3) rails-i18n (~> 5.1) rainbow (~> 3.0) raindrops (~> 0.18) @@ -1106,50 +1222,47 @@ DEPENDENCIES rbtrace (~> 0.4) rdoc (~> 6.0) re2 (~> 1.1.1) - recaptcha (~> 3.0) - redcarpet (~> 3.4) + recaptcha (~> 4.11) redis (~> 3.2) redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) - rouge (~> 3.1) + rouge (~> 3.5) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 3.7.0) - rspec-retry (~> 0.4.5) + rspec-rails (~> 3.8.0) + rspec-retry (~> 0.6.1) rspec-set (~> 0.1.3) rspec_junit_formatter rspec_profiling (~> 0.0.5) - rubocop (~> 0.54.0) + rubocop (~> 0.69.0) + rubocop-performance (~> 1.1.0) rubocop-rspec (~> 1.22.1) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.17.0) ruby-progressbar ruby_parser (~> 3.8) rubyzip (~> 1.2.2) - rufus-scheduler (~> 3.4) - rugged (~> 0.27) + rugged (~> 0.28) sanitize (~> 4.6) - sass (~> 3.5) - sass-rails (~> 5.0.6) + sassc-rails (~> 2.1.0) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) - select2-rails (~> 3.5.9) - selenium-webdriver (~> 3.12) - sentry-raven (~> 2.7) + selenium-webdriver (~> 3.141) + sentry-raven (~> 2.9) settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) - shoulda-matchers (~> 3.1.2) - sidekiq (~> 5.2.1) - sidekiq-cron (~> 0.6.0) + shoulda-matchers (~> 4.0.1) + sidekiq (~> 5.2.7) + sidekiq-cron (~> 1.0) simple_po_parser (~> 1.1.2) - simplecov (~> 0.14.0) + simplecov (~> 0.16.1) slack-notifier (~> 1.5.1) spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) - sshkey (~> 1.9.0) + sshkey (~> 2.0) stackprof (~> 0.2.10) state_machines-activerecord (~> 0.5.1) sys-filesystem (~> 1.1.6) @@ -1157,17 +1270,17 @@ DEPENDENCIES thin (~> 1.7.0) timecop (~> 0.8.0) toml-rb (~> 1.0.0) - truncato (~> 0.7.9) + truncato (~> 0.7.11) u2f (~> 0.2.1) uglifier (~> 2.7.2) unf (~> 0.1.4) - unicorn (~> 5.1.0) + unicorn (~> 5.4.1) unicorn-worker-killer (~> 0.4.4) validates_hostname (~> 1.0.6) - version_sorter (~> 2.1.0) + version_sorter (~> 2.2.4) virtus (~> 1.0.1) vmstat (~> 2.3.0) - webmock (~> 2.3.2) + webmock (~> 3.5.1) webpack-rails (~> 0.9.10) wikicloth (= 0.8.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index 10b8c3f25ead..8da7a3262c12 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -15,68 +15,104 @@ }; version = "4.1.2"; }; - actioncable = { - dependencies = ["actionpack" "nio4r" "websocket-driver"]; + acme-client = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1443cal16yzc94hfxcx9ljagdbs5xs54bmr55wzmg84wx28bgvrb"; + sha256 = "1552fkgaj6qfylwsckgmhck34shjqnfrzymj1ji1kq3r310qqrnp"; type = "gem"; }; - version = "5.0.7.1"; + version = "2.0.2"; + }; + actioncable = { + dependencies = ["actionpack" "nio4r" "websocket-driver"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm"; + type = "gem"; + }; + version = "5.2.3"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "077g5yg8l10rcs8r63pmmikakma1nr2bvxa1ifly1vbry8lajmhm"; + sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zn3gw1naz1l6kcb4h5all24kisdv8fk733vm1niiaq2zmwbvlrw"; + sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; }; actionview = { - dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; + dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "053z1r9lbyqb7a8mvi7ppwgphqg1pn9ynhklwxavq65cym8qn9a1"; + sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; }; activejob = { dependencies = ["activesupport" "globalid"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w9rspq9y5a99kyljzam7k0cpvkxpzhfmlvs1j6a4flxn14qy7lv"; + sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; }; activemodel = { dependencies = ["activesupport"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i808lgn542x0lyk2dlnziiqcf1nmxhxqf6125dq6brr08yxgr0c"; + sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qva7vdv9arliza0155k0xh5w1q6rzdajj3rmj7hv0f86ybd674c"; + sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; + }; + activerecord-explain-analyze = { + dependencies = ["activerecord" "pg"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yvz452ww0vn3n6197gx6zklwa591gc7f1m8accvjd9zw8gv3ssx"; + type = "gem"; + }; + version = "0.1.0"; }; activerecord_sane_schema_dumper = { dependencies = ["rails"]; @@ -87,23 +123,38 @@ }; version = "1.0"; }; - activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + activestorage = { + dependencies = ["actionpack" "activerecord" "marcel"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02dnmcmkvzijbzm5nlmrd55s5586b78s087kvpvkada3791b9agb"; + sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; + }; + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; + type = "gem"; + }; + version = "5.2.3"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i"; + sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl"; type = "gem"; }; - version = "5.0.0"; + version = "6.0.0"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -139,13 +190,26 @@ }; version = "2.0.0"; }; - arel = { + apollo_upload_server = { + dependencies = ["graphql" "rails"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l757dkkaxk5fq3368l79jpyzq9a9driricjamhiwhwvh0h7xcyx"; + sha256 = "0riijpyicbkqsr46w4mfhh3pq2yrmakkz8mmgbrfjhzbyzac25na"; type = "gem"; }; - version = "7.1.4"; + version = "2.0.0.beta.3"; + }; + arel = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; + type = "gem"; + }; + version = "9.0.0"; }; asana = { dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; @@ -157,21 +221,36 @@ version = "0.8.1"; }; asciidoctor = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qld3a1pbcjvs8lbxp95iz83bfmg5scmnf8q3rklinmdmhzakslx"; + sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz"; type = "gem"; }; - version = "1.5.8"; + version = "2.0.10"; + }; + asciidoctor-include-ext = { + dependencies = ["asciidoctor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1alaqfh31hd98yhqq8fsc50zzqw04p3d83pc35gdx3x9p3j1ds7d"; + type = "gem"; + }; + version = "0.3.1"; }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x092ldl8p7svczg4lnrnp0h918acnflh7jz5qwv40ksh1fflqna"; + sha256 = "0lzxj16w7s3w0wnlpg8lfs9v2xxk3x3c1skynqm1sms7rjhnhlnb"; type = "gem"; }; - version = "0.0.8"; + version = "0.0.9"; }; ast = { source = { @@ -199,12 +278,14 @@ version = "3.1.0"; }; attr_required = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc"; + sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; awesome_print = { source = { @@ -240,12 +321,14 @@ version = "0.3.2"; }; batch-loader = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pwr2hk9x1qx9i2xpkpjwkdjsmm4kamz5f25wizsaw37zb64apjc"; + sha256 = "09jaxxddqpgq8ynwd2gpjq5rkhw00zdjnqisk9qbpjgxzk6f8gwi"; type = "gem"; }; - version = "1.2.2"; + version = "1.4.0"; }; bcrypt = { source = { @@ -271,6 +354,17 @@ }; version = "2.3.0"; }; + benchmark-memory = { + dependencies = ["memory_profiler"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11qw8k6rl79ri00njrf1x9v6vzwgv12rkcvgzvg0sk8pfrkzwyxa"; + type = "gem"; + }; + version = "0.1.2"; + }; better_errors = { dependencies = ["coderay" "erubi" "rack"]; source = { @@ -289,12 +383,14 @@ version = "2.4.3"; }; binding_ninja = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19dk26qyx433ffa6y48511apc2iw71zw4jnlqxhy0wix9dlxr2ri"; + sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa"; type = "gem"; }; - version = "0.2.2"; + version = "0.2.3"; }; binding_of_caller = { dependencies = ["debug_inspector"]; @@ -309,18 +405,21 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; + sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.1"; }; bootstrap_form = { + dependencies = ["actionpack" "activemodel"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sw88vi5sb48xzgwclic38jdgmcbvah2qfi3rijrlmi1wai4j1fw"; + sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m"; type = "gem"; }; - version = "2.7.0"; + version = "4.2.0"; }; brakeman = { source = { @@ -373,13 +472,15 @@ version = "9.1.0"; }; capybara = { - dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"]; + dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hkl6p07gf29952biv07fy88vjz46ng2h37wwx5ks0mk9kn8vvvf"; + sha256 = "1y7ncfji4s3h3wdr2hwsrd32k0va92a6lyx2x8w6a3vkbc94kpch"; type = "gem"; }; - version = "2.16.1"; + version = "3.22.0"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; @@ -407,6 +508,14 @@ }; version = "0.1"; }; + character_set = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9"; + type = "gem"; + }; + version = "1.1.2"; + }; charlock_holmes = { source = { remotes = ["https://rubygems.org"]; @@ -493,21 +602,25 @@ version = "0.1.5"; }; concurrent-ruby = { + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18q9skp5pfq4jwbxzmw8q2rn4cpw6mf4561i2hsjcl1nxdag2jvb"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.1.3"; + version = "1.1.5"; }; concurrent-ruby-ext = { dependencies = ["concurrent-ruby"]; + groups = ["default" "mysql" "postgres"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h7k4wnvbxv7vzb53kaqxbbyhp3m98g2rgymr6n1l9v0jlzcr1i8"; + sha256 = "03ypsv2k581yv0b3f0hzvb3mq6mqj8jlbi32jmkj3k175vbc8hvz"; type = "gem"; }; - version = "1.1.3"; + version = "1.1.5"; }; connection_pool = { source = { @@ -587,10 +700,10 @@ dependencies = ["html-pipeline"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j"; + sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964"; type = "gem"; }; - version = "2.0.0"; + version = "2.2.0"; }; declarative = { source = { @@ -608,6 +721,28 @@ }; version = "0.1.0"; }; + default_value_for = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xj9d1y2fk3kxfm1kyiwasjpw6r1w7c1xjx26sm3c33xhmz57fla"; + type = "gem"; + }; + version = "3.2.0"; + }; + derailed_benchmarks = { + dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c9djg1r2w461h97zmmdsdgnsrxqm4qfyp7gry9qxbav9skrplb8"; + type = "gem"; + }; + version = "1.3.5"; + }; descendants_tracker = { dependencies = ["thread_safe"]; source = { @@ -627,12 +762,14 @@ }; devise = { dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xmxfhym0yxwb0zwmmzhdiykbpyqqm3id02g7rf3vcgbc1lqvdnj"; + sha256 = "04b2p61mqfb6ln8s2lhmvnkd45wjjinykbn9svmhs54kacrrjkcf"; type = "gem"; }; - version = "4.4.3"; + version = "4.6.2"; }; devise-two-factor = { dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; @@ -669,12 +806,14 @@ version = "3.3.0"; }; docile = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + sha256 = "04d2izkna3ahfn6fwq4xrcafa715d3bbqczxm16fq40fqy87xn17"; type = "gem"; }; - version = "1.1.5"; + version = "1.3.1"; }; domain_name = { dependencies = ["unf"]; @@ -745,20 +884,14 @@ version = "0.0.11"; }; erubi = { + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bws86na9k565raiz0kk61yy5pxxp0fmwyzpibdwjkq0xzx8q6q1"; + sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1"; type = "gem"; }; - version = "1.7.1"; - }; - erubis = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; - type = "gem"; - }; - version = "2.7.0"; + version = "1.8.0"; }; escape_utils = { source = { @@ -770,12 +903,14 @@ }; et-orbi = { dependencies = ["tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi"; + sha256 = "1swgjb3h2hs5xflb68837l0vd32masbz9c66b1963mxlnnxf5gsg"; type = "gem"; }; - version = "1.0.3"; + version = "1.2.1"; }; eventmachine = { source = { @@ -809,6 +944,17 @@ }; version = "0.9.0"; }; + extended-markdown-filter = { + dependencies = ["html-pipeline"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17mi5qayplfaa6p3mfwa36il84ixr0bimqvl0q73lw5i81blp126"; + type = "gem"; + }; + version = "0.6.0"; + }; factory_bot = { dependencies = ["activesupport"]; source = { @@ -881,10 +1027,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; }; - version = "1.9.25"; + version = "1.10.0"; }; flipper = { source = { @@ -925,64 +1071,66 @@ dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m"; + sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.3"; }; fog-aws = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3"; + sha256 = "086kyvdhf1k8nk7f4gmybjc3k0m88f9pw99frddcy1w96pj5kyg4"; type = "gem"; }; - version = "2.0.1"; + version = "3.5.2"; }; fog-core = { - dependencies = ["builder" "excon" "formatador"]; + dependencies = ["builder" "excon" "formatador" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3"; + sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; type = "gem"; }; - version = "1.45.0"; + version = "2.1.0"; }; fog-google = { dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2"; + sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.2"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r"; + sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; type = "gem"; }; - version = "1.0.2"; + version = "1.2.0"; }; fog-local = { dependencies = ["fog-core"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn"; + sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21"; type = "gem"; }; - version = "0.3.1"; + version = "0.6.0"; }; fog-openstack = { dependencies = ["fog-core" "fog-json" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys"; + sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg"; type = "gem"; }; - version = "0.1.21"; + version = "1.0.8"; }; fog-rackspace = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; @@ -1004,12 +1152,14 @@ }; font-awesome-rails = { dependencies = ["railties"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qc07vj7qyllrj7lr7wl89l5ir0gj104rc7sds2jynzmrqsamnlw"; + sha256 = "11mf7bk2737pyxjwba3a9lpgcxzbp0vgq01n2dn30774zysc90hj"; type = "gem"; }; - version = "4.7.0.1"; + version = "4.7.0.4"; }; foreman = { dependencies = ["thor"]; @@ -1028,6 +1178,17 @@ }; version = "0.2.5"; }; + fugit = { + dependencies = ["et-orbi" "raabro"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x5h31hl75x0p5s36hinywg18ijlxjhnlb5p02aqcjjkx777rcav"; + type = "gem"; + }; + version = "1.2.1"; + }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; source = { @@ -1037,6 +1198,16 @@ }; version = "2.2.0"; }; + gemoji = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; + type = "gem"; + }; + version = "3.0.1"; + }; gemojione = { dependencies = ["json"]; source = { @@ -1047,12 +1218,14 @@ version = "3.3.0"; }; get_process_mem = { + groups = ["default" "development" "puma" "test" "unicorn"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "025f7v6bpbgsa2nr0hzv2riggj8qmzbwcyxfgjidpmwh5grh7j29"; + sha256 = "1bvfjdign16r0zwm2rlfrq0sk1licvmlgbnlpnyckniv5r7i080g"; type = "gem"; }; - version = "0.2.0"; + version = "0.2.3"; }; gettext = { dependencies = ["locale" "text"]; @@ -1083,12 +1256,14 @@ }; gitaly-proto = { dependencies = ["grpc"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0"; + sha256 = "1lx2cids0r175agdz3wa25ivi17vxx2kryb2v29gdsrpg3pyyq7j"; type = "gem"; }; - version = "1.5.0"; + version = "1.37.0"; }; github-markup = { source = { @@ -1098,22 +1273,26 @@ }; version = "1.7.0"; }; - gitlab-default_value_for = { - dependencies = ["activerecord"]; + gitlab-labkit = { + dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qqjf7nxmwxnkdlrgbnby8wjckaj2s5yna96avgb7fwm0h90f1sn"; + sha256 = "0dvapmdc9axm9dq2gg89qrqb318rkrsabpyybrqvcx1ipbi5k3a1"; type = "gem"; }; - version = "3.1.1"; + version = "0.3.0"; }; gitlab-markup = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy"; + sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d"; type = "gem"; }; - version = "1.6.5"; + version = "1.7.0"; }; gitlab-sidekiq-fetcher = { dependencies = ["sidekiq"]; @@ -1127,31 +1306,35 @@ version = "0.4.0"; }; gitlab-styles = { - dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; + dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rspec"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx"; + sha256 = "1vxlvbq4jpq0cfjqippz9d3j73sq9qg3pna5pb0l8jr0rc0xs89y"; type = "gem"; }; - version = "2.4.1"; + version = "2.7.0"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv"; + sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90"; type = "gem"; }; - version = "2.0.4"; + version = "2.1.1"; }; globalid = { dependencies = ["activesupport"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38"; + sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1"; type = "gem"; }; - version = "0.4.1"; + version = "0.4.2"; }; gon = { dependencies = ["actionpack" "multi_json" "request_store"]; @@ -1172,21 +1355,25 @@ version = "0.23.4"; }; google-protobuf = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf"; + sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2"; type = "gem"; }; - version = "3.6.1"; + version = "3.7.1"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq"; + sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.4"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -1226,12 +1413,14 @@ }; grape-path-helpers = { dependencies = ["activesupport" "grape" "rake"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13h5575xfc144wsr48sp3qngpwvh4ikz4r3m55j8jmdr6sa16rbw"; + sha256 = "16l6lrv4h4ls0lrpj35pc00431q2rx6r9n47337qyvprxs3v0a01"; type = "gem"; }; - version = "1.0.6"; + version = "1.1.0"; }; grape_logging = { dependencies = ["grape"]; @@ -1259,14 +1448,27 @@ }; version = "1.8.1"; }; - grpc = { - dependencies = ["google-protobuf" "googleapis-common-protos-types"]; + graphql-docs = { + dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb"; + sha256 = "12wzsikbn54b2hcv100hz7isq5gdjm5w5b8xya64ra5sw6sabq8d"; type = "gem"; }; - version = "1.15.0"; + version = "1.6.0"; + }; + grpc = { + dependencies = ["google-protobuf" "googleapis-common-protos-types"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs"; + type = "gem"; + }; + version = "1.19.0"; }; haml = { dependencies = ["temple" "tilt"]; @@ -1279,12 +1481,14 @@ }; haml_lint = { dependencies = ["haml" "rainbow" "rake" "rubocop" "sysexits"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "125aj0j84nx5gqm42hfx5d8486higlra423ahgfpsdjwbp399rwv"; + sha256 = "1k6pvb2lc6d72nq01jqmi3mxpp80m9mmbc265kgaxmcnjxqhacb1"; type = "gem"; }; - version = "0.28.0"; + version = "0.31.0"; }; hamlit = { dependencies = ["temple" "thor" "tilt"]; @@ -1306,10 +1510,10 @@ hashdiff = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; + sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.8"; }; hashie = { source = { @@ -1337,8 +1541,20 @@ }; version = "2.6.0"; }; + heapy = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r9f38fpgjgaxskkwvsliijj6vfmgsff9pnranvvvzkdl67hk1hw"; + type = "gem"; + }; + version = "0.1.4"; + }; hipchat = { dependencies = ["httparty" "mimemagic"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k"; @@ -1407,13 +1623,15 @@ version = "0.6.0"; }; httparty = { - dependencies = ["json" "multi_xml"]; + dependencies = ["mime-types" "multi_xml"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2"; + sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32"; type = "gem"; }; - version = "0.13.7"; + version = "0.16.4"; }; httpclient = { source = { @@ -1425,12 +1643,14 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr"; + sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; type = "gem"; }; - version = "1.2.0"; + version = "1.6.0"; }; icalendar = { source = { @@ -1465,6 +1685,25 @@ }; version = "0.8.3"; }; + jaeger-client = { + dependencies = ["opentracing" "thrift"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l"; + type = "gem"; + }; + version = "0.10.0"; + }; + jaro_winkler = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l"; + type = "gem"; + }; + version = "1.5.2"; + }; jira-ruby = { dependencies = ["activesupport" "multipart-post" "oauth"]; source = { @@ -1474,22 +1713,14 @@ }; version = "1.4.1"; }; - jquery-atwho-rails = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9"; - type = "gem"; - }; - version = "1.3.2"; - }; js_regex = { - dependencies = ["regexp_parser"]; + dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf"; + sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq"; type = "gem"; }; - version = "2.2.1"; + version = "3.1.1"; }; json = { source = { @@ -1563,10 +1794,10 @@ kgio = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118"; + sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.2"; }; knapsack = { dependencies = ["rake"]; @@ -1577,14 +1808,24 @@ }; version = "1.17.0"; }; + kramdown = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + type = "gem"; + }; + version = "1.17.0"; + }; kubeclient = { dependencies = ["http" "recursive-open-struct" "rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s250z89nz7vzich3nikc8fs8vgpac38wjv8llm4ldvs4iyc4ypg"; + sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn"; type = "gem"; }; - version = "4.0.0"; + version = "4.2.2"; }; launchy = { dependencies = ["addressable"]; @@ -1597,21 +1838,25 @@ }; letter_opener = { dependencies = ["launchy"]; + groups = ["default" "development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pcrdbxvp2x5six8fqn8gf09bn9rd3jga76ds205yph5m8fsda21"; + sha256 = "09a7kgsmr10a0hrc9bwxglgqvppjxij9w8bxx91mnvh0ivaw0nq9"; type = "gem"; }; - version = "1.4.1"; + version = "1.7.0"; }; letter_opener_web = { dependencies = ["actionmailer" "letter_opener" "railties"]; + groups = ["development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "050x5cwqbxj2cydd2pzy9vfhmpgn1w6lfbwjaax1m1vpkn3xg9bv"; + sha256 = "17qhwrkncrrp1bi2f7fbkm5lpnkdsiwy8jcvgr2wa97ck8y4x2bb"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.4"; }; license_finder = { dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"]; @@ -1674,6 +1919,28 @@ }; version = "0.9.1"; }; + marcel = { + dependencies = ["mimemagic"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; + type = "gem"; + }; + version = "0.3.3"; + }; + mdl = { + dependencies = ["kramdown" "mixlib-cli" "mixlib-config"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i"; + type = "gem"; + }; + version = "0.5.0"; + }; memoist = { source = { remotes = ["https://rubygems.org"]; @@ -1691,6 +1958,16 @@ }; version = "0.4.2"; }; + memory_profiler = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xki7jrbzylsmk1brjibmhifb0x70skr55pdq4rvxcyrlnrrvyxz"; + type = "gem"; + }; + version = "0.9.13"; + }; method_source = { source = { remotes = ["https://rubygems.org"]; @@ -1709,12 +1986,14 @@ version = "3.2.2"; }; mime-types-data = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; + sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; type = "gem"; }; - version = "3.2018.0812"; + version = "3.2019.0331"; }; mimemagic = { source = { @@ -1743,10 +2022,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { source = { @@ -1756,13 +2035,36 @@ }; version = "5.11.3"; }; - msgpack = { + mixlib-cli = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; type = "gem"; }; - version = "1.2.4"; + version = "1.7.0"; + }; + mixlib-config = { + dependencies = ["tomlrb"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb"; + type = "gem"; + }; + version = "2.2.18"; + }; + msgpack = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w38hilm3dk42dwk8ygiq49bl4in7y80hfqr63hk54mj4gmzi6ch"; + type = "gem"; + }; + version = "1.2.10"; }; multi_json = { source = { @@ -1830,12 +2132,14 @@ version = "0.16.0"; }; net-ssh = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hj2i8rk5wb6235r5n19in1hkrp1fbz2bf40xmagavb5ahv7205w"; + sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; type = "gem"; }; - version = "5.0.1"; + version = "5.2.0"; }; netrc = { source = { @@ -1855,12 +2159,14 @@ }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.3"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -2031,6 +2337,17 @@ }; version = "0.2.2"; }; + omniauth-salesforce = { + dependencies = ["omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sr7xmffx6dbsrvnh6spka5ljyzf69iac754xw5r1736py41qhpj"; + type = "gem"; + }; + version = "1.0.5"; + }; omniauth-saml = { dependencies = ["omniauth" "ruby-saml"]; source = { @@ -2058,6 +2375,17 @@ }; version = "1.4.0"; }; + omniauth-ultraauth = { + dependencies = ["omniauth_openid_connect"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z8gz8ql4vb8y5n4lr67afnjmp23bpqi18dmda5psigvd2jddyn8"; + type = "gem"; + }; + version = "0.0.2"; + }; omniauth_crowd = { dependencies = ["activesupport" "nokogiri" "omniauth"]; source = { @@ -2067,6 +2395,46 @@ }; version = "2.2.3"; }; + omniauth_openid_connect = { + dependencies = ["addressable" "omniauth" "openid_connect"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ja7cjlm4z0k0pwwy64djl58pay3lzkw7im565fybs4a8q4wmacb"; + type = "gem"; + }; + version = "0.3.1"; + }; + openid_connect = { + dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r13bv18nyvw0g1nw3fzffvv2si99zj24w0k5zgawf4q6nn5f7vd"; + type = "gem"; + }; + version = "1.1.6"; + }; + opentracing = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11lj1d8vq0hkb5hjz8q4lm82cddrggpbb33dhqfn7rxhwsmxgdfy"; + type = "gem"; + }; + version = "0.5.0"; + }; + optimist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + type = "gem"; + }; + version = "3.0.0"; + }; org-ruby = { dependencies = ["rubypants"]; source = { @@ -2093,21 +2461,25 @@ version = "1.0.0"; }; parallel = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; + sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; type = "gem"; }; - version = "1.12.1"; + version = "1.17.0"; }; parser = { dependencies = ["ast"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f"; + sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn"; type = "gem"; }; - version = "2.5.3.0"; + version = "2.6.3.0"; }; parslet = { source = { @@ -2172,12 +2544,14 @@ version = "1.2.0"; }; pg = { + groups = ["development" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32"; + sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy"; type = "gem"; }; - version = "0.18.4"; + version = "1.1.4"; }; po_to_json = { dependencies = ["json"]; @@ -2188,14 +2562,6 @@ }; version = "1.0.1"; }; - powerpack = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43"; - type = "gem"; - }; - version = "0.1.1"; - }; premailer = { dependencies = ["addressable" "css_parser" "htmlentities"]; source = { @@ -2232,12 +2598,14 @@ version = "0.0.3"; }; prometheus-client-mmap = { + groups = ["metrics"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14ww8c2qy43jw3fzmq54hsljmqmlx9a7zg9sv6ddw48qy118ls10"; + sha256 = "01f1zkpi7qsmgmk17fpq6ck7jn64sa9afsq20vc5k9f6mpyqkncd"; type = "gem"; }; - version = "0.9.4"; + version = "0.9.8"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -2267,12 +2635,14 @@ version = "0.3.6"; }; public_suffix = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l"; type = "gem"; }; - version = "3.0.3"; + version = "3.1.0"; }; puma = { source = { @@ -2299,13 +2669,23 @@ }; version = "0.0.3.3"; }; - rack = { + raabro = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm"; + sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq"; type = "gem"; }; - version = "2.0.6"; + version = "1.1.6"; + }; + rack = { + groups = ["default" "development" "kerberos" "mysql" "postgres" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; + type = "gem"; + }; + version = "2.0.7"; }; rack-accept = { dependencies = ["rack"]; @@ -2334,22 +2714,24 @@ version = "1.0.2"; }; rack-oauth2 = { - dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"]; + dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf"; + sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii"; type = "gem"; }; - version = "1.2.3"; + version = "1.9.3"; }; rack-protection = { dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ylx74ravz7nvnyygq0nk3v86qdzrmqxpwpayhppyy50l72rcajq"; + sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; rack-proxy = { dependencies = ["rack"]; @@ -2362,21 +2744,35 @@ }; rack-test = { dependencies = ["rack"]; + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; + sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; type = "gem"; }; - version = "0.6.3"; + version = "1.1.0"; + }; + rack-timeout = { + groups = ["puma"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15xph8h6v0lvq9pxm3bc9i9pnk2k68rgdr1mp0dw4l7v1xvhs78a"; + type = "gem"; + }; + version = "0.5.1"; }; rails = { - dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; + dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0blacnfcn2944cml69wji2ywp9c13qjiciavnfsa9vpimk8ixq9w"; + sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2387,15 +2783,6 @@ }; version = "1.0.2"; }; - rails-deprecated_sanitizer = { - dependencies = ["activesupport"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj"; - type = "gem"; - }; - version = "1.0.3"; - }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; source = { @@ -2425,12 +2812,14 @@ }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cfh2ijfalxj8hhf0rfw8bqhazsq6km7barsxczsvyl2a9islanr"; + sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; }; rainbow = { source = { @@ -2443,10 +2832,10 @@ raindrops = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz"; + sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; rake = { source = { @@ -2483,13 +2872,13 @@ version = "0.3.6"; }; rbtrace = { - dependencies = ["ffi" "msgpack" "trollop"]; + dependencies = ["ffi" "msgpack" "optimist"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv"; + sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; type = "gem"; }; - version = "0.4.10"; + version = "0.4.11"; }; rdoc = { source = { @@ -2509,12 +2898,14 @@ }; recaptcha = { dependencies = ["json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n"; + sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w"; type = "gem"; }; - version = "3.0.0"; + version = "4.13.1"; }; recursive-open-struct = { source = { @@ -2524,14 +2915,6 @@ }; version = "1.1.0"; }; - redcarpet = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; - type = "gem"; - }; - version = "3.4.0"; - }; RedCloth = { source = { remotes = ["https://rubygems.org"]; @@ -2603,12 +2986,22 @@ version = "1.6.0"; }; regexp_parser = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb"; + sha256 = "0dsgjb3kszk6a82s6gl0h6a8vncjrxmcbk0r4mcxcdcad2b7vb2d"; type = "gem"; }; - version = "0.5.0"; + version = "1.5.1"; + }; + regexp_property_values = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr"; + type = "gem"; + }; + version = "0.3.4"; }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; @@ -2670,12 +3063,14 @@ version = "2.1.2"; }; rouge = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; + sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; type = "gem"; }; - version = "3.3.0"; + version = "3.5.1"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -2697,66 +3092,80 @@ }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01"; + sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; rspec-core = { dependencies = ["rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zvjbymx3avxm3lf8v4gka3a862vnaxldmwvp6767bpy48nhnvjj"; + sha256 = "0spjgmd3yx6q28q950r32bi0cs8h2si53zn6rq8s7n1i4zp4zwbf"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy"; + sha256 = "0x3iddjjaramqb0yb51c79p2qajgi9wb5b59bzv25czddigyk49r"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.4"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3"; + sha256 = "12zplnsv4p6wvvxsk8xn6nm87a5qadxlkk497zlxfczd0jfawrni"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.1"; }; rspec-parameterized = { dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "159yw3mb4dab5kr18a97miyyi7dqmyrfjp3aw6r6j9i4xkc4xk3a"; + sha256 = "1c0892jbaznnldk1wi24qxm70g4zhw2idqx516rhgdzgd7yh5j31"; type = "gem"; }; - version = "0.4.1"; + version = "0.4.2"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cdcnbv5dppwy3b4jdp5a0wd9m07a8wlqwb9yazn8i7k1k2mwgvx"; + sha256 = "1pf6n9l4sw1arlax1bdbm1znsvl8cgna2n6k6yk1bi8vz2n73ls1"; type = "gem"; }; - version = "3.7.2"; + version = "3.8.2"; }; rspec-retry = { dependencies = ["rspec-core"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0izvxab7jvk25kaprk0i72asjyh1ip3cm70bgxlm8lpid35qjar6"; + sha256 = "1nnqcg2yd3nn187zbvh4cgx8xsvdk56lz1985qy7232v7i8yidw6"; type = "gem"; }; - version = "0.4.5"; + version = "0.6.1"; }; rspec-set = { source = { @@ -2767,12 +3176,14 @@ version = "0.1.3"; }; rspec-support = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nl30xb6jmcl0awhqp6jycl01wdssblifwy921phfml70rd9flj1"; + sha256 = "139mbhfdr10flm2ffryvxkyqgqs1gjdclc1xhyh7i7njfqayxk7g"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.2"; }; rspec_junit_formatter = { dependencies = ["rspec-core"]; @@ -2793,13 +3204,15 @@ version = "0.0.5"; }; rubocop = { - dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "106y99lq0fg62k3vk1w5wwb4vq16pnh4l61skc82xck627z0h8is"; + sha256 = "1cmw8ajaiidvrzjcsljh47f4l3lmcazqrzljgalj3szkr8ibkk5i"; type = "gem"; }; - version = "0.54.0"; + version = "0.69.0"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; @@ -2810,6 +3223,17 @@ }; version = "0.1.1"; }; + rubocop-performance = { + dependencies = ["rubocop"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0azzgj62w24wa4hza1qn7i9b9crxdh907kydlzcvhismx41h3lzk"; + type = "gem"; + }; + version = "1.1.0"; + }; rubocop-rspec = { dependencies = ["rubocop"]; source = { @@ -2846,12 +3270,14 @@ version = "0.17.0"; }; ruby-progressbar = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; + sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; ruby-saml = { dependencies = ["nokogiri"]; @@ -2864,12 +3290,14 @@ }; ruby_parser = { dependencies = ["sexp_processor"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mysmdyxhvyn6dhshfxyw762f9asr3kxw45idvw1bh6np31kk4j1"; + sha256 = "0s3hsccsmrirc2hy3r51kl8g9cfmcn7jxaa0asadg1kn78h1sgr7"; type = "gem"; }; - version = "3.11.0"; + version = "3.13.1"; }; rubyntlm = { source = { @@ -2895,22 +3323,15 @@ }; version = "1.2.2"; }; - rufus-scheduler = { - dependencies = ["et-orbi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8"; - type = "gem"; - }; - version = "3.4.0"; - }; rugged = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6"; + sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6"; type = "gem"; }; - version = "0.27.5"; + version = "0.28.1"; }; safe_yaml = { source = { @@ -2947,14 +3368,27 @@ }; version = "4.0.0"; }; - sass-rails = { - dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"]; + sassc = { + dependencies = ["ffi" "rake"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iji20hb8crncz14piss1b29bfb6l89sz3ai5fny3iw39vnxkdcb"; + sha256 = "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4"; type = "gem"; }; - version = "5.0.6"; + version = "2.0.1"; + }; + sassc-rails = { + dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18mgdjxdzpbw92zrllynxw7jn7yihi85j3dg7i4f6c39w1scqkbn"; + type = "gem"; + }; + version = "2.1.0"; }; sawyer = { dependencies = ["addressable" "faraday"]; @@ -2983,32 +3417,27 @@ }; version = "2.3.7"; }; - select2-rails = { - dependencies = ["thor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj"; - type = "gem"; - }; - version = "3.5.9.3"; - }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07bl3wjkf254r3ljfl4qdazz5aw60s6nqjwrbbgq754j9b7226kz"; + sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs"; type = "gem"; }; - version = "3.12.0"; + version = "3.141.0"; }; sentry-raven = { dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4"; + sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483"; type = "gem"; }; - version = "2.7.4"; + version = "2.9.0"; }; settingslogic = { source = { @@ -3019,12 +3448,14 @@ version = "2.0.9"; }; sexp_processor = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnmphfrd86694x5k7rxddbhbvv5rqbglsc34kfryy4jqhbzz42c"; + sha256 = "0w24rgmyjf7yz0xr2qhbr8z48h4m6gvbggr8nc1pldwn9rbi04b7"; type = "gem"; }; - version = "4.11.0"; + version = "4.12.0"; }; sham_rack = { dependencies = ["rack"]; @@ -3037,30 +3468,34 @@ }; shoulda-matchers = { dependencies = ["activesupport"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zvv94pqk5b5my3w1shdz7h34xf2ldhg5k4qfdpbwi2iy0j9zw2a"; + sha256 = "1s6a2i39lsqq8rrkk2pddqcb10bsihxy3v5gpnc2gk8xakj1brdq"; type = "gem"; }; - version = "3.1.2"; + version = "4.0.1"; }; sidekiq = { - dependencies = ["connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack" "rack-protection" "redis"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zyf9y3rvzizbwh68i2g1lzd40lalrdc4iyjmaa74gnfwsf92i26"; + sha256 = "131zv8i341bkacxx7n1id2cmblkbs379farnibqg8c7bycd1iajq"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.7"; }; sidekiq-cron = { - dependencies = ["rufus-scheduler" "sidekiq"]; + dependencies = ["fugit" "sidekiq"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj"; + sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0"; type = "gem"; }; - version = "0.6.0"; + version = "1.0.4"; }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; @@ -3081,20 +3516,24 @@ }; simplecov = { dependencies = ["docile" "json" "simplecov-html"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r9fnsnsqj432cmrpafryn8nif3x0qg9mdnvrcf0wr01prkdlnww"; + sha256 = "1sfyfgf7zrp2n42v7rswkqgk3bbwk1bnsphm24y7laxv3f8z0947"; type = "gem"; }; - version = "0.14.1"; + version = "0.16.1"; }; simplecov-html = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qni8g0xxglkx25w54qcfbi4wjkpvmb28cb7rj5zk3iqynjcdrqf"; + sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn"; type = "gem"; }; - version = "0.10.0"; + version = "0.10.2"; }; slack-notifier = { source = { @@ -3151,10 +3590,10 @@ sshkey = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h"; + sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; type = "gem"; }; - version = "1.9.0"; + version = "2.0.0"; }; stackprof = { source = { @@ -3190,6 +3629,17 @@ }; version = "0.5.1"; }; + swd = { + dependencies = ["activesupport" "attr_required" "httpclient"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s2vjb6f13za7p1iycl2p73d3p202xa6xny9fjrp8ynwsqix7lyd"; + type = "gem"; + }; + version = "1.1.2"; + }; sys-filesystem = { dependencies = ["ffi"]; source = { @@ -3256,6 +3706,14 @@ }; version = "0.3.6"; }; + thrift = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv"; + type = "gem"; + }; + version = "0.11.0.0"; + }; tilt = { source = { remotes = ["https://rubygems.org"]; @@ -3298,22 +3756,24 @@ }; version = "1.0.0"; }; - trollop = { + tomlrb = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq"; + sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv"; type = "gem"; }; - version = "2.1.3"; + version = "1.2.8"; }; truncato = { dependencies = ["htmlentities" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b"; + sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4"; type = "gem"; }; - version = "0.7.10"; + version = "0.7.11"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -3367,21 +3827,23 @@ version = "0.0.7.5"; }; unicode-display_width = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n"; + sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; type = "gem"; }; - version = "1.3.2"; + version = "1.6.0"; }; unicorn = { dependencies = ["kgio" "raindrops"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v"; + sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak"; type = "gem"; }; - version = "5.1.0"; + version = "5.4.1"; }; unicorn-worker-killer = { dependencies = ["get_process_mem" "unicorn"]; @@ -3402,12 +3864,36 @@ }; unparser = { dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w662glqi7hwmfvx0smxckxgc7kw5bsqhqz0pyvalbyv1gc0gs2x"; + sha256 = "03vjj74kj86vlazhiclf63kf6gajs66k8ni34q70fdhf97d7b60c"; type = "gem"; }; - version = "0.4.2"; + version = "0.4.5"; + }; + validate_email = { + dependencies = ["activemodel" "mail"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r1fz29l699arka177c9xw7409d1a3ff95bf7a6pmc97slb91zlx"; + type = "gem"; + }; + version = "0.1.6"; + }; + validate_url = { + dependencies = ["activemodel" "public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k0bfxzvdcf1nrqhvnyhijc4mwab9wn4qvqb0ynq6p8dj0f866zi"; + type = "gem"; + }; + version = "1.0.8"; }; validates_hostname = { dependencies = ["activerecord" "activesupport"]; @@ -3421,10 +3907,10 @@ version_sorter = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr"; + sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.4"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"]; @@ -3452,14 +3938,25 @@ }; version = "1.2.7"; }; + webfinger = { + dependencies = ["activesupport" "httpclient"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m0jh8k7c0ifh2jhbn7ihqrmn5fi754wflva97zgy70hpdvxyjar"; + type = "gem"; + }; + version = "1.1.0"; + }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5"; + sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp"; type = "gem"; }; - version = "2.3.2"; + version = "3.5.1"; }; webpack-rails = { dependencies = ["railties"]; @@ -3472,12 +3969,14 @@ }; websocket-driver = { dependencies = ["websocket-extensions"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1943442yllhldh9dbp374x2q39cxa49xrm28nb78b7mfbv3y195l"; + sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn"; type = "gem"; }; - version = "0.6.5"; + version = "0.7.0"; }; websocket-extensions = { source = { @@ -3514,11 +4013,13 @@ }; xpath = { dependencies = ["nokogiri"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ha626m6fh50fpilb9pdnmq9xl586w7c0zyidg895c3iq13rqgyw"; + sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; type = "gem"; }; - version = "2.1.0"; + version = "3.2.0"; }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index f01944a0e877..62ee2990dfa6 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -1,7 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '5.0.7.1' -gem 'rails-deprecated_sanitizer', '~> 1.0.3' +gem 'rails', '5.2.3' # Improves copy-on-write performance for MRI gem 'nakayoshi_fork', '~> 0.0.4' @@ -12,19 +11,19 @@ gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' +gem 'default_value_for', '~> 3.2.0' # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql -gem 'pg', '~> 0.18.2', group: :postgres +gem 'pg', '~> 1.1', group: :postgres -gem 'rugged', '~> 0.27' -gem 'grape-path-helpers', '~> 1.0' +gem 'rugged', '~> 0.28' +gem 'grape-path-helpers', '~> 1.1' gem 'faraday', '~> 0.12' # Authentication libraries -gem 'devise', '~> 4.4' +gem 'devise', '~> 4.6' gem 'doorkeeper', '~> 4.3' gem 'doorkeeper-openid_connect', '~> 1.5' gem 'omniauth', '~> 1.8' @@ -42,14 +41,17 @@ gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.3.3' -gem 'rack-oauth2', '~> 1.2.1' +gem 'omniauth_openid_connect', '~> 0.3.1' +gem "omniauth-ultraauth", '~> 0.0.2' +gem 'omniauth-salesforce', '~> 1.0.5' +gem 'rack-oauth2', '~> 1.9.3' gem 'jwt', '~> 2.1.0' # Kerberos authentication. EE-only gem 'gssapi', group: :kerberos # Spam and anti-bot protection -gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' +gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'akismet', '~> 2.0' # Two-factor authentication @@ -61,6 +63,8 @@ gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.6' gem 'rubyzip', '~> 1.2.2', require: 'zip' +# GitLab Pages letsencrypt support +gem 'acme-client', '~> 2.0.2' # Browser detection gem 'browser', '~> 2.5' @@ -71,7 +75,7 @@ gem 'gpgme', '~> 2.0.18' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'net-ldap' # API @@ -82,6 +86,8 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' # GraphQL API gem 'graphql', '~> 1.8.0' gem 'graphiql-rails', '~> 1.4.10' +gem 'apollo_upload_server', '~> 2.0.0.beta3' +gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] # Disable strong_params so that Mash does not respond to :permitted? gem 'hashie-forbidden_attributes' @@ -97,13 +103,15 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick' # for backups -gem 'fog-aws', '~> 2.0.1' -gem 'fog-core', '~> 1.44' -gem 'fog-google', '~> 1.7.1' -gem 'fog-local', '~> 0.3' -gem 'fog-openstack', '~> 0.1' +gem 'fog-aws', '~> 3.5' +# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. +# Also see config/initializers/fog_core_patch.rb. +gem 'fog-core', '= 2.1.0' +gem 'fog-google', '~> 1.8' +gem 'fog-local', '~> 0.6' +gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' -gem 'fog-aliyun', '~> 0.2.0' +gem 'fog-aliyun', '~> 0.3' # for Google storage gem 'google-api-client', '~> 0.23' @@ -116,29 +124,29 @@ gem 'seed-fu', '~> 2.3.7' # Search gem 'elasticsearch-model', '~> 0.1.9' -gem 'elasticsearch-rails', '~> 0.1.9' +gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '5.0.3' gem 'aws-sdk' gem 'faraday_middleware-aws-signers-v4' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' -gem 'deckar01-task_list', '2.0.0' -gem 'gitlab-markup', '~> 1.6.5' +gem 'deckar01-task_list', '2.2.0' +gem 'gitlab-markup', '~> 1.7.0' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.0' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 1.5.8' -gem 'asciidoctor-plantuml', '0.0.8' -gem 'rouge', '~> 3.1' -gem 'truncato', '~> 0.7.9' -gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.5' +gem 'asciidoctor', '~> 2.0.10' +gem 'asciidoctor-include-ext', '~> 0.3.1', require: false +gem 'asciidoctor-plantuml', '0.0.9' +gem 'rouge', '~> 3.5' +gem 'truncato', '~> 0.7.11' +gem 'bootstrap_form', '~> 4.2.0' +gem 'nokogiri', '~> 1.10.3' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -148,38 +156,36 @@ gem 'icalendar' gem 'diffy', '~> 3.1.0' # Application server -# The 2.0.6 version of rack requires monkeypatch to be present in -# `config.ru`. This can be removed once a new update for Rack -# is available that contains https://github.com/rack/rack/pull/1201. -gem 'rack', '2.0.6' +gem 'rack', '~> 2.0.7' group :unicorn do - gem 'unicorn', '~> 5.1.0' + gem 'unicorn', '~> 5.4.1' gem 'unicorn-worker-killer', '~> 0.4.4' end group :puma do gem 'puma', '~> 3.12', require: false gem 'puma_worker_killer', require: false + gem 'rack-timeout', require: false end # State machine gem 'state_machines-activerecord', '~> 0.5.1' # Issue tags -gem 'acts-as-taggable-on', '~> 5.0' +gem 'acts-as-taggable-on', '~> 6.0' # Background jobs -gem 'sidekiq', '~> 5.2.1' -gem 'sidekiq-cron', '~> 0.6.0' +gem 'sidekiq', '~> 5.2.7' +gem 'sidekiq-cron', '~> 1.0' gem 'redis-namespace', '~> 1.6.0' gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' # Cron Parser -gem 'rufus-scheduler', '~> 3.4' +gem 'fugit', '~> 1.2.1' # HTTP requests -gem 'httparty', '~> 0.13.3' +gem 'httparty', '~> 0.16.4' # Colored output to console gem 'rainbow', '~> 3.0' @@ -195,10 +201,10 @@ gem 're2', '~> 1.1.1' # Misc -gem 'version_sorter', '~> 2.1.0' +gem 'version_sorter', '~> 2.2.4' # Export Ruby Regex to Javascript -gem 'js_regex', '~> 2.2.1' +gem 'js_regex', '~> 3.1' # User agent parsing gem 'device_detector' @@ -216,7 +222,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false # HipChat integration gem 'hipchat', '~> 1.5.0' -# JIRA integration +# Jira integration gem 'jira-ruby', '~> 1.4' # Flowdock integration @@ -235,7 +241,7 @@ gem 'asana', '~> 0.8.1' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 4.0.0' +gem 'kubeclient', '~> 4.2.2' # Sanitize user input gem 'sanitize', '~> 4.6' @@ -269,27 +275,27 @@ gem 'chronic_duration', '~> 0.10.6' gem 'webpack-rails', '~> 0.9.10' gem 'rack-proxy', '~> 0.6.0' -gem 'sass-rails', '~> 5.0.6' -gem 'sass', '~> 3.5' +gem 'sassc-rails', '~> 2.1.0' gem 'uglifier', '~> 2.7.2' gem 'addressable', '~> 2.5.2' gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.2' -gem 'jquery-atwho-rails', '~> 1.3.2' gem 'request_store', '~> 1.3' -gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' gem 'base32', '~> 0.3.0' gem "gitlab-license", "~> 1.0" # Sentry integration -gem 'sentry-raven', '~> 2.7' +gem 'sentry-raven', '~> 2.9' gem 'premailer-rails', '~> 1.9.7' +# LabKit: Tracing and Correlation +gem 'gitlab-labkit', '~> 0.3.0' + # I18n gem 'ruby_parser', '~> 3.8', require: false gem 'rails-i18n', '~> 5.1' @@ -297,7 +303,7 @@ gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.2.2', require: false, group: :development -gem 'batch-loader', '~> 1.2.2' +gem 'batch-loader', '~> 1.4.0' # Perf bar gem 'peek', '~> 1.0.1' @@ -307,13 +313,19 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' +# Snowplow events tracking +gem 'snowplow-tracker', '~> 0.6.1' + +# Memory benchmarks +gem 'derailed_benchmarks', require: false + # Metrics group :metrics do gem 'method_source', '~> 0.8', require: false gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.9.4' + gem 'prometheus-client-mmap', '~> 0.9.8' gem 'raindrops', '~> 0.18' end @@ -321,7 +333,7 @@ group :development do gem 'foreman', '~> 0.84.0' gem 'brakeman', '~> 4.2', require: false - gem 'letter_opener_web', '~> 1.3.0' + gem 'letter_opener_web', '~> 1.3.4' gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false # Better errors handler @@ -333,7 +345,7 @@ group :development do end group :development, :test do - gem 'bootsnap', '~> 1.3' + gem 'bootsnap', '~> 1.4' gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.4' @@ -343,8 +355,8 @@ group :development, :test do gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 4.8.2' - gem 'rspec-rails', '~> 3.7.0' - gem 'rspec-retry', '~> 0.4.5' + gem 'rspec-rails', '~> 3.8.0' + gem 'rspec-retry', '~> 0.6.1' gem 'rspec_profiling', '~> 0.0.5' gem 'rspec-set', '~> 0.1.3' gem 'rspec-parameterized', require: false @@ -355,22 +367,24 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.10' - gem 'capybara', '~> 2.16.1' - gem 'capybara-screenshot', '~> 1.0.18' - gem 'selenium-webdriver', '~> 3.12' + gem 'capybara', '~> 3.22.0' + gem 'capybara-screenshot', '~> 1.0.22' + gem 'selenium-webdriver', '~> 3.141' gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 2.4', require: false + gem 'gitlab-styles', '~> 2.7', require: false # Pin these dependencies, otherwise a new rule could break the CI pipelines - gem 'rubocop', '~> 0.54.0' + gem 'rubocop', '~> 0.69.0' + gem 'rubocop-performance', '~> 1.1.0' gem 'rubocop-rspec', '~> 1.22.1' gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.28.0', require: false - gem 'simplecov', '~> 0.14.0', require: false + gem 'haml_lint', '~> 0.31.0', require: false + gem 'simplecov', '~> 0.16.1', require: false gem 'bundler-audit', '~> 0.5.0', require: false + gem 'mdl', '~> 0.5.0', require: false gem 'benchmark-ips', '~> 2.3.0', require: false @@ -387,10 +401,10 @@ group :development, :test do end group :test do - gem 'shoulda-matchers', '~> 3.1.2', require: false + gem 'shoulda-matchers', '~> 4.0.1', require: false gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' - gem 'webmock', '~> 2.3.2' + gem 'webmock', '~> 3.5.1' gem 'rails-controller-testing' gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.1' @@ -407,6 +421,9 @@ gem 'html2text' gem 'ruby-prof', '~> 0.17.0' gem 'rbtrace', '~> 0.4', require: false +gem 'memory_profiler', '~> 0.9', require: false +gem 'benchmark-memory', '~> 0.1', require: false +gem 'activerecord-explain-analyze', '~> 0.1', require: false # OAuth gem 'oauth2', '~> 1.4' @@ -422,8 +439,8 @@ gem 'sys-filesystem', '~> 1.1.6' gem 'net-ntp' # SSH host key support -gem 'net-ssh', '~> 5.0' -gem 'sshkey', '~> 1.9.0' +gem 'net-ssh', '~> 5.2' +gem 'sshkey', '~> 2.0' # Required for ED25519 SSH host key support group :ed25519 do @@ -432,10 +449,11 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly' -gem 'grpc', '~> 1.15.0' +gem 'gitaly-proto', '~> 1.37.0', require: 'gitaly' -gem 'google-protobuf', '~> 3.6' +gem 'grpc', '~> 1.19.0' + +gem 'google-protobuf', '~> 3.7.1' gem 'toml-rb', '~> 1.0.0', require: false diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index 8d07afb59bf1..0a6d7fe1370b 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -4,47 +4,56 @@ GEM RedCloth (4.3.2) abstract_type (0.0.7) ace-rails-ap (4.1.2) - actioncable (5.0.7.1) - actionpack (= 5.0.7.1) - nio4r (>= 1.2, < 3.0) - websocket-driver (~> 0.6.1) - actionmailer (5.0.7.1) - actionpack (= 5.0.7.1) - actionview (= 5.0.7.1) - activejob (= 5.0.7.1) + acme-client (2.0.2) + faraday (~> 0.9, >= 0.9.1) + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7.1) - actionview (= 5.0.7.1) - activesupport (= 5.0.7.1) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) rack (~> 2.0) - rack-test (~> 0.6.3) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7.1) - activesupport (= 5.0.7.1) + actionview (5.2.3) + activesupport (= 5.2.3) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.7.1) - activesupport (= 5.0.7.1) + activejob (5.2.3) + activesupport (= 5.2.3) globalid (>= 0.3.6) - activemodel (5.0.7.1) - activesupport (= 5.0.7.1) - activerecord (5.0.7.1) - activemodel (= 5.0.7.1) - activesupport (= 5.0.7.1) - arel (~> 7.0) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activerecord-explain-analyze (0.1.0) + activerecord (>= 4) + pg activerecord_sane_schema_dumper (1.0) rails (>= 5, < 6) - activesupport (5.0.7.1) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - acts-as-taggable-on (5.0.0) - activerecord (>= 4.2.8) + acts-as-taggable-on (6.0.0) + activerecord (~> 5.0) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -52,20 +61,25 @@ GEM public_suffix (>= 2.0.2, < 4.0) aes_key_wrap (1.0.1) akismet (2.0.0) - arel (7.1.4) + apollo_upload_server (2.0.0.beta.3) + graphql (>= 1.8) + rails (>= 4.2) + arel (9.0.0) asana (0.8.1) faraday (~> 0.9) faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.8) - asciidoctor-plantuml (0.0.8) - asciidoctor (~> 1.5) + asciidoctor (2.0.10) + asciidoctor-include-ext (0.3.1) + asciidoctor (>= 1.5.6, < 3.0.0) + asciidoctor-plantuml (0.0.9) + asciidoctor (>= 1.5.6, < 3.0.0) ast (2.4.0) atomic (1.1.99) attr_encrypted (3.1.0) encryptor (~> 3.0.0) - attr_required (1.0.0) + attr_required (1.0.1) awesome_print (1.8.0) aws-sdk (2.9.32) aws-sdk-resources (= 2.9.32) @@ -81,21 +95,25 @@ GEM thread_safe (~> 0.3, >= 0.3.1) babosa (1.0.2) base32 (0.3.2) - batch-loader (1.2.2) + batch-loader (1.4.0) bcrypt (3.1.12) bcrypt_pbkdf (1.0.0) benchmark-ips (2.3.0) + benchmark-memory (0.1.2) + memory_profiler (~> 0.9) better_errors (2.5.0) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) bindata (2.4.3) - binding_ninja (0.2.2) + binding_ninja (0.2.3) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.3.2) + bootsnap (1.4.1) msgpack (~> 1.0) - bootstrap_form (2.7.0) + bootstrap_form (4.2.0) + actionpack (>= 5.0) + activemodel (>= 5.0) brakeman (4.2.1) browser (2.5.3) builder (3.2.3) @@ -106,13 +124,14 @@ GEM bundler (~> 1.2) thor (~> 0.18) byebug (9.1.0) - capybara (2.16.1) + capybara (3.22.0) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.5) + xpath (~> 3.2) capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy @@ -121,6 +140,7 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) + character_set (1.1.2) charlock_holmes (0.7.6) childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) @@ -137,10 +157,11 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.3) - concurrent-ruby-ext (1.1.3) - concurrent-ruby (= 1.1.3) + concurrent-ruby (1.1.5) + concurrent-ruby-ext (1.1.5) + concurrent-ruby (= 1.1.5) connection_pool (2.2.2) + contracts (0.11.0) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) @@ -151,14 +172,24 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) - deckar01-task_list (2.0.0) + deckar01-task_list (2.2.0) html-pipeline declarative (0.0.10) declarative-option (0.1.0) + default_value_for (3.2.0) + activerecord (>= 3.2.0, < 6.0) + derailed_benchmarks (1.3.5) + benchmark-ips (~> 2) + get_process_mem (~> 0) + heapy (~> 0) + memory_profiler (~> 0) + rack (>= 1) + rake (> 10, < 13) + thor (~> 0.19) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) device_detector (1.0.0) - devise (4.4.3) + devise (4.6.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -174,7 +205,7 @@ GEM diffy (3.1.0) discordrb-webhooks-blackst0ne (3.3.0) rest-client (~> 2.0) - docile (1.1.5) + docile (1.3.1) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) doorkeeper (4.3.2) @@ -203,15 +234,16 @@ GEM mail (~> 2.7) encryptor (3.0.0) equalizer (0.0.11) - erubi (1.7.1) - erubis (2.7.0) + erubi (1.8.0) escape_utils (1.2.1) - et-orbi (1.0.3) + et-orbi (1.2.1) tzinfo eventmachine (1.2.7) excon (0.62.0) execjs (2.6.0) expression_parser (0.9.0) + extended-markdown-filter (0.6.0) + html-pipeline (~> 2.0) factory_bot (4.8.2) activesupport (>= 3.0.0) factory_bot_rails (4.8.2) @@ -230,7 +262,7 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.9.25) + ffi (1.10.0) flipper (0.13.0) flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) @@ -241,32 +273,33 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aliyun (0.2.0) - fog-core (~> 1.27) - fog-json (~> 1.0) + fog-aliyun (0.3.3) + fog-core + fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (2.0.1) - fog-core (~> 1.38) - fog-json (~> 1.0) + fog-aws (3.5.2) + fog-core (~> 2.1) + fog-json (~> 1.1) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.45.0) + fog-core (2.1.0) builder excon (~> 0.58) formatador (~> 0.2) - fog-google (1.7.1) - fog-core - fog-json - fog-xml + mime-types + fog-google (1.8.2) + fog-core (<= 2.1.0) + fog-json (~> 1.2) + fog-xml (~> 0.1.0) google-api-client (~> 0.23.0) - fog-json (1.0.2) - fog-core (~> 1.0) + fog-json (1.2.0) + fog-core multi_json (~> 1.10) - fog-local (0.3.1) - fog-core (~> 1.27) - fog-openstack (0.1.21) - fog-core (>= 1.40) + fog-local (0.6.0) + fog-core (>= 1.27, < 3.0) + fog-openstack (1.0.8) + fog-core (~> 2.1) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -277,17 +310,21 @@ GEM fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) - font-awesome-rails (4.7.0.1) - railties (>= 3.2, < 5.1) + font-awesome-rails (4.7.0.4) + railties (>= 3.2, < 6.0) foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) + fugit (1.2.1) + et-orbi (~> 1.1, >= 1.1.8) + raabro (~> 1.1) fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) + gemoji (3.0.1) gemojione (3.3.0) json - get_process_mem (0.2.0) + get_process_mem (0.2.3) gettext (3.2.9) locale (>= 2.0.5) text (>= 1.3.0) @@ -298,25 +335,30 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.5.0) + gitaly-proto (1.37.0) grpc (~> 1.0) github-markup (1.7.0) - gitlab-default_value_for (3.1.1) - activerecord (>= 3.2.0, < 6.0) + gitlab-labkit (0.3.0) + actionpack (~> 5) + activesupport (~> 5) + grpc (~> 1.19.0) + jaeger-client (~> 0.10) + opentracing (~> 0.4) gitlab-license (1.0.0) - gitlab-markup (1.6.5) + gitlab-markup (1.7.0) gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) - gitlab-styles (2.4.1) - rubocop (~> 0.54.0) + gitlab-styles (2.7.0) + rubocop (~> 0.69.0) rubocop-gitlab-security (~> 0.1.0) + rubocop-performance (~> 1.1.0) rubocop-rspec (~> 1.19) - gitlab_omniauth-ldap (2.0.4) + gitlab_omniauth-ldap (2.1.1) net-ldap (~> 0.16) omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) gon (6.2.0) actionpack (>= 3.0) @@ -329,8 +371,8 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.6.1) - googleapis-common-protos-types (1.0.2) + google-protobuf (3.7.1) + googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) googleauth (0.6.6) faraday (~> 0.12) @@ -351,8 +393,8 @@ GEM grape-entity (0.7.1) activesupport (>= 4.0) multi_json (>= 1.3.2) - grape-path-helpers (1.0.6) - activesupport (>= 4, < 5.1) + grape-path-helpers (1.1.0) + activesupport grape (~> 1.0) rake (~> 12) grape_logging (1.7.0) @@ -361,7 +403,15 @@ GEM railties sprockets-rails graphql (1.8.1) - grpc (1.15.0) + graphql-docs (1.6.0) + commonmarker (~> 0.16) + escape_utils (~> 1.2) + extended-markdown-filter (~> 0.4) + gemoji (~> 3.0) + graphql (~> 1.6) + html-pipeline (~> 2.8) + sass (~> 3.4) + grpc (1.19.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) gssapi (1.2.0) @@ -369,7 +419,7 @@ GEM haml (5.0.4) temple (>= 0.8.0) tilt - haml_lint (0.28.0) + haml_lint (0.31.0) haml (>= 4.0, < 5.1) rainbow rake (>= 10, < 13) @@ -380,12 +430,13 @@ GEM thor tilt hangouts-chat (0.0.5) - hashdiff (0.3.4) + hashdiff (0.3.8) hashie (3.5.7) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) rails (>= 4.0) + heapy (0.1.4) hipchat (1.5.2) httparty mimemagic @@ -404,11 +455,11 @@ GEM domain_name (~> 0.5) http-form_data (2.1.1) http_parser.rb (0.6.0) - httparty (0.13.7) - json (~> 1.8) + httparty (0.16.4) + mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.2.0) + i18n (1.6.0) concurrent-ruby (~> 1.0) icalendar (2.4.1) ice_nine (0.11.2) @@ -416,14 +467,19 @@ GEM cause json ipaddress (0.8.3) + jaeger-client (0.10.0) + opentracing (~> 0.3) + thrift + jaro_winkler (1.5.2) jira-ruby (1.4.1) activesupport multipart-post oauth (~> 0.5, >= 0.5.0) jmespath (1.3.1) - jquery-atwho-rails (1.3.2) - js_regex (2.2.1) - regexp_parser (>= 0.4.11, <= 0.5.0) + js_regex (3.1.1) + character_set (~> 1.1) + regexp_parser (~> 1.1) + regexp_property_values (~> 0.3) json (1.8.6) json-jwt (1.9.4) activesupport @@ -444,18 +500,19 @@ GEM activerecord kaminari-core (= 1.0.1) kaminari-core (1.0.1) - kgio (2.10.0) + kgio (2.11.2) knapsack (1.17.0) rake - kubeclient (4.0.0) + kramdown (1.17.0) + kubeclient (4.2.2) http (~> 3.0) recursive-open-struct (~> 1.0, >= 1.0.4) rest-client (~> 2.0) launchy (2.4.3) addressable (~> 2.3) - letter_opener (1.4.1) + letter_opener (1.7.0) launchy (~> 2.2) - letter_opener_web (1.3.0) + letter_opener_web (1.3.4) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) @@ -480,19 +537,29 @@ GEM mail (2.7.1) mini_mime (>= 0.1.1) mail_room (0.9.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + mdl (0.5.0) + kramdown (~> 1.12, >= 1.12.0) + mixlib-cli (~> 1.7, >= 1.7.0) + mixlib-config (~> 2.2, >= 2.2.1) memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) + memory_profiler (0.9.13) method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) + mime-types-data (3.2019.0331) mimemagic (0.3.2) mini_magick (4.8.0) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.4) + mixlib-cli (1.7.0) + mixlib-config (2.2.18) + tomlrb + msgpack (1.2.10) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -504,11 +571,11 @@ GEM net-dns (0.9.0) net-ldap (0.16.0) net-ntp (2.1.3) - net-ssh (5.0.1) + net-ssh (5.2.0) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri numerizer (0.1.1) @@ -562,6 +629,9 @@ GEM omniauth (~> 1.9) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) + omniauth-salesforce (1.0.5) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.0) omniauth-saml (1.10.0) omniauth (~> 1.3, >= 1.3.2) ruby-saml (~> 1.7) @@ -570,16 +640,34 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack + omniauth-ultraauth (0.0.2) + omniauth_openid_connect (~> 0.3.0) omniauth_crowd (2.2.3) activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) + omniauth_openid_connect (0.3.1) + addressable (~> 2.5) + omniauth (~> 1.3) + openid_connect (~> 1.1) + openid_connect (1.1.6) + activemodel + attr_required (>= 1.0.0) + json-jwt (>= 1.5.0) + rack-oauth2 (>= 1.6.1) + swd (>= 1.0.0) + tzinfo + validate_email + validate_url + webfinger (>= 1.0.1) + opentracing (0.5.0) + optimist (3.0.0) org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) os (1.0.0) - parallel (1.12.1) - parser (2.5.3.0) + parallel (1.17.0) + parser (2.6.3.0) ast (~> 2.4.0) parslet (1.8.2) peek (1.0.1) @@ -605,10 +693,9 @@ GEM atomic (>= 1.0.0) peek redis - pg (0.18.4) + pg (1.1.4) po_to_json (1.0.1) json (>= 1.6.0) - powerpack (0.1.1) premailer (1.10.4) addressable css_parser (>= 1.4.10) @@ -621,7 +708,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.9.4) + prometheus-client-mmap (0.9.8) pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -630,48 +717,49 @@ GEM pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) - public_suffix (3.0.3) + public_suffix (3.1.0) puma (3.12.0) puma_worker_killer (0.1.0) get_process_mem (~> 0.2) puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) - rack (2.0.6) + raabro (1.1.6) + rack (2.0.7) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.4.1) rack rack-cors (1.0.2) - rack-oauth2 (1.2.3) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - multi_json (>= 1.3.6) - rack (>= 1.1) - rack-protection (2.0.4) + rack-oauth2 (1.9.3) + activesupport + attr_required + httpclient + json-jwt (>= 1.9.0) + rack + rack-protection (2.0.5) rack rack-proxy (0.6.0) rack - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.7.1) - actioncable (= 5.0.7.1) - actionmailer (= 5.0.7.1) - actionpack (= 5.0.7.1) - actionview (= 5.0.7.1) - activejob (= 5.0.7.1) - activemodel (= 5.0.7.1) - activerecord (= 5.0.7.1) - activesupport (= 5.0.7.1) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rack-timeout (0.5.1) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) bundler (>= 1.3.0) - railties (= 5.0.7.1) + railties (= 5.2.3) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) actionview (~> 5.x, >= 5.0.1) activesupport (~> 5.x) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -680,30 +768,29 @@ GEM rails-i18n (5.1.1) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.0.7.1) - actionpack (= 5.0.7.1) - activesupport (= 5.0.7.1) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - raindrops (0.18.0) + raindrops (0.19.0) rake (12.3.2) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) - rbtrace (0.4.10) + rbtrace (0.4.11) ffi (>= 1.0.6) msgpack (>= 0.4.3) - trollop (>= 1.16.2) + optimist (>= 3.0.0) rdoc (6.0.4) re2 (1.1.1) - recaptcha (3.0.0) + recaptcha (4.13.1) json recursive-open-struct (1.1.0) - redcarpet (3.4.0) redis (3.3.5) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) @@ -723,7 +810,8 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.6.0) redis (>= 2.2, < 5) - regexp_parser (0.5.0) + regexp_parser (1.5.1) + regexp_property_values (0.3.4) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -739,41 +827,41 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.3.0) + rouge (3.5.1) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) - rspec (3.7.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.2) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.4) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-parameterized (0.4.1) - binding_ninja (>= 0.2.1) + rspec-support (~> 3.8.0) + rspec-parameterized (0.4.2) + binding_ninja (>= 0.2.3) parser proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (3.7.2) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-support (~> 3.7.0) - rspec-retry (0.4.5) - rspec-core + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-retry (0.6.1) + rspec-core (> 3.3) rspec-set (0.1.3) - rspec-support (3.7.1) + rspec-support (3.8.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.5) @@ -781,15 +869,17 @@ GEM pg rails sqlite3 - rubocop (0.54.0) + rubocop (0.69.0) + jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5) - powerpack (~> 0.1) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) + unicode-display_width (>= 1.4.0, < 1.7) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) + rubocop-performance (1.1.0) + rubocop (>= 0.67.0) rubocop-rspec (1.22.2) rubocop (>= 0.52.1) ruby-enum (0.7.2) @@ -797,17 +887,15 @@ GEM ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-prof (0.17.0) - ruby-progressbar (1.9.0) + ruby-progressbar (1.10.0) ruby-saml (1.7.2) nokogiri (>= 1.5.10) - ruby_parser (3.11.0) + ruby_parser (3.13.1) sexp_processor (~> 4.9) rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (1.2.2) - rufus-scheduler (3.4.0) - et-orbi (~> 1.0) - rugged (0.27.5) + rugged (0.28.1) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -818,12 +906,15 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.6) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + sassc (2.0.1) + ffi (~> 1.9) + rake + sassc-rails (2.1.0) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) @@ -833,25 +924,24 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.9.3) - thor (~> 0.14) - selenium-webdriver (3.12.0) + selenium-webdriver (3.141.0) childprocess (~> 0.5) - rubyzip (~> 1.2) - sentry-raven (2.7.4) + rubyzip (~> 1.2, >= 1.2.2) + sentry-raven (2.9.0) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) - sexp_processor (4.11.0) + sexp_processor (4.12.0) sham_rack (1.3.6) rack - shoulda-matchers (3.1.2) - activesupport (>= 4.0.0) - sidekiq (5.2.3) + shoulda-matchers (4.0.1) + activesupport (>= 4.2.0) + sidekiq (5.2.7) connection_pool (~> 2.2, >= 2.2.2) + rack (>= 1.5.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) - sidekiq-cron (0.6.0) - rufus-scheduler (>= 3.3.0) + sidekiq-cron (1.0.4) + fugit (~> 1.1) sidekiq (>= 4.2.1) signet (0.11.0) addressable (~> 2.3) @@ -859,12 +949,14 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_po_parser (1.1.2) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.2) slack-notifier (1.5.1) + snowplow-tracker (0.6.1) + contracts (~> 0.7, <= 0.11) spring (2.0.2) activesupport (>= 4.2) spring-commands-rspec (1.0.4) @@ -877,7 +969,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkey (1.9.0) + sshkey (2.0.0) stackprof (0.2.10) state_machines (0.5.0) state_machines-activemodel (0.5.1) @@ -886,10 +978,14 @@ GEM state_machines-activerecord (0.5.1) activerecord (>= 4.1, < 6.0) state_machines-activemodel (>= 0.5.0) + swd (1.1.2) + activesupport (>= 3) + attr_required (>= 0.0.5) + httpclient (>= 2.4) sys-filesystem (1.1.6) ffi sysexits (1.2.0) - temple (0.8.0) + temple (0.8.1) test-prof (0.2.5) text (1.3.1) thin (1.7.2) @@ -898,17 +994,18 @@ GEM rack (>= 1, < 3) thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.8) + thrift (0.11.0.0) + tilt (2.0.9) timecop (0.8.1) timfel-krb5-auth (0.8.3) toml (0.2.0) parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) - trollop (2.1.3) - truncato (0.7.10) + tomlrb (1.2.8) + truncato (0.7.11) htmlentities (~> 4.3.1) - nokogiri (~> 1.8.0, >= 1.7.0) + nokogiri (>= 1.7.0, <= 2.0) tzinfo (1.2.5) thread_safe (~> 0.1) u2f (0.2.1) @@ -919,26 +1016,32 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.3.2) - unicorn (5.1.0) + unicode-display_width (1.6.0) + unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) uniform_notifier (1.10.0) - unparser (0.4.2) + unparser (0.4.5) abstract_type (~> 0.0.7) adamantium (~> 0.2.0) concord (~> 0.1.5) diff-lcs (~> 1.3) equalizer (~> 0.0.9) - parser (>= 2.3.1.2, < 2.6) + parser (~> 2.6.3) procto (~> 0.0.2) + validate_email (0.1.6) + activemodel (>= 3.0) + mail (>= 2.2.5) + validate_url (1.0.8) + activemodel (>= 3.0.0) + public_suffix validates_hostname (1.0.6) activerecord (>= 3.0) activesupport (>= 3.0) - version_sorter (2.1.0) + version_sorter (2.2.4) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -947,13 +1050,16 @@ GEM vmstat (2.3.0) warden (1.2.7) rack (>= 1.0) - webmock (2.3.2) + webfinger (1.1.0) + activesupport + httpclient (>= 2.4) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff webpack-rails (0.9.11) railties (>= 3.2.0) - websocket-driver (0.6.5) + websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) wikicloth (0.8.1) @@ -962,8 +1068,8 @@ GEM rinku with_env (1.1.0) xml-simple (1.1.5) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -971,31 +1077,36 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) + acme-client (~> 2.0.2) + activerecord-explain-analyze (~> 0.1) activerecord_sane_schema_dumper (= 1.0) - acts-as-taggable-on (~> 5.0) + acts-as-taggable-on (~> 6.0) addressable (~> 2.5.2) akismet (~> 2.0) + apollo_upload_server (~> 2.0.0.beta3) asana (~> 0.8.1) - asciidoctor (~> 1.5.8) - asciidoctor-plantuml (= 0.0.8) + asciidoctor (~> 2.0.10) + asciidoctor-include-ext (~> 0.3.1) + asciidoctor-plantuml (= 0.0.9) attr_encrypted (~> 3.1.0) awesome_print aws-sdk babosa (~> 1.0.2) base32 (~> 0.3.0) - batch-loader (~> 1.2.2) + batch-loader (~> 1.4.0) bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) + benchmark-memory (~> 0.1) better_errors (~> 2.5.0) binding_of_caller (~> 0.8.0) - bootsnap (~> 1.3) - bootstrap_form (~> 2.7.0) + bootsnap (~> 1.4) + bootstrap_form (~> 4.2.0) brakeman (~> 4.2) browser (~> 2.5) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) - capybara (~> 2.16.1) - capybara-screenshot (~> 1.0.18) + capybara (~> 3.22.0) + capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) @@ -1005,9 +1116,11 @@ DEPENDENCIES connection_pool (~> 2.0) creole (~> 0.5.0) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.0.0) + deckar01-task_list (= 2.2.0) + default_value_for (~> 3.2.0) + derailed_benchmarks device_detector - devise (~> 4.4) + devise (~> 4.6) devise-two-factor (~> 3.0.0) diffy (~> 3.1.0) discordrb-webhooks-blackst0ne (~> 3.3) @@ -1029,41 +1142,43 @@ DEPENDENCIES flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) flowdock (~> 0.7) - fog-aliyun (~> 0.2.0) - fog-aws (~> 2.0.1) - fog-core (~> 1.44) - fog-google (~> 1.7.1) - fog-local (~> 0.3) - fog-openstack (~> 0.1) + fog-aliyun (~> 0.3) + fog-aws (~> 3.5) + fog-core (= 2.1.0) + fog-google (~> 1.8) + fog-local (~> 0.6) + fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.7) foreman (~> 0.84.0) + fugit (~> 1.2.1) fuubar (~> 2.2.0) gemojione (~> 3.3) gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.5.0) + gitaly-proto (~> 1.37.0) github-markup (~> 1.7.0) - gitlab-default_value_for (~> 3.1.1) + gitlab-labkit (~> 0.3.0) gitlab-license (~> 1.0) - gitlab-markup (~> 1.6.5) + gitlab-markup (~> 1.7.0) gitlab-sidekiq-fetcher (~> 0.4.0) - gitlab-styles (~> 2.4) - gitlab_omniauth-ldap (~> 2.0.4) + gitlab-styles (~> 2.7) + gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.23) - google-protobuf (~> 3.6) + google-protobuf (~> 3.7.1) gpgme (~> 2.0.18) grape (~> 1.1.0) grape-entity (~> 0.7.1) - grape-path-helpers (~> 1.0) + grape-path-helpers (~> 1.1) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) graphql (~> 1.8.0) - grpc (~> 1.15.0) + graphql-docs (~> 1.6.0) + grpc (~> 1.19.0) gssapi - haml_lint (~> 0.28.0) + haml_lint (~> 0.31.0) hamlit (~> 2.8.8) hangouts-chat (~> 0.0.5) hashie-forbidden_attributes @@ -1071,23 +1186,24 @@ DEPENDENCIES hipchat (~> 1.5.0) html-pipeline (~> 2.8) html2text - httparty (~> 0.13.3) + httparty (~> 0.16.4) icalendar influxdb (~> 0.2) jira-ruby (~> 1.4) - jquery-atwho-rails (~> 1.3.2) - js_regex (~> 2.2.1) + js_regex (~> 3.1) json-schema (~> 2.8.0) jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) - kubeclient (~> 4.0.0) - letter_opener_web (~> 1.3.0) + kubeclient (~> 4.2.2) + letter_opener_web (~> 1.3.4) license_finder (~> 5.4) licensee (~> 8.9) lograge (~> 0.5) loofah (~> 2.2) mail_room (~> 0.9.1) + mdl (~> 0.5.0) + memory_profiler (~> 0.9) method_source (~> 0.8) mimemagic (~> 0.3.2) mini_magick @@ -1097,8 +1213,8 @@ DEPENDENCIES net-dns (~> 0.9.0) net-ldap net-ntp - net-ssh (~> 5.0) - nokogiri (~> 1.8.5) + net-ssh (~> 5.2) + nokogiri (~> 1.10.3) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1112,10 +1228,13 @@ DEPENDENCIES omniauth-google-oauth2 (~> 0.6.0) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) + omniauth-salesforce (~> 1.0.5) omniauth-saml (~> 1.10) omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) + omniauth-ultraauth (~> 0.0.2) omniauth_crowd (~> 2.2.0) + omniauth_openid_connect (~> 0.3.1) org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) @@ -1123,21 +1242,21 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - pg (~> 0.18.2) + pg (~> 1.1) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.9.4) + prometheus-client-mmap (~> 0.9.8) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) puma (~> 3.12) puma_worker_killer - rack (= 2.0.6) + rack (~> 2.0.7) rack-attack (~> 4.4.1) rack-cors (~> 1.0.0) - rack-oauth2 (~> 1.2.1) + rack-oauth2 (~> 1.9.3) rack-proxy (~> 0.6.0) - rails (= 5.0.7.1) + rack-timeout + rails (= 5.2.3) rails-controller-testing - rails-deprecated_sanitizer (~> 1.0.3) rails-i18n (~> 5.1) rainbow (~> 3.0) raindrops (~> 0.18) @@ -1145,50 +1264,48 @@ DEPENDENCIES rbtrace (~> 0.4) rdoc (~> 6.0) re2 (~> 1.1.1) - recaptcha (~> 3.0) - redcarpet (~> 3.4) + recaptcha (~> 4.11) redis (~> 3.2) redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) - rouge (~> 3.1) + rouge (~> 3.5) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 3.7.0) - rspec-retry (~> 0.4.5) + rspec-rails (~> 3.8.0) + rspec-retry (~> 0.6.1) rspec-set (~> 0.1.3) rspec_junit_formatter rspec_profiling (~> 0.0.5) - rubocop (~> 0.54.0) + rubocop (~> 0.69.0) + rubocop-performance (~> 1.1.0) rubocop-rspec (~> 1.22.1) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.17.0) ruby-progressbar ruby_parser (~> 3.8) rubyzip (~> 1.2.2) - rufus-scheduler (~> 3.4) - rugged (~> 0.27) + rugged (~> 0.28) sanitize (~> 4.6) - sass (~> 3.5) - sass-rails (~> 5.0.6) + sassc-rails (~> 2.1.0) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) - select2-rails (~> 3.5.9) - selenium-webdriver (~> 3.12) - sentry-raven (~> 2.7) + selenium-webdriver (~> 3.141) + sentry-raven (~> 2.9) settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) - shoulda-matchers (~> 3.1.2) - sidekiq (~> 5.2.1) - sidekiq-cron (~> 0.6.0) + shoulda-matchers (~> 4.0.1) + sidekiq (~> 5.2.7) + sidekiq-cron (~> 1.0) simple_po_parser (~> 1.1.2) - simplecov (~> 0.14.0) + simplecov (~> 0.16.1) slack-notifier (~> 1.5.1) + snowplow-tracker (~> 0.6.1) spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) - sshkey (~> 1.9.0) + sshkey (~> 2.0) stackprof (~> 0.2.10) state_machines-activerecord (~> 0.5.1) sys-filesystem (~> 1.1.6) @@ -1196,17 +1313,17 @@ DEPENDENCIES thin (~> 1.7.0) timecop (~> 0.8.0) toml-rb (~> 1.0.0) - truncato (~> 0.7.9) + truncato (~> 0.7.11) u2f (~> 0.2.1) uglifier (~> 2.7.2) unf (~> 0.1.4) - unicorn (~> 5.1.0) + unicorn (~> 5.4.1) unicorn-worker-killer (~> 0.4.4) validates_hostname (~> 1.0.6) - version_sorter (~> 2.1.0) + version_sorter (~> 2.2.4) virtus (~> 1.0.1) vmstat (~> 2.3.0) - webmock (~> 2.3.2) + webmock (~> 3.5.1) webpack-rails (~> 0.9.10) wikicloth (= 0.8.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index 03f885f2f9e5..8050743ab258 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -15,68 +15,104 @@ }; version = "4.1.2"; }; - actioncable = { - dependencies = ["actionpack" "nio4r" "websocket-driver"]; + acme-client = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1443cal16yzc94hfxcx9ljagdbs5xs54bmr55wzmg84wx28bgvrb"; + sha256 = "1552fkgaj6qfylwsckgmhck34shjqnfrzymj1ji1kq3r310qqrnp"; type = "gem"; }; - version = "5.0.7.1"; + version = "2.0.2"; + }; + actioncable = { + dependencies = ["actionpack" "nio4r" "websocket-driver"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm"; + type = "gem"; + }; + version = "5.2.3"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "077g5yg8l10rcs8r63pmmikakma1nr2bvxa1ifly1vbry8lajmhm"; + sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zn3gw1naz1l6kcb4h5all24kisdv8fk733vm1niiaq2zmwbvlrw"; + sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; }; actionview = { - dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; + dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "053z1r9lbyqb7a8mvi7ppwgphqg1pn9ynhklwxavq65cym8qn9a1"; + sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; }; activejob = { dependencies = ["activesupport" "globalid"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w9rspq9y5a99kyljzam7k0cpvkxpzhfmlvs1j6a4flxn14qy7lv"; + sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; }; activemodel = { dependencies = ["activesupport"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i808lgn542x0lyk2dlnziiqcf1nmxhxqf6125dq6brr08yxgr0c"; + sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qva7vdv9arliza0155k0xh5w1q6rzdajj3rmj7hv0f86ybd674c"; + sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; + }; + activerecord-explain-analyze = { + dependencies = ["activerecord" "pg"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yvz452ww0vn3n6197gx6zklwa591gc7f1m8accvjd9zw8gv3ssx"; + type = "gem"; + }; + version = "0.1.0"; }; activerecord_sane_schema_dumper = { dependencies = ["rails"]; @@ -87,23 +123,38 @@ }; version = "1.0"; }; - activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + activestorage = { + dependencies = ["actionpack" "activerecord" "marcel"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02dnmcmkvzijbzm5nlmrd55s5586b78s087kvpvkada3791b9agb"; + sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; + }; + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; + type = "gem"; + }; + version = "5.2.3"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i"; + sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl"; type = "gem"; }; - version = "5.0.0"; + version = "6.0.0"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -139,13 +190,26 @@ }; version = "2.0.0"; }; - arel = { + apollo_upload_server = { + dependencies = ["graphql" "rails"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l757dkkaxk5fq3368l79jpyzq9a9driricjamhiwhwvh0h7xcyx"; + sha256 = "0riijpyicbkqsr46w4mfhh3pq2yrmakkz8mmgbrfjhzbyzac25na"; type = "gem"; }; - version = "7.1.4"; + version = "2.0.0.beta.3"; + }; + arel = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; + type = "gem"; + }; + version = "9.0.0"; }; asana = { dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; @@ -157,21 +221,36 @@ version = "0.8.1"; }; asciidoctor = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qld3a1pbcjvs8lbxp95iz83bfmg5scmnf8q3rklinmdmhzakslx"; + sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz"; type = "gem"; }; - version = "1.5.8"; + version = "2.0.10"; + }; + asciidoctor-include-ext = { + dependencies = ["asciidoctor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1alaqfh31hd98yhqq8fsc50zzqw04p3d83pc35gdx3x9p3j1ds7d"; + type = "gem"; + }; + version = "0.3.1"; }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x092ldl8p7svczg4lnrnp0h918acnflh7jz5qwv40ksh1fflqna"; + sha256 = "0lzxj16w7s3w0wnlpg8lfs9v2xxk3x3c1skynqm1sms7rjhnhlnb"; type = "gem"; }; - version = "0.0.8"; + version = "0.0.9"; }; ast = { source = { @@ -199,12 +278,14 @@ version = "3.1.0"; }; attr_required = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc"; + sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; awesome_print = { source = { @@ -275,12 +356,14 @@ version = "0.3.2"; }; batch-loader = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pwr2hk9x1qx9i2xpkpjwkdjsmm4kamz5f25wizsaw37zb64apjc"; + sha256 = "09jaxxddqpgq8ynwd2gpjq5rkhw00zdjnqisk9qbpjgxzk6f8gwi"; type = "gem"; }; - version = "1.2.2"; + version = "1.4.0"; }; bcrypt = { source = { @@ -306,6 +389,17 @@ }; version = "2.3.0"; }; + benchmark-memory = { + dependencies = ["memory_profiler"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11qw8k6rl79ri00njrf1x9v6vzwgv12rkcvgzvg0sk8pfrkzwyxa"; + type = "gem"; + }; + version = "0.1.2"; + }; better_errors = { dependencies = ["coderay" "erubi" "rack"]; source = { @@ -324,12 +418,14 @@ version = "2.4.3"; }; binding_ninja = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19dk26qyx433ffa6y48511apc2iw71zw4jnlqxhy0wix9dlxr2ri"; + sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa"; type = "gem"; }; - version = "0.2.2"; + version = "0.2.3"; }; binding_of_caller = { dependencies = ["debug_inspector"]; @@ -344,18 +440,21 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; + sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.1"; }; bootstrap_form = { + dependencies = ["actionpack" "activemodel"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sw88vi5sb48xzgwclic38jdgmcbvah2qfi3rijrlmi1wai4j1fw"; + sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m"; type = "gem"; }; - version = "2.7.0"; + version = "4.2.0"; }; brakeman = { source = { @@ -408,13 +507,15 @@ version = "9.1.0"; }; capybara = { - dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"]; + dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hkl6p07gf29952biv07fy88vjz46ng2h37wwx5ks0mk9kn8vvvf"; + sha256 = "1y7ncfji4s3h3wdr2hwsrd32k0va92a6lyx2x8w6a3vkbc94kpch"; type = "gem"; }; - version = "2.16.1"; + version = "3.22.0"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; @@ -442,6 +543,14 @@ }; version = "0.1"; }; + character_set = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9"; + type = "gem"; + }; + version = "1.1.2"; + }; charlock_holmes = { source = { remotes = ["https://rubygems.org"]; @@ -528,21 +637,25 @@ version = "0.1.5"; }; concurrent-ruby = { + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18q9skp5pfq4jwbxzmw8q2rn4cpw6mf4561i2hsjcl1nxdag2jvb"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.1.3"; + version = "1.1.5"; }; concurrent-ruby-ext = { dependencies = ["concurrent-ruby"]; + groups = ["default" "mysql" "postgres"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h7k4wnvbxv7vzb53kaqxbbyhp3m98g2rgymr6n1l9v0jlzcr1i8"; + sha256 = "03ypsv2k581yv0b3f0hzvb3mq6mqj8jlbi32jmkj3k175vbc8hvz"; type = "gem"; }; - version = "1.1.3"; + version = "1.1.5"; }; connection_pool = { source = { @@ -552,6 +665,16 @@ }; version = "2.2.2"; }; + contracts = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11kj7hdr94hxgxad9wazncvaxzaxlbvw6laq179ivhw9za746vnz"; + type = "gem"; + }; + version = "0.11.0"; + }; crack = { dependencies = ["safe_yaml"]; source = { @@ -622,10 +745,10 @@ dependencies = ["html-pipeline"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j"; + sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964"; type = "gem"; }; - version = "2.0.0"; + version = "2.2.0"; }; declarative = { source = { @@ -643,6 +766,28 @@ }; version = "0.1.0"; }; + default_value_for = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xj9d1y2fk3kxfm1kyiwasjpw6r1w7c1xjx26sm3c33xhmz57fla"; + type = "gem"; + }; + version = "3.2.0"; + }; + derailed_benchmarks = { + dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c9djg1r2w461h97zmmdsdgnsrxqm4qfyp7gry9qxbav9skrplb8"; + type = "gem"; + }; + version = "1.3.5"; + }; descendants_tracker = { dependencies = ["thread_safe"]; source = { @@ -662,12 +807,14 @@ }; devise = { dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xmxfhym0yxwb0zwmmzhdiykbpyqqm3id02g7rf3vcgbc1lqvdnj"; + sha256 = "04b2p61mqfb6ln8s2lhmvnkd45wjjinykbn9svmhs54kacrrjkcf"; type = "gem"; }; - version = "4.4.3"; + version = "4.6.2"; }; devise-two-factor = { dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; @@ -704,12 +851,14 @@ version = "3.3.0"; }; docile = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + sha256 = "04d2izkna3ahfn6fwq4xrcafa715d3bbqczxm16fq40fqy87xn17"; type = "gem"; }; - version = "1.1.5"; + version = "1.3.1"; }; domain_name = { dependencies = ["unf"]; @@ -824,20 +973,14 @@ version = "0.0.11"; }; erubi = { + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bws86na9k565raiz0kk61yy5pxxp0fmwyzpibdwjkq0xzx8q6q1"; + sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1"; type = "gem"; }; - version = "1.7.1"; - }; - erubis = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; - type = "gem"; - }; - version = "2.7.0"; + version = "1.8.0"; }; escape_utils = { source = { @@ -849,12 +992,14 @@ }; et-orbi = { dependencies = ["tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi"; + sha256 = "1swgjb3h2hs5xflb68837l0vd32masbz9c66b1963mxlnnxf5gsg"; type = "gem"; }; - version = "1.0.3"; + version = "1.2.1"; }; eventmachine = { source = { @@ -888,6 +1033,17 @@ }; version = "0.9.0"; }; + extended-markdown-filter = { + dependencies = ["html-pipeline"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17mi5qayplfaa6p3mfwa36il84ixr0bimqvl0q73lw5i81blp126"; + type = "gem"; + }; + version = "0.6.0"; + }; factory_bot = { dependencies = ["activesupport"]; source = { @@ -969,10 +1125,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; }; - version = "1.9.25"; + version = "1.10.0"; }; flipper = { source = { @@ -1013,64 +1169,66 @@ dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m"; + sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.3"; }; fog-aws = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3"; + sha256 = "086kyvdhf1k8nk7f4gmybjc3k0m88f9pw99frddcy1w96pj5kyg4"; type = "gem"; }; - version = "2.0.1"; + version = "3.5.2"; }; fog-core = { - dependencies = ["builder" "excon" "formatador"]; + dependencies = ["builder" "excon" "formatador" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3"; + sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; type = "gem"; }; - version = "1.45.0"; + version = "2.1.0"; }; fog-google = { dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2"; + sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.2"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r"; + sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; type = "gem"; }; - version = "1.0.2"; + version = "1.2.0"; }; fog-local = { dependencies = ["fog-core"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn"; + sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21"; type = "gem"; }; - version = "0.3.1"; + version = "0.6.0"; }; fog-openstack = { dependencies = ["fog-core" "fog-json" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys"; + sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg"; type = "gem"; }; - version = "0.1.21"; + version = "1.0.8"; }; fog-rackspace = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; @@ -1092,12 +1250,14 @@ }; font-awesome-rails = { dependencies = ["railties"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qc07vj7qyllrj7lr7wl89l5ir0gj104rc7sds2jynzmrqsamnlw"; + sha256 = "11mf7bk2737pyxjwba3a9lpgcxzbp0vgq01n2dn30774zysc90hj"; type = "gem"; }; - version = "4.7.0.1"; + version = "4.7.0.4"; }; foreman = { dependencies = ["thor"]; @@ -1116,6 +1276,17 @@ }; version = "0.2.5"; }; + fugit = { + dependencies = ["et-orbi" "raabro"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x5h31hl75x0p5s36hinywg18ijlxjhnlb5p02aqcjjkx777rcav"; + type = "gem"; + }; + version = "1.2.1"; + }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; source = { @@ -1125,6 +1296,16 @@ }; version = "2.2.0"; }; + gemoji = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; + type = "gem"; + }; + version = "3.0.1"; + }; gemojione = { dependencies = ["json"]; source = { @@ -1135,12 +1316,14 @@ version = "3.3.0"; }; get_process_mem = { + groups = ["default" "development" "puma" "test" "unicorn"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "025f7v6bpbgsa2nr0hzv2riggj8qmzbwcyxfgjidpmwh5grh7j29"; + sha256 = "1bvfjdign16r0zwm2rlfrq0sk1licvmlgbnlpnyckniv5r7i080g"; type = "gem"; }; - version = "0.2.0"; + version = "0.2.3"; }; gettext = { dependencies = ["locale" "text"]; @@ -1171,12 +1354,14 @@ }; gitaly-proto = { dependencies = ["grpc"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0"; + sha256 = "1lx2cids0r175agdz3wa25ivi17vxx2kryb2v29gdsrpg3pyyq7j"; type = "gem"; }; - version = "1.5.0"; + version = "1.37.0"; }; github-markup = { source = { @@ -1186,14 +1371,16 @@ }; version = "1.7.0"; }; - gitlab-default_value_for = { - dependencies = ["activerecord"]; + gitlab-labkit = { + dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qqjf7nxmwxnkdlrgbnby8wjckaj2s5yna96avgb7fwm0h90f1sn"; + sha256 = "0dvapmdc9axm9dq2gg89qrqb318rkrsabpyybrqvcx1ipbi5k3a1"; type = "gem"; }; - version = "3.1.1"; + version = "0.3.0"; }; gitlab-license = { source = { @@ -1204,12 +1391,14 @@ version = "1.0.0"; }; gitlab-markup = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy"; + sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d"; type = "gem"; }; - version = "1.6.5"; + version = "1.7.0"; }; gitlab-sidekiq-fetcher = { dependencies = ["sidekiq"]; @@ -1223,31 +1412,35 @@ version = "0.4.0"; }; gitlab-styles = { - dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; + dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rspec"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx"; + sha256 = "1vxlvbq4jpq0cfjqippz9d3j73sq9qg3pna5pb0l8jr0rc0xs89y"; type = "gem"; }; - version = "2.4.1"; + version = "2.7.0"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv"; + sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90"; type = "gem"; }; - version = "2.0.4"; + version = "2.1.1"; }; globalid = { dependencies = ["activesupport"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38"; + sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1"; type = "gem"; }; - version = "0.4.1"; + version = "0.4.2"; }; gon = { dependencies = ["actionpack" "multi_json" "request_store"]; @@ -1268,21 +1461,25 @@ version = "0.23.4"; }; google-protobuf = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf"; + sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2"; type = "gem"; }; - version = "3.6.1"; + version = "3.7.1"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq"; + sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.4"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -1322,12 +1519,14 @@ }; grape-path-helpers = { dependencies = ["activesupport" "grape" "rake"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13h5575xfc144wsr48sp3qngpwvh4ikz4r3m55j8jmdr6sa16rbw"; + sha256 = "16l6lrv4h4ls0lrpj35pc00431q2rx6r9n47337qyvprxs3v0a01"; type = "gem"; }; - version = "1.0.6"; + version = "1.1.0"; }; grape_logging = { dependencies = ["grape"]; @@ -1355,14 +1554,27 @@ }; version = "1.8.1"; }; - grpc = { - dependencies = ["google-protobuf" "googleapis-common-protos-types"]; + graphql-docs = { + dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m2wspnm1cfkmhlbp7yqv5bb4vsfh246cm0aavxra67aw4l8plhb"; + sha256 = "12wzsikbn54b2hcv100hz7isq5gdjm5w5b8xya64ra5sw6sabq8d"; type = "gem"; }; - version = "1.15.0"; + version = "1.6.0"; + }; + grpc = { + dependencies = ["google-protobuf" "googleapis-common-protos-types"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs"; + type = "gem"; + }; + version = "1.19.0"; }; gssapi = { dependencies = ["ffi"]; @@ -1384,12 +1596,14 @@ }; haml_lint = { dependencies = ["haml" "rainbow" "rake" "rubocop" "sysexits"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "125aj0j84nx5gqm42hfx5d8486higlra423ahgfpsdjwbp399rwv"; + sha256 = "1k6pvb2lc6d72nq01jqmi3mxpp80m9mmbc265kgaxmcnjxqhacb1"; type = "gem"; }; - version = "0.28.0"; + version = "0.31.0"; }; hamlit = { dependencies = ["temple" "thor" "tilt"]; @@ -1411,10 +1625,10 @@ hashdiff = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; + sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.8"; }; hashie = { source = { @@ -1442,8 +1656,20 @@ }; version = "2.6.0"; }; + heapy = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r9f38fpgjgaxskkwvsliijj6vfmgsff9pnranvvvzkdl67hk1hw"; + type = "gem"; + }; + version = "0.1.4"; + }; hipchat = { dependencies = ["httparty" "mimemagic"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k"; @@ -1512,13 +1738,15 @@ version = "0.6.0"; }; httparty = { - dependencies = ["json" "multi_xml"]; + dependencies = ["mime-types" "multi_xml"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2"; + sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32"; type = "gem"; }; - version = "0.13.7"; + version = "0.16.4"; }; httpclient = { source = { @@ -1530,12 +1758,14 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr"; + sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; type = "gem"; }; - version = "1.2.0"; + version = "1.6.0"; }; icalendar = { source = { @@ -1570,6 +1800,25 @@ }; version = "0.8.3"; }; + jaeger-client = { + dependencies = ["opentracing" "thrift"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l"; + type = "gem"; + }; + version = "0.10.0"; + }; + jaro_winkler = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l"; + type = "gem"; + }; + version = "1.5.2"; + }; jira-ruby = { dependencies = ["activesupport" "multipart-post" "oauth"]; source = { @@ -1587,22 +1836,14 @@ }; version = "1.3.1"; }; - jquery-atwho-rails = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9"; - type = "gem"; - }; - version = "1.3.2"; - }; js_regex = { - dependencies = ["regexp_parser"]; + dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf"; + sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq"; type = "gem"; }; - version = "2.2.1"; + version = "3.1.1"; }; json = { source = { @@ -1676,10 +1917,10 @@ kgio = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118"; + sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.2"; }; knapsack = { dependencies = ["rake"]; @@ -1690,14 +1931,24 @@ }; version = "1.17.0"; }; + kramdown = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + type = "gem"; + }; + version = "1.17.0"; + }; kubeclient = { dependencies = ["http" "recursive-open-struct" "rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s250z89nz7vzich3nikc8fs8vgpac38wjv8llm4ldvs4iyc4ypg"; + sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn"; type = "gem"; }; - version = "4.0.0"; + version = "4.2.2"; }; launchy = { dependencies = ["addressable"]; @@ -1710,21 +1961,25 @@ }; letter_opener = { dependencies = ["launchy"]; + groups = ["default" "development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pcrdbxvp2x5six8fqn8gf09bn9rd3jga76ds205yph5m8fsda21"; + sha256 = "09a7kgsmr10a0hrc9bwxglgqvppjxij9w8bxx91mnvh0ivaw0nq9"; type = "gem"; }; - version = "1.4.1"; + version = "1.7.0"; }; letter_opener_web = { dependencies = ["actionmailer" "letter_opener" "railties"]; + groups = ["development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "050x5cwqbxj2cydd2pzy9vfhmpgn1w6lfbwjaax1m1vpkn3xg9bv"; + sha256 = "17qhwrkncrrp1bi2f7fbkm5lpnkdsiwy8jcvgr2wa97ck8y4x2bb"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.4"; }; license_finder = { dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"]; @@ -1787,6 +2042,28 @@ }; version = "0.9.1"; }; + marcel = { + dependencies = ["mimemagic"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; + type = "gem"; + }; + version = "0.3.3"; + }; + mdl = { + dependencies = ["kramdown" "mixlib-cli" "mixlib-config"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i"; + type = "gem"; + }; + version = "0.5.0"; + }; memoist = { source = { remotes = ["https://rubygems.org"]; @@ -1804,6 +2081,16 @@ }; version = "0.4.2"; }; + memory_profiler = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xki7jrbzylsmk1brjibmhifb0x70skr55pdq4rvxcyrlnrrvyxz"; + type = "gem"; + }; + version = "0.9.13"; + }; method_source = { source = { remotes = ["https://rubygems.org"]; @@ -1822,12 +2109,14 @@ version = "3.2.2"; }; mime-types-data = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; + sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; type = "gem"; }; - version = "3.2018.0812"; + version = "3.2019.0331"; }; mimemagic = { source = { @@ -1856,10 +2145,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { source = { @@ -1869,13 +2158,36 @@ }; version = "5.11.3"; }; - msgpack = { + mixlib-cli = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; type = "gem"; }; - version = "1.2.4"; + version = "1.7.0"; + }; + mixlib-config = { + dependencies = ["tomlrb"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb"; + type = "gem"; + }; + version = "2.2.18"; + }; + msgpack = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w38hilm3dk42dwk8ygiq49bl4in7y80hfqr63hk54mj4gmzi6ch"; + type = "gem"; + }; + version = "1.2.10"; }; multi_json = { source = { @@ -1959,12 +2271,14 @@ version = "2.1.3"; }; net-ssh = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hj2i8rk5wb6235r5n19in1hkrp1fbz2bf40xmagavb5ahv7205w"; + sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; type = "gem"; }; - version = "5.0.1"; + version = "5.2.0"; }; netrc = { source = { @@ -1984,12 +2298,14 @@ }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.3"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -2160,6 +2476,17 @@ }; version = "0.2.2"; }; + omniauth-salesforce = { + dependencies = ["omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sr7xmffx6dbsrvnh6spka5ljyzf69iac754xw5r1736py41qhpj"; + type = "gem"; + }; + version = "1.0.5"; + }; omniauth-saml = { dependencies = ["omniauth" "ruby-saml"]; source = { @@ -2187,6 +2514,17 @@ }; version = "1.4.0"; }; + omniauth-ultraauth = { + dependencies = ["omniauth_openid_connect"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z8gz8ql4vb8y5n4lr67afnjmp23bpqi18dmda5psigvd2jddyn8"; + type = "gem"; + }; + version = "0.0.2"; + }; omniauth_crowd = { dependencies = ["activesupport" "nokogiri" "omniauth"]; source = { @@ -2196,6 +2534,46 @@ }; version = "2.2.3"; }; + omniauth_openid_connect = { + dependencies = ["addressable" "omniauth" "openid_connect"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ja7cjlm4z0k0pwwy64djl58pay3lzkw7im565fybs4a8q4wmacb"; + type = "gem"; + }; + version = "0.3.1"; + }; + openid_connect = { + dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r13bv18nyvw0g1nw3fzffvv2si99zj24w0k5zgawf4q6nn5f7vd"; + type = "gem"; + }; + version = "1.1.6"; + }; + opentracing = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11lj1d8vq0hkb5hjz8q4lm82cddrggpbb33dhqfn7rxhwsmxgdfy"; + type = "gem"; + }; + version = "0.5.0"; + }; + optimist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + type = "gem"; + }; + version = "3.0.0"; + }; org-ruby = { dependencies = ["rubypants"]; source = { @@ -2222,21 +2600,25 @@ version = "1.0.0"; }; parallel = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; + sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; type = "gem"; }; - version = "1.12.1"; + version = "1.17.0"; }; parser = { dependencies = ["ast"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f"; + sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn"; type = "gem"; }; - version = "2.5.3.0"; + version = "2.6.3.0"; }; parslet = { source = { @@ -2301,12 +2683,14 @@ version = "1.2.0"; }; pg = { + groups = ["development" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32"; + sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy"; type = "gem"; }; - version = "0.18.4"; + version = "1.1.4"; }; po_to_json = { dependencies = ["json"]; @@ -2317,14 +2701,6 @@ }; version = "1.0.1"; }; - powerpack = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43"; - type = "gem"; - }; - version = "0.1.1"; - }; premailer = { dependencies = ["addressable" "css_parser" "htmlentities"]; source = { @@ -2361,12 +2737,14 @@ version = "0.0.3"; }; prometheus-client-mmap = { + groups = ["metrics"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14ww8c2qy43jw3fzmq54hsljmqmlx9a7zg9sv6ddw48qy118ls10"; + sha256 = "01f1zkpi7qsmgmk17fpq6ck7jn64sa9afsq20vc5k9f6mpyqkncd"; type = "gem"; }; - version = "0.9.4"; + version = "0.9.8"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -2396,12 +2774,14 @@ version = "0.3.6"; }; public_suffix = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l"; type = "gem"; }; - version = "3.0.3"; + version = "3.1.0"; }; puma = { source = { @@ -2428,13 +2808,23 @@ }; version = "0.0.3.3"; }; - rack = { + raabro = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm"; + sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq"; type = "gem"; }; - version = "2.0.6"; + version = "1.1.6"; + }; + rack = { + groups = ["default" "development" "kerberos" "mysql" "postgres" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; + type = "gem"; + }; + version = "2.0.7"; }; rack-accept = { dependencies = ["rack"]; @@ -2463,22 +2853,24 @@ version = "1.0.2"; }; rack-oauth2 = { - dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"]; + dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf"; + sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii"; type = "gem"; }; - version = "1.2.3"; + version = "1.9.3"; }; rack-protection = { dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ylx74ravz7nvnyygq0nk3v86qdzrmqxpwpayhppyy50l72rcajq"; + sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; rack-proxy = { dependencies = ["rack"]; @@ -2491,21 +2883,35 @@ }; rack-test = { dependencies = ["rack"]; + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; + sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; type = "gem"; }; - version = "0.6.3"; + version = "1.1.0"; + }; + rack-timeout = { + groups = ["puma"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15xph8h6v0lvq9pxm3bc9i9pnk2k68rgdr1mp0dw4l7v1xvhs78a"; + type = "gem"; + }; + version = "0.5.1"; }; rails = { - dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; + dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0blacnfcn2944cml69wji2ywp9c13qjiciavnfsa9vpimk8ixq9w"; + sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2516,15 +2922,6 @@ }; version = "1.0.2"; }; - rails-deprecated_sanitizer = { - dependencies = ["activesupport"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj"; - type = "gem"; - }; - version = "1.0.3"; - }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; source = { @@ -2554,12 +2951,14 @@ }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + groups = ["default" "development" "mysql" "postgres" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cfh2ijfalxj8hhf0rfw8bqhazsq6km7barsxczsvyl2a9islanr"; + sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4"; type = "gem"; }; - version = "5.0.7.1"; + version = "5.2.3"; }; rainbow = { source = { @@ -2572,10 +2971,10 @@ raindrops = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz"; + sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; rake = { source = { @@ -2612,13 +3011,13 @@ version = "0.3.6"; }; rbtrace = { - dependencies = ["ffi" "msgpack" "trollop"]; + dependencies = ["ffi" "msgpack" "optimist"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv"; + sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; type = "gem"; }; - version = "0.4.10"; + version = "0.4.11"; }; rdoc = { source = { @@ -2638,12 +3037,14 @@ }; recaptcha = { dependencies = ["json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n"; + sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w"; type = "gem"; }; - version = "3.0.0"; + version = "4.13.1"; }; recursive-open-struct = { source = { @@ -2653,14 +3054,6 @@ }; version = "1.1.0"; }; - redcarpet = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; - type = "gem"; - }; - version = "3.4.0"; - }; RedCloth = { source = { remotes = ["https://rubygems.org"]; @@ -2732,12 +3125,22 @@ version = "1.6.0"; }; regexp_parser = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb"; + sha256 = "0dsgjb3kszk6a82s6gl0h6a8vncjrxmcbk0r4mcxcdcad2b7vb2d"; type = "gem"; }; - version = "0.5.0"; + version = "1.5.1"; + }; + regexp_property_values = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr"; + type = "gem"; + }; + version = "0.3.4"; }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; @@ -2799,12 +3202,14 @@ version = "2.1.2"; }; rouge = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; + sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; type = "gem"; }; - version = "3.3.0"; + version = "3.5.1"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -2826,66 +3231,80 @@ }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01"; + sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; rspec-core = { dependencies = ["rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zvjbymx3avxm3lf8v4gka3a862vnaxldmwvp6767bpy48nhnvjj"; + sha256 = "0spjgmd3yx6q28q950r32bi0cs8h2si53zn6rq8s7n1i4zp4zwbf"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy"; + sha256 = "0x3iddjjaramqb0yb51c79p2qajgi9wb5b59bzv25czddigyk49r"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.4"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3"; + sha256 = "12zplnsv4p6wvvxsk8xn6nm87a5qadxlkk497zlxfczd0jfawrni"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.1"; }; rspec-parameterized = { dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "159yw3mb4dab5kr18a97miyyi7dqmyrfjp3aw6r6j9i4xkc4xk3a"; + sha256 = "1c0892jbaznnldk1wi24qxm70g4zhw2idqx516rhgdzgd7yh5j31"; type = "gem"; }; - version = "0.4.1"; + version = "0.4.2"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cdcnbv5dppwy3b4jdp5a0wd9m07a8wlqwb9yazn8i7k1k2mwgvx"; + sha256 = "1pf6n9l4sw1arlax1bdbm1znsvl8cgna2n6k6yk1bi8vz2n73ls1"; type = "gem"; }; - version = "3.7.2"; + version = "3.8.2"; }; rspec-retry = { dependencies = ["rspec-core"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0izvxab7jvk25kaprk0i72asjyh1ip3cm70bgxlm8lpid35qjar6"; + sha256 = "1nnqcg2yd3nn187zbvh4cgx8xsvdk56lz1985qy7232v7i8yidw6"; type = "gem"; }; - version = "0.4.5"; + version = "0.6.1"; }; rspec-set = { source = { @@ -2896,12 +3315,14 @@ version = "0.1.3"; }; rspec-support = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nl30xb6jmcl0awhqp6jycl01wdssblifwy921phfml70rd9flj1"; + sha256 = "139mbhfdr10flm2ffryvxkyqgqs1gjdclc1xhyh7i7njfqayxk7g"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.2"; }; rspec_junit_formatter = { dependencies = ["rspec-core"]; @@ -2922,13 +3343,15 @@ version = "0.0.5"; }; rubocop = { - dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "106y99lq0fg62k3vk1w5wwb4vq16pnh4l61skc82xck627z0h8is"; + sha256 = "1cmw8ajaiidvrzjcsljh47f4l3lmcazqrzljgalj3szkr8ibkk5i"; type = "gem"; }; - version = "0.54.0"; + version = "0.69.0"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; @@ -2939,6 +3362,17 @@ }; version = "0.1.1"; }; + rubocop-performance = { + dependencies = ["rubocop"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0azzgj62w24wa4hza1qn7i9b9crxdh907kydlzcvhismx41h3lzk"; + type = "gem"; + }; + version = "1.1.0"; + }; rubocop-rspec = { dependencies = ["rubocop"]; source = { @@ -2975,12 +3409,14 @@ version = "0.17.0"; }; ruby-progressbar = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; + sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; ruby-saml = { dependencies = ["nokogiri"]; @@ -2993,12 +3429,14 @@ }; ruby_parser = { dependencies = ["sexp_processor"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mysmdyxhvyn6dhshfxyw762f9asr3kxw45idvw1bh6np31kk4j1"; + sha256 = "0s3hsccsmrirc2hy3r51kl8g9cfmcn7jxaa0asadg1kn78h1sgr7"; type = "gem"; }; - version = "3.11.0"; + version = "3.13.1"; }; rubyntlm = { source = { @@ -3024,22 +3462,15 @@ }; version = "1.2.2"; }; - rufus-scheduler = { - dependencies = ["et-orbi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8"; - type = "gem"; - }; - version = "3.4.0"; - }; rugged = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6"; + sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6"; type = "gem"; }; - version = "0.27.5"; + version = "0.28.1"; }; safe_yaml = { source = { @@ -3076,14 +3507,27 @@ }; version = "4.0.0"; }; - sass-rails = { - dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"]; + sassc = { + dependencies = ["ffi" "rake"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iji20hb8crncz14piss1b29bfb6l89sz3ai5fny3iw39vnxkdcb"; + sha256 = "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4"; type = "gem"; }; - version = "5.0.6"; + version = "2.0.1"; + }; + sassc-rails = { + dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18mgdjxdzpbw92zrllynxw7jn7yihi85j3dg7i4f6c39w1scqkbn"; + type = "gem"; + }; + version = "2.1.0"; }; sawyer = { dependencies = ["addressable" "faraday"]; @@ -3112,32 +3556,27 @@ }; version = "2.3.7"; }; - select2-rails = { - dependencies = ["thor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj"; - type = "gem"; - }; - version = "3.5.9.3"; - }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07bl3wjkf254r3ljfl4qdazz5aw60s6nqjwrbbgq754j9b7226kz"; + sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs"; type = "gem"; }; - version = "3.12.0"; + version = "3.141.0"; }; sentry-raven = { dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4"; + sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483"; type = "gem"; }; - version = "2.7.4"; + version = "2.9.0"; }; settingslogic = { source = { @@ -3148,12 +3587,14 @@ version = "2.0.9"; }; sexp_processor = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnmphfrd86694x5k7rxddbhbvv5rqbglsc34kfryy4jqhbzz42c"; + sha256 = "0w24rgmyjf7yz0xr2qhbr8z48h4m6gvbggr8nc1pldwn9rbi04b7"; type = "gem"; }; - version = "4.11.0"; + version = "4.12.0"; }; sham_rack = { dependencies = ["rack"]; @@ -3166,30 +3607,34 @@ }; shoulda-matchers = { dependencies = ["activesupport"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zvv94pqk5b5my3w1shdz7h34xf2ldhg5k4qfdpbwi2iy0j9zw2a"; + sha256 = "1s6a2i39lsqq8rrkk2pddqcb10bsihxy3v5gpnc2gk8xakj1brdq"; type = "gem"; }; - version = "3.1.2"; + version = "4.0.1"; }; sidekiq = { - dependencies = ["connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack" "rack-protection" "redis"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zyf9y3rvzizbwh68i2g1lzd40lalrdc4iyjmaa74gnfwsf92i26"; + sha256 = "131zv8i341bkacxx7n1id2cmblkbs379farnibqg8c7bycd1iajq"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.7"; }; sidekiq-cron = { - dependencies = ["rufus-scheduler" "sidekiq"]; + dependencies = ["fugit" "sidekiq"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj"; + sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0"; type = "gem"; }; - version = "0.6.0"; + version = "1.0.4"; }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; @@ -3210,20 +3655,24 @@ }; simplecov = { dependencies = ["docile" "json" "simplecov-html"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r9fnsnsqj432cmrpafryn8nif3x0qg9mdnvrcf0wr01prkdlnww"; + sha256 = "1sfyfgf7zrp2n42v7rswkqgk3bbwk1bnsphm24y7laxv3f8z0947"; type = "gem"; }; - version = "0.14.1"; + version = "0.16.1"; }; simplecov-html = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qni8g0xxglkx25w54qcfbi4wjkpvmb28cb7rj5zk3iqynjcdrqf"; + sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn"; type = "gem"; }; - version = "0.10.0"; + version = "0.10.2"; }; slack-notifier = { source = { @@ -3233,6 +3682,17 @@ }; version = "1.5.1"; }; + snowplow-tracker = { + dependencies = ["contracts"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05136477ifa567aym9k8nqqmwv3plbczgh9x9fbz86860vym5v4w"; + type = "gem"; + }; + version = "0.6.1"; + }; spring = { dependencies = ["activesupport"]; source = { @@ -3280,10 +3740,10 @@ sshkey = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h"; + sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; type = "gem"; }; - version = "1.9.0"; + version = "2.0.0"; }; stackprof = { source = { @@ -3319,6 +3779,17 @@ }; version = "0.5.1"; }; + swd = { + dependencies = ["activesupport" "attr_required" "httpclient"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s2vjb6f13za7p1iycl2p73d3p202xa6xny9fjrp8ynwsqix7lyd"; + type = "gem"; + }; + version = "1.1.2"; + }; sys-filesystem = { dependencies = ["ffi"]; source = { @@ -3337,12 +3808,14 @@ version = "1.2.0"; }; temple = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq"; + sha256 = "158d7ygbwcifqnvrph219p7m78yjdjazhykv5darbkms7bxm5y09"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.1"; }; test-prof = { source = { @@ -3385,13 +3858,23 @@ }; version = "0.3.6"; }; - tilt = { + thrift = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; + sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv"; type = "gem"; }; - version = "2.0.8"; + version = "0.11.0.0"; + }; + tilt = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + type = "gem"; + }; + version = "2.0.9"; }; timecop = { source = { @@ -3427,22 +3910,24 @@ }; version = "1.0.0"; }; - trollop = { + tomlrb = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq"; + sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv"; type = "gem"; }; - version = "2.1.3"; + version = "1.2.8"; }; truncato = { dependencies = ["htmlentities" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b"; + sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4"; type = "gem"; }; - version = "0.7.10"; + version = "0.7.11"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -3496,21 +3981,23 @@ version = "0.0.7.5"; }; unicode-display_width = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n"; + sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; type = "gem"; }; - version = "1.3.2"; + version = "1.6.0"; }; unicorn = { dependencies = ["kgio" "raindrops"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v"; + sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak"; type = "gem"; }; - version = "5.1.0"; + version = "5.4.1"; }; unicorn-worker-killer = { dependencies = ["get_process_mem" "unicorn"]; @@ -3531,12 +4018,36 @@ }; unparser = { dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w662glqi7hwmfvx0smxckxgc7kw5bsqhqz0pyvalbyv1gc0gs2x"; + sha256 = "03vjj74kj86vlazhiclf63kf6gajs66k8ni34q70fdhf97d7b60c"; type = "gem"; }; - version = "0.4.2"; + version = "0.4.5"; + }; + validate_email = { + dependencies = ["activemodel" "mail"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r1fz29l699arka177c9xw7409d1a3ff95bf7a6pmc97slb91zlx"; + type = "gem"; + }; + version = "0.1.6"; + }; + validate_url = { + dependencies = ["activemodel" "public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k0bfxzvdcf1nrqhvnyhijc4mwab9wn4qvqb0ynq6p8dj0f866zi"; + type = "gem"; + }; + version = "1.0.8"; }; validates_hostname = { dependencies = ["activerecord" "activesupport"]; @@ -3550,10 +4061,10 @@ version_sorter = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr"; + sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.4"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"]; @@ -3581,14 +4092,25 @@ }; version = "1.2.7"; }; + webfinger = { + dependencies = ["activesupport" "httpclient"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m0jh8k7c0ifh2jhbn7ihqrmn5fi754wflva97zgy70hpdvxyjar"; + type = "gem"; + }; + version = "1.1.0"; + }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5"; + sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp"; type = "gem"; }; - version = "2.3.2"; + version = "3.5.1"; }; webpack-rails = { dependencies = ["railties"]; @@ -3601,12 +4123,14 @@ }; websocket-driver = { dependencies = ["websocket-extensions"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1943442yllhldh9dbp374x2q39cxa49xrm28nb78b7mfbv3y195l"; + sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn"; type = "gem"; }; - version = "0.6.5"; + version = "0.7.0"; }; websocket-extensions = { source = { @@ -3643,11 +4167,13 @@ }; xpath = { dependencies = ["nokogiri"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ha626m6fh50fpilb9pdnmq9xl586w7c0zyidg895c3iq13rqgyw"; + sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; type = "gem"; }; - version = "2.1.0"; + version = "3.2.0"; }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 26dc3d39eb1b..650bd73aa845 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log +#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix import click import click_log @@ -9,6 +9,7 @@ import logging import subprocess import json import pathlib +from distutils.version import LooseVersion from typing import Iterable import requests @@ -18,6 +19,7 @@ logger = logging.getLogger(__name__) class GitLabRepo: + version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?") def __init__(self, owner: str, repo: str): self.owner = owner self.repo = repo @@ -31,8 +33,13 @@ class GitLabRepo: r = requests.get(self.url + "/tags?format=atom", stream=True) tree = ElementTree.fromstring(r.content) - return sorted((e.text for e in tree.findall( - '{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')), reverse=True) + versions = [e.text for e in tree.findall('{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')] + # filter out versions not matching version_regex + versions = list(filter(self.version_regex.match, versions)) + + # sort, but ignore v and -ee for sorting comparisons + versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True) + return versions def get_git_hash(self, rev: str): out = subprocess.check_output(['nix-prefetch-git', self.url, rev]) @@ -187,13 +194,21 @@ def update_gitaly(): data = _get_data_json() gitaly_server_version = data['ce']['passthru']['GITALY_SERVER_VERSION'] r = GitLabRepo('gitlab-org', 'gitaly') - rubyenv_dir = pathlib.Path(__file__).parent / 'gitaly' + gitaly_dir = pathlib.Path(__file__).parent / 'gitaly' for fn in ['Gemfile.lock', 'Gemfile']: - with open(rubyenv_dir / fn, 'w') as f: + with open(gitaly_dir / fn, 'w') as f: f.write(r.get_file(f"ruby/{fn}", f"v{gitaly_server_version}")) - subprocess.check_output(['bundix'], cwd=rubyenv_dir) + for fn in ['go.mod', 'go.sum']: + with open(gitaly_dir / fn, 'w') as f: + f.write(r.get_file(fn, f"v{gitaly_server_version}")) + + subprocess.check_output(['bundix'], cwd=gitaly_dir) + subprocess.check_output(['vgo2nix'], cwd=gitaly_dir) + + for fn in ['go.mod', 'go.sum']: + os.unlink(gitaly_dir / fn) # currently broken, as `gitaly.meta.position` returns # pkgs/development/go-modules/generic/default.nix # so update-source-version doesn't know where to update hashes @@ -202,7 +217,6 @@ def update_gitaly(): click.echo(f"Please update gitaly/default.nix to version {gitaly_server_version} and hash {gitaly_hash}") - @cli.command('update-gitlab-shell') def update_gitlab_shell(): """Update gitlab-shell""" diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 56e411368961..0b63a8f21985 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gogs-${version}"; - version = "0.11.66"; + version = "0.11.86"; src = fetchFromGitHub { owner = "gogs"; repo = "gogs"; rev = "v${version}"; - sha256 = "1b9ilk4xlsllsj5pzmxwsz4a1zvgd06a8mi9ni9hbvmfl3w8xf28"; + sha256 = "0l8mwy0cyy3cdxqinf8ydb35kf7c8pj09xrhpr7rr7lldnvczabw"; }; patches = [ ./static-root-path.patch ]; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 6456dd75b522..3177ee286736 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -16,10 +16,10 @@ python3.pkgs.buildPythonApplication rec { intltool itstool libxml2 gobject-introspection wrapGAppsHook ]; buildInputs = [ - gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme + gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ]; - checkInputs = [ xvfb_run python3.pkgs.pytest dbus ]; + checkInputs = [ xvfb_run python3.pkgs.pytest dbus gtksourceview gtk3 ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 67baa98d21ec..fc4c18f5eb76 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.8.2"; + version = "4.9"; 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 = "1cpx8nf6vcqz92kx6b5c4900pcay8zb89gvy8y33prh5rywjq83c"; + sha256 = "01ig0464cvy9d87rn274g39frxr0p5q4lxf1xn5k3m24grf0qq0g"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile b/pkgs/applications/version-management/redmine/4.x/Gemfile index 3fd176007abf..343c7b3a5470 100644 --- a/pkgs/applications/version-management/redmine/4.x/Gemfile +++ b/pkgs/applications/version-management/redmine/4.x/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem "bundler", ">= 1.5.0" -gem "rails", "5.2.2" +gem "rails", "5.2.3" gem "rouge", "~> 3.3.0" gem "request_store", "1.0.5" gem "mini_mime", "~> 1.0.1" @@ -14,6 +14,7 @@ gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6" gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1") gem "i18n", "~> 0.7.0" +gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] @@ -33,7 +34,7 @@ end platforms :mri, :mingw, :x64_mingw do # Optional gem for exporting the gantt to a PNG file, not supported with jruby group :rmagick do - gem "rmagick", ">= 2.14.0" + gem "rmagick", "~> 2.16.0" end # Optional Markdown support, not for JRuby diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock index 8c569ddb3227..671d2bb4ac1f 100644 --- a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.2) - actionpack (= 5.2.2) + actioncable (5.2.3) + actionpack (= 5.2.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.2) - actionpack (= 5.2.2) - actionview (= 5.2.2) - activejob (= 5.2.2) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.2) - actionview (= 5.2.2) - activesupport (= 5.2.2) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -21,26 +21,26 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.2) - activesupport (= 5.2.2) + actionview (5.2.3) + activesupport (= 5.2.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.2) - activesupport (= 5.2.2) + activejob (5.2.3) + activesupport (= 5.2.3) globalid (>= 0.3.6) - activemodel (5.2.2) - activesupport (= 5.2.2) - activerecord (5.2.2) - activemodel (= 5.2.2) - activesupport (= 5.2.2) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) arel (>= 9.0) - activestorage (5.2.2) - actionpack (= 5.2.2) - activerecord (= 5.2.2) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) marcel (~> 0.3.1) - activesupport (5.2.2) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -56,21 +56,20 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (>= 2.0, < 4.0) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) - concurrent-ruby (1.1.4) + childprocess (1.0.1) + rake (< 13.0) + concurrent-ruby (1.1.5) crass (1.0.4) - css_parser (1.6.0) + css_parser (1.7.0) addressable - csv (3.0.4) + csv (3.0.9) docile (1.1.5) erubi (1.8.0) - ffi (1.10.0) globalid (0.4.2) activesupport (>= 4.2.0) htmlentities (4.3.4) i18n (0.7.0) - json (2.1.0) + json (2.2.0) loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -89,38 +88,38 @@ GEM mysql2 (0.5.2) net-ldap (0.16.1) nio4r (2.3.1) - nokogiri (1.10.1) + nokogiri (1.10.3) mini_portile2 (~> 2.4.0) pg (1.1.4) - public_suffix (3.0.3) - puma (3.12.0) - rack (2.0.6) + public_suffix (3.1.0) + puma (3.12.1) + rack (2.0.7) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.2) - actioncable (= 5.2.2) - actionmailer (= 5.2.2) - actionpack (= 5.2.2) - actionview (= 5.2.2) - activejob (= 5.2.2) - activemodel (= 5.2.2) - activerecord (= 5.2.2) - activestorage (= 5.2.2) - activesupport (= 5.2.2) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) bundler (>= 1.3.0) - railties (= 5.2.2) + railties (= 5.2.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (5.2.2) - actionpack (= 5.2.2) - activesupport (= 5.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -132,17 +131,17 @@ GEM redcarpet (3.4.0) request_store (1.0.5) rmagick (2.16.0) - roadie (3.4.0) + roadie (3.5.0) css_parser (~> 1.4) - nokogiri (~> 1.5) + nokogiri (~> 1.8) roadie-rails (1.3.0) railties (>= 3.0, < 5.3) roadie (~> 3.1) rouge (3.3.0) ruby-openid (2.3.0) - rubyzip (1.2.2) - selenium-webdriver (3.141.0) - childprocess (~> 0.5) + rubyzip (1.2.3) + selenium-webdriver (3.142.3) + childprocess (>= 0.5, < 2.0) rubyzip (~> 1.2, >= 1.2.2) simplecov (0.14.1) docile (~> 1.1.0) @@ -160,12 +159,12 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - websocket-driver (0.7.0) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.4) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.18) + yard (0.9.19) PLATFORMS ruby @@ -186,12 +185,12 @@ DEPENDENCIES pg (~> 1.1.4) puma (~> 3.7) rack-openid - rails (= 5.2.2) + rails (= 5.2.3) rails-dom-testing rbpdf (~> 1.19.6) redcarpet (~> 3.4.0) request_store (= 1.0.5) - rmagick (>= 2.14.0) + rmagick (~> 2.16.0) roadie-rails (~> 1.3.0) rouge (~> 3.3.0) ruby-openid (~> 2.3.0) diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix index ba9f96f5a30c..1f3c4a832fbe 100644 --- a/pkgs/applications/version-management/redmine/4.x/default.nix +++ b/pkgs/applications/version-management/redmine/4.x/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bundlerEnv, ruby }: let - version = "4.0.1"; + version = "4.0.4"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -15,7 +15,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${name}.tar.gz"; - sha256 = "1zzn9rkh7x1h9f2shcc8qhb693hp0hpah0z53i6gfgg5p8k5hns1"; + sha256 = "0i5bmgdi3mahbis9hn0hk53rnz4ihp9yij4b4i07ny9vf3n4kp1a"; }; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; diff --git a/pkgs/applications/version-management/redmine/4.x/gemset.nix b/pkgs/applications/version-management/redmine/4.x/gemset.nix index ce21a58b5564..34e459111f8a 100644 --- a/pkgs/applications/version-management/redmine/4.x/gemset.nix +++ b/pkgs/applications/version-management/redmine/4.x/gemset.nix @@ -3,28 +3,28 @@ dependencies = ["actionpack" "nio4r" "websocket-driver"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0826k5ch0l03f9yrkxy69aiv039z4qi00lnahw2rzywd2iz6r68x"; + sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.3"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfpb8s95cmkpp9ybyp2c88r55r5llscmmnkfwcwgasz9ncjiq5n"; + sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iwhbqqn0cm39dq040iwq8cfyclqk3kyzwlp5k3j5cz8k2668wws"; + sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.3"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -39,55 +39,55 @@ dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lz04drbi1z0xhvb8jnr14pbf505lilr02arahxq7y3mxiz0rs8z"; + sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.3"; }; activejob = { dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jjkl62x2aprg55x9rpm0h2c82vr2qr989hg3l9r21l01q4822ir"; + sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.3"; }; activemodel = { dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xmwi3mw8g4shbjvkhk72ra3r5jccbdsd4piphqka2y1h8s7sxvi"; + sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.3"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19a0sns6a5wz2wym25lb1dv4lbrrl5sd1n15s5ky2636znmhz30y"; + sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.3"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c72837098sw384vk6dmrb2p7q3wx4swnibk6sw9dp4hn1vc4p31"; + sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.3"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz"; + sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -124,21 +124,21 @@ version = "2.18.0"; }; childprocess = { - dependencies = ["ffi"]; + dependencies = ["rake"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; + sha256 = "1d2gasf988jh2k3fjb7i54c68rq6ni6jf9w0gnsfhrq94a6mprkz"; type = "gem"; }; - version = "0.9.0"; + version = "1.0.1"; }; concurrent-ruby = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.1.4"; + version = "1.1.5"; }; crass = { source = { @@ -152,18 +152,18 @@ dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61"; + sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; csv = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19m22vlxddva301z2izvg06hldlc37nyzhin3kjjfcnlbb8imj33"; + sha256 = "097rl10ivzlya5640530ayls2f1vid2mfgjy9ngd789qmp0j6x4b"; type = "gem"; }; - version = "3.0.4"; + version = "3.0.9"; }; docile = { source = { @@ -181,14 +181,6 @@ }; version = "1.8.0"; }; - ffi = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; - type = "gem"; - }; - version = "1.10.0"; - }; globalid = { dependencies = ["activesupport"]; source = { @@ -217,10 +209,10 @@ json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -334,10 +326,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; + sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; type = "gem"; }; - version = "1.10.1"; + version = "1.10.3"; }; pg = { source = { @@ -350,26 +342,26 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l"; type = "gem"; }; - version = "3.0.3"; + version = "3.1.0"; }; puma = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq"; + sha256 = "1pkrbvak6rlf147qpd4zss031qrwwh53g8s6017037iwg0436kv3"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.1"; }; rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm"; + sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; type = "gem"; }; - version = "2.0.6"; + version = "2.0.7"; }; rack-openid = { dependencies = ["rack" "ruby-openid"]; @@ -393,10 +385,10 @@ dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m9cszds68dsiycciiayd3c9g90s2yzn1izkr3gpgqkfw6dmvzyr"; + sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.3"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -420,10 +412,10 @@ dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00pnylmbz4c46mxw5lhxi8h39lndfg6fs1hpd0qd6swnjhkqsr1l"; + sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.3"; }; rake = { source = { @@ -478,10 +470,10 @@ dependencies = ["css_parser" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l3s80394yijvz0fsvfkw0azsi9yxsdkxd8lpas0bd7wlndjvmxx"; + sha256 = "0b2qgr725hnscz3ldb607gwgjkr47ncs1jjnk6zh0h70p5dxrk2d"; type = "gem"; }; - version = "3.4.0"; + version = "3.5.0"; }; roadie-rails = { dependencies = ["railties" "roadie"]; @@ -511,19 +503,19 @@ rubyzip = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; + sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs"; + sha256 = "0i0jr4qrcvg5isc11ivjw7f9gywbimnz613k82bfcrnlzdf90mxy"; type = "gem"; }; - version = "3.141.0"; + version = "3.142.3"; }; simplecov = { dependencies = ["docile" "json" "simplecov-html"]; @@ -589,18 +581,18 @@ dependencies = ["websocket-extensions"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn"; + sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2"; type = "gem"; }; - version = "0.7.0"; + version = "0.7.1"; }; websocket-extensions = { source = { remotes = ["https://rubygems.org"]; - sha256 = "034sdr7fd34yag5l6y156rkbhiqgmy395m231dwhlpcswhs6d270"; + sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; xpath = { dependencies = ["nokogiri"]; @@ -614,9 +606,9 @@ yard = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f"; + sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v"; type = "gem"; }; - version = "0.9.18"; + version = "0.9.19"; }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index 8f457449e7e6..5a0283e20ed5 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem "bundler", ">= 1.5.0", "< 2.0.0" -gem "rails", "4.2.11" +gem "rails", "4.2.11.1" gem "addressable", "2.4.0" if RUBY_VERSION < "2.0" if RUBY_VERSION < "2.1" gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5") @@ -21,6 +21,7 @@ gem "mail", "~> 2.6.4" gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.1" : "~> 1.6.8") gem "i18n", "~> 0.7.0" gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" +gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3" # Request at least rails-html-sanitizer 1.0.3 because of security advisories gem "rails-html-sanitizer", ">= 1.0.3" @@ -43,7 +44,7 @@ end platforms :mri, :mingw, :x64_mingw do # Optional gem for exporting the gantt to a PNG file, not supported with jruby group :rmagick do - gem "rmagick", ">= 2.14.0" + gem "rmagick", "~> 2.16.0" end # Optional Markdown support, not for JRuby diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 8bc8a03e7901..21296d343b44 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,38 +1,38 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.11) - actionpack (= 4.2.11) - actionview (= 4.2.11) - activejob (= 4.2.11) + actionmailer (4.2.11.1) + actionpack (= 4.2.11.1) + actionview (= 4.2.11.1) + activejob (= 4.2.11.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.11) - actionview (= 4.2.11) - activesupport (= 4.2.11) + actionpack (4.2.11.1) + actionview (= 4.2.11.1) + activesupport (= 4.2.11.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) actionpack-xml_parser (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.2.11) - activesupport (= 4.2.11) + actionview (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.11) - activesupport (= 4.2.11) + activejob (4.2.11.1) + activesupport (= 4.2.11.1) globalid (>= 0.3.0) - activemodel (4.2.11) - activesupport (= 4.2.11) + activemodel (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) - activerecord (4.2.11) - activemodel (= 4.2.11) - activesupport (= 4.2.11) + activerecord (4.2.11.1) + activemodel (= 4.2.11.1) + activesupport (= 4.2.11.1) arel (~> 6.0) - activesupport (4.2.11) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -51,13 +51,13 @@ GEM childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) coderay (1.1.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) crass (1.0.4) - css_parser (1.6.0) + css_parser (1.7.0) addressable docile (1.1.5) erubis (2.7.0) - ffi (1.10.0) + ffi (1.11.1) globalid (0.4.2) activesupport (>= 4.2.0) htmlentities (4.3.4) @@ -73,7 +73,7 @@ GEM metaclass (0.0.4) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) + mime-types-data (3.2019.0331) mimemagic (0.3.3) mini_mime (1.0.1) mini_portile2 (2.3.0) @@ -88,23 +88,23 @@ GEM pg (0.18.4) protected_attributes (1.1.4) activemodel (>= 4.0.1, < 5.0) - public_suffix (3.0.3) + public_suffix (3.1.0) rack (1.6.11) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.11) - actionmailer (= 4.2.11) - actionpack (= 4.2.11) - actionview (= 4.2.11) - activejob (= 4.2.11) - activemodel (= 4.2.11) - activerecord (= 4.2.11) - activesupport (= 4.2.11) + rails (4.2.11.1) + actionmailer (= 4.2.11.1) + actionpack (= 4.2.11.1) + actionview (= 4.2.11.1) + activejob (= 4.2.11.1) + activemodel (= 4.2.11.1) + activerecord (= 4.2.11.1) + activesupport (= 4.2.11.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.11) + railties (= 4.2.11.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -114,13 +114,13 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (4.2.11) - actionpack (= 4.2.11) - activesupport (= 4.2.11) + railties (4.2.11.1) + actionpack (= 4.2.11.1) + activesupport (= 4.2.11.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) - rbpdf (1.19.7) + rbpdf (1.19.8) htmlentities rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) @@ -135,7 +135,7 @@ GEM railties (>= 3.0, < 5.1) roadie (~> 3.1) ruby-openid (2.3.0) - rubyzip (1.2.2) + rubyzip (1.2.3) selenium-webdriver (2.53.4) childprocess (~> 0.5) rubyzip (~> 1.0) @@ -161,7 +161,7 @@ GEM websocket (1.2.8) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.18) + yard (0.9.19) PLATFORMS ruby @@ -184,14 +184,14 @@ DEPENDENCIES pg (~> 0.18.1) protected_attributes rack-openid - rails (= 4.2.11) + rails (= 4.2.11.1) rails-dom-testing rails-html-sanitizer (>= 1.0.3) rbpdf (~> 1.19.6) rdoc (~> 4.3) redcarpet (~> 3.4.0) request_store (= 1.0.5) - rmagick (>= 2.14.0) + rmagick (~> 2.16.0) roadie (~> 3.2.1) roadie-rails (~> 1.1.1) ruby-openid (~> 2.3.0) diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 02ae5da0f3f0..c97bf5127dc8 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bundlerEnv, ruby }: let - version = "3.4.8"; + version = "3.4.11"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -15,7 +15,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${name}.tar.gz"; - sha256 = "1d8bj3hx2nlyvsqbx7zbslb4dgwgyxidj4jzh4n2ki0i7vgw0x5m"; + sha256 = "14987sd9ff2n3982qlfwd4m0g1m10w8jyv791nica3wppvnrxh0r"; }; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index 0a231c995791..4ef4bd404270 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -3,19 +3,19 @@ dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zkklsh7ymhvdm5p9fr5ycd39d5caassag8yq0dga9cbk7fps74m"; + sha256 = "18wwlj4f7jffv3vxm80d2z36nwza95l5xfcqc401hvvrls4xzhsy"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "13xkil3y7gjj0m4ky14asi4m08x69wwv63wfn0h95wli4x8h8w7r"; + sha256 = "0rmldsk3a4lwxk0lrp6x1nz1v1r2xmbm3300l4ghgfygv3grdwjh"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; actionpack-xml_parser = { dependencies = ["actionpack"]; @@ -30,46 +30,46 @@ dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09vwq0xgxxhssxxh8fa7l2pv6a56smw3v6gvb9l1mycmf8vprd4b"; + sha256 = "0x7vjn8q6blzyf7j3kwg0ciy7vnfh28bjdkd1mp9k4ghp9jn0g9p"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12yqs22f4lz20nw6djsrkhii3p3nfpd51nw0lhvnczx0q8kl0nyk"; + sha256 = "0jy1c1r6syjqpa0sh9f1p4iaxzvp6qg4n6zs774j9z27q7h407mj"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; activemodel = { dependencies = ["activesupport" "builder"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11aqvabf5c1pgb404f5bqp1i7mxkyhzmwk6y8zm5w6rf4nq095mq"; + sha256 = "1c1x0rd6wnk1f0gsmxs6x3gx7yf6fs9qqkdv7r4hlbcdd849in33"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sw0m19cnasbr4cabvc302hjddc3s6fja3fr0gbj9h2n8b3633i5"; + sha256 = "07ixiwi0zzs9skqarvpfamsnay7npfswymrn28ngxaf8hi279q5p"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; activesupport = { dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4"; + sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -125,10 +125,10 @@ concurrent-ruby = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.1.4"; + version = "1.1.5"; }; crass = { source = { @@ -142,10 +142,10 @@ dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61"; + sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; docile = { source = { @@ -166,10 +166,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.1"; }; globalid = { dependencies = ["activesupport"]; @@ -243,10 +243,10 @@ mime-types-data = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; + sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; type = "gem"; }; - version = "3.2018.0812"; + version = "3.2019.0331"; }; mimemagic = { source = { @@ -342,10 +342,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l"; type = "gem"; }; - version = "3.0.3"; + version = "3.1.0"; }; rack = { source = { @@ -377,10 +377,10 @@ dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rhp1l5klw8alqnzji2p4w01x7ygsfnzc7mf87ncr2jlizmgy4nx"; + sha256 = "1ywvis59dd3v8qapi9ix6743zgk07l21x1cd6nb1ddpahxhm7dml"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; rails-deprecated_sanitizer = { dependencies = ["activesupport"]; @@ -413,10 +413,10 @@ dependencies = ["actionpack" "activesupport" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09x32zkxs0vfi4y0bjrqd61821kx2azwhdxvk2ygqj4yvxfh11i1"; + sha256 = "1bjf21z9maiiazc1if56nnh9xmgbkcqlpznv34f40a1hsvgk1d1m"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; rake = { source = { @@ -430,10 +430,10 @@ dependencies = ["htmlentities" "rbpdf-font"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i00mmc028p7hnpwlx9r6zdwwz589kd9ns6qpxmgl6f620n1fvs2"; + sha256 = "0fnhcn4z2zz6ic1yvl5hmhwmkdnybh8f8fnk1ni7bvl2s4ig5195"; type = "gem"; }; - version = "1.19.7"; + version = "1.19.8"; }; rbpdf-font = { source = { @@ -504,10 +504,10 @@ rubyzip = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; + sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip" "websocket"]; @@ -607,9 +607,9 @@ yard = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f"; + sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v"; type = "gem"; }; - version = "0.9.18"; + version = "0.9.19"; }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 153c6d78a7b7..38c3da220c92 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { bin_path = "$out/bin"; install_freedesktop_items = substituteAll { inherit (stdenv) shell; + isExecutable = true; src = ./install_freedesktop_items.sh; }; runtime_paths = lib.makeBinPath [ diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 64e8e5d2d253..3144d68a2887 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -116,13 +116,13 @@ in { }; subversion19 = common { - version = "1.9.9"; - sha256 = "1ll13ychbkp367c7zsrrpda5nygkryma5k18qfr8wbaq7dbvxzcd"; + version = "1.9.12"; + sha256 = "15z33gdnfiqblm5515020wfdwnp2837r3hnparava6m2fgyiafiw"; }; subversion_1_10 = common { - version = "1.10.3"; - sha256 = "1z6r3n91a4znsh68rl3jisfr7k4faymhbpalmmvsmvsap34al3cz"; + version = "1.10.6"; + sha256 = "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q"; extraBuildInputs = [ lz4 utf8proc ]; }; diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 48c5032f2da2..4802d259fb23 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor -, gtk3, gettext, wrapGAppsHook, gdk_pixbuf }: +, gtk3, gettext, wrapGAppsHook, gdk_pixbuf, gobject-introspection }: let inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3; @@ -15,8 +15,18 @@ in buildPythonApplication rec { sha256 = "0ncb8nykchrjlllbzfjpvirmfvfaps9qhilc56kvcw3nzqrnkx8q"; }; + # Temporary fix + # See https://github.com/NixOS/nixpkgs/issues/61578 + # and https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + nativeBuildInputs = [ gettext wrapGAppsHook + + # Temporary fix + # See https://github.com/NixOS/nixpkgs/issues/61578 + # and https://github.com/NixOS/nixpkgs/issues/56943 + gobject-introspection ]; buildInputs = [ diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index a329321b70c6..344c47eb934a 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }: +{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }: let binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ]; wrapper = writeScript "dvd-slideshow.sh" '' - #!${stdenv.shell} + #!${runtimeShell} # wrapper script for dvd-slideshow programs export PATH=${binPath}:$PATH diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 07474c5e52c5..77ee2bc10f89 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -3,7 +3,7 @@ # Derivation patches HandBrake to use Nix closure dependencies. # -{ stdenv, lib, fetchurl, callPackage, +{ stdenv, lib, fetchurl, # Main build tools python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, # Processing, video codecs, containers @@ -29,12 +29,12 @@ }: stdenv.mkDerivation rec { - version = "1.2.0"; - name = "handbrake-${version}"; + pname = "handbrake"; + version = "1.2.2"; src = fetchurl { url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2''; - sha256 = "03clkknaq3mz84p85cvr21gsy9b8vv2g4vvyfz44hz8la253jfqi"; + sha256 = "0k2yaqy7zi06k8mkp9az2mn9dlgj3a1339vacakfh2nn2zsics6z"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 05105b64af74..f7ecbc23a309 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -18,7 +18,7 @@ , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp -, libplist, p11-kit, zlib +, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson , dbusSupport ? true, dbus ? null , joystickSupport ? true, cwiid ? null , nfsSupport ? true, libnfs ? null @@ -40,21 +40,18 @@ assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used i assert vdpauSupport -> libvdpau != null; # TODO for Kodi 18.0 -# - cmake is no longer in project/cmake -# - maybe we can remove auto{conf,make} and libtool from inputs # - check if dbus support PR has been merged and add dbus as a buildInput -# - try to use system ffmpeg (kodi 17 works best with bundled 3.1 with patches) let - kodiReleaseDate = "20171115"; - kodiVersion = "17.6"; - rel = "Krypton"; + kodiReleaseDate = "20190129"; + kodiVersion = "18.1"; + rel = "Leia"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "1pwmmbry7dajwdpmc1mdygjvxna4kl38h32d71g10yf3mdm5wmz3"; + sha256 = "1w26aqvzxv4c70gcd1vw1pldapsc2xcacwq9b7dqx5m44j0zx1dc"; }; kodiDependency = { name, version, rev, sha256, ... } @attrs: @@ -72,9 +69,9 @@ let ffmpeg = kodiDependency rec { name = "FFmpeg"; - version = "3.1.11"; - rev = "${version}-${rel}-17.5"; # TODO: change 17.5 back to ${kodiVersion} - sha256 = "0nc4sb6v1g3l11v9h5l9n44a8r40186rcbp2xg5c7vg6wcpjid13"; + version = "4.0.3"; + rev = "${version}-${rel}-18.2"; + sha256 = "1krsjlr949iy5l6ljxancza1yi6w1annxc5s6k283i9mb15qy8cy"; preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . ''; @@ -86,29 +83,29 @@ let # we should be able to build these externally and have kodi reference them as buildInputs. # Doesn't work ATM though so we just use them for the src - libdvdcss = kodiDependency { + libdvdcss = kodiDependency rec { name = "libdvdcss"; - version = "20160215"; - rev = "2f12236bc1c92f73c21e973363f79eb300de603f"; - sha256 = "198r0q73i55ga1dvyqq9nfcri0zq08b94hy8671lg14i3izx44dd"; + version = "1.4.2"; + rev = "${version}-${rel}-Beta-5"; + sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"; buildInputs = [ libdvdread ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; }; - libdvdnav = kodiDependency { + libdvdnav = kodiDependency rec { name = "libdvdnav"; - version = "20170217"; - rev = "981488f7f27554b103cca10c1fbeba027396c94a"; - sha256 = "089pswc51l3avh95zl4cpsh7gh1innh7b2y4xgx840mcmy46ycr8"; + version = "6.0.0"; + rev = "${version}-${rel}-Alpha-3"; + sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"; buildInputs = [ libdvdread ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; }; - libdvdread = kodiDependency { + libdvdread = kodiDependency rec { name = "libdvdread"; - version = "20160221"; - rev = "17d99db97e7b8f23077b342369d3c22a6250affd"; - sha256 = "1gr5aq1cjr3as9mnwrw29cxn4m6f6pfrxdahkdcjy70q3ldg90sl"; + version = "6.0.0"; + rev = "${version}-${rel}-Alpha-3"; + sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; }; @@ -136,7 +133,7 @@ in stdenv.mkDerivation rec { libgcrypt libgpgerror libunistring libcrossguid cwiid libplist bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp - ffmpeg + ffmpeg flatbuffers fmt fstrcmp rapidjson # libdvdcss libdvdnav libdvdread ] ++ lib.optional dbusSupport dbus @@ -176,14 +173,10 @@ in stdenv.mkDerivation rec { doCheck = false; postPatch = '' - substituteInPlace xbmc/linux/LinuxTimezone.cpp \ + substituteInPlace xbmc/platform/linux/LinuxTimezone.cpp \ --replace 'usr/share/zoneinfo' 'etc/zoneinfo' ''; - preConfigure = '' - cd project/cmake - ''; - postInstall = '' for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ @@ -209,6 +202,6 @@ in stdenv.mkDerivation rec { homepage = https://kodi.tv/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg ]; + maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg sephalon ]; }; } diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 196852933a98..29fbf79c662c 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,13 +1,14 @@ { stdenv, callPackage, fetchurl, fetchFromGitHub, unzip -, cmake, kodiPlain, libcec_platform, tinyxml +, cmake, kodiPlain, libcec_platform, tinyxml, rapidxml , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib -, python2Packages }: +, python2Packages, expat, glib, nspr, nss }: with stdenv.lib; let self = rec { pluginDir = "/share/kodi/addons"; + rel = "Leia"; kodi = kodiPlain; @@ -54,6 +55,8 @@ let self = rec { dontStrip = true; + extraRuntimeDependencies = [ ]; + installPhase = '' ${if isNull sourceDir then "" else "cd $src/$sourceDir"} d=$out${pluginDir}/${namespace} @@ -64,7 +67,8 @@ let self = rec { ''; } // args)); - mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], ... }@args: + mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], + extraRuntimeDependencies ? [], extraInstallPhase ? "", ... }@args: toKodiPlugin (stdenv.mkDerivation (rec { name = "kodi-plugin-${plugin}-${version}"; @@ -73,6 +77,8 @@ let self = rec { buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ] ++ extraBuildInputs; + inherit extraRuntimeDependencies; + # disables check ensuring install prefix is that of kodi cmakeFlags = [ "-DOVERRIDE_PATHS=1" @@ -84,6 +90,7 @@ let self = rec { installPhase = let n = namespace; in '' make install ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version} + ${extraInstallPhase} ''; } // args)); @@ -212,14 +219,14 @@ let self = rec { joystick = mkKodiABIPlugin rec { namespace = "peripheral.joystick"; - version = "1.3.2"; + version = "1.4.7"; plugin = namespace; src = fetchFromGitHub { - owner = "kodi-game"; + owner = "xbmc"; repo = namespace; - rev = "96171dd32899553ffe8fc775fca66e8df5ff5cf1"; - sha256 = "18m61v8z9fbh4imvzhh4g9629r9df49g2yk9ycaczirg131dhfbh"; + rev = "v${version}"; + sha256 = "03gsp4kg41s3n4ib4wsv7m3krfipgwc2z07i4mnd5zvg0c4xrmap"; }; meta = { @@ -282,14 +289,14 @@ let self = rec { steam-controller = mkKodiABIPlugin rec { namespace = "peripheral.steamcontroller"; - version = "0.9.0"; + version = "0.10.0"; plugin = namespace; src = fetchFromGitHub { owner = "kodi-game"; repo = namespace; - rev = "76f640fad4f68118f4fab6c4c3338d13daca7074"; - sha256 = "0yqlfdiiymb8z6flyhpval8w3kdc9qv3mli3jg1xn5ac485nxsxh"; + rev = "ea345392ab5aa4485f3a48d2037fa8a8e8ab82de"; + sha256 = "1hbd8fdvn7xkr9csz1g9wah78nhnq1rkazl4zwa31y70830k3279"; }; extraBuildInputs = [ libusb ]; @@ -355,13 +362,13 @@ let self = rec { plugin = "pvr-hts"; namespace = "pvr.hts"; - version = "3.4.16"; + version = "4.4.14"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; - rev = "b39e4e9870d68841279cbc7d7214f3ad9b27f330"; - sha256 = "0pmlgqr4kd0gvckz77mj6v42kcx6lb23anm8jnf2fbn877snnijx"; + rev = "${version}-${rel}"; + sha256 = "1bcwcwd2yjhw85yk6lyhf0iqiclrsz7r7vpbxgc650fwqbb146gr"; }; meta = { @@ -377,13 +384,13 @@ let self = rec { plugin = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "2.4.7"; + version = "3.5.0"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; - rev = "60d89d16dd953d38947e8a6da2f8bb84a0f764ef"; - sha256 = "0dvdv0vk2q12nj0i5h51iaypy3i7jfsxjyxwwpxfy82y8260ragy"; + rev = "${version}-${rel}"; + sha256 = "1zrkvfn0im2qmvqm93pa3cg8xkxv61sxlj8nsz4r5z9v9nhqadf6"; }; meta = { @@ -401,13 +408,13 @@ let self = rec { plugin = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "2.4.14"; + version = "3.5.7"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; - rev = "2a649d7e21b64c4fa4a8b14c2cc139261eebc7e8"; - sha256 = "1f1im2gachrxnr3z96h5cg2c13vapgkvkdwvrbl4hxlnyp1a6jyz"; + rev = "${version}-${rel}"; + sha256 = "17znib7c491h2ii4gagxradh0jyvgga0d548gbk4yjj2nc9qqc6d"; }; meta = { @@ -418,7 +425,7 @@ let self = rec { license = licenses.gpl2Plus; }; - extraBuildInputs = [ zlib ]; + extraBuildInputs = [ zlib rapidxml ]; }; osmc-skin = mkKodiPlugin rec { @@ -470,4 +477,33 @@ let self = rec { }; }); + inputstream-adaptive = mkKodiABIPlugin rec { + + plugin = "inputstream-adaptive"; + namespace = "inputstream.adaptive"; + version = "2.3.12"; + + src = fetchFromGitHub { + owner = "peak3d"; + repo = "inputstream.adaptive"; + rev = "${version}"; + sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z"; + }; + + extraBuildInputs = [ expat ]; + + extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; + + extraInstallPhase = let n = namespace; in '' + ln -s $out/lib/addons/${n}/libssd_wv.so $out/${pluginDir}/${n}/libssd_wv.so + ''; + + meta = { + homepage = https://github.com/peak3d/inputstream.adaptive; + description = "Kodi inputstream addon for several manifest types"; + platforms = platforms.all; + maintainers = with maintainers; [ sephalon ]; + }; + }; + }; in self diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index d0dc9274a105..b4365eed949b 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -14,7 +14,10 @@ buildEnv { do makeWrapper ${kodi}/bin/$exe $out/bin/$exe \ --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \ - --prefix KODI_HOME : $out/share/kodi + --prefix KODI_HOME : $out/share/kodi \ + --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath + (stdenv.lib.concatMap + (plugin: plugin.extraRuntimeDependencies) plugins)}" done ''; diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 34efffc21d72..cceed556f978 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; homepage = https://mediathekview.de/; license = licenses.gpl3; - maintainers = with maintainers; [ chaoflow moredread ]; + maintainers = with maintainers; [ moredread ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 728f6387ffa9..374ea08816f7 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala, wrapGAppsHook +{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala_0_40, wrapGAppsHook , gsettings-desktop-schemas, gtk3, keybinder3, ffmpeg }: stdenv.mkDerivation rec { - name = "peek-${version}"; + pname = "peek"; version = "1.3.1"; src = fetchFromGitHub { owner = "phw"; - repo = "peek"; + repo = pname; rev = version; sha256 = "1fnvlklmg6s5rs3ql74isa5fgdkqqrpsyf8k2spxj520239l4vgb"; }; @@ -17,9 +17,21 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg ]}) ''; - nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ]; + nativeBuildInputs = [ + cmake + gettext + pkgconfig + libxml2.bin + txt2man + vala_0_40 # See https://github.com/NixOS/nixpkgs/issues/58433 + wrapGAppsHook + ]; - buildInputs = [ gsettings-desktop-schemas gtk3 keybinder3 ]; + buildInputs = [ + gsettings-desktop-schemas + gtk3 + keybinder3 + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 2cd4f19ca939..6e0b7412558e 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -48,7 +48,7 @@ in python3Packages.buildPythonApplication rec { buildInputs = [ gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas libnotify gst-transcoder ] ++ (with gst_all_1; [ diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 2dd76b36d057..812004bd119f 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "qstopmotion"; - version = "2.4.0"; + version = "2.4.1"; name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/Version_2_4_0/${name}-Source.tar.gz"; - sha256 = "0pbyq6nrr9g3crlsng660768167s0fybvcpzbfc0w9kkhs2jwrr2"; + url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${name}-Source.tar.gz"; + sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh"; }; buildInputs = with qt5; [ v4l_utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index 6042f490dfa0..1671c3f14d00 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -9,7 +9,7 @@ , libX11 , libXtst , wrapGAppsHook -, defaultIconTheme +, gnome3 , hicolor-icon-theme }: buildPythonApplication rec { @@ -39,7 +39,7 @@ buildPythonApplication rec { ]; buildInputs = [ - defaultIconTheme + gnome3.adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index bbb11c497668..27a0fa3388ed 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "18.12.23"; + version = "19.02.28"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1i6gkqvg31q7g5s3zgqzg4i5kyas7k4svclgbk459i5h1ar3v5vn"; + sha256 = "14l0cm81jy7syi08d8dg4nzp7s9zji9cycnf2mvh7zc7x069d1jr"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index cd3999e38c09..2961613418c1 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -21,11 +21,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null); stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "3.0.6"; + version = "3.0.8"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; - sha256 = "1lvyyahv6g9zv7m5g5qinyrwmw47zdsd5ysimb862j7kw15nvh8q"; + sha256 = "e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6"; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 94b21a77a702..fe23bcac5855 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -4,13 +4,13 @@ with lib; buildGoPackage rec { name = "containerd-${version}"; - version = "1.2.2"; + version = "1.2.6"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya"; + sha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; }; goPackagePath = "github.com/containerd/containerd"; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index e7c8a302c273..98591c3f778e 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -198,14 +198,14 @@ rec { # Get revisions from # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* - docker_18_09 = dockerGen rec { - version = "18.09.2"; - rev = "62479626f213818ba5b4565105a05277308587d5"; # git commit - sha256 = "05kvpy1c4g661xfds6dfzb8r5q76ndblxjykfj06had18pv0xxd4"; - runcRev = "09c8266bf2fcf9519a651b04ae54c967b9ab86ec"; - runcSha256 = "08h45vs1f25byapqzy6x42r86m232z166v6z81gc2a3id8v0nzia"; - containerdRev = "9754871865f7fe2f4e74d43e2fc7ccd237edcbce"; - containerdSha256 = "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya"; + docker_18_09 = makeOverridable dockerGen { + version = "18.09.7"; + rev = "2d0083d657f82c47044c8d3948ba434b622fe2fd"; + sha256 = "1f7q99pay7mmy925ap95p935y9xslxpmgha397db7x2w008rfl9k"; + runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; + runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; + containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; + containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix index 4499fff4dc8b..9419939d1c74 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/virtualization/dynamips/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dynamips"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "0x63m37vjyp57900x09gfvw02cwg85b33918x7fjj9x37wgmi5qf"; + sha256 = "1841h0m0k0p3c3ify4imafjk7jigcj2zlr8rn3iyp7jnafkxqik7"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 711838b29447..ab971fe64c98 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS"; homepage = "https://github.com/aws/amazon-ecs-agent"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index e1696fc15a56..778006a40f04 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.13.0"; + version = "0.15.0"; baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; fetchbin = name: sha256: fetchurl { @@ -9,8 +9,8 @@ let inherit sha256; }; - firecracker-bin = fetchbin "firecracker" "1wdcy4vmnx216jnza7bz6czlqpsjrnpqfsb5d322ld4gzbylm718"; - jailer-bin = fetchbin "jailer" "0k0sc5138bh35ciim2l78ma9g5x18dw098f2ar5y31ybr8i4q60y"; + firecracker-bin = fetchbin "firecracker" "06b9pj9s4i0wqbh24frsza2j28n7qflp623vwvar5k18jq6jixd0"; + jailer-bin = fetchbin "jailer" "17nbsg3yi9rif9qxgp483b2qx0jn2sn1hlvk63gl8m54mnxzmcr3"; in stdenv.mkDerivation { name = "firecracker-${version}"; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index ca8e4985016b..afb2088c6a6e 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , cmake, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig , libX11, freefont_ttf, nettle, libconfig }: @@ -21,6 +21,15 @@ stdenv.mkDerivation rec { libX11 freefont_ttf nettle libconfig cmake ]; + patches = [ + # Fix obsolete spice header usage. Remove with the next release. See https://github.com/gnif/LookingGlass/pull/126 + (fetchpatch { + url = "https://github.com/gnif/LookingGlass/commit/2567447b24b28458ba0f09c766a643ad8d753255.patch"; + sha256 = "04j2h75rpxd71szry15f31r6s0kgk96i8q9khdv9q3i2fvkf242n"; + stripLen = 1; + }) + ]; + enableParallelBuilding = true; sourceRoot = "source/client"; diff --git a/pkgs/applications/virtualization/nvidia-docker/config.toml b/pkgs/applications/virtualization/nvidia-docker/config.toml new file mode 100644 index 000000000000..bbd166995f36 --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-docker/config.toml @@ -0,0 +1,13 @@ +disable-require = false +#swarm-resource = "DOCKER_RESOURCE_GPU" + +[nvidia-container-cli] +#root = "/run/nvidia/driver" +#path = "/usr/bin/nvidia-container-cli" +environment = [] +#debug = "/var/log/nvidia-container-runtime-hook.log" +ldcache = "/tmp/ld.so.cache" +load-kmods = true +#no-cgroups = false +#user = "root:video" +ldconfig = "@@glibcbin@/bin/ldconfig" diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix new file mode 100644 index 000000000000..3e79ff84882f --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -0,0 +1,84 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, callPackage, makeWrapper +, buildGoPackage, runc, libelf, libcap, libseccomp, glibc }: + +with lib; let + + glibc-ldconf = glibc.overrideAttrs (oldAttrs: { + # ldconfig needs help reading libraries that have been patchelf-ed, as the + # .dynstr section is no longer in the first LOAD segment. See also + # https://sourceware.org/bugzilla/show_bug.cgi?id=23964 and + # https://github.com/NixOS/patchelf/issues/44 + patches = oldAttrs.patches ++ [ (fetchpatch { + name = "ldconfig-patchelf.patch"; + url = "https://sourceware.org/bugzilla/attachment.cgi?id=11444"; + sha256 = "0nzzmq7pli37iyjrgcmvcy92piiwjybpw245ds7q43pbgdm7lc3s"; + })]; + }); + + libnvidia-container = callPackage ./libnvc.nix { }; + + nvidia-container-runtime = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nvidia-container-runtime"; + rev = "runtime-v2.0.0"; + sha256 = "0jcj5xxbg7x7gyhbb67h3ds6vly62gx7j02zm6lg102h34jajj7a"; + }; + + nvidia-container-runtime-hook = buildGoPackage rec { + name = "nvidia-container-runtime-hook-${version}"; + version = "1.4.0"; + + goPackagePath = "nvidia-container-runtime-hook"; + + src = "${nvidia-container-runtime}/hook/nvidia-container-runtime-hook"; + }; + + nvidia-runc = runc.overrideAttrs (oldAttrs: rec { + name = "nvidia-runc"; + version = "1.0.0-rc6"; + src = fetchFromGitHub { + owner = "opencontainers"; + repo = "runc"; + rev = "v${version}"; + sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j"; + }; + patches = [ "${nvidia-container-runtime}/runtime/runc/3f2f8b84a77f73d38244dd690525642a72156c64/0001-Add-prestart-hook-nvidia-container-runtime-hook-to-t.patch" ]; + }); + +in stdenv.mkDerivation rec { + name = "nvidia-docker-${version}"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nvidia-docker"; + rev = "v${version}"; + sha256 = "1vx5m591mnvcb9vy0196x5lh3r8swjsk0fnlv5h62m7m4m07v6wx"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildPhase = '' + mkdir bin + cp nvidia-docker bin + cp ${libnvidia-container}/bin/nvidia-container-cli bin + cp ${nvidia-container-runtime-hook}/bin/nvidia-container-runtime-hook bin + cp ${nvidia-runc}/bin/runc bin/nvidia-container-runtime + ''; + + installPhase = '' + mkdir -p $out/{bin,etc} + cp -r bin $out + wrapProgram $out/bin/nvidia-container-cli \ + --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib + cp ${./config.toml} $out/etc/config.toml + substituteInPlace $out/etc/config.toml --subst-var-by glibcbin ${lib.getBin glibc-ldconf} + ''; + + meta = { + homepage = https://github.com/NVIDIA/nvidia-docker; + description = "NVIDIA container runtime for Docker"; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch new file mode 100644 index 000000000000..043c1efade8a --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch @@ -0,0 +1,130 @@ +diff --git a/src/ldcache.c b/src/ldcache.c +index 38bab05..e1abc89 100644 +--- a/src/ldcache.c ++++ b/src/ldcache.c +@@ -108,40 +108,27 @@ ldcache_close(struct ldcache *ctx) + + int + ldcache_resolve(struct ldcache *ctx, uint32_t arch, const char *root, const char * const libs[], +- char *paths[], size_t size, ldcache_select_fn select, void *select_ctx) ++ char *paths[], size_t size, const char* version) + { + char path[PATH_MAX]; +- struct header_libc6 *h; +- int override; ++ char dir[PATH_MAX]; ++ char lib[PATH_MAX]; + +- h = (struct header_libc6 *)ctx->ptr; + memset(paths, 0, size * sizeof(*paths)); + +- for (uint32_t i = 0; i < h->nlibs; ++i) { +- int32_t flags = h->libs[i].flags; +- char *key = (char *)ctx->ptr + h->libs[i].key; +- char *value = (char *)ctx->ptr + h->libs[i].value; +- +- if (!(flags & LD_ELF) || (flags & LD_ARCH_MASK) != arch) ++ for (size_t j = 0; j < size; ++j) { ++ snprintf(dir, 100, "/run/opengl-driver%s/lib", ++ arch == LD_I386_LIB32 ? "-32" : ""); ++ if (!strncmp(libs[j], "libvdpau_nvidia.so", 100)) ++ strcat(dir, "/vdpau"); ++ snprintf(lib, 100, "%s/%s.%s", dir, libs[j], version); ++ if (path_resolve_full(ctx->err, path, "/", lib) < 0) ++ return (-1); ++ if (!file_exists(ctx->err, path)) + continue; +- +- for (size_t j = 0; j < size; ++j) { +- if (!str_has_prefix(key, libs[j])) +- continue; +- if (path_resolve(ctx->err, path, root, value) < 0) +- return (-1); +- if (paths[j] != NULL && str_equal(paths[j], path)) +- continue; +- if ((override = select(ctx->err, select_ctx, root, paths[j], path)) < 0) +- return (-1); +- if (override) { +- free(paths[j]); +- paths[j] = xstrdup(ctx->err, path); +- if (paths[j] == NULL) +- return (-1); +- } +- break; +- } ++ paths[j] = xstrdup(ctx->err, path); ++ if (paths[j] == NULL) ++ return (-1); + } + return (0); + } +diff --git a/src/ldcache.h b/src/ldcache.h +index 33d78dd..2b087db 100644 +--- a/src/ldcache.h ++++ b/src/ldcache.h +@@ -50,6 +50,6 @@ void ldcache_init(struct ldcache *, struct error *, const char *); + int ldcache_open(struct ldcache *); + int ldcache_close(struct ldcache *); + int ldcache_resolve(struct ldcache *, uint32_t, const char *, const char * const [], +- char *[], size_t, ldcache_select_fn, void *); ++ char *[], size_t, const char*); + + #endif /* HEADER_LDCACHE_H */ +diff --git a/src/nvc_info.c b/src/nvc_info.c +index cc96542..3fe7612 100644 +--- a/src/nvc_info.c ++++ b/src/nvc_info.c +@@ -163,15 +163,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * + if (path_resolve_full(err, path, root, ldcache) < 0) + return (-1); + ldcache_init(&ld, err, path); +- if (ldcache_open(&ld) < 0) +- return (-1); + + info->nlibs = size; + info->libs = array_new(err, size); + if (info->libs == NULL) + goto fail; + if (ldcache_resolve(&ld, LIB_ARCH, root, libs, +- info->libs, info->nlibs, select_libraries, info) < 0) ++ info->libs, info->nlibs, info->nvrm_version) < 0) + goto fail; + + info->nlibs32 = size; +@@ -179,13 +177,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * + if (info->libs32 == NULL) + goto fail; + if (ldcache_resolve(&ld, LIB32_ARCH, root, libs, +- info->libs32, info->nlibs32, select_libraries, info) < 0) ++ info->libs32, info->nlibs32, info->nvrm_version) < 0) + goto fail; + rv = 0; + + fail: +- if (ldcache_close(&ld) < 0) +- return (-1); + return (rv); + } + +@@ -199,7 +195,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r + char path[PATH_MAX]; + int rv = -1; + +- if ((env = secure_getenv("PATH")) == NULL) { ++ if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin") == NULL) { + error_setx(err, "environment variable PATH not found"); + return (-1); + } +diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c +index d41a24d..65b7878 100644 +--- a/src/nvc_ldcache.c ++++ b/src/nvc_ldcache.c +@@ -331,7 +331,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt) + if (validate_args(ctx, cnt != NULL) < 0) + return (-1); + +- argv = (char * []){cnt->cfg.ldconfig, cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL}; ++ argv = (char * []){cnt->cfg.ldconfig, "-f", "/tmp/ld.so.conf.nvidia-host", "-C", "/tmp/ld.so.cache.nvidia-host", cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL}; + if (*argv[0] == '@') { + /* + * We treat this path specially to be relative to the host filesystem. diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix new file mode 100644 index 000000000000..46b8e3ba43c3 --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix @@ -0,0 +1,53 @@ +{ stdenv, lib, fetchFromGitHub, libelf, libcap, libseccomp }: + +with lib; let + + modp-ver = "396.51"; + + nvidia-modprobe = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nvidia-modprobe"; + rev = modp-ver; + sha256 = "1fw2qwc84k64agw6fx2v0mjf88aggph9c6qhs4cv7l3gmflv8qbk"; + }; + +in stdenv.mkDerivation rec { + name = "libnvidia-container-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "libnvidia-container"; + rev = "v${version}"; + sha256 = "1ws6mfsbgxhzlb5w1r8qqg2arvxkr21n59i4cqsyz3h5jsqsflbw"; + }; + + # locations of nvidia-driver libraries are not resolved via ldconfig which + # doesn't get used on NixOS. Additional support binaries like nvidia-smi are + # not resolved via the environment PATH but via the derivation output path. + patches = [ ./libnvc-ldconfig-and-path-fixes.patch ]; + + makeFlags = [ + "WITH_LIBELF=yes" + "prefix=$(out)" + ]; + + postPatch = '' + sed -i 's/^REVISION :=.*/REVISION = ${src.rev}/' mk/common.mk + sed -i 's/^COMPILER :=.*/COMPILER = $(CC)/' mk/common.mk + + mkdir -p deps/src/nvidia-modprobe-${modp-ver} + cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver} + chmod -R u+w deps/src + touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp + ''; + + buildInputs = [ libelf libcap libseccomp ]; + + meta = { + homepage = https://github.com/NVIDIA/libnvidia-container; + description = "NVIDIA container runtime library"; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index a43e1733f063..0668400d28ca 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd, which, + pkgconfig, glib, gtk3, gtkmm3, iproute, dbus, systemd, which, withX ? true }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ] - ++ lib.optionals withX [ gtk gtkmm libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; + ++ lib.optionals withX [ gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; patches = [ ./recognize_nixos.patch ]; postPatch = '' diff --git a/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch b/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch new file mode 100644 index 000000000000..03e47a57863c --- /dev/null +++ b/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch @@ -0,0 +1,44 @@ +commit cdc3e7eeafa9f683214d2c15d52ef384c3de6611 +Author: aszlig +Date: Mon Mar 18 13:21:01 2019 +0100 + + 9pfs: Ignore O_NOATIME open flag + + Since Linux 4.19, overlayfs uses the O_NOATIME flag on its lowerdir, + which in turn causes errors when the Nix store is mounted in the guest + because the file owner of the store paths typically don't match the + owner of the QEMU process. + + After submitting a patch to the overlayfs mailing list[1], it turns out + that my patch was incomplete[2] and needs a bit more rework. + + So instead of using an incomplete kernel patch in nixpkgs, which affects + *all* users of overlayfs, not just NixOS VM tests, I decided that for + now it's better to patch QEMU instead. + + The change here really only ignores the O_NOATIME flag so that the + behaviour is similar to what NFS does. From open(2): + + This flag may not be effective on all filesystems. One example is NFS, + where the server maintains the access time. + + This change is therefore only temporary until the final fix lands in the + stable kernel releases. + + [1]: https://www.spinics.net/lists/linux-unionfs/msg06755.html + [2]: https://www.spinics.net/lists/linux-unionfs/msg06756.html + + Signed-off-by: aszlig + +diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c +index 55821343e5..0b8425fe18 100644 +--- a/hw/9pfs/9p.c ++++ b/hw/9pfs/9p.c +@@ -127,7 +127,6 @@ static int dotl_to_open_flags(int flags) + { P9_DOTL_LARGEFILE, O_LARGEFILE }, + { P9_DOTL_DIRECTORY, O_DIRECTORY }, + { P9_DOTL_NOFOLLOW, O_NOFOLLOW }, +- { P9_DOTL_NOATIME, O_NOATIME }, + { P9_DOTL_SYNC, O_SYNC }, + }; + diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 67a863b6fb7c..837832b1672f 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -76,6 +76,17 @@ stdenv.mkDerivation rec { patches = [ ./no-etc-install.patch ./fix-qemu-ga.patch + ./9p-ignore-noatime.patch + (fetchpatch { + name = "CVE-2019-3812.patch"; + url = "https://git.qemu.org/?p=qemu.git;a=patch;h=b05b267840515730dbf6753495d5b7bd8b04ad1c"; + sha256 = "03a5vc5wvirbyi5r8kb2r4m2w6f1zmh9bqsr2psh4pblwar0nf55"; + }) + (fetchpatch { + url = "https://git.qemu.org/?p=qemu.git;a=patch;h=d52680fc932efb8a2f334cc6993e705ed1e31e99"; + name = "CVE-2019-12155.patch"; + sha256 = "0h2q71mcz3gvlrbfkqcgla74jdg73hvzcrwr4max2ckpxx8x9207"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optional pulseSupport ./fix-hda-recording.patch ++ optionals stdenv.hostPlatform.isMusl [ diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index b89ef1dd7bff..f19f4c5b27ea 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -5,13 +5,13 @@ with lib; buildGoPackage rec { name = "runc-${version}"; - version = "1.0.0-rc6"; + version = "1.0.0-rc8"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j"; + sha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; }; goPackagePath = "github.com/opencontainers/runc"; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 91934a3610b8..bb16660db87e 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -23,10 +23,11 @@ python3Packages.buildPythonApplication rec { gobject-introspection # for setup hook populating GI_TYPELIB_PATH ]; - buildInputs = - [ libvirt-glib vte dconf gtk-vnc gnome3.defaultIconTheme avahi - gsettings-desktop-schemas libosinfo gtk3 - ] ++ optional spiceSupport spice-gtk; + buildInputs = [ + libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi + gsettings-desktop-schemas libosinfo gtk3 + gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 + ] ++ optional spiceSupport spice-gtk; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 8304dd15597b..fd572a9f2ebe 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -19,9 +19,10 @@ with stdenv.lib; let python = python2; buildType = "release"; - # Remember to change the extpackRev and version in extpack.nix as well. - main = "1m48ywa913g6zgqslvrihxs2fbr4gmljypbdpjma2hck6isyi02m"; - version = "5.2.22"; + # Remember to change the extpackRev and version in extpack.nix and + # guest-additions/default.nix as well. + main = "0jmrbyhs92lyarpvylxqn2ajxdg9b290w5nd4g0i4h83d28bwbw0"; + version = "5.2.28"; in stdenv.mkDerivation { name = "virtualbox-${version}"; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index d2c513e899af..0e8a6eb25da5 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -2,7 +2,7 @@ with lib; -let version = "5.2.22"; +let version = "5.2.28"; in fetchurl rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack"; @@ -10,7 +10,7 @@ fetchurl rec { sha256 = # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. - let value = "779250666551b2f5426e86c2d21ceb0209b46174536971611025f753535131ef"; + let value = "376e07cbf2ff2844c95c800346c8e4697d7bc671ae0e21e46153b2e7b4ccc1d6"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 259f2b268fe3..ecefc9bc07e9 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 = "e51e33500a265b5c2d7bb2d03d32208df880523dfcb1e2dde2c78a0e0daa0603"; + sha256 = "0cwdmdgcd1jysyw7c9b3cdk1ngk5nq7slh1zkhxkvvq142cnm1v9"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 364771de80fd..2a8255c7a8bb 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -5,8 +5,12 @@ , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs , libxkbcommon, xcbutilxrm, hicolor-icon-theme , asciidoctor +, gtk3Support ? false, gtk3 ? null }: +# needed for beautiful.gtk to work +assert gtk3Support -> gtk3 != null; + with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; version = "4.3"; @@ -36,23 +40,27 @@ with luaPackages; stdenv.mkDerivation rec { xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon - xcbutilxrm ]; + xcbutilxrm ] + ++ stdenv.lib.optional gtk3Support gtk3; #cmakeFlags = "-DGENERATE_MANPAGES=ON"; cmakeFlags = "-DOVERRIDE_VERSION=${version}"; GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; + # LUA_CPATH and LUA_PATH are used only for *building*, see the --search flags + # below for how awesome finds the libraries it needs at runtime. LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; - LUA_PATH = "?.lua;${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; + LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;"; postInstall = '' - wrapProgram $out/bin/awesome \ + # Don't use wrapProgram or the wrapper will duplicate the --search + # arguments every restart + mv "$out/bin/awesome" "$out/bin/.awesome-wrapped" + makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \ --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LUA_PATH ';' "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua" \ - --prefix LUA_CPATH ';' "${lgi}/lib/lua/${lua.luaversion}/?.so" + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" wrapProgram $out/bin/awesome-client \ --prefix PATH : "${which}/bin" diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 1fed92764c10..b44aa73bc5ae 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -3,7 +3,7 @@ python3Packages.buildPythonApplication rec { # i3pystatus moved to rolling release: # https://github.com/enkore/i3pystatus/issues/584 - version = "unstable-2018-04-11"; + version = "unstable-2019-02-10"; pname = "i3pystatus"; disabled = !python3Packages.isPy3k; @@ -11,8 +11,8 @@ python3Packages.buildPythonApplication rec { { owner = "enkore"; repo = "i3pystatus"; - rev = "3efbd56bb7a851f16173ec6f0eef472b6e96c7cc"; - sha256 = "0r4mc23chxlaym7jcjnflw7mn5nbw3q8q4ix0nim7lh98yfndd3b"; + rev = "bcd8f12b18d491029fdd5bd0f433b4500fcdc68e"; + sha256 = "0gw6sla73cid6gwxn2n4zmsg2svq5flf9zxly6x2rfljizgf0720"; }; propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++ @@ -44,4 +44,3 @@ python3Packages.buildPythonApplication rec { maintainers = [ maintainers.igsha ]; }; } - diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix deleted file mode 100644 index 155b26e0987d..000000000000 --- a/pkgs/applications/window-managers/sway/beta.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, fetchFromGitHub -, meson, ninja -, pkgconfig, scdoc -, wayland, libxkbcommon, pcre, json_c, dbus, libevdev -, pango, cairo, libinput, libcap, pam, gdk_pixbuf -, wlroots, wayland-protocols -, buildDocs ? true -}: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "sway"; - version = "1.0-rc3"; - - src = fetchFromGitHub { - owner = "swaywm"; - repo = "sway"; - rev = version; - sha256 = "1ixwc1bg725x68qr84s8a5i4rlzc4svc52jgdw1yl5bgr6l1k5zc"; - }; - - postPatch = '' - sed -iE "s/version: '1.0',/version: '${version}',/" meson.build - ''; - - nativeBuildInputs = [ - pkgconfig meson ninja - ] ++ stdenv.lib.optional buildDocs scdoc; - - buildInputs = [ - wayland libxkbcommon pcre json_c dbus libevdev - pango cairo libinput libcap pam gdk_pixbuf - wlroots wayland-protocols - ]; - - enableParallelBuilding = true; - - mesonFlags = [ - "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" - "-Dtray=enabled" - ] ++ stdenv.lib.optional buildDocs "-Dman-pages=enabled"; - - meta = with stdenv.lib; { - description = "i3-compatible window manager for Wayland"; - homepage = https://swaywm.org; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; # Trying to keep it up-to-date. - }; -} diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index fb30f0073bfd..ad06b1ee832c 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,40 +1,53 @@ -{ stdenv, fetchFromGitHub -, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl -, wayland, wlc, libxkbcommon, pcre, json_c, dbus -, pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs -, libXdmcp -, buildDocs ? true +{ stdenv, fetchFromGitHub, fetchpatch +, meson, ninja +, pkgconfig, scdoc +, wayland, libxkbcommon, pcre, json_c, dbus, libevdev +, pango, cairo, libinput, libcap, pam, gdk_pixbuf +, wlroots, wayland-protocols }: stdenv.mkDerivation rec { - name = "sway-${version}"; - version = "0.15.2"; + name = "${pname}-${version}"; + pname = "sway"; + version = "1.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "1p9j5gv85lsgj4z28qja07dqyvqk41w6mlaflvvm9yxafx477g5n"; + sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx"; }; - nativeBuildInputs = [ - cmake pkgconfig - ] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ]; + patches = [ + # Fix for a compiler warning that causes a build failure + # (see https://github.com/swaywm/sway/issues/3862): + (fetchpatch { + url = "https://github.com/swaywm/sway/commit/bcde298a719f60b9913133dbd2a169dedbc8dd7d.patch"; + sha256 = "0r583nmqvq43ib93yv6flw8pj833v32lbs0q0xld56s3rnzvvdcp"; + }) + ./sway-config-no-nix-store-references.patch + ]; + + nativeBuildInputs = [ pkgconfig meson ninja scdoc ]; + buildInputs = [ - wayland wlc libxkbcommon pcre json_c dbus - pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs - libXdmcp + wayland libxkbcommon pcre json_c dbus libevdev + pango cairo libinput libcap pam gdk_pixbuf + wlroots wayland-protocols ]; enableParallelBuilding = true; - cmakeFlags = "-DVERSION=${version} -DLD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib"; + mesonFlags = [ + "-Ddefault-wallpaper=false" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" + "-Dtray=enabled" "-Dman-pages=enabled" + ]; meta = with stdenv.lib; { - description = "i3-compatible window manager for Wayland"; + description = "i3-compatible tiling Wayland compositor"; homepage = https://swaywm.org; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date. + maintainers = with maintainers; [ primeos synthetica ]; }; } diff --git a/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch b/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch new file mode 100644 index 000000000000..009c12959430 --- /dev/null +++ b/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch @@ -0,0 +1,21 @@ +diff --git a/config.in b/config.in +--- a/config.in ++++ b/config.in +@@ -21,8 +21,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec + + ### Output configuration + # +-# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/) +-output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill ++# Default wallpaper ++#output * bg ~/.config/sway/backgrounds/Sway_Wallpaper_Blue_1920x1080.png fill + # + # Example configuration: + # +@@ -213,5 +213,3 @@ bar { + inactive_workspace #32323200 #32323200 #5c5c5c + } + } +- +-include @sysconfdir@/sway/config.d/* + diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix new file mode 100644 index 000000000000..ef7da72fda93 --- /dev/null +++ b/pkgs/build-support/appimage/default.nix @@ -0,0 +1,176 @@ +{ pkgs, stdenv, libarchive, patchelf, zlib, buildFHSUserEnv, writeScript }: + +rec { + # Both extraction functions could be unified, but then + # it would depend on libmagic to correctly identify ISO 9660s + + extractType1 = { name, src }: stdenv.mkDerivation { + name = "${name}-extracted"; + inherit src; + + nativeBuildInputs = [ libarchive ]; + buildCommand = '' + mkdir $out + bsdtar -x -C $out -f $src + ''; + }; + + extractType2 = { name, src }: stdenv.mkDerivation { + name = "${name}-extracted"; + inherit src; + + nativeBuildInputs = [ patchelf ]; + buildCommand = '' + install $src ./appimage + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \ + ./appimage + + ./appimage --appimage-extract + + cp -rv squashfs-root $out + ''; + }; + + wrapAppImage = { name, src, extraPkgs }: buildFHSUserEnv (defaultFhsEnvArgs // { + inherit name; + + targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; + + runScript = writeScript "run" '' + #!${stdenv.shell} + + export APPDIR=${src} + export APPIMAGE_SILENT_INSTALL=1 + cd $APPDIR + exec ./AppRun "$@" + ''; + }); + + wrapType1 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage { + inherit name extraPkgs; + src = extractType1 { inherit name src; }; + }; + + wrapType2 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage { + inherit name extraPkgs; + src = extractType2 { inherit name src; }; + }; + + defaultFhsEnvArgs = { + name = "appimage-env"; + + # Most of the packages were taken from the Steam chroot + targetPkgs = pkgs: with pkgs; [ + gtk3 + bashInteractive + gnome3.zenity + python2 + xorg.xrandr + which + perl + xdg_utils + iana-etc + krb5 + ]; + + multiPkgs = pkgs: with pkgs; [ + desktop-file-utils + xorg.libXcomposite + xorg.libXtst + xorg.libXrandr + xorg.libXext + xorg.libX11 + xorg.libXfixes + libGL + + gst_all_1.gstreamer + gst_all_1.gst-plugins-ugly + libdrm + xorg.xkeyboardconfig + xorg.libpciaccess + + glib + gtk2 + bzip2 + zlib + gdk_pixbuf + + xorg.libXinerama + xorg.libXdamage + xorg.libXcursor + xorg.libXrender + xorg.libXScrnSaver + xorg.libXxf86vm + xorg.libXi + xorg.libSM + xorg.libICE + gnome2.GConf + freetype + (curl.override { gnutlsSupport = true; sslSupport = false; }) + nspr + nss + fontconfig + cairo + pango + expat + dbus + cups + libcap + SDL2 + libusb1 + udev + dbus-glib + libav + atk + at-spi2-atk + libudev0-shim + networkmanager098 + + xorg.libXt + xorg.libXmu + xorg.libxcb + libGLU + libuuid + libogg + libvorbis + SDL + SDL2_image + glew110 + openssl + libidn + tbb + wayland + mesa_noglu + libxkbcommon + + flac + freeglut + libjpeg + libpng12 + libsamplerate + libmikmod + libtheora + libtiff + pixman + speex + SDL_image + SDL_ttf + SDL_mixer + SDL2_ttf + SDL2_mixer + gstreamer + gst-plugins-base + libappindicator-gtk2 + libcaca + libcanberra + libgcrypt + libvpx + librsvg + xorg.libXft + libvdpau + alsaLib + ]; + }; +} diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 142f5255caad..59a7ded4bdd8 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -327,6 +327,7 @@ stdenv.mkDerivation { { description = stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_ + " (wrapper script)"; + priority = 10; } // optionalAttrs useMacosReexportHack { platforms = stdenv.lib.platforms.darwin; }; diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 23568f51b23e..c0f741b62886 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -196,4 +196,5 @@ in stdenv.mkDerivation { ${if isMultiBuild then extraBuildCommandsMulti else ""} ''; preferLocalBuild = true; + allowSubstitutes = false; } diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 678f5a3fe9e6..b699d762d29c 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -26,6 +26,13 @@ sub isInPathsToLink { return 0; } +# Similar to `lib.isStorePath` +sub isStorePath { + my $path = shift; + my $storePath = "@storeDir@"; + + return substr($path, 0, 1) eq "/" && dirname($path) eq $storePath; +} # For each activated package, determine what symlinks to create. @@ -84,6 +91,11 @@ sub checkCollision { sub findFiles { my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_; + # The store path must not be a file + if (-f $target && isStorePath $target) { + die "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv!"; + } + # Urgh, hacky... return if $relName eq "/propagated-build-inputs" || diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 41a1e67ef428..7f2427777f92 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -2,7 +2,7 @@ # a fork of the buildEnv in the Nix distribution. Most changes should # eventually be merged back into the Nix distribution. -{ buildPackages, runCommand, lib }: +{ buildPackages, runCommand, lib, substituteAll }: lib.makeOverridable ({ name @@ -43,6 +43,13 @@ lib.makeOverridable , meta ? {} }: +let + builder = substituteAll { + src = ./builder.pl; + inherit (builtins) storeDir; + }; +in + runCommand name rec { inherit manifest ignoreCollisions checkCollisionContents passthru @@ -63,10 +70,11 @@ runCommand name priority = drv.meta.priority or 5; }) paths); preferLocalBuild = true; + allowSubstitutes = false; # XXX: The size is somewhat arbitrary passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null; } '' - ${buildPackages.perl}/bin/perl -w ${./builder.pl} + ${buildPackages.perl}/bin/perl -w ${builder} eval "$postBuild" '') diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index 28f2802a5bce..24795a724ec8 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { exportReferencesGraph.closure = rootPaths; + preferLocalBuild = true; + PATH = "${buildPackages.coreutils}/bin:${buildPackages.jq}/bin"; builder = builtins.toFile "builder" diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ef17a3f4e58a..73b135400bbe 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -23,7 +23,8 @@ writeScript, writeText, closureInfo, - substituteAll + substituteAll, + runtimeShell }: # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. @@ -119,7 +120,7 @@ rec { export PATH=${shadow}/bin:$PATH mkdir -p /etc/pam.d if [[ ! -f /etc/passwd ]]; then - echo "root:x:0:0::/root:${stdenv.shell}" > /etc/passwd + echo "root:x:0:0::/root:${runtimeShell}" > /etc/passwd echo "root:!x:::::::" > /etc/shadow fi if [[ ! -f /etc/group ]]; then @@ -198,7 +199,7 @@ rec { # Unpack all of the parent layers into the image. lowerdir="" extractionID=0 - for layerTar in $(cat layer-list); do + for layerTar in $(tac layer-list); do echo "Unpacking layer $layerTar" extractionID=$((extractionID + 1)) @@ -209,7 +210,7 @@ rec { find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \; # Get the next lower directory and continue the loop. - lowerdir=$lowerdir''${lowerdir:+:}image/$extractionID/layer + lowerdir=image/$extractionID/layer''${lowerdir:+:}$lowerdir done mkdir work @@ -261,7 +262,7 @@ rec { # things like `ls` or `echo` will be missing. shellScript = name: text: writeScript name '' - #!${stdenv.shell} + #!${runtimeShell} set -e export PATH=${coreutils}/bin:/bin ${text} @@ -282,7 +283,8 @@ rec { }: let storePathToLayer = substituteAll - { inherit (stdenv) shell; + { shell = runtimeShell; + isExecutable = true; src = ./store-path-to-layer.sh; }; in @@ -341,7 +343,7 @@ rec { # Tar up the layer and throw it into 'layer.tar'. echo "Packing layer..." mkdir $out - tar -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . + tar --transform='s|^\./||' -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . # Compute a checksum of the tarball. echo "Computing layer checksum..." @@ -577,9 +579,9 @@ rec { layerID=$(sha256sum "$layer/json" | cut -d ' ' -f 1) ln -s "$layer" "./image/$layerID" - manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$layerID/layer.tar\"] + .") - imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${configJson})\"}] + .") - imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .") + manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= . + [\"$layerID/layer.tar\"]") + imageJson=$(echo "$imageJson" | jq ".history |= . + [{\"created\": \"$(jq -r .created ${configJson})\"}]") + imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= . + [\"sha256:$layerChecksum\"]") done imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1) echo "$imageJson" > "image/$imageJsonChecksum.json" @@ -771,23 +773,24 @@ rec { # Use the temp folder we've been working on to create a new image. mv temp image/$layerID - # Add the new layer ID to the beginning of the layer list + # Add the new layer ID to the end of the layer list ( + cat layer-list # originally this used `sed -i "1i$layerID" layer-list`, but # would fail if layer-list was completely empty. echo "$layerID/layer.tar" - cat layer-list ) | ${pkgs.moreutils}/bin/sponge layer-list # Create image json and image manifest imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}") manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]") - for layerTar in $(tac ./layer-list); do + for layerTar in $(cat ./layer-list); do layerChecksum=$(sha256sum image/$layerTar | cut -d ' ' -f1) - imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${baseJson})\"}] + .") - imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .") - manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$layerTar\"] + .") + imageJson=$(echo "$imageJson" | jq ".history |= . + [{\"created\": \"$(jq -r .created ${baseJson})\"}]") + # diff_ids order is from the bottom-most to top-most layer + imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= . + [\"sha256:$layerChecksum\"]") + manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= . + [\"$layerTar\"]") done imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1) diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index d78e35c56625..824c4cf0a5ef 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -186,4 +186,51 @@ rec { runAsRoot = "touch /example-file"; fromImage = bash; }; + + # 13. example of 3 layers images This image is used to verify the + # order of layers is correct. + # It allows to validate + # - the layer of parent are below + # - the order of parent layer is preserved at image build time + # (this is why there are 3 images) + layersOrder = let + l1 = pkgs.dockerTools.buildImage { + name = "l1"; + tag = "latest"; + extraCommands = '' + mkdir -p tmp + echo layer1 > tmp/layer1 + echo layer1 > tmp/layer2 + echo layer1 > tmp/layer3 + ''; + }; + l2 = pkgs.dockerTools.buildImage { + name = "l2"; + fromImage = l1; + tag = "latest"; + extraCommands = '' + mkdir -p tmp + echo layer2 > tmp/layer2 + echo layer2 > tmp/layer3 + ''; + }; + in pkgs.dockerTools.buildImage { + name = "l3"; + fromImage = l2; + tag = "latest"; + contents = [ pkgs.coreutils ]; + extraCommands = '' + mkdir -p tmp + echo layer3 > tmp/layer3 + ''; + }; + + # 14. Create another layered image, for comparing layers with image 10. + another-layered-image = pkgs.dockerTools.buildLayeredImage { + name = "another-layered-image"; + tag = "latest"; + config.Cmd = [ "${pkgs.hello}/bin/hello" ]; + contents = [ pkgs.hello ]; + }; + } diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh index ff814c1f6130..bcad9e83e06f 100755 --- a/pkgs/build-support/docker/store-path-to-layer.sh +++ b/pkgs/build-support/docker/store-path-to-layer.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ set -eu @@ -9,6 +9,9 @@ layerPath="./layers/$layerNumber" echo "Creating layer #$layerNumber for $@" mkdir -p "$layerPath" +tar --no-recursion -rf "$layerPath/layer.tar" \ + --mtime="@$SOURCE_DATE_EPOCH" \ + --owner=0 --group=0 /nix /nix/store tar -rpf "$layerPath/layer.tar" --hard-dereference --sort=name \ --mtime="@$SOURCE_DATE_EPOCH" \ --owner=0 --group=0 "$@" diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index e161daffbd37..dfdd5b60851d 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -121,21 +121,25 @@ stdenv.mkDerivation { siteStart="$out/share/emacs/site-lisp/site-start.el" siteStartByteCompiled="$siteStart"c + subdirs="$out/share/emacs/site-lisp/subdirs.el" + subdirsByteCompiled="$subdirs"c - # A dependency may have brought the original siteStart, delete it and - # create our own + # A dependency may have brought the original siteStart or subdirs, delete + # it and create our own # Begin the new site-start.el by loading the original, which sets some # NixOS-specific paths. Paths are searched in the reverse of the order # they are specified in, so user and system profile paths are searched last. - rm -f $siteStart $siteStartByteCompiled + rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled cat >"$siteStart" <> $out/bin/${w.name} <" ]; + sha256 = "0dn292d4mjlxif0kclrljzff8rm35cd9d92vycjbzklyhz5d62wi"; + crateBin = + [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ + [{ name = "carnix"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."carnix"."0.9.1"."clap"}" deps) + (crates."dirs"."${deps."carnix"."0.9.1"."dirs"}" deps) + (crates."env_logger"."${deps."carnix"."0.9.1"."env_logger"}" deps) + (crates."error_chain"."${deps."carnix"."0.9.1"."error_chain"}" deps) + (crates."itertools"."${deps."carnix"."0.9.1"."itertools"}" deps) + (crates."log"."${deps."carnix"."0.9.1"."log"}" deps) + (crates."nom"."${deps."carnix"."0.9.1"."nom"}" deps) + (crates."regex"."${deps."carnix"."0.9.1"."regex"}" deps) + (crates."serde"."${deps."carnix"."0.9.1"."serde"}" deps) + (crates."serde_derive"."${deps."carnix"."0.9.1"."serde_derive"}" deps) + (crates."serde_json"."${deps."carnix"."0.9.1"."serde_json"}" deps) + (crates."tempdir"."${deps."carnix"."0.9.1"."tempdir"}" deps) + (crates."toml"."${deps."carnix"."0.9.1"."toml"}" deps) + ]); + }; + features_.carnix."0.9.1" = deps: f: updateFeatures f (rec { + carnix."0.9.1".default = (f.carnix."0.9.1".default or true); + clap."${deps.carnix."0.9.1".clap}".default = true; + dirs."${deps.carnix."0.9.1".dirs}".default = true; + env_logger."${deps.carnix."0.9.1".env_logger}".default = true; + error_chain."${deps.carnix."0.9.1".error_chain}".default = true; + itertools."${deps.carnix."0.9.1".itertools}".default = true; + log."${deps.carnix."0.9.1".log}".default = true; + nom."${deps.carnix."0.9.1".nom}".default = true; + regex."${deps.carnix."0.9.1".regex}".default = true; + serde."${deps.carnix."0.9.1".serde}".default = true; + serde_derive."${deps.carnix."0.9.1".serde_derive}".default = true; + serde_json."${deps.carnix."0.9.1".serde_json}".default = true; + tempdir."${deps.carnix."0.9.1".tempdir}".default = true; + toml."${deps.carnix."0.9.1".toml}".default = true; + }) [ + (features_.clap."${deps."carnix"."0.9.1"."clap"}" deps) + (features_.dirs."${deps."carnix"."0.9.1"."dirs"}" deps) + (features_.env_logger."${deps."carnix"."0.9.1"."env_logger"}" deps) + (features_.error_chain."${deps."carnix"."0.9.1"."error_chain"}" deps) + (features_.itertools."${deps."carnix"."0.9.1"."itertools"}" deps) + (features_.log."${deps."carnix"."0.9.1"."log"}" deps) + (features_.nom."${deps."carnix"."0.9.1"."nom"}" deps) + (features_.regex."${deps."carnix"."0.9.1"."regex"}" deps) + (features_.serde."${deps."carnix"."0.9.1"."serde"}" deps) + (features_.serde_derive."${deps."carnix"."0.9.1"."serde_derive"}" deps) + (features_.serde_json."${deps."carnix"."0.9.1"."serde_json"}" deps) + (features_.tempdir."${deps."carnix"."0.9.1"."tempdir"}" deps) + (features_.toml."${deps."carnix"."0.9.1"."toml"}" deps) + ]; + + # end # carnix-0.9.2 @@ -396,6 +455,68 @@ rec { ]; +# end +# carnix-0.9.8 + + crates.carnix."0.9.8" = deps: { features?(features_.carnix."0.9.8" deps {}) }: buildRustCrate { + crateName = "carnix"; + version = "0.9.8"; + authors = [ "pe@pijul.org " ]; + sha256 = "0c2k98qjm1yyx5wl0wqs0rrjczp6h62ri1x8a99442clxsyvp4n9"; + crateBin = + [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ + [{ name = "carnix"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."carnix"."0.9.8"."clap"}" deps) + (crates."dirs"."${deps."carnix"."0.9.8"."dirs"}" deps) + (crates."env_logger"."${deps."carnix"."0.9.8"."env_logger"}" deps) + (crates."error_chain"."${deps."carnix"."0.9.8"."error_chain"}" deps) + (crates."itertools"."${deps."carnix"."0.9.8"."itertools"}" deps) + (crates."log"."${deps."carnix"."0.9.8"."log"}" deps) + (crates."nom"."${deps."carnix"."0.9.8"."nom"}" deps) + (crates."regex"."${deps."carnix"."0.9.8"."regex"}" deps) + (crates."serde"."${deps."carnix"."0.9.8"."serde"}" deps) + (crates."serde_derive"."${deps."carnix"."0.9.8"."serde_derive"}" deps) + (crates."serde_json"."${deps."carnix"."0.9.8"."serde_json"}" deps) + (crates."tempdir"."${deps."carnix"."0.9.8"."tempdir"}" deps) + (crates."toml"."${deps."carnix"."0.9.8"."toml"}" deps) + (crates."url"."${deps."carnix"."0.9.8"."url"}" deps) + ]); + }; + features_.carnix."0.9.8" = deps: f: updateFeatures f (rec { + carnix."0.9.8".default = (f.carnix."0.9.8".default or true); + clap."${deps.carnix."0.9.8".clap}".default = true; + dirs."${deps.carnix."0.9.8".dirs}".default = true; + env_logger."${deps.carnix."0.9.8".env_logger}".default = true; + error_chain."${deps.carnix."0.9.8".error_chain}".default = true; + itertools."${deps.carnix."0.9.8".itertools}".default = true; + log."${deps.carnix."0.9.8".log}".default = true; + nom."${deps.carnix."0.9.8".nom}".default = true; + regex."${deps.carnix."0.9.8".regex}".default = true; + serde."${deps.carnix."0.9.8".serde}".default = true; + serde_derive."${deps.carnix."0.9.8".serde_derive}".default = true; + serde_json."${deps.carnix."0.9.8".serde_json}".default = true; + tempdir."${deps.carnix."0.9.8".tempdir}".default = true; + toml."${deps.carnix."0.9.8".toml}".default = true; + url."${deps.carnix."0.9.8".url}".default = true; + }) [ + (features_.clap."${deps."carnix"."0.9.8"."clap"}" deps) + (features_.dirs."${deps."carnix"."0.9.8"."dirs"}" deps) + (features_.env_logger."${deps."carnix"."0.9.8"."env_logger"}" deps) + (features_.error_chain."${deps."carnix"."0.9.8"."error_chain"}" deps) + (features_.itertools."${deps."carnix"."0.9.8"."itertools"}" deps) + (features_.log."${deps."carnix"."0.9.8"."log"}" deps) + (features_.nom."${deps."carnix"."0.9.8"."nom"}" deps) + (features_.regex."${deps."carnix"."0.9.8"."regex"}" deps) + (features_.serde."${deps."carnix"."0.9.8"."serde"}" deps) + (features_.serde_derive."${deps."carnix"."0.9.8"."serde_derive"}" deps) + (features_.serde_json."${deps."carnix"."0.9.8"."serde_json"}" deps) + (features_.tempdir."${deps."carnix"."0.9.8"."tempdir"}" deps) + (features_.toml."${deps."carnix"."0.9.8"."toml"}" deps) + (features_.url."${deps."carnix"."0.9.8"."url"}" deps) + ]; + + # end # cc-1.0.25 @@ -801,6 +922,32 @@ rec { ]; +# end +# idna-0.1.5 + + crates.idna."0.1.5" = deps: { features?(features_.idna."0.1.5" deps {}) }: buildRustCrate { + crateName = "idna"; + version = "0.1.5"; + authors = [ "The rust-url developers" ]; + sha256 = "1gwgl19rz5vzi67rrhamczhxy050f5ynx4ybabfapyalv7z1qmjy"; + dependencies = mapFeatures features ([ + (crates."matches"."${deps."idna"."0.1.5"."matches"}" deps) + (crates."unicode_bidi"."${deps."idna"."0.1.5"."unicode_bidi"}" deps) + (crates."unicode_normalization"."${deps."idna"."0.1.5"."unicode_normalization"}" deps) + ]); + }; + features_.idna."0.1.5" = deps: f: updateFeatures f (rec { + idna."0.1.5".default = (f.idna."0.1.5".default or true); + matches."${deps.idna."0.1.5".matches}".default = true; + unicode_bidi."${deps.idna."0.1.5".unicode_bidi}".default = true; + unicode_normalization."${deps.idna."0.1.5".unicode_normalization}".default = true; + }) [ + (features_.matches."${deps."idna"."0.1.5"."matches"}" deps) + (features_.unicode_bidi."${deps."idna"."0.1.5"."unicode_bidi"}" deps) + (features_.unicode_normalization."${deps."idna"."0.1.5"."unicode_normalization"}" deps) + ]; + + # end # itertools-0.7.8 @@ -926,6 +1073,21 @@ rec { ]; +# end +# matches-0.1.8 + + crates.matches."0.1.8" = deps: { features?(features_.matches."0.1.8" deps {}) }: buildRustCrate { + crateName = "matches"; + version = "0.1.8"; + authors = [ "Simon Sapin " ]; + sha256 = "03hl636fg6xggy0a26200xs74amk3k9n0908rga2szn68agyz3cv"; + libPath = "lib.rs"; + }; + features_.matches."0.1.8" = deps: f: updateFeatures f (rec { + matches."0.1.8".default = (f.matches."0.1.8".default or true); + }) []; + + # end # memchr-1.0.2 @@ -1093,6 +1255,21 @@ rec { ]; +# end +# percent-encoding-1.0.1 + + crates.percent_encoding."1.0.1" = deps: { features?(features_.percent_encoding."1.0.1" deps {}) }: buildRustCrate { + crateName = "percent-encoding"; + version = "1.0.1"; + authors = [ "The rust-url developers" ]; + sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; + libPath = "lib.rs"; + }; + features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec { + percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true); + }) []; + + # end # proc-macro2-0.4.20 @@ -1849,6 +2026,56 @@ rec { }) []; +# end +# unicode-bidi-0.3.4 + + crates.unicode_bidi."0.3.4" = deps: { features?(features_.unicode_bidi."0.3.4" deps {}) }: buildRustCrate { + crateName = "unicode-bidi"; + version = "0.3.4"; + authors = [ "The Servo Project Developers" ]; + sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; + libName = "unicode_bidi"; + dependencies = mapFeatures features ([ + (crates."matches"."${deps."unicode_bidi"."0.3.4"."matches"}" deps) + ]); + features = mkFeatures (features."unicode_bidi"."0.3.4" or {}); + }; + features_.unicode_bidi."0.3.4" = deps: f: updateFeatures f (rec { + matches."${deps.unicode_bidi."0.3.4".matches}".default = true; + unicode_bidi = fold recursiveUpdate {} [ + { "0.3.4".default = (f.unicode_bidi."0.3.4".default or true); } + { "0.3.4".flame = + (f.unicode_bidi."0.3.4".flame or false) || + (f.unicode_bidi."0.3.4".flame_it or false) || + (unicode_bidi."0.3.4"."flame_it" or false); } + { "0.3.4".flamer = + (f.unicode_bidi."0.3.4".flamer or false) || + (f.unicode_bidi."0.3.4".flame_it or false) || + (unicode_bidi."0.3.4"."flame_it" or false); } + { "0.3.4".serde = + (f.unicode_bidi."0.3.4".serde or false) || + (f.unicode_bidi."0.3.4".with_serde or false) || + (unicode_bidi."0.3.4"."with_serde" or false); } + ]; + }) [ + (features_.matches."${deps."unicode_bidi"."0.3.4"."matches"}" deps) + ]; + + +# end +# unicode-normalization-0.1.7 + + crates.unicode_normalization."0.1.7" = deps: { features?(features_.unicode_normalization."0.1.7" deps {}) }: buildRustCrate { + crateName = "unicode-normalization"; + version = "0.1.7"; + authors = [ "kwantam " ]; + sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs"; + }; + features_.unicode_normalization."0.1.7" = deps: f: updateFeatures f (rec { + unicode_normalization."0.1.7".default = (f.unicode_normalization."0.1.7".default or true); + }) []; + + # end # unicode-width-0.1.5 @@ -1879,6 +2106,43 @@ rec { }) []; +# end +# url-1.7.2 + + crates.url."1.7.2" = deps: { features?(features_.url."1.7.2" deps {}) }: buildRustCrate { + crateName = "url"; + version = "1.7.2"; + authors = [ "The rust-url developers" ]; + sha256 = "0qzrjzd9r1niv7037x4cgnv98fs1vj0k18lpxx890ipc47x5gc09"; + dependencies = mapFeatures features ([ + (crates."idna"."${deps."url"."1.7.2"."idna"}" deps) + (crates."matches"."${deps."url"."1.7.2"."matches"}" deps) + (crates."percent_encoding"."${deps."url"."1.7.2"."percent_encoding"}" deps) + ]); + features = mkFeatures (features."url"."1.7.2" or {}); + }; + features_.url."1.7.2" = deps: f: updateFeatures f (rec { + idna."${deps.url."1.7.2".idna}".default = true; + matches."${deps.url."1.7.2".matches}".default = true; + percent_encoding."${deps.url."1.7.2".percent_encoding}".default = true; + url = fold recursiveUpdate {} [ + { "1.7.2".default = (f.url."1.7.2".default or true); } + { "1.7.2".encoding = + (f.url."1.7.2".encoding or false) || + (f.url."1.7.2".query_encoding or false) || + (url."1.7.2"."query_encoding" or false); } + { "1.7.2".heapsize = + (f.url."1.7.2".heapsize or false) || + (f.url."1.7.2".heap_size or false) || + (url."1.7.2"."heap_size" or false); } + ]; + }) [ + (features_.idna."${deps."url"."1.7.2"."idna"}" deps) + (features_.matches."${deps."url"."1.7.2"."matches"}" deps) + (features_.percent_encoding."${deps."url"."1.7.2"."percent_encoding"}" deps) + ]; + + # end # utf8-ranges-1.0.1 diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 43aecdef5f2e..c69832a89b9f 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,6 +1,7 @@ { stdenv, cacert, git, cargo, rustc, cargo-vendor, fetchcargo, python3 }: -{ name, cargoSha256 ? "unset" +{ name ? "${args.pname}-${args.version}" +, cargoSha256 ? "unset" , src ? null , srcs ? null , cargoPatches ? [] diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 4206b0f33ff9..3fc10c8b0b4b 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -8,12 +8,13 @@ , vmTools , gawk , utillinux +, runtimeShell , e2fsprogs }: rec { shellScript = name: text: writeScript name '' - #!${stdenv.shell} + #!${runtimeShell} set -e ${text} ''; diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index 51921fdfbdc7..e4712a5ef22c 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeScript, file }: +{ stdenv, callPackage, cleanPackaging, fetchurl, writeScript, file }: let lib = stdenv.lib; in { # : string @@ -19,6 +19,10 @@ in { # mostly for moving and deleting files from the build directory # : lines , postInstall + # packages with setup hooks that should be run + # (see definition of `makeSetupHook`) + # : list drv +, setupHooks ? [] # : list Maintainer , maintainers ? [] @@ -50,25 +54,6 @@ let "README.*" ]; - globWith = stdenv.lib.concatMapStringsSep "\n"; - rmNoise = globWith (f: - ''rm -rf ${f}'') commonNoiseFiles; - mvMeta = globWith - (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'') - commonMetaFiles; - - # Move & remove actions, taking the package doc directory - commonFileActions = writeScript "common-file-actions.sh" '' - #!${stdenv.shell} - set -e - DOCDIR="$1" - shopt -s globstar extglob nullglob - ${rmNoise} - mkdir -p "$DOCDIR" - ${mvMeta} - ''; - - in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -82,6 +67,8 @@ in stdenv.mkDerivation { dontDisableStatic = true; enableParallelBuilding = true; + nativeBuildInputs = setupHooks; + configureFlags = configureFlags ++ [ "--enable-absolute-paths" (if stdenv.isDarwin @@ -99,21 +86,16 @@ in stdenv.mkDerivation { # TODO(Profpatsch): ensure that there is always a $doc output! postInstall = '' echo "Cleaning & moving common files" - mkdir -p $doc/share/doc/${pname} - ${commonFileActions} $doc/share/doc/${pname} + ${cleanPackaging.commonFileActions { + noiseFiles = commonNoiseFiles; + docFiles = commonMetaFiles; + }} $doc/share/doc/${pname} ${postInstall} ''; postFixup = '' - echo "Checking for remaining source files" - rem=$(find -mindepth 1 -xtype f -print0 \ - | tee $TMP/remaining-files) - if [[ "$rem" != "" ]]; then - echo "ERROR: These files should be either moved or deleted:" - cat $TMP/remaining-files | xargs -0 ${file}/bin/file - exit 1 - fi + ${cleanPackaging.checkForRemainingFiles} ''; meta = { diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/build-support/skaware/clean-packaging.nix new file mode 100644 index 000000000000..16bae04b21e2 --- /dev/null +++ b/pkgs/build-support/skaware/clean-packaging.nix @@ -0,0 +1,53 @@ +# set of utilities that assure the cwd of a build +# is completely clean after the build, meaning all +# files were either discarded or moved to outputs. +# This ensures nothing is forgotten and new files +# are correctly handled on update. +{ stdenv, file, writeScript }: + +let + globWith = stdenv.lib.concatMapStringsSep "\n"; + rmNoise = noiseGlobs: globWith (f: + ''rm -rf ${f}'') noiseGlobs; + mvDoc = docGlobs: globWith + (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'') + docGlobs; + + # Shell script that implements common move & remove actions + # $1 is the doc directory (will be created). + # Best used in conjunction with checkForRemainingFiles + commonFileActions = + { # list of fileglobs that are removed from the source dir + noiseFiles + # files that are moved to the doc directory ($1) + # TODO(Profpatsch): allow to set target dir with + # { glob = …; to = "html" } (relative to docdir) + , docFiles }: + writeScript "common-file-actions.sh" '' + #!${stdenv.shell} + set -e + DOCDIR="$1" + shopt -s globstar extglob nullglob + ${rmNoise noiseFiles} + mkdir -p "$DOCDIR" + ${mvDoc docFiles} + ''; + + # Shell script to check whether the build directory is empty. + # If there are still files remaining, exit 1 with a helpful + # listing of all remaining files and their types. + checkForRemainingFiles = writeScript "check-for-remaining-files.sh" '' + #!${stdenv.shell} + echo "Checking for remaining source files" + rem=$(find -mindepth 1 -xtype f -print0 \ + | tee $TMP/remaining-files) + if [[ "$rem" != "" ]]; then + echo "ERROR: These files should be either moved or deleted:" + cat $TMP/remaining-files | xargs -0 ${file}/bin/file + exit 1 + fi + ''; + +in { + inherit commonFileActions checkForRemainingFiles; +} diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix index aa600a76650c..66feb695c418 100644 --- a/pkgs/build-support/substitute-files/substitute-all-files.nix +++ b/pkgs/build-support/substitute-files/substitute-all-files.nix @@ -22,4 +22,5 @@ stdenv.mkDerivation ({ eval "$postInstall" ''; preferLocalBuild = true; + allowSubstitutes = false; } // args) diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix index 7fd46f95f998..57b160bbe901 100644 --- a/pkgs/build-support/substitute/substitute-all.nix +++ b/pkgs/build-support/substitute/substitute-all.nix @@ -8,4 +8,5 @@ stdenvNoCC.mkDerivation ({ builder = ./substitute-all.sh; inherit (args) src; preferLocalBuild = true; + allowSubstitutes = false; } // args) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 454ef8912b3b..ab83b73c5455 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, stdenvNoCC, lndir }: +{ lib, stdenv, stdenvNoCC, lndir, runtimeShell }: let @@ -15,12 +15,12 @@ rec { /* Run the shell command `buildCommand' to produce a store path named * `name'. The attributes in `env' are added to the environment * prior to running the command. By default `runCommand' runs using - * stdenv with no compiler environment. `runCommandCC` + * stdenv with no compiler environment. `runCommandCC` * * Examples: * runCommand "name" {envVariable = true;} ''echo hello'' * runCommandNoCC "name" {envVariable = true;} ''echo hello'' # equivalent to prior - * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out''; + * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out''; */ runCommand = runCommandNoCC; runCommandNoCC = runCommand' stdenvNoCC; @@ -145,7 +145,7 @@ rec { executable = true; destination = "/bin/${name}"; text = '' - #!${stdenv.shell} + #!${runtimeShell} ${text} ''; checkPhase = '' @@ -215,7 +215,7 @@ rec { * myhellohook = makeSetupHook { deps = [ hello ]; } ./myscript.sh; * * # wrotes a setup hook where @bash@ myscript.sh is substituted for the - * # bash interpreter. + * # bash interpreter. * myhellohookSub = makeSetupHook { * deps = [ hello ]; * substitutions = { bash = "${pkgs.bash}/bin/bash"; }; @@ -278,7 +278,7 @@ rec { * packages that cannot be built automatically. * * Examples: - * + * * requireFile { * name = "my-file"; * url = "http://example.com/download/"; diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index e000308bed8f..08b93aaf1174 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -1,5 +1,6 @@ { stdenv, writeScript, vmTools, makeInitrd , samba, vde2, openssh, socat, netcat-gnu, coreutils, gnugrep, gzip +, runtimeShell }: { sshKey @@ -74,7 +75,7 @@ let loopForever = "while :; do ${coreutils}/bin/sleep 1; done"; initScript = writeScript "init.sh" ('' - #!${stdenv.shell} + #!${runtimeShell} ${coreutils}/bin/cp -L "${sshKey}" /ssh.key ${coreutils}/bin/chmod 600 /ssh.key '' + (if installMode then '' diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 6d657472e66f..280202c2200d 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.16"; + version = "5.00"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "1d2d6llazg3inwjiz22cn46mbm5ydpbyh9qb55z4j3nm4w6wrzs7"; + sha256 = "006rcqhs4ay9q8wip2kbgk3065gwvfbzrqgv2dsydwvcnwv50bss"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/data/fonts/b612/default.nix index b7b79f2e2ca1..2f583e2fc4b2 100644 --- a/pkgs/data/fonts/b612/default.nix +++ b/pkgs/data/fonts/b612/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchzip, lib }: let - version = "1.003"; + version = "1.008"; pname = "b612"; in fetchzip rec { name = "${pname}-font-${version}"; - url = "http://git.polarsys.org/c/${pname}/${pname}.git/snapshot/${pname}-bd14fde2544566e620eab106eb8d6f2b7fb1347e.zip"; - sha256 = "07gadk9b975k69pgw9gj54qx8d5xvxphid7wrmv4cna52jyy4464"; + url = "https://github.com/polarsys/b612/archive/${version}.zip"; + sha256 = "0r3lana1q9w3siv8czb3p9rrb5d9svp628yfbvvmnj7qvjrmfsiq"; postFetch = '' mkdir -p $out/share/fonts/truetype/${pname} unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname} diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix new file mode 100644 index 000000000000..bad78e3433e1 --- /dev/null +++ b/pkgs/data/fonts/creep/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, fontforge }: + +stdenv.mkDerivation rec { + pname = "creep"; + version = "0.31"; + + src = fetchFromGitHub { + owner = "romeovs"; + repo = pname; + rev = version; + sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n"; + }; + + nativeBuildInputs = [ fontforge ]; + + dontBuild = true; + + installPhase = '' + install -D -m644 creep.bdf "$out/usr/share/fonts/misc/creep.bdf" + ''; + + meta = with stdenv.lib; { + description = "A pretty sweet 4px wide pixel font"; + homepage = https://github.com/romeovs/creep; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ buffet ]; + }; +} diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix new file mode 100644 index 000000000000..e61e582d742a --- /dev/null +++ b/pkgs/data/fonts/undefined-medium/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip }: + +fetchzip rec { + name = "undefined-medium-1.0"; + + url = https://github.com/andirueckel/undefined-medium/archive/v1.0.zip; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile ${name}/fonts/otf/\*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "0v3p1g9f1c0d6b9lhrvm1grzivm7ddk7dvn96zl5hdzr2y60y1rw"; + + meta = with stdenv.lib; { + homepage = https://undefined-medium.com/; + description = "A pixel grid-based monospace typeface"; + longDescription = '' + undefined medium is a free and open-source pixel grid-based + monospace typeface suitable for programming, writing, and + whatever else you can think of … it’s pretty undefined. + ''; + license = licenses.ofl; + maintainers = [ maintainers.rycee ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 943eb9572b2c..b167a7802d15 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "unifont-${version}"; - version = "11.0.03"; + version = "12.0.01"; ttf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.ttf"; - sha256 = "1fqlf3kczh1y7vhpcdcs1i9043idg5x9jisfqfd99sikvcbw7w75"; + sha256 = "191vgddv5fksg7g01q692nfcb02ks2y28fi9fv8aghvs36q4iana"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; - sha256 = "0wqcmvkqdww60hqh245whzh4mx3frrx2712lay826f9h5s4ywz6g"; + sha256 = "14xbrsdrnllly8h2afan3b4v486vd4y8iff8zqmcfliw0cipm8v4"; }; nativeBuildInputs = [ mkfontscale mkfontdir ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "006jbla4zfwccyy84sm4ck869sq5az5s5cfkcmdgj7ah3rz4d7dn"; + outputHash = "1jccbz7wyyk7rpyapgsppcgakgpm1l9fqqxs7fg9naav7i0nzzpg"; meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 29ba4bfb5402..d94a2cc02420 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchzip }: let - version = "10.0.06"; + version = "12.0.01"; in fetchzip rec { name = "unifont_upper-${version}"; - url = "http://unifoundry.com/pub/unifont-${version}/font-builds/${name}.ttf"; + url = "mirror://gnu/unifont/unifont-${version}/${name}.ttf"; postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - sha256 = "13x5z8iyh9xz5fllcy89yinnz1iy16a2pjf3vip66nz10sq8crlr"; + sha256 = "1mmbndyi91fcdj7ykk5y7rypmm5jf2zf5pp5ab8hq3aa9y7invw3"; meta = with stdenv.lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/pkgs/data/fonts/yanone-kaffeesatz/default.nix new file mode 100644 index 000000000000..026bb2d22443 --- /dev/null +++ b/pkgs/data/fonts/yanone-kaffeesatz/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchzip}: + +fetchzip { + name = "yanone-kaffeesatz-2004"; + + url = https://yanone.de/2015/data/UIdownloads/Yanone%20Kaffeesatz.zip; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "190c4wx7avy3kp98lsyml7kc0jw7csf5n79af2ypbkhsadfsy8di"; + + meta = { + description = "The free font classic"; + maintainers = with stdenv.lib.maintainers; [ mt-caret ]; + platforms = with stdenv.lib.platforms; all; + homepage = https://yanone.de/fonts/kaffeesatz/; + license = stdenv.lib.licenses.ofl; + }; +} diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 4ad036278700..98a98cfa7c8e 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "19.01.24"; + version = "19.02.22"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "18asihcv41jlysb2ynbvbk6fn0lnj7ckaz1nyx1w25a7nk413dnm"; + sha256 = "10jh633rllp9yjfkjjyf8455n84q7ppxw1kk9dp1rsg4dq327ks7"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 967c629324c2..ddec15e5f318 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "19.01.24"; + version = "19.02.22"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0x3d21snfp4v9ippny1jmf2hw5dcscwrlasxvr5bgxhff1idf81c"; + sha256 = "0qn0s7cd795pm0hbx85gxd1s272zxrzf3r9r6da54h149v3wkgzw"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index c50c511e7363..17b83b94aa83 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e95fefd56a6b8de585e92cd34de4870e31fb7bc7.tar.gz"; - sha256 = "08pzxwsc4incrl5mv8572xs9332206p2cw2mynxks33n7nh98vmx"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b9a84642e423be98c8629aace783b78dc9f40439.tar.gz"; + sha256 = "08yj9vm62b40mwg51qwz6hz7ird7fmd08881wp2c7c2njqlaj84y"; } diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 59079b28efc2..0d19d8c9dcab 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "tzdata-${version}"; - version = "2018g"; + version = "2019a"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2"; + sha256 = "0wlpqm4asvi0waaz24xj20iq40gqfypmb4nldjhkfgm09bgnsdlh"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa"; + sha256 = "1x9z8fpgnhzlsnps0hamb54ymaskjab7ys9m4i4gpk9hpiig2fc7"; }) ]; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index d839d4a3dd80..79e573087a40 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { name = "plata-theme-${version}"; - version = "0.4.9"; + version = "0.5.0"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "0kj04nj265rgkbbhzhz9f7q6z5yr1dxmcrnq1b5ldha3xqrq2pv9"; + sha256 = "16kpdil2bmapbd0g2znwz4ddplykzabydw6g2i8wxs9c5r1hx0q5"; }; preferLocalBuild = true; diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix index 3c99c40ee807..ee0c81d7d39e 100644 --- a/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { go-dbus-generator ]; - makeFlags = [ "GOPATH=$(out)/share/go" ]; + makeFlags = [ "GOPATH=${placeholder ''out''}/share/go" ]; postPatch = '' sed -i -e 's:/share/gocode:/share/go:' Makefile diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index c1321acb853e..3b8004305114 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -1,12 +1,32 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, - deepin-gettext-tools, go-dbus-factory, go-gir-generator, go-lib, - alsaLib, glib, gtk3, libcanberra, libgudev, librsvg, poppler, - pulseaudio, go, deepin }: + alsaLib, + bc, + blur-effect, + coreutils, + dbus-factory, + deepin, + deepin-gettext-tools, + fontconfig, + glib, + go, + go-dbus-factory, + go-gir-generator, + go-lib, + grub2, + gtk3, + libcanberra, + libgudev, + librsvg, + poppler, + pulseaudio, + rfkill, + xcur2png +}: buildGoPackage rec { name = "${pname}-${version}"; pname = "dde-api"; - version = "3.5.0"; + version = "3.18.1"; goPackagePath = "pkg.deepin.io/dde/api"; @@ -14,33 +34,62 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1g3s0i5wa6qyv00yksz4r4cy2vhiknq8v0yx7aribvwm3gxf7jw3"; + sha256 = "0y8v18f6l3ycysdn4qi7c93z805q7alji8wix4j4qh9x9r35d728"; }; goDeps = ./deps.nix; + outputs = [ "out" ]; + nativeBuildInputs = [ pkgconfig - deepin-gettext-tools - go-dbus-factory - go-gir-generator - go-lib + deepin-gettext-tools # build + dbus-factory # build + go-dbus-factory # needed + go-gir-generator # needed + go-lib # build + deepin.setupHook ]; buildInputs = [ - alsaLib - glib - gtk3 - libcanberra - libgudev - librsvg - poppler - pulseaudio - ]; + alsaLib # needed + bc # run (to adjust grub theme?) + blur-effect # run (is it really needed?) + coreutils # run (is it really needed?) + fontconfig # run (is it really needed?) + #glib # ? arch + grub2 # run (is it really needed?) + gtk3 # build run + libcanberra # build run + libgudev # needed + librsvg # build run + poppler # build run + pulseaudio # needed + rfkill # run + xcur2png # run + #locales # run (locale-helper needs locale-gen, which is unavailable on NixOS?) + ]; postPatch = '' - patchShebangs . - sed -i -e "s|/var|$bin/var|" Makefile + searchHardCodedPaths # debugging + + sed -i -e "s|/var|$out/var|" Makefile + + # TODO: confirm where to install grub themes + sed -i -e "s|/boot/grub|$out/boot/grub|" Makefile + + fixPath $out /usr/lib/deepin-api \ + lunar-calendar/main.go \ + misc/services/com.deepin.api.CursorHelper.service \ + misc/services/com.deepin.api.Graphic.service \ + misc/services/com.deepin.api.LunarCalendar.service \ + misc/services/com.deepin.api.Pinyin.service \ + misc/system-services/com.deepin.api.Device.service \ + misc/system-services/com.deepin.api.LocaleHelper.service \ + misc/system-services/com.deepin.api.SoundThemePlayer.service \ + misc/systemd/system/deepin-shutdown-sound.service \ + theme_thumb/gtk/gtk.go \ + thumbnails/gtk/gtk.go ''; buildPhase = '' @@ -48,10 +97,9 @@ buildGoPackage rec { ''; installPhase = '' - make install PREFIX="$bin" SYSTEMD_LIB_DIR="$bin/lib" -C go/src/${goPackagePath} - mkdir -p $out/share - mv $bin/share/gocode $out/share/go - remove-references-to -t ${go} $bin/bin/* $bin/lib/deepin-api/* + make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath} + mv $out/share/gocode $out/share/go + remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/* ''; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/pkgs/desktops/deepin/dde-api/deps.nix b/pkgs/desktops/deepin/dde-api/deps.nix index bd7a13043da2..03758f0d43e1 100644 --- a/pkgs/desktops/deepin/dde-api/deps.nix +++ b/pkgs/desktops/deepin/dde-api/deps.nix @@ -1,4 +1,4 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/alecthomas/template"; @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/disintegration/imaging"; - rev = "9458da53d1e65e098d48467a4317c403327e4424"; - sha256 = "1b0ma9if8s892qfx5b1vjinxn00ah9vsyxijs8knkilrhf5vqcx4"; + rev = "061e8a750a4db9667cdf9e2af7f4029ba506cb3b"; + sha256 = "13fkknwz2iby5rdzv9sgam6p27zdgxis3sxgyls9sdir5lbhjhm7"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/fogleman/gg"; - rev = "0e0ff3ade7039063fe954cc1b45fad6cd4ac80db"; - sha256 = "06gvsngfwizdxin90nldix5503fqgnwqmqvxzrz0xg5hfazwfra5"; + rev = "0403632d5b905943a1c2a5b2763aaecd568467ec"; + sha256 = "1nkldjghbqnzj2djfaxhiv35kk341xhcrj9m2dwq65v684iqkk8n"; }; } { @@ -59,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "03541136501cab4910ad8852fe749ef8e18907ca"; - sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp"; + rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561"; + sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "69cc3646b96e61de0b417f4815b86c36e65783ee"; - sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9"; + rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65"; + sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; - sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; + rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f"; + sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s"; }; } { diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix index 631471527f3a..0ef0da5c70b7 100644 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { qmake qttools deepin-gettext-tools + deepin.setupHook ]; buildInputs = [ @@ -27,11 +28,14 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs . + searchHardCodedPaths + patchShebangs translate_generation.sh + patchShebangs translate_desktop.sh + + fixPath $out /usr com.deepin.Calendar.service + sed -i translate_desktop.sh \ -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," - sed -i com.deepin.Calendar.service \ - -e "s,/usr,$out," ''; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index 3678694be9ee..954d0971c250 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -1,13 +1,15 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, dbus-factory, go-dbus-factory, go-gir-generator, go-lib, - deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl, - librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3, - python3Packages, hicolor-icon-theme, go, deepin }: + deepin-gettext-tools, dde-api, deepin-desktop-schemas, + deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3, + libgudev, libinput, libnl, librsvg, linux-pam, networkmanager, + pulseaudio, xorg, python3, hicolor-icon-theme, glibc, tzdata, go, + deepin, makeWrapper, wrapGAppsHook }: buildGoPackage rec { name = "${pname}-${version}"; pname = "dde-daemon"; - version = "3.6.0"; + version = "3.24.1"; goPackagePath = "pkg.deepin.io/dde/daemon"; @@ -15,15 +17,14 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0gn2zp34wg79lvzdfla6yb4gs3f9ll83kj765zvig1wpx51nq1aj"; + sha256 = "1qxj0mqnl10qj8qidpc1sv8gm4gj5965i07d003yxlxcw9cqwx7y"; }; patches = [ # https://github.com/linuxdeepin/dde-daemon/issues/51 (fetchpatch { - name = "dde-daemon_3.2.3.patch"; - url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.2.3.patch; - sha256 = "0a3xb15czpfl2vajpf7ycw37vr7fbw2png1a67mvjjkgx7d1k7dg"; + url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.8.0.patch; + sha256 = "1ampdsp9zlg263flswdw9gj10n7gxh7zi6w6z9jgh29xlai05pvh"; }) ]; @@ -38,46 +39,70 @@ buildGoPackage rec { go-gir-generator go-lib deepin-gettext-tools - dde-api linux-pam networkmanager networkmanager.dev - python3Packages.python + python3 + makeWrapper + wrapGAppsHook + deepin.setupHook ]; buildInputs = [ alsaLib + dde-api + deepin-desktop-base + deepin-desktop-schemas + deepin-wallpapers glib - gnome3.libgudev + libgudev gtk3 hicolor-icon-theme libinput libnl librsvg pulseaudio + tzdata ]; postPatch = '' - patchShebangs . + searchHardCodedPaths + patchShebangs network/nm_generator/gen_nm_consts.py - sed -i network/nm_generator/Makefile -e 's,/usr/share/gir-1.0/NM-1.0.gir,${networkmanager.dev}/share/gir-1.0/NM-1.0.gir,' + fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go + fixPath ${networkmanager.dev} /usr/share/gir-1.0/NM-1.0.gir network/nm_generator/Makefile + fixPath ${glibc.bin} /usr/bin/getconf systeminfo/utils.go + fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go + fixPath ${tzdata} /usr/share/zoneinfo timedate/zoneinfo/zone.go + fixPath ${dde-api} /usr/lib/deepin-api grub2/modify_manger.go accounts/image_blur.go + fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} + + + searchHardCodedPaths ''; buildPhase = '' - make -C go/src/${goPackagePath} # compilation of the nm module is failing #make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code + make -C go/src/${goPackagePath} ''; installPhase = '' make install PREFIX="$out" -C go/src/${goPackagePath} remove-references-to -t ${go} $out/lib/deepin-daemon/* + searchHardCodedPaths $out + ''; + + postFixup = '' + # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec + for binary in $out/lib/deepin-daemon/*; do + wrapProgram $binary "''${gappsWrapperArgs[@]}" + done ''; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix index 3d241baa3260..fab2f9f93b20 100644 --- a/pkgs/desktops/deepin/dde-daemon/deps.nix +++ b/pkgs/desktops/deepin/dde-daemon/deps.nix @@ -1,4 +1,4 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/alecthomas/template"; @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "03541136501cab4910ad8852fe749ef8e18907ca"; - sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp"; + rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561"; + sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl"; }; } { @@ -50,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/msteinert/pam"; - rev = "f4cd9f5e29232537a12db1678f48c702ad6896b7"; - sha256 = "1vjawxswy3f23v4d72kk95y3b557580670ai9ffvrwy6wy85qync"; + rev = "f29b9f28d6f9a1f6c4e6fd5db731999eb946574b"; + sha256 = "1v5z51mgyz2glm7v0mg60xs1as88wx6cqhys2khc5d3khkr8q0qp"; }; } { @@ -68,8 +68,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "69cc3646b96e61de0b417f4815b86c36e65783ee"; - sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9"; + rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65"; + sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; - sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; + rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f"; + sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2"; - sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj"; + rev = "e3703dcdd614d2d7488fff034c75c551ea25da95"; + sha256 = "1xh106aslp04vbzb4hc7cc5fyg2ljwny8fwfwsp5mpbqr9ixkikv"; }; } { @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/linuxdeepin/go-lib.git"; - rev = "b199d0dc96e979398ea3985334ccf9c20236d1a7"; - sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv"; + rev = "3558b2348565e983c7d4a57a0a21bbe716a55b83"; + sha256 = "0p9yrxa3x71n3jxffh03ahjgimdzvxzhny632k363lkha6glvbnc"; }; } ] diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix index f28d8f77b3c3..1d9c13c17bbc 100644 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, python, deepin }: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, python3, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dde-qt-dbus-factory"; - version = "1.0.5"; + version = "1.1.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0cz55hsbhy1ab1mndv0sp6xnqrhz2y66w7pcxy8v9k87ii32czf8"; + sha256 = "1b2i5m6fzkga72hbl85v2rng3qq53di39p7jj2f119wmlfbyp2vg"; }; nativeBuildInputs = [ qmake - python + python3 + deepin.setupHook ]; postPatch = '' - sed -i libdframeworkdbus/{DFrameworkdbusConfig.in,libdframeworkdbus.pro} \ - -e "s,/usr,$out," + searchHardCodedPaths + fixPath $out /usr \ + libdframeworkdbus/DFrameworkdbusConfig.in \ + libdframeworkdbus/libdframeworkdbus.pro ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index d3970cf87108..a61a0fdbb84e 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qtsvg, qttools, qtx11extras, xkeyboard_config, xorg, lightdm_qt, gsettings-qt, dde-qt-dbus-factory, deepin-gettext-tools, dtkcore, dtkwidget, - hicolor-icon-theme, deepin }: + deepin-desktop-schemas, deepin, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dde-session-ui"; - version = "4.6.2"; + version = "4.9.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1fxlrj7vv7nqllwpwc8mxiv9bfqcj9b2qwkpjaq326pfmg5p5lhq"; + sha256 = "1bh7wbkzikcnka94nzqzl87cs2m6bslrv9r2hdsvqqr3aaad5za3"; }; nativeBuildInputs = [ @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { qmake qttools deepin-gettext-tools + wrapGAppsHook + deepin.setupHook ]; buildInputs = [ @@ -35,10 +37,13 @@ stdenv.mkDerivation rec { xorg.libXtst xkeyboard_config hicolor-icon-theme + deepin-desktop-schemas ]; postPatch = '' - patchShebangs . + searchHardCodedPaths + patchShebangs translate_generation.sh + patchShebangs translate_desktop.sh sed -i translate_desktop.sh -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," find -type f -exec sed -i -e "s,path = /etc,path = $out/etc," {} + find -type f -exec sed -i -e "s,path = /usr,path = $out," {} + diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix index 80a368c5be99..b5e75c217b1e 100644 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -3,34 +3,40 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-desktop-base"; - version = "2018.10.29"; + version = "2019.03.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0l2zb7rpag2q36lqsgvirhjgmj7w243nsi1rywkypf2xm7g2v235"; + sha256 = "1d016h95nsn5yay9f4c13hixfxj0q01hpxwj2x84i6qpx63dxdwq"; }; + nativeBuildInputs = [ deepin.setupHook ]; + buildInputs = [ deepin-wallpapers ]; + # TODO: Fedora recommended dependencies: + # deepin-wallpapers + # plymouth-theme-deepin + postPatch = '' - sed -i Makefile -e "s:/usr:$out:" -e "s:/etc:$out/etc:" + searchHardCodedPaths + + fixPath $out /etc Makefile + fixPath $out /usr Makefile + + # Remove Deepin distro's lsb-release + # Don't override systemd timeouts + # Remove apt-specific templates + echo ---------------------------------------------------------------- + echo grep --color=always -E 'lsb-release|systemd|python-apt|backgrounds' Makefile + grep --color=always -E 'lsb-release|systemd|python-apt|backgrounds' Makefile + echo ---------------------------------------------------------------- + sed -i -E '/lsb-release|systemd|python-apt|backgrounds/d' Makefile ''; postInstall = '' - # Remove Deepin distro's lsb-release - rm $out/etc/lsb-release - - # Don't override systemd timeouts - rm -r $out/etc/systemd - - # Remove apt-specific templates - rm -r $out/share/python-apt - - # Remove empty backgrounds directory - rm -r $out/share/backgrounds - # Make a symlink for deepin-version ln -s ../lib/deepin/desktop-version $out/etc/deepin-version ''; @@ -39,6 +45,14 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Base assets and definitions for Deepin Desktop Environment"; + # TODO: revise + longDescription = '' + This package provides some components for Deepin desktop environment. + - deepin logo + - deepin desktop version + - login screen background image + - language information + ''; homepage = https://github.com/linuxdeepin/deepin-desktop-base; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index d2b70ec4a896..f0a3d711a1d7 100644 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchFromGitHub, python, deepin-gtk-theme, - deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, gnome3, - deepin }: +{ stdenv, fetchFromGitHub, python3, gnome3, glib, deepin-gtk-theme, + deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-desktop-schemas"; - version = "3.4.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "10x0rh9z925yzyp8h0vgmg4313smvran06lvr12c3931qkmkzwgq"; + sha256 = "0bamjcpmsl8xhw3ksgl11wv5xwcdhrkl1namikfzc4an03sk1rdq"; }; nativeBuildInputs = [ - python + python3 + glib.dev + deepin.setupHook ]; buildInputs = [ @@ -27,12 +28,34 @@ stdenv.mkDerivation rec { ]; postPatch = '' + searchHardCodedPaths + # fix default background url - sed -i '/picture-uri/s|/usr/share/backgrounds/default_background.jpg|$out/share/backgrounds/deepin/default.png|' \ + sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \ overrides/common/com.deepin.wrap.gnome.desktop.override + + fixPath ${deepin-wallpapers} /usr/share/backgrounds \ + overrides/common/com.deepin.wrap.gnome.desktop.override + + fixPath ${deepin-wallpapers} /usr/share/wallpapers/deepin \ + schemas/com.deepin.dde.appearance.gschema.xml + + # still hardcoded paths: + # /etc/gnome-settings-daemon/xrandr/monitors.xml ? gnome3.gnome-settings-daemon + # /usr/share/backgrounds/gnome/adwaita-lock.jpg ? gnome3.gnome-backgrounds + # /usr/share/backgrounds/gnome/adwaita-timed.xml gnome3.gnome-backgrounds + # /usr/share/desktop-directories ''; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; + + doCheck = true; + checkTarget = "test"; + + postInstall = '' + glib-compile-schemas --strict $out/share/glib-2.0/schemas + searchHardCodedPaths $out + ''; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index 779fae6a113e..d9a6f3701688 100644 --- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { python3Packages.python ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; postPatch = '' sed -e 's/sudo cp/cp/' -i src/generate_mo.py diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index 8d11ca8bf42a..e0657752d102 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index ef4574206019..3b6b61c1ae76 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -1,29 +1,39 @@ -{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme, deepin }: +{ stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-icon-theme"; - version = "15.12.64"; + version = "15.12.68"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0z1yrp6yg2hb67azrbd9ac743jjh83vxdf2j0mmv2lfpd4fqw8qc"; + sha256 = "12jgz81s5qggmnkfg9m5f799r10p43qmh4zqxl1kjvlrqgvsc9rf"; }; - nativeBuildInputs = [ gtk3 papirus-icon-theme ]; + nativeBuildInputs = [ gtk3 xcursorgen ]; + + buildInputs = [ papirus-icon-theme ]; postPatch = '' - patchShebangs . - - # install in $out - sed -i -e "s|/usr|$out|g" Makefile tools/hicolor.links + patchShebangs tools/hicolor.links + patchShebangs tools/display_unused_links.sh + patchShebangs cursors-src/cursors/bitmaps/make.sh + patchShebangs cursors-src/render-cursors.sh # keep icon-theme.cache sed -i -e 's|\(-rm -f .*/icon-theme.cache\)|# \1|g' Makefile ''; + buildTargets = "all hicolor-links"; + installTargets = "install-icons install-cursors"; + installFlags = [ "PREFIX=${placeholder ''out''}" ]; + + postInstall = '' + cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/ + ''; + passthru.updateScript = deepin.updateScript { inherit name; }; meta = with stdenv.lib; { diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index 0b08f7cd39a0..7e2840f0f3f2 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -6,19 +6,20 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-image-viewer"; - version = "1.3.1"; + version = "1.3.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0dxdvm6hzj6izfxka35za8y7vacd06nksfgzx6xsv7ywzagri4k5"; + sha256 = "0paanw9sd67ic9yrbzqhrwi4bf4lpvsk16jynx99n76j3jgyijkk"; }; nativeBuildInputs = [ pkgconfig qmake qttools + deepin.setupHook ]; buildInputs = [ @@ -33,12 +34,12 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs . + searchHardCodedPaths + patchShebangs viewer/generate_translations.sh + fixPath $out /usr viewer/com.deepin.ImageViewer.service sed -i qimage-plugins/freeimage/freeimage.pro \ qimage-plugins/libraw/libraw.pro \ -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," - sed -i viewer/com.deepin.ImageViewer.service \ - -e "s,/usr,$out," ''; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index 645abfedad71..5de292805b65 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig qmake + deepin.setupHook ]; buildInputs = [ @@ -25,7 +26,11 @@ stdenv.mkDerivation rec { ]; postPatch = '' - sed -i deepin-menu.pro -e "s,/usr,$out," + searchHardCodedPaths + fixPath $out /usr \ + data/com.deepin.menu.service \ + deepin-menu.desktop \ + deepin-menu.pro ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix index 78b6303188a2..fdf2c240e2c8 100644 --- a/pkgs/desktops/deepin/deepin-metacity/default.nix +++ b/pkgs/desktops/deepin/deepin-metacity/default.nix @@ -1,31 +1,32 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf, - json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification, - deepin-wallpapers, deepin-desktop-schemas, deepin }: +{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, glib, + gtk3, libgtop, bamf, json-glib, libcanberra-gtk3, libxkbcommon, + libstartup_notification, deepin-wallpapers, deepin-desktop-schemas, + deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-metacity"; - version = "3.22.22"; + version = "3.22.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0gr10dv8vphla6z7zqiyyg3n3ag4rrlz43c4kr7fd5xwx2bfvp3d"; + sha256 = "1im0wz1zlxiag4kpp5d4hv0aa0ybr4bizarr3903hrqv0lp46hyx"; }; nativeBuildInputs = [ pkgconfig intltool libtool + glib.dev gnome3.gnome-common - gnome3.glib.dev ]; buildInputs = [ gnome3.dconf - gnome3.gtk - gnome3.libgtop + gtk3 + libgtop gnome3.zenity bamf json-glib @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { -e 's;/usr/share/backgrounds/default_background.jpg;${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg;' ''; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; configureFlags = [ "--disable-themes-documentation" ]; diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index 3d195f8f1c0c..8a675ca1169e 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-movie-reborn"; - version = "3.2.14"; + version = "3.2.21"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1i9sdg2p6qp57rqzrnjbxnqj3mg1qggzyq3yykw271vs8h85a707"; + sha256 = "09a4sirbdxnrwj9ww2v7b1s9ylsincqzpqm2zisny9zxy22fm8s9"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix index be845d3c6bac..fc26440a3ef1 100644 --- a/pkgs/desktops/deepin/deepin-mutter/default.nix +++ b/pkgs/desktops/deepin/deepin-mutter/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg, - libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon, - libstartup_notification, libinput, cogl, clutter, systemd, deepin }: +{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, + xorg, libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon, + libstartup_notification, libinput, libgudev, cogl, clutter, systemd, + gsettings-desktop-schemas, deepin-desktop-schemas, wrapGAppsHook, + deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-mutter"; - version = "3.20.35"; + version = "3.20.38"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0mwk06kgw8qp8rg1j6px1zlya4x5rr9llax0qks59j56b3m9yim7"; + sha256 = "1aq7606sgn2c6n8wfgxdryw3lprc4va0zjc0r65798w5656fdi31"; }; nativeBuildInputs = [ @@ -19,27 +21,32 @@ stdenv.mkDerivation rec { intltool libtool gnome3.gnome-common + wrapGAppsHook + deepin.setupHook ]; buildInputs = [ - gnome3.gtk - gnome3.gnome-desktop - gnome3.gsettings-desktop-schemas - gnome3.libgudev - gnome3.zenity - upower - xorg.libxkbfile - libxkbcommon - libcanberra-gtk3 - libstartup_notification - libinput - xkeyboard_config - cogl clutter + cogl + deepin-desktop-schemas + gnome3.gnome-desktop + gnome3.zenity + gsettings-desktop-schemas + gtk3 + libcanberra-gtk3 + libgudev + libinput + libstartup_notification + libxkbcommon systemd + upower + xkeyboard_config + xorg.libxkbfile ]; - enableParallelBuilding = true; + postPatch = '' + searchHardCodedPaths + ''; configureFlags = [ "--enable-native-backend" @@ -50,6 +57,8 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 ./autogen.sh ''; + enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; meta = with stdenv.lib; { diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix index bb004372497f..bb752cc1ca90 100644 --- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9"; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 70e15441436d..74337974acca 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, ninja, vala, - gettext, gobject-introspection, at-spi2-core, dbus, epoxy, expect, - gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg, - libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, - deepin-menu, deepin-shortcut-viewer, deepin }: + gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib, + libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1, + libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, + libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-terminal"; - version = "3.0.10.2"; + version = "3.2.1.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-terminal"; rev = version; - sha256 = "0ylhp8q9kfdq9l69drawjaf0q8vcqyflb2a3zfnwbnf06dlpvkz6"; + sha256 = "0dj386csbiw0yqz9nj6ij0s4d0ak9lpq2bmsfs17bjkgdp0ayp90"; }; nativeBuildInputs = [ @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { ninja vala gettext - gobject-introspection # For setup hook + libselinux libsepol utillinux # required by gio + deepin.setupHook ]; buildInputs = [ @@ -49,15 +50,19 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs . + searchHardCodedPaths ''; - enableParallelBuilding = true; + cmakeFlags = [ + "-DTEST_BUILD=OFF" + "-DUSE_VENDOR_LIB=OFF" + "-DVERSION=${version}" + ]; passthru.updateScript = deepin.updateScript { inherit name; }; meta = with stdenv.lib; { - description = "The default terminal emulation for Deepin"; + description = "Default terminal emulator for Deepin"; longDescription = '' Deepin terminal, it sharpens your focus in the world of command line! It is an advanced terminal emulator with workspace, multiple diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix index 8f04bd482184..f99974ba9c26 100644 --- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix @@ -3,19 +3,21 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-wallpapers"; - version = "1.7.5"; + version = "1.7.7"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-wallpapers"; rev = version; - sha256 = "0mfjkh81ci0gjwmgycrh32by7v9b73nyvyjbqd29ccpb8bpyyakn"; + sha256 = "09cfnxbpms98ibqbi4xd51181q3az5n8rmndcdr9w12kyzniz7xv"; }; - nativeBuildInputs = [ dde-api.bin ]; + nativeBuildInputs = [ dde-api deepin.setupHook ]; postPatch = '' - sed -i -e "s:/usr/lib/deepin-api:${dde-api.bin}/lib/deepin-api:" Makefile + searchHardCodedPaths # debugging + + sed -i -e "s:/usr/lib/deepin-api:${dde-api}/lib/deepin-api:" Makefile sed -i -e "s:/usr/share/wallpapers:$out/share/wallpapers:" Makefile ''; diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix index ea2f06aae607..d1ae0557aaa7 100644 --- a/pkgs/desktops/deepin/deepin-wm/default.nix +++ b/pkgs/desktops/deepin/deepin-wm/default.nix @@ -1,49 +1,55 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3, - bamf, clutter-gtk, pantheon, libcanberra-gtk3, libwnck3, - deepin-mutter, deepin-wallpapers, deepin-desktop-schemas, - hicolor-icon-theme, deepin }: + bamf, clutter-gtk, pantheon, libgee, libcanberra-gtk3, libwnck3, + deepin-menu, deepin-mutter, deepin-wallpapers, + deepin-desktop-schemas, wrapGAppsHook, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-wm"; - version = "1.9.34"; + version = "1.9.37"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "13hydcalifdc6723k8l4pk905y9sxic5x1fqww0fyx7j6b3hm13f"; + sha256 = "1xd2x0kyav2cxnk0bybl7lrmak1r2468slxz5a6anrdriw9l10gi"; }; nativeBuildInputs = [ pkgconfig intltool libtool - gnome3.gnome-common vala + gnome3.gnome-common + wrapGAppsHook + deepin.setupHook ]; buildInputs = [ - gnome3.gnome-desktop - gnome3.libgee bamf clutter-gtk - pantheon.granite - libcanberra-gtk3 - libwnck3 + deepin-desktop-schemas + deepin-menu deepin-mutter deepin-wallpapers - deepin-desktop-schemas - hicolor-icon-theme + gnome3.gnome-desktop + libcanberra-gtk3 + libgee + libwnck3 + pantheon.granite ]; postPatch = '' - sed -i src/Background/BackgroundSource.vala \ - -e 's;/usr/share/backgrounds/default_background.jpg;${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg;' + searchHardCodedPaths + fixPath ${deepin-wallpapers} /usr/share/backgrounds src/Background/BackgroundSource.vala + # fix background path + sed -i 's|default_background.jpg|deepin/desktop.jpg|' src/Background/BackgroundSource.vala ''; + NIX_CFLAGS_COMPILE = "-DWNCK_I_KNOW_THIS_IS_UNSTABLE"; + preConfigure = '' - ./autogen.sh + NOCONFIGURE=1 ./autogen.sh ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 4fe787bc5d4b..9b8219728c77 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -2,6 +2,8 @@ let packages = self: with self; { + setupHook = ./setup-hook.sh; + updateScript = callPackage ./update.nix { }; dbus-factory = callPackage ./dbus-factory { }; @@ -23,7 +25,6 @@ let deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; deepin-sound-theme = callPackage ./deepin-sound-theme { }; deepin-terminal = callPackage ./deepin-terminal { - inherit (pkgs.gnome3) libgee; wnck = pkgs.libwnck3; }; deepin-wallpapers = callPackage ./deepin-wallpapers { }; diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 9904c58128f5..4081a40a96e2 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkcore"; - version = "2.0.9.8"; + version = "2.0.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "06jj5gpy2qbmc21nf0fnbvgw7nbjjgvzx7m2vg9byw5il8l4g22h"; + sha256 = "0dwpq6c38gaa95mgjnwj3vjz57n0cz6jfk950xi6s9ww2f4g6kq7"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index b61f31e40ee9..b55a5fbc9fe9 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkwidget"; - version = "2.0.9.10"; + version = "2.0.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0757dzy82bfv97b1gzkwa9zx3jzfbap20v3r1h7lkfcfw95410iw"; + sha256 = "11a7yirfkcj3rq7va9av4m1pr22mq1yx1j9k18xrqv36n0rlbrr6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix index 01d504eda896..ad2926fa403f 100644 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-dbus-factory"; - version = "0.0.7.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0gj2xxv45gh7wr5ry3mcsi46kdsyq9nbd7znssn34kapiv40ixcx"; + sha256 = "1i1ymi2qpcbf4d6rnfzrbq5n2vwnn8dvbq9xlw7jls3jpr3d5r00"; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; postPatch = '' sed -i -e 's:/share/gocode:/share/go:' Makefile diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix index 28873d8459ec..92cf3960c736 100644 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "PREFIX=$(out)" - "GOCACHE=off" + "PREFIX=${placeholder ''out''}" + "GOCACHE=$(TMPDIR)/go-cache" ]; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix index d33837b21c31..03c906585e3d 100644 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -4,23 +4,15 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-gir-generator"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0grp4ffy3vmlknzmymnxq1spwshff2ylqsw82pj4y2v2fcvnqfvb"; + sha256 = "0d93qzp3dlia5d1yxw0rwca76qk3jyamj9xzmk13vzig8zw0jx16"; }; - patches = [ - # fix: dde-api build error with gobject-introspection 1.58+ - (fetchurl { - url = https://github.com/linuxdeepin/go-gir-generator/commit/a7ab229201e28d1be727f5021b3588fa4a1acf5f.patch; - sha256 = "13ywalwkjg8wwvd0pvmc2rv1h38airyvimdn9jfb5wis9xm48401"; - }) - ]; - nativeBuildInputs = [ pkgconfig go @@ -36,8 +28,8 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "PREFIX=$(out)" - "GOCACHE=off" + "PREFIX=${placeholder ''out''}" + "GOCACHE=$(TMPDIR)/go-cache" ]; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index 684f1dd7f32d..41315c440901 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-lib"; - version = "1.3.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv"; + sha256 = "090l33y79gdj2xy1bhk2ksl6hvmsfhmx0bhygm4y4d0iqckf2x2m"; }; buildInputs = [ @@ -21,10 +21,12 @@ stdenv.mkDerivation rec { mobile-broadband-provider-info ]; - makeFlags = [ - "PREFIX=$(out)" - "GOSITE_DIR=$(out)/share/go" - ]; + installPhase = '' + mkdir -p $out/share/go/src/pkg.deepin.io/lib + cp -a * $out/share/go/src/pkg.deepin.io/lib + + rm -r $out/share/go/src/pkg.deepin.io/lib/debian + ''; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index c4ce0ca563bd..7d2c89165087 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qt5dxcb-plugin"; - version = "1.1.13"; + version = "1.1.25"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "12lvh3agw3qdviqf32brmzba5kscnj5al5jhc08lq69a9kmip05x"; + sha256 = "1nadmj1hdpw4n3kpk3dlx22bmxdli66abhjl73hwrbvszmmcm9vp"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index 809156377225..634bac5cf97d 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qt5integration"; - version = "0.3.6"; + version = "0.3.8"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1v9whlqn07c5c8xnaiicdshj9n88a667gfbn8y8bk5bfylilfzcy"; + sha256 = "12d6iv2x0q2n73rscma30q31nh7h26gmhlf665gkgl2j825hlx5n"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/setup-hook.sh b/pkgs/desktops/deepin/setup-hook.sh new file mode 100755 index 000000000000..15fe5be1538d --- /dev/null +++ b/pkgs/desktops/deepin/setup-hook.sh @@ -0,0 +1,53 @@ +# Helper functions for deepin packaging + +searchHardCodedPaths() { + # looks for ocurrences of hard coded paths in given (current) + # directory and command invocations for the purpose of debugging a + # derivation + + local dir=$1 + + echo ----------- looking for command invocations + grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $dir || true + + echo ----------- looking for hard coded paths + grep --color=always -r -E '/(usr|bin|sbin|etc|var|opt)\>' $dir || true + + echo ----------- done +} + +fixPath() { + # Usage: + # + # fixPath + # + # replaces occurences of by in + # removing /usr from the start of if present + + local parentdir=$1 + local path=$2 + local newpath=$parentdir$(echo $path | sed "s,^/usr,,") + local files=("${@:3}") + echo ======= grep --color=always "${path}" "${files[@]}" + grep --color=always "${path}" "${files[@]}" + echo +++++++ sed -i -e "s,$path,$newpath,g" "${files[@]}" + sed -i -e "s,$path,$newpath,g" "${files[@]}" +} + +searchForUnresolvedDLL() { + # Usage: + # + # searchForUnresolvedDLL + # + # looks in for executables with unresolved dynamic library paths + + local dir="$1" + echo ======= Looking for executables with unresolved dynamic library dependencies + echo $dir + for f in $(find -L "$dir" -type f -executable); do + if (ldd $f | grep -q "not found"); then + echo $f + ldd $f | grep --color=always "not found" + fi + done +} diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 5de7d93f49c6..4815103893f0 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libxml2 python3Packages.python python3Packages.pyatspi python3Packages.pygobject3 python3Packages.ipython - at-spi2-core dbus libwnck3 gnome3.defaultIconTheme + at-spi2-core dbus libwnck3 gnome3.adwaita-icon-theme ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 310f8ccb63b9..fa406e6f4dbb 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -1,5 +1,7 @@ { stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight -, pkgconfig, gtk3, glib, libnotify, gtkspell3 +, pkgconfig, gtk3, glib, libnotify, gtkspell3, evolution-data-server +, adwaita-icon-theme, gnome-desktop, libgdata +, libgweather, glib-networking, gsettings-desktop-schemas , wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: @@ -14,17 +16,17 @@ in stdenv.mkDerivation rec { sha256 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h"; }; - propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; + propagatedUserEnvPkgs = [ evolution-data-server ]; buildInputs = [ - gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu - gnome3.evolution-data-server libsecret libical gcr - webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3 - libcanberra-gtk3 bogofilter gnome3.libgdata sqlite + gtk3 glib gdk_pixbuf adwaita-icon-theme librsvg db icu + evolution-data-server libsecret libical gcr + webkitgtk shared-mime-info gnome-desktop gtkspell3 + libcanberra-gtk3 bogofilter 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 - gnome3.glib-networking openldap + nss nspr libnotify procps highlight libgweather + gsettings-desktop-schemas + glib-networking openldap ]; nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index fe307bca797b..5ee26eba6b7d 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive +{ stdenv, fetchurl, glib, gtk3, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; - buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ]; + buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ]; PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 61eda9421945..8310f426be6c 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -1,5 +1,6 @@ { stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib +, pkgconfig, gtk3, glib, adwaita-icon-theme +, libpeas, gtksourceview, gsettings-desktop-schemas , wrapGAppsHook, itstool, libsoup, libxml2 , gnome3, gspell }: @@ -16,9 +17,9 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib - gnome3.defaultIconTheme libsoup - gnome3.libpeas gnome3.gtksourceview - gnome3.gsettings-desktop-schemas gspell + adwaita-icon-theme libsoup + libpeas gtksourceview + gsettings-desktop-schemas gspell ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index d9f1e7850afd..388808b7d646 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, +{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -10,13 +10,16 @@ stdenv.mkDerivation rec { sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "ghex"; attrPath = "gnome3.ghex"; }; - }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtk intltool itstool libxml2 ]; + buildInputs = [ gtk3 intltool itstool libxml2 ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "ghex"; + attrPath = "gnome3.ghex"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Ghex; diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 39e0f2ba23e1..9adffc7922c2 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib libxml2 python3 python3.pkgs.pygobject3 gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme + gdk_pixbuf gnome3.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 357cd42d66bd..216902872457 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { libvirt-glib glib gtk3 gtk-vnc freerdp libxml2 libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive - gnome3.defaultIconTheme librsvg acl libgudev libsecret + gnome3.adwaita-icon-theme librsvg acl libgudev libsecret libcap_ng numactl xen libapparmor ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 8cc8712a15de..9b48e3231911 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3 -, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup +, gettext, libxml2, gnome3, gtk3, evolution-data-server, libsoup , glib, gnome-online-accounts, gsettings-desktop-schemas }: let @@ -22,8 +22,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ]; buildInputs = [ - gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib - gsettings-desktop-schemas gnome3.defaultIconTheme + gtk3 evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib + gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 047f9bc22102..101b9f4a62ec 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3 -, gobject-introspection, gjs, libunistring }: +, gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }: stdenv.mkDerivation rec { name = "gnome-characters-${version}"; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ]; buildInputs = [ - glib gtk3 gjs pango gnome3.gsettings-desktop-schemas - gnome3.defaultIconTheme libunistring + glib gtk3 gjs pango gsettings-desktop-schemas + adwaita-icon-theme libunistring # typelib - gnome3.gnome-desktop + gnome-desktop ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 30323cf62f53..c614dc6486c8 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils , vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop +, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, geocode-glib , gnome3, gdk_pixbuf, geoclue2, libgweather }: stdenv.mkDerivation rec { @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { gobject-introspection # for finding vapi files ]; buildInputs = [ - gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme - gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound + gtk3 glib gsettings-desktop-schemas gdk_pixbuf adwaita-icon-theme + gnome-desktop geocode-glib geoclue2 libgweather gsound ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index d2792304016f..186f3a14d271 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme evince + gdk_pixbuf gnome3.adwaita-icon-theme evince libsoup webkitgtk gjs gobject-introspection tracker tracker-miners libgdata gnome-desktop libzapojit libgepub diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index c6140a53fd9b..89f4cc01e50c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils libxml2 libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 2f7e5bbe8071..d7df923339a9 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { geocode-glib libchamplain libsoup gdk_pixbuf librsvg libgweather gnome3.gsettings-desktop-schemas evolution-data-server - gnome-online-accounts gnome3.defaultIconTheme + gnome-online-accounts gnome3.adwaita-icon-theme webkitgtk ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 3edf1f5dd402..98d3cfb55398 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -17,8 +17,8 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = with gst_all_1; [ - gtk3 glib libmediaart gnome-online-accounts - gdk_pixbuf gnome3.defaultIconTheme python3 + gtk3 glib libmediaart gnome-online-accounts gobject-introspection + gdk_pixbuf gnome3.adwaita-icon-theme python3 grilo grilo-plugins libnotify libdazzle libsoup gnome3.gsettings-desktop-schemas tracker gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index dcee87dc799c..9bc71bb43389 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook libgtop intltool itstool libxml2 - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; propagatedUserEnvPkgs = [ nmap inetutils ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index e39ce00fd658..78c39651ad6b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { gnome3.gnome-online-accounts zeitgeist gnome3.gsettings-desktop-schemas evolution-data-server - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 508b8af3f4f7..8c0c216965d1 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { buildInputs = [ gtk3 glib gegl babl libgdata libdazzle gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme + gdk_pixbuf gnome3.adwaita-icon-theme gfbgraph grilo-plugins grilo gnome-online-accounts tracker gexiv2 geocode-glib dleyna-renderer diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index 3f8ce7f4a51a..2d9c313e641d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { gtk3 glib upower - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index 37b48a744822..23b671ebfc09 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook -, gettext, gnome3, glib, gtk, libpeas +, gettext, gnome3, glib, gtk3, libpeas , gnome-online-accounts, gsettings-desktop-schemas -, evolution-data-server, libxml2, libsoup, libical, rest, json-glib }: +, evolution-data-server, libxml2, libsoup, libical, librest, json-glib }: let pname = "gnome-todo"; @@ -18,11 +18,11 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig gettext python3 wrapGAppsHook ]; buildInputs = [ - glib gtk libpeas gnome-online-accounts - gsettings-desktop-schemas gnome3.defaultIconTheme + glib gtk3 libpeas gnome-online-accounts + gsettings-desktop-schemas gnome3.adwaita-icon-theme # Plug-ins evolution-data-server libxml2 libsoup libical - rest json-glib + librest json-glib ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 6a827b7f0e3c..5ae279f57f04 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ gtk3 gjs gobject-introspection gnome-desktop - libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas + libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas ]; # The .service file isn't wrapped with the correct environment diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 9ef2b57e6d14..84f7b519d1e2 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib gcr gnome3.gsettings-desktop-schemas gnupg - gnome3.defaultIconTheme gpgme + gnome3.adwaita-icon-theme gpgme libsecret avahi libsoup p11-kit openssh openldap ]; diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index 00037f526b64..ae360d73b879 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ - gtk3 vte libxml2 gtk-vnc libsecret gnome3.defaultIconTheme librsvg + gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg ]; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 4fa40a6c1b08..b091395ab37b 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 -, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor-icon-theme }: +, iconnamingutils, gtk3, gdk_pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "adwaita-icon-theme-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdk_pixbuf librsvg ]; - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; + nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ]; # remove a tree of dirs with no files within postInstall = '' rm -rf "$out/locale" ''; diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index c29e3ff5200d..cf73524a0ca2 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ gtk3 glib gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index fe2b50f296a4..bad06bae4054 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook -, wrapGAppsHook }: +, wrapGAppsHook, libgee }: let pname = "caribou"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { libXtst gtk2 ]; - propagatedBuildInputs = [ gnome3.libgee libxklavier ]; + propagatedBuildInputs = [ libgee libxklavier ]; postPatch = '' patchShebangs . diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 9c1d7d7d1a98..1f55071c83d7 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3 -, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }: +, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42, fetchpatch }: let pname = "dconf"; @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { sha256 = "1dq2dn7qmxr4fxzx9wnag89ck24gxq17p2n4gl81h4w8qdy3m6jl"; }; + patches = [ + # Fix the build on Darwin + # Issue: https://gitlab.gnome.org/GNOME/dconf/issues/47 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/dconf/commit/49f4d916e1151af3975df52c522c69de98ed2fbb.patch"; + sha256 = "00klkr1jzli9ap0aj6399m1bj2bxxz48pmcj4r16dsy6dfdl6325"; + }) + ]; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 1a4ef2a1cf41..19f2783be3d3 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gcr libsecret libpulseaudio gdk_pixbuf libnotify clutter libsoup gnutls libgee p11-kit libcanberra-gtk3 telepathy-farstream farstream - gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas librsvg # Spell-checking enchant isocodes diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index c8ca0016d57d..37cdce40f340 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu +{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk3, glib, icu , wrapGAppsHook, gnome3, libxml2, libxslt, itstool , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit , sqlite, gcr, isocodes, desktop-file-utils, python3 @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify + gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify sqlite isocodes p11-kit icu - gdk_pixbuf gnome3.defaultIconTheme gcr + gdk_pixbuf gnome3.adwaita-icon-theme gcr glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav json-glib libdazzle diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 94d39964bc48..27418f0a971c 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,7 +1,8 @@ -{ fetchurl, stdenv, pkgconfig, intltool, libxml2 +{ fetchurl, fetchpatch, stdenv, pkgconfig, intltool, libxml2 , glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3 , poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook -, librsvg, gobject-introspection, yelp-tools, gspell +, librsvg, gobject-introspection, yelp-tools, gspell, adwaita-icon-theme, gsettings-desktop-schemas +, libgxps , recentListSize ? null # 5 is not enough, allow passing a different number , supportXPS ? false # Open XML Paper Specification via libgxps , autoreconfHook, pruneLibtoolFiles @@ -16,6 +17,15 @@ stdenv.mkDerivation rec { sha256 = "0k7jln6dpg4bpv61niicjzkzyq6fhb3yfld7pc8ck71c8pmvsnx9"; }; + + patches = [ + (fetchpatch { + name = "CVE-2019-11459.patch"; + url = "https://gitlab.gnome.org/GNOME/evince/commit/3e38d5ad724a042eebadcba8c2d57b0f48b7a8c7.patch"; + sha256 = "1ds6iwr2r9i86nwrly8cx7p1kbvf1gljjplcffa67znxqmwx4n74"; + }) + ]; + passthru = { updateScript = gnome3.updateScript { packageName = "evince"; }; }; @@ -26,18 +36,19 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 pango atk gdk_pixbuf libxml2 - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas poppler ghostscriptX djvulibre libspectre libarchive - libsecret librsvg gnome3.adwaita-icon-theme gspell - ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; + libsecret librsvg adwaita-icon-theme gspell + ] ++ stdenv.lib.optional supportXPS libgxps; configureFlags = [ "--disable-nautilus" # Do not build nautilus plugin + "--enable-ps" "--enable-introspection" (if supportXPS then "--enable-xps" else "--disable-xps") ]; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; preConfigure = stdenv.lib.optionalString (recentListSize != null) '' sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index a27bc2cc9ae5..806c3f32d2b1 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre -, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: +, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib +, glib, gtk3, gnome-online-accounts, libgweather, libgdata }: stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; @@ -25,8 +26,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala ]; - buildInputs = with gnome3; [ - glib libsoup libxml2 gtk gnome-online-accounts + buildInputs = [ + glib libsoup libxml2 gtk3 gnome-online-accounts gcr p11-kit libgweather libgdata libaccounts-glib json-glib icu sqlite kerberos openldap webkitgtk glib-networking libcanberra-gtk3 pcre diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 135200ee3c4f..c985d01a5e66 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg , accountsservice, libX11, gnome3, systemd, autoreconfHook -, gtk, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth +, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth , librsvg, coreutils, xwayland, fetchpatch }: stdenv.mkDerivation rec { name = "gdm-${version}"; - version = "3.30.2"; + version = "3.30.3"; src = fetchurl { url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1handy65r1n0zby09jr492b3643wszzigdkxp7q2ypgxb3hyv45y"; + sha256 = "15f7lz7z75krgbq8vb800afj96h8mw2fpy1s28za2911x5vgq0ak"; }; # Only needed to make it build @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool gnome3.dconf ]; buildInputs = [ glib accountsservice systemd - gobject-introspection libX11 gtk + gobject-introspection libX11 gtk3 libcanberra-gtk3 pam plymouth librsvg ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index b065025327ff..e09d0b4e6f93 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3 - gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 4a37599b136d..037509b9c548 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib libxml2 gtksourceview3 mpfr gmp - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas libsoup libmpc ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index a7347f74ca4b..253bbc4e1967 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas folks gnome-desktop telepathy-glib libxml2 gnome-online-accounts cheese - gnome3.defaultIconTheme libchamplain clutter-gtk geocode-glib + gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 58afc0ab85d0..2dd076e4adeb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -5,17 +5,20 @@ , cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc , libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd , docbook_xsl, modemmanager, clutter, clutter-gtk, cheese, gnome-session -, fontconfig, sound-theme-freedesktop, grilo, python3 }: +, fontconfig, sound-theme-freedesktop, grilo, python3 +, gtk3, glib, glib-networking, gsettings-desktop-schemas +, gnome-desktop, gnome-settings-daemon, gnome-online-accounts +, vino, gnome-bluetooth, tracker, adwaita-icon-theme, mutter, cups }: let pname = "gnome-control-center"; - version = "3.30.2"; + version = "3.30.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0rn4r0ng4pd9smpay4rf4dkcl09b2ipr9srryybhd1srmd02ps51"; + sha256 = "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r"; }; nativeBuildInputs = [ @@ -23,21 +26,24 @@ in stdenv.mkDerivation rec { shared-mime-info python3 ]; - buildInputs = with gnome3; [ - ibus gtk glib glib-networking upower gsettings-desktop-schemas + buildInputs = [ + ibus gtk3 glib glib-networking upower gsettings-desktop-schemas libxml2 gnome-desktop gnome-settings-daemon polkit libgtop gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify grilo libpwquality cracklib vino libcanberra-gtk3 libgudev libsecret - gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk cheese + gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese networkmanager modemmanager gnome-bluetooth tracker + mutter # schemas for the keybindings ]; patches = [ (substituteAll { src = ./paths.patch; gcm = gnome-color-manager; + gnome_desktop = gnome-desktop; inherit glibc libgnomekbd tzdata; + inherit cups networkmanagerapplet; }) ]; @@ -56,6 +62,8 @@ in stdenv.mkDerivation rec { # Thumbnailers (for setting user profile pictures) --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" + # WM keyboard shortcuts + --prefix XDG_DATA_DIRS : "${mutter}/share" ) for i in $out/share/applications/*; do substituteInPlace $i --replace "Exec=gnome-control-center" "Exec=$out/bin/gnome-control-center" diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch index 0c11a7626e40..14625e33c788 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch @@ -1,6 +1,8 @@ +diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c +index ee26cfed9..10bd061f9 100644 --- a/panels/color/cc-color-panel.c +++ b/panels/color/cc-color-panel.c -@@ -599,7 +599,7 @@ +@@ -599,7 +599,7 @@ gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs) /* run with modal set */ argv = g_ptr_array_new_with_free_func (g_free); @@ -9,7 +11,7 @@ g_ptr_array_add (argv, g_strdup ("--device")); g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device))); g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1038,7 +1038,7 @@ +@@ -1038,7 +1038,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile) /* open up gcm-viewer as a info pane */ argv = g_ptr_array_new_with_free_func (g_free); @@ -18,7 +20,7 @@ g_ptr_array_add (argv, g_strdup ("--profile")); g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1288,15 +1288,12 @@ +@@ -1288,15 +1288,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device) static void gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device) { @@ -35,6 +37,8 @@ gtk_widget_set_sensitive (prefs->toolbutton_profile_view, TRUE); else gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE); +diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h +index 96b25140c..1ad704d4a 100644 --- a/panels/datetime/tz.h +++ b/panels/datetime/tz.h @@ -27,11 +27,7 @@ @@ -50,9 +54,79 @@ typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; +diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c +index 7758271b1..fc57ce483 100644 +--- a/panels/info/cc-info-overview-panel.c ++++ b/panels/info/cc-info-overview-panel.c +@@ -192,7 +192,7 @@ load_gnome_version (char **version, + gsize length; + g_autoptr(VersionData) data = NULL; + +- if (!g_file_get_contents (DATADIR "/gnome/gnome-version.xml", ++ if (!g_file_get_contents ("@gnome_desktop@/share/gnome/gnome-version.xml", + &contents, + &length, + &error)) +diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c +index 556b57fb8..6e34ad42b 100644 +--- a/panels/network/connection-editor/net-connection-editor.c ++++ b/panels/network/connection-editor/net-connection-editor.c +@@ -259,9 +259,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *editor, const gchar *typ + GError *error = NULL; + + if (editor->is_new_connection) { +- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type); ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type); + } else { +- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'", ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'", + nm_connection_get_uuid (editor->connection)); + } + +diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c +index 4440b94df..c6105cd97 100644 +--- a/panels/network/net-device-wifi.c ++++ b/panels/network/net-device-wifi.c +@@ -1652,7 +1652,7 @@ device_wifi_edit (NetObject *object) + return; + } + uuid = nm_connection_get_uuid (NM_CONNECTION (connection)); +- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); + g_debug ("Launching '%s'\n", cmdline); + if (!g_spawn_command_line_async (cmdline, &error)) { + g_warning ("Failed to launch nm-connection-editor: %s", error->message); +diff --git a/panels/network/net-device.c b/panels/network/net-device.c +index 95b556eca..0b9d4cd22 100644 +--- a/panels/network/net-device.c ++++ b/panels/network/net-device.c +@@ -194,7 +194,7 @@ net_device_edit (NetObject *object) + + connection = net_device_get_find_connection (device); + uuid = nm_connection_get_uuid (connection); +- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); + g_debug ("Launching '%s'\n", cmdline); + if (!g_spawn_command_line_async (cmdline, &error)) { + g_warning ("Failed to launch nm-connection-editor: %s", error->message); +diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c +index 8af77e9a9..a1897b046 100644 +--- a/panels/printers/pp-host.c ++++ b/panels/printers/pp-host.c +@@ -267,7 +267,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res, + data->devices->devices = NULL; + + argv = g_new0 (gchar *, 3); +- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); ++ argv[0] = g_strdup ("@cups@/lib/cups/backend/snmp"); + argv[1] = g_strdup (priv->hostname); + + /* Use SNMP to get printer's informations */ +diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c +index 1061466ea..9b3e7df43 100644 --- a/panels/region/cc-region-panel.c +++ b/panels/region/cc-region-panel.c -@@ -1265,10 +1265,10 @@ +@@ -1273,10 +1273,10 @@ show_selected_layout (CcRegionPanel *self) } if (variant && variant[0]) @@ -65,9 +139,24 @@ layout); g_spawn_command_line_async (commandline, NULL); +diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c +index 00239ce0f..617c98870 100644 +--- a/panels/user-accounts/run-passwd.c ++++ b/panels/user-accounts/run-passwd.c +@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) + gchar **envp; + gint my_stdin, my_stdout, my_stderr; + +- argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ ++ argv[0] = "/run/wrappers/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ + argv[1] = NULL; + + envp = g_get_environ (); +diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c +index 9cb92007a..84d2f0fa3 100644 --- a/tests/datetime/test-endianess.c +++ b/tests/datetime/test-endianess.c -@@ -26,7 +26,7 @@ +@@ -26,7 +26,7 @@ test_endianess (void) g_autoptr(GDir) dir = NULL; const char *name; diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch index 59191bddd9af..57eb4b3d44a9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch @@ -1,19 +1,15 @@ --- a/libgnome-desktop/gnome-desktop-thumbnail-script.c +++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c -@@ -504,14 +504,10 @@ +@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, - "bwrap", - "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/lib", "/lib", -- "--ro-bind", "/lib64", "/lib64", +- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", + "@bubblewrap_bin@", -+ "--ro-bind", "/nix/store", "/nix/store", - "--proc", "/proc", - "--dev", "/dev", -- "--symlink", "usr/bin", "/bin", -- "--symlink", "usr/sbin", "/sbin", - "--chdir", "/", - "--setenv", "GIO_USE_VFS", "local", - "--unshare-all", ++ "--ro-bind", "@storeDir@", "@storeDir@", ++ "--ro-bind", "/run/current-system", "/run/current-system", + NULL); + + /* These directories might be symlinks into /usr/... */ diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index b98a6a2d676f..30346689a0a6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib -, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland +, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland, fetchpatch , libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }: stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; - version = "3.30.2"; + version = "3.30.2.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0k6iccfj9naw42dl2mgljfvk12dmvg06plg86qd81nksrf9ycxal"; + sha256 = "02ksmq2h4jjvjalp5x6d6v36qnp1h66qxwv2gl7kbx7dxqcp6ys3"; }; enableParallelBuilding = true; @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { (substituteAll { src = ./bubblewrap-paths.patch; bubblewrap_bin = "${bubblewrap}/bin/bwrap"; + inherit (builtins) storeDir; + }) + (fetchpatch { + name = "fix-missing-font-cache"; + url = https://gitlab.gnome.org/GNOME/gnome-desktop/commit/b87de7495160dbf48f01aa1ddb361fc2556ffd0c.patch; + sha256 = "1aw7lw93kcflmqmbx25cwja25441i8xzvgjm1pfsxvw3vr8j6scb"; }) ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 1019a809d7f8..a15d2d7f6e62 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 -, gnome3, gtk, glib }: +, gnome3, gtk3, glib }: stdenv.mkDerivation rec { name = "gnome-dictionary-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 5d224623c3ca..629dfe0421be 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,5 +1,5 @@ { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, meson, ninja, gtk, glib, wrapGAppsHook, python3, libnotify +, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify , itstool, gnome3, libxml2 , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: @@ -12,17 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; }; - }; - nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl wrapGAppsHook python3 libxml2 ]; + buildInputs = [ - gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 - udisks2 gnome3.defaultIconTheme + gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 + udisks2 gnome3.adwaita-icon-theme gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas ]; @@ -31,6 +28,13 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-disk-utility"; + attrPath = "gnome3.gnome-disk-utility"; + }; + }; + meta = with stdenv.lib; { homepage = https://en.wikipedia.org/wiki/GNOME_Disks; description = "A udisks graphical front-end"; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 06a5b258c80f..3e8f7d3617fb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -1,5 +1,5 @@ { stdenv, meson, ninja, gettext, fetchurl -, pkgconfig, gtk3, glib, libxml2 +, pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme , wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { @@ -11,18 +11,21 @@ stdenv.mkDerivation rec { sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-font-viewer"; attrPath = "gnome3.gnome-font-viewer"; }; - }; - doCheck = true; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome3.gnome-desktop gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme ]; # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-font-viewer"; + attrPath = "gnome3.gnome-font-viewer"; + }; + }; + meta = with stdenv.lib; { description = "Program that can preview fonts and create thumbnails for fonts"; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index 4ceb0335c183..d12e558c276f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook -, webkitgtk, json-glib, rest, libsecret, gtk-doc, gobject-introspection +{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook +, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection , gettext, icu, glib-networking , libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos }: let pname = "gnome-online-accounts"; - version = "3.30.1"; + version = "3.30.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0havx26cfy0ln17jzmzbrrx35afknv2s9mdy34j0p7wmbqr8m5ky"; + sha256 = "1p1gdgryziklrgngn6m13xnvfx4gb01h723nndfi9944r24fbiq5"; }; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc ]; buildInputs = [ - glib gtk webkitgtk json-glib rest libsecret glib-networking icu libsoup + glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup gcr kerberos ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index 6deefaa36732..ed4c1a3da13a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: +, libgdata, grilo, libzapojit, grilo-plugins, gnome-online-accounts, libmediaart +, tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gnome-online-miners-${version}"; @@ -10,19 +11,24 @@ stdenv.mkDerivation rec { sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-online-miners"; attrPath = "gnome3.gnome-online-miners"; }; - }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl - gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome-online-accounts gnome3.libmediaart - gnome3.tracker gnome3.gfbgraph json-glib gnome3.rest - dleyna-server ]; + buildInputs = [ + glib libgdata libxml2 libsoup gmp openssl + grilo libzapojit grilo-plugins + gnome-online-accounts libmediaart + tracker gfbgraph json-glib librest + dleyna-server + ]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-online-miners"; + attrPath = "gnome3.gnome-online-miners"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; description = "A set of crawlers that go through your online content and index them locally in Tracker"; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index fc39ea812237..3ce2a4433acd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; buildInputs = [ - gtk3 glib libcanberra-gtk3 gnome3.defaultIconTheme + gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 2f44a4e168df..34921d46b4cd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas +{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib gtk libICE gnome-desktop json-glib xorg.xtrans gnome3.defaultIconTheme + glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome3.adwaita-icon-theme gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index c76ba218c9ac..7a2271e128de 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,7 +1,7 @@ -{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit +{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, gtk3, glib, libnotify, lcms2, libXtst +, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit, gsettings-desktop-schemas , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager -, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }: +, gnome-desktop, geocode-glib, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }: stdenv.mkDerivation rec { name = "gnome-settings-daemon-${version}"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ]; - buildInputs = with gnome3; [ - ibus gtk glib gsettings-desktop-schemas networkmanager + buildInputs = [ + ibus gtk3 glib gsettings-desktop-schemas networkmanager libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib libcanberra-gtk3 upower colord libgweather xkeyboard_config nss polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 76e5bd13522e..693a3bec4868 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -2,9 +2,10 @@ , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils -, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr -, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd -, sassc, systemd, gst_all_1 }: +, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou +, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop +, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3 +, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -26,16 +27,16 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales sassc desktop-file-utils libxslt.bin ]; - buildInputs = with gnome3; [ + buildInputs = [ systemd caribou gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice libcroco libsecret libsoup polkit gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy-glib libXtst gjs mutter libpulseaudio evolution-data-server - libical gtk gstreamer gdm libcanberra-gtk3 geoclue2 - defaultIconTheme gnome3.gnome-bluetooth - gnome3.gnome-clocks # schemas needed - at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon + libical gtk3 gstreamer gdm libcanberra-gtk3 geoclue2 + adwaita-icon-theme gnome-bluetooth + gnome-clocks # schemas needed + at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon gst_all_1.gst-plugins-good # recording gobject-introspection @@ -45,7 +46,7 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ # Needed to support on-screen keyboard used with touch screen devices # see https://github.com/NixOS/nixpkgs/issues/25968 - gnome3.caribou + caribou ]; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 3c45842fdd40..cab777f4febe 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd +, gtk3, gsettings-desktop-schemas, gnome-desktop , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { @@ -24,8 +25,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gtk glib packagekit appstream-glib libsoup - gnome3.gsettings-desktop-schemas gnome3.gnome-desktop + gtk3 glib packagekit appstream-glib libsoup + gsettings-desktop-schemas gnome-desktop gspell json-glib libsecret ostree polkit flatpak fwupd ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index a1e3ece3db40..4b02411b4863 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { polkit # for ITS file ]; buildInputs = [ - bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.defaultIconTheme librsvg + bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg gnome3.gsettings-desktop-schemas systemd ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 4765edbcf7e5..6bde15ba762e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus -, gtk, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala +, gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala , desktop-file-utils, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk gsettings-desktop-schemas vte libuuid dconf + gtk3 gsettings-desktop-schemas vte libuuid dconf # For extension nautilus ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index b6c40b28ab1a..3d5cfb85d671 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.adwaita-icon-theme ]; postFixup = '' gtk-update-icon-cache "$out"/share/icons/HighContrast diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 6a5d2fde5018..134ba41d6534 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, apacheHttpd, nautilus -, pkgconfig, gtk3, glib, libxml2, systemd +, pkgconfig, gtk3, glib, libxml2, systemd, adwaita-icon-theme , wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd , gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; preConfigure = '' sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ @@ -26,15 +26,19 @@ stdenv.mkDerivation rec { -i data/dav_user_2.4.conf ''; - configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd" - "--with-modules-path=${apacheHttpd.dev}/modules" - "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; + configureFlags = [ + "--with-httpd=${apacheHttpd.out}/bin/httpd" + "--with-modules-path=${apacheHttpd.dev}/modules" + "--with-systemduserunitdir=$(out)/etc/systemd/user" + "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" + ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libxml2 libtool - wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg - nautilus libnotify libcanberra-gtk3 systemd ]; + buildInputs = [ + gtk3 glib intltool itstool libxml2 libtool + wrapGAppsHook file gdk_pixbuf adwaita-icon-theme librsvg + nautilus libnotify libcanberra-gtk3 systemd + ]; postInstall = '' mkdir -p $out/share/gsettings-schemas/$name diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index ab2ead7d3449..02e0c29fdaa7 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite, librest +, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av, libgdata, libmediaart , gmime, json-glib, avahi, tracker, dleyna-server, itstool, totem-pl-parser }: let @@ -15,10 +15,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext itstool ]; buildInputs = [ - gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata + gnome3.grilo libxml2 gupnp gssdp libgdata lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts - totem-pl-parser gnome3.rest gmime json-glib - avahi gnome3.libmediaart tracker dleyna-server + totem-pl-parser librest gmime json-glib + avahi libmediaart tracker dleyna-server ]; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index a968bfd2b569..2b7794a9a8ef 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, defaultIconTheme +{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, adwaita-icon-theme , glib, desktop-file-utils, gtk-doc, autoconf, automake, libtool , wrapGAppsHook, gnome3, itstool, libxml2, yelp-tools , docbook_xsl, docbook_xml_dtd_412, gsettings-desktop-schemas @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { yelp-tools libxml2 desktop-file-utils gobject-introspection ]; - buildInputs = [ gtk3 glib gsettings-desktop-schemas defaultIconTheme ]; + buildInputs = [ gtk3 glib gsettings-desktop-schemas adwaita-icon-theme ]; configureFlags = [ "--with-unicode-data=${unicode-data}" diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index e80212713aae..8aa7cff2d030 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -1,17 +1,55 @@ -{ fetchurl, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo -, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 +{ fetchFromGitLab, stdenv, substituteAll, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo +, glib, gtk3, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3, fetchpatch +, gsettings-desktop-schemas, gnome-desktop, wrapGAppsHook , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput -, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: +, geocode-glib, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { - name = "mutter-${version}"; - version = "3.28.3"; + pname = "mutter"; + version = "3.28.4"; - src = fetchurl { - url = "mirror://gnome/sources/mutter/3.28/${name}.tar.xz"; - sha256 = "0vq3rmq20d6b1mi6sf67wkzqys6hw5j7n7fd4hndcp19d5i26149"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = version; + sha256 = "0p8ky306dnm4alkncmsnd8r2awpsi37p0bzvkv313pgqw2hbwq9i"; }; + patches = [ + (substituteAll { + src = ./fix-paths-328.patch; + inherit zenity; + }) + + # https://bugzilla.redhat.com/show_bug.cgi?id=1700337 + # https://gitlab.gnome.org/GNOME/mutter/merge_requests/133 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0070-clutter-Add-API-to-retrieve-the-physical-size-of-abs.patch"; + sha256 = "11xg0clrqwvssy2r6hv4iya8g87z2v5f47fimd2b4hha6ki3g1is"; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0071-backends-Add-MetaInputMapper.patch"; + sha256 = "1kcp42hg8sy1q21w5586gdgmi95nf36829kkfswbah61h6bkb518"; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0072-backends-Delegate-on-MetaInputMapper-for-unmapped-di.patch"; + sha256 = "0zf4yxhq5s3dnzmn15mx4yb978g27ij4vmq055my9p7xgh6h9ga8"; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0073-backends-Add-MetaInputMapper-method-to-lookup-device.patch"; + sha256 = "0dnb2hqx5in6x9ar6wnr1hy3bg2wdcl3wbdx4jn66c7bi7s1k5zd"; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0074-backends-Turn-builtin-touchscreen-on-off-together-wi.patch"; + sha256 = "17fvs7j5ws4sz6fkch93gjlik0nm4z426w4n348gyw5llh0r76pg"; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0075-backends-Update-to-new-output-setting-for-tablets-to.patch"; + sha256 = "141p3an83s042f67fw2fqmr79i5g634ndrbpd8cs47fd4wwiwpj5"; + }) + ]; + configureFlags = [ "--with-x" "--disable-static" @@ -30,21 +68,16 @@ stdenv.mkDerivation rec { libXtst ]; - nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool wrapGAppsHook ]; - buildInputs = with gnome3; [ - glib gobject-introspection gtk gsettings-desktop-schemas upower + buildInputs = [ + glib gobject-introspection gtk3 gsettings-desktop-schemas upower gnome-desktop cairo pango cogl clutter zenity libstartup_notification - gnome3.geocode-glib libinput libgudev libwacom + geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile - libxkbcommon pipewire + libxkbcommon ]; - preFixup = '' - wrapProgram "$out/bin/mutter" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 9a1418cbe0a9..518b0ec1c48c 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,7 +1,8 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo +{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput -, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: +, gsettings-desktop-schemas, glib, gtk3, gnome-desktop +, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { name = "mutter-${version}"; @@ -12,9 +13,15 @@ stdenv.mkDerivation rec { sha256 = "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; }; - }; + patches = [ + # https://gitlab.gnome.org/GNOME/mutter/issues/270 + # Fixes direction of the desktop switching animation when using workspace + # grid extension with desktops arranged horizontally. + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/mutter/commit/92cccf53dfe9e077f1d61ac4f896fd391f8cb689.patch; + sha256 = "11vmypypjss50xg7hhdbqrxvgqlxx4lnwy59089qsfl3akg4kk2i"; + }) + ]; configureFlags = [ "--with-x" @@ -36,10 +43,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; - buildInputs = with gnome3; [ - glib gobject-introspection gtk gsettings-desktop-schemas upower + buildInputs = [ + glib gobject-introspection gtk3 gsettings-desktop-schemas upower gnome-desktop cairo pango cogl clutter zenity libstartup_notification - gnome3.geocode-glib libinput libgudev libwacom + geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile libxkbcommon pipewire ]; @@ -51,6 +58,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "mutter"; + attrPath = "gnome3.mutter"; + }; + }; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch b/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch new file mode 100644 index 000000000000..6c40624a55da --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/util.c b/src/core/util.c +index 5b8de18c7..546352a95 100644 +--- a/src/core/util.c ++++ b/src/core/util.c +@@ -635,7 +635,7 @@ meta_show_dialog (const char *type, + + args = g_ptr_array_new (); + +- append_argument (args, "zenity"); ++ append_argument (args, "@zenity@/bin/zenity"); + append_argument (args, type); + + if (display) diff --git a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch index 051b7618612c..e3ad75b869c8 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch @@ -1,6 +1,6 @@ --- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c +++ a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -@@ -514,14 +514,10 @@ add_bwrap (GPtrArray *array, +@@ -514,14 +514,11 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, @@ -8,8 +8,9 @@ - "--ro-bind", "/usr", "/usr", - "--ro-bind", "/lib", "/lib", - "--ro-bind", "/lib64", "/lib64", -+ "@bubblewrap_bin@", -+ "--ro-bind", "@storeDir@", "@storeDir@", ++ "@bubblewrap_bin@", ++ "--ro-bind", "@storeDir@", "@storeDir@", ++ "--ro-bind", "/run/current-system", "/run/current-system", "--proc", "/proc", "--dev", "/dev", - "--symlink", "usr/bin", "/bin", diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index b581d8f09837..715686460a38 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2 -, desktop-file-utils, python3, wrapGAppsHook , gtk, gnome3, gnome-autoar +, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar , glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi , librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf , substituteAll, bubblewrap @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib-networking shared-mime-info libexif gtk exempi libnotify libselinux + glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux tracker tracker-miners gexiv2 libseccomp bubblewrap gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index ef79f972ff0f..742819e0ba17 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook -, cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp +, cairo, gdk_pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp , libxml2, sane-backends, vala, gnome3, gobject-introspection }: stdenv.mkDerivation rec { @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb - gtk libwebp packagekit sane-backends vala + cairo gdk_pixbuf colord glib gnome3.adwaita-icon-theme gusb + gtk3 libwebp packagekit sane-backends vala ]; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2 diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 3565931e4df1..d4a66b6c4936 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, meson, ninja, intltool, gst_all_1 , clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobject-introspection, totem-pl-parser -, wrapGAppsHook, itstool, libxml2, vala, gnome3 +, wrapGAppsHook, itstool, libxml2, vala, gnome3, grilo, grilo-plugins +, libpeas, adwaita-icon-theme, gnome-desktop, gsettings-desktop-schemas , gdk_pixbuf, tracker, nautilus }: stdenv.mkDerivation rec { @@ -15,15 +16,15 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobject-introspection wrapGAppsHook ]; buildInputs = [ - gtk3 glib gnome3.grilo clutter-gtk clutter-gst totem-pl-parser gnome3.grilo-plugins + gtk3 glib grilo clutter-gtk clutter-gst totem-pl-parser grilo-plugins gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info - gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop - gnome3.gsettings-desktop-schemas tracker nautilus + gst_all_1.gst-plugins-ugly gst_all_1.gst-libav libpeas shared-mime-info + gdk_pixbuf libxml2 adwaita-icon-theme gnome-desktop + gsettings-desktop-schemas tracker nautilus python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins ]; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 7127ab71b1fc..85bb32972f4b 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt +{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, gexiv2, tracker , meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server , exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif , libgrss, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid @@ -35,9 +35,9 @@ in stdenv.mkDerivation rec { flac giflib glib - gnome3.gexiv2 + gexiv2 totem-pl-parser - gnome3.tracker + tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index d744fc6c87c7..8c0941d05d6a 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobject-introspection, python2 , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer -, gnome3, icu, libuuid, networkmanager, libsoup, json-glib }: +, gnome3, icu, libuuid, networkmanager, libsoup, json-glib, substituteAll }: let pname = "tracker"; - version = "2.1.6"; + version = "2.1.8"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "143zapq50lggj3mpqg2y4rh1hgnkbn9vgvzpqxr7waiawsmx0awq"; + sha256 = "0a2m0472k245k95w527d6cb4i0p8ns8z5vxh0mcx33wbh41k9jya"; }; nativeBuildInputs = [ @@ -29,31 +29,22 @@ in stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; mesonFlags = [ - "-Ddbus_services=share/dbus-1/services" - "-Dsystemd_user_services=lib/systemd/user" + "-Ddbus_services=${placeholder ''out''}/share/dbus-1/services" + "-Dsystemd_user_services=${placeholder ''out''}/lib/systemd/user" # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas "-Dfunctional_tests=false" ]; patches = [ - # Always generate tracker-sparql.h in time - (fetchurl { - url = https://gitlab.gnome.org/GNOME/tracker/commit/3cbfaa5b374e615098e60eb4430f108b642ebe76.diff; - sha256 = "0smavzvsglpghggrcl8sjflki13nh7pr0jl2yv6ymbf5hr1c4dws"; + (substituteAll { + src = ./fix-paths.patch; + gdbus = "${glib.bin}/bin/gdbus"; }) ]; postPatch = '' patchShebangs utils/g-ir-merge/g-ir-merge patchShebangs utils/data-generators/cc/generate - - # make .desktop Exec absolute - patch -p0 < https://github.com/elementary/screenshot/pull/93 - version = "1.6.1"; + version = "1.6.2"; name = "elementary-${pname}-${version}"; @@ -18,7 +12,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "screenshot"; rev = version; - sha256 = "1vvj550md7vw7n057h8cy887a0nmsbwry67dxrxyz6bsvpk8sb6g"; + sha256 = "1z61j96jk9zjr3bn5hgsp25m4v8h1rqwxm0kg8c34bvl06f13v8q"; }; passthru = { @@ -52,11 +46,6 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - postInstall = '' - mkdir -p $out/share/fonts/truetype - cp -rva ${redacted-script}/share/fonts/truetype/redacted-elementary $out/share/fonts/truetype - ''; - meta = with stdenv.lib; { description = "Screenshot tool designed for elementary OS"; homepage = https://github.com/elementary/screenshot; diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix deleted file mode 100644 index db1d9d240c40..000000000000 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, pantheon }: - -stdenv.mkDerivation rec { - name = "elementary-redacted-script-${version}"; - version = "5.1.0"; - - src = fetchFromGitHub { - owner = "elementary"; - repo = "fonts"; - rev = version; - sha256 = "16x2w7w29k4jx2nwc5932h9rqvb216vxsziazisv2rpll74kn8b2"; - }; - - dontConfigure = true; - - installPhase = '' - mkdir -p $out/share/fonts/truetype/redacted-elementary - cp -a redacted/*.ttf $out/share/fonts/truetype/redacted-elementary - ''; - - meta = with stdenv.lib; { - description = "Redacted Script Font for elementary"; - homepage = https://github.com/elementary/fonts; - license = licenses.ofl; - maintainers = pantheon.maintainers; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 01fe35e4a8ee..9b2060afa6b7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "terminal"; - version = "5.3.3"; + version = "5.3.5"; name = "elementary-${pname}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "1rhqfq5dn913g551ribycid4k8add2lanxkkqpv6zzdgvah26ni8"; + sha256 = "1gd5m24digmx3sgs21ggfiqiwhgym6s1dlg1sv9mdqh5wgsa6b8f"; }; passthru = { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 2ee925209838..1883e2294797 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Universal Access Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index bdba8328fe93..d217ad20d2ed 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ./remove-update-button.patch ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard About Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 0cdb732ca731..ed4dc0c84473 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Applications Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 697c3ac592bb..db653a7f8ffe 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-bluetooth"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "13jm2idjsgqkvdz1dxgl2wwx7bsqahppf6cnpl0pmz167wahg5zp"; + sha256 = "0rp9wa0yilc3wgwnybc6cryxphja7imixn45zhj475a4nb3afd0q"; }; passthru = { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Bluetooth Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 95a350372b95..8c00ff4728e8 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ./clock-format.patch ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Date & Time Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 192f8a69ae97..f5fbb0a51cfb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-display"; - version = "2.1.6"; + version = "2.1.8"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0pw21bnc79shiynmg7h9bs1x1v011lh07ypn22j73yhmxp6wiypd"; + sha256 = "1xpgkvcv3bylpaj7c80727vr55vilkgjvnlbw7d5pr56v6mv7n9j"; }; passthru = { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Displays Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index f38f15e3c6d2..50256b8f77d7 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1997hnhlcp2jmf3z70na42vl1b7i5vxhp7k5ga5sl68dv0g4126y"; + sha256 = "17iijb7imxw5zv7vkrbc1vsp87k900yqgyv7ycz1gw37xb4klsyp"; }; passthru = { @@ -43,9 +43,7 @@ stdenv.mkDerivation rec { }) ]; - LIBRARY_PATH = stdenv.lib.makeLibraryPath [ libgnomekbd ]; - - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Keyboard Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 6c4bdeb7fb71..eaf15fdb8155 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -1,17 +1,25 @@ -{ stdenv, fetchFromGitHub, pantheon, fetchpatch, meson, ninja -, pkgconfig, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, fetchpatch, meson, ninja, pkgconfig, vala +, libgee, granite, gtk3, switchboard, elementary-settings-daemon, gobject-introspection }: stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; - version = "2.1.4"; + version = "2.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1zh5472ab01bckrc1py5bqqsal9i9pbgx6i8ap2d4yzhc8sirjrf"; + sha256 = "0mr25p7j5hl8zmvz5i3g30s4xbdhk6d22lw2akch3si40il9q5fv"; }; + patches = [ + ./hardcode-settings-daemon-gsettings.patch + ]; + + postPatch = '' + substituteInPlace src/Views/General.vala --subst-var-by GSD_GSETTINGS ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas + ''; + passthru = { updateScript = pantheon.updateScript { repoName = pname; @@ -33,7 +41,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Mouse & Touchpad Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch new file mode 100644 index 000000000000..b904fe153094 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch @@ -0,0 +1,63 @@ +diff --git a/src/Views/General.vala b/src/Views/General.vala +index 4b19b73..dfa3d4d 100644 +--- a/src/Views/General.vala ++++ b/src/Views/General.vala +@@ -138,32 +138,34 @@ public class MouseTouchpad.GeneralView : Gtk.Grid { + attach (pointer_speed_scale, 3, 8); + attach (pointer_speed_help, 1, 9, 3); + +- var xsettings_schema = SettingsSchemaSource.get_default ().lookup ("org.gnome.settings-daemon.plugins.xsettings", false); +- if (xsettings_schema != null) { +- var primary_paste_switch = new Gtk.Switch (); +- primary_paste_switch.halign = Gtk.Align.START; +- +- var primary_paste_help = new Gtk.Label (_("Middle or three-finger clicking on an input will paste any selected text")); +- primary_paste_help.margin_bottom = 18; +- primary_paste_help.wrap = true; +- primary_paste_help.xalign = 0; +- primary_paste_help.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL); +- +- attach (new SettingLabel (_("Middle click paste:")), 0, 4); +- attach (primary_paste_switch, 1, 4); +- attach (primary_paste_help, 1, 5, 3); +- +- var xsettings = new GLib.Settings ("org.gnome.settings-daemon.plugins.xsettings"); +- primary_paste_switch.notify["active"].connect (() => on_primary_paste_switch_changed (primary_paste_switch, xsettings)); +- +- var current_value = xsettings.get_value ("overrides").lookup_value ("Gtk/EnablePrimaryPaste", VariantType.INT32); +- if (current_value != null) { +- primary_paste_switch.active = current_value.get_int32 () == 1; +- } ++ var primary_paste_switch = new Gtk.Switch (); ++ primary_paste_switch.halign = Gtk.Align.START; ++ ++ var primary_paste_help = new Gtk.Label (_("Middle or three-finger clicking on an input will paste any selected text")); ++ primary_paste_help.margin_bottom = 18; ++ primary_paste_help.wrap = true; ++ primary_paste_help.xalign = 0; ++ primary_paste_help.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL); ++ ++ attach (new SettingLabel (_("Middle click paste:")), 0, 4); ++ attach (primary_paste_switch, 1, 4); ++ attach (primary_paste_help, 1, 5, 3); ++ ++ SettingsSchemaSource daemon_schema_source = new SettingsSchemaSource.from_directory ("@GSD_GSETTINGS@", null, true); ++ SettingsSchema xsettings_schema = daemon_schema_source.lookup ("org.gnome.settings-daemon.plugins.xsettings", false); ++ ++ var xsettings = new GLib.Settings.full (xsettings_schema, null, null); ++ primary_paste_switch.notify["active"].connect (() => on_primary_paste_switch_changed (primary_paste_switch, xsettings)); ++ ++ var current_value = xsettings.get_value ("overrides").lookup_value ("Gtk/EnablePrimaryPaste", VariantType.INT32); ++ if (current_value != null) { ++ primary_paste_switch.active = current_value.get_int32 () == 1; + } + +- var daemon_settings = new GLib.Settings ("org.gnome.settings-daemon.peripherals.mouse"); +- daemon_settings.bind ("locate-pointer", reveal_pointer_switch, "active", GLib.SettingsBindFlags.DEFAULT); ++ SettingsSchema daemon_mouse_schema = daemon_schema_source.lookup ("org.gnome.settings-daemon.peripherals.mouse", false); ++ ++ var daemon_mouse_settings = new GLib.Settings.full (daemon_mouse_schema, null, null); ++ daemon_mouse_settings.bind ("locate-pointer", reveal_pointer_switch, "active", GLib.SettingsBindFlags.DEFAULT); + + var a11y_mouse_settings = new GLib.Settings ("org.gnome.desktop.a11y.mouse"); + a11y_mouse_settings.bind ("secondary-click-enabled", hold_switch, "active", GLib.SettingsBindFlags.DEFAULT); diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 3943cad48fd3..95b558901d20 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Networking Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index 6bb5d285a34f..a6fb86bb828c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Notifications Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index e47dc4c4060c..2242948812df 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala , libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop -, gala, wingpanel, plank, switchboard, gettext, gobject-introspection, bamf }: +, gala, wingpanel, plank, switchboard, gettext, gobject-introspection, bamf, fetchpatch }: stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0yy821hl26jfd9hyigqi7nmaf30iww0lhg9qzcwlfzsvvfwnxagi"; + sha256 = "1vrnzxqzl84k8gbrais4j1jyap10kvil4cr769jpr3q3bkbblwrw"; }; passthru = { @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { patches = [ ./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded ./hardcode-gsettings.patch + # Fixes https://github.com/elementary/switchboard-plug-pantheon-shell/issues/172 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-pantheon-shell/commit/e4f86df6a6be402db4c979a4b005573618b744d1.patch"; + sha256 = "0sa8611k6sqg96mnp2plmxd30w6zq76bfwszl8ankr9kwsgyc66y"; + }) ]; postPatch = '' @@ -51,7 +56,7 @@ stdenv.mkDerivation rec { ''; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Desktop Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index ab1fd98795a1..0178f23f5e1a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -49,10 +49,10 @@ stdenv.mkDerivation rec { substituteInPlace src/MainView.vala --subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas ''; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; - PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "share/dbus-1/system-services"; - PKG_CONFIG_DBUS_1_SYSCONFDIR = "etc"; - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "share/polkit-1/actions"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; + PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "${placeholder ''out''}/share/dbus-1/system-services"; + PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder ''out''}/etc"; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder ''out''}/share/polkit-1/actions"; meta = with stdenv.lib; { description = "Switchboard Power Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index bb9e576a4c49..11bd70894edd 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Printers Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 4060e0717891..ff59768e363f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-security-privacy"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0f1idh36hlgmdva5jn0xnj2b6gbic0asnj3b7j283gyziibm3pxa"; + sha256 = "0k2bq7l0m7qfpy1mkb3qvsinqd8n4lp0vwz3x64wlgfn2qipm1fn"; }; passthru = { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { zeitgeist ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; patches = [ ./hardcode-gsettings.patch diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index a2c047ffcb41..9660daa7715d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Sharing Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index e4d0db46923b..ad379f37471a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; - version = "2.1.3"; + version = "2.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0dvxmjziifffa2rm7h43ca5grhlcpih3rgik50mz808mqfxr4l1q"; + sha256 = "0frml591r82j7hf1zlccgv8pzk3w10x470f9nzvdgdjpz0r776k2"; }; passthru = { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; meta = with stdenv.lib; { description = "Switchboard Sound Plug"; diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 2f7e79f9f9b3..e30252bb71c2 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "stylesheet"; - version = "5.2.1"; + version = "5.2.5"; name = "elementary-gtk-theme-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "03l8m87f7z25svxk0hhcqnn4qnnqvasr5qwzq3s87lx25gwjml29"; + sha256 = "0934rfdwkn4315mhayzba8a3b6i1xczp66gl6n45hh5c81gb2p65"; }; passthru = { diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 23fb8445838a..d8fa143686ec 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "icons"; - version = "5.0.3"; + version = "5.0.4"; name = "elementary-icon-theme-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "0wpv7yirf44bfqfmyshzfw9605j1idm7c9jqg68k3nmymmd6iqzf"; + sha256 = "0ha7biqvmkv68x1gi9bfcn5z0ld067pa5czx0pyf053pa86lg3hx"; }; passthru = { diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix new file mode 100644 index 000000000000..061feb4b2d95 --- /dev/null +++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pantheon }: + +stdenv.mkDerivation rec { + pname = "elementary-redacted-script"; + version = "unstable-2016-06-03"; + + src = fetchFromGitHub { + owner = "png2378"; + repo = "redacted-elementary"; + rev = "346440ff9ce19465e6d5c3d6d67a8573f992c746"; + sha256 = "1jpd13sxkarclr0mlm66wzgpjh52ghzjzn4mywhyshyyskwn7jg1"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/fonts/truetype/redacted-elementary + cp -a truetype/*.ttf $out/share/fonts/truetype/redacted-elementary + ''; + + meta = with stdenv.lib; { + description = "Font for concealing text"; + homepage = https://github.com/png2378/redacted-elementary; + license = licenses.ofl; + maintainers = pantheon.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index a7b8a01eeb0b..8271abc1506d 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -62,6 +62,8 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; + notes-up = pkgs.notes-up.override { withPantheon = true; }; + #### APPS elementary-calculator = callPackage ./apps/elementary-calculator { }; @@ -215,6 +217,8 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-icon-theme = callPackage ./artwork/elementary-icon-theme { }; + elementary-redacted-script = callPackage ./artwork/elementary-redacted-script { }; + elementary-sound-theme = callPackage ./artwork/elementary-sound-theme { }; elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 303aae6882b8..32083d3ada62 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -52,13 +52,14 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./gsd.patch; - elementary-settings-daemon = "${elementary-settings-daemon}/libexec"; + elementary_settings_daemon = "${elementary-settings-daemon}/libexec/"; }) (substituteAll { src = ./numlockx.patch; inherit numlockx; }) ./01-sysconfdir-install.patch + ./hardcode-theme.patch ]; mesonFlags = [ @@ -70,9 +71,6 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - # GTK+ reads default settings (such as icons and themes) from elementary's settings.ini here - --prefix XDG_CONFIG_DIRS : "${elementary-default-settings}/etc" - # dbus-launch needed in path --prefix PATH : "${dbus}/bin" diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch index 1770d54aee0d..bcbf604c6a2e 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch @@ -7,7 +7,7 @@ index 2450c1a..a908d11 100644 conf_data.set('CONF_DIR', join_paths(get_option('sysconfdir'), 'lightdm')) conf_data.set('GETTEXT_PACKAGE', meson.project_name()) -conf_data.set('GSD_DIR', '/usr/lib/gnome-settings-daemon/') -+conf_data.set('GSD_DIR', '@elementary-settings-daemon@') ++conf_data.set('GSD_DIR', '@elementary_settings_daemon@') conf_data.set('VERSION', meson.project_version()) config_header = configure_file ( input: 'config.vala.in', diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch new file mode 100644 index 000000000000..e9263aab736e --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch @@ -0,0 +1,15 @@ +diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala +index 11aa4c0..daf4a8a 100644 +--- a/src/PantheonGreeter.vala ++++ b/src/PantheonGreeter.vala +@@ -474,6 +474,10 @@ public static int main (string [] args) { + Gdk.CursorType.LEFT_PTR); + Gdk.get_default_root_window ().set_cursor (cursor); + ++ var settings = Gtk.Settings.get_default (); ++ settings.gtk_icon_theme_name = "elementary"; ++ settings.gtk_theme_name = "elementary"; ++ + var icon_theme = Gtk.IconTheme.get_default (); + icon_theme.add_resource_path ("/io/elementary/greeter/icons"); + diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index fddd4143616e..a6ec70a6b584 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, writeScript, pantheon, gnome-keyring, gnome-session, wingpanel, orca, at-spi2-core, elementary-default-settings, writeTextFile, writeShellScriptBin, elementary-settings-daemon }: +{ stdenv, fetchFromGitHub, substituteAll, writeScript, pantheon, gnome-keyring, gnome-session, wingpanel, orca, at-spi2-core, elementary-default-settings, writeTextFile, writeShellScriptBin, elementary-settings-daemon, runtimeShell }: let @@ -15,7 +15,7 @@ let # dockitems-script = writeScript "dockitems-script" '' - #!${stdenv.shell} + #!${runtimeShell} elementary_default_settings="${elementary-default-settings}" dock_items="$elementary_default_settings/share/elementary/config/plank/dock1/launchers"/* @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - mkdir -p $out/share - cp -avr applications $out/share/ + mkdir -p $out/share/applications + cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list mkdir -p $out/etc/xdg/autostart cp -av ${gnome-keyring}/etc/xdg/autostart/* $out/etc/xdg/autostart diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list b/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list new file mode 100644 index 000000000000..3b5e3b0e77a5 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list @@ -0,0 +1,168 @@ +[Default Applications] +application/ogg=io.elementary.music.desktop +application/oxps=org.gnome.Evince.desktop +application/pdf=org.gnome.Evince.desktop +application/postscript=org.gnome.Evince.desktop +application/vnd.ms-xpsdocument=org.gnome.Evince.desktop +application/vnd.rn-realmedia=io.elementary.videos.desktop +application/x-ar=org.gnome.FileRoller.desktop +application/x-arj=org.gnome.FileRoller.desktop +application/x-bzdvi=org.gnome.Evince.desktop +application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop +application/x-bzip=org.gnome.FileRoller.desktop +application/x-bzpdf=org.gnome.Evince.desktop +application/x-bzpostscript=org.gnome.Evince.desktop +application/x-cbr=org.gnome.Evince.desktop +application/x-cbt=org.gnome.Evince.desktop +application/x-cbz=org.gnome.Evince.desktop +application/x-compress=org.gnome.FileRoller.desktop +application/x-compressed-tar=org.gnome.FileRoller.desktop +application/x-dvi=org.gnome.Evince.desktop +application/x-ear=org.gnome.FileRoller.desktop +application/x-extension-m4a=io.elementary.videos.desktop +application/x-extension-mp4=io.elementary.videos.desktop +application/x-flac=io.elementary.music.desktop +application/x-gtar=org.gnome.FileRoller.desktop +application/x-gzdvi=org.gnome.Evince.desktop +application/x-gzip=org.gnome.FileRoller.desktop +application/x-gzpdf=org.gnome.Evince.desktop +application/x-gzpostscript=org.gnome.Evince.desktop +application/x-lha=org.gnome.FileRoller.desktop +application/x-lhz=org.gnome.FileRoller.desktop +application/x-lzop=org.gnome.FileRoller.desktop +application/x-matroska=io.elementary.videos.desktop +application/x-ogg=io.elementary.music.desktop +application/x-perl=io.elementary.code.desktop +application/x-rar-compressed=org.gnome.FileRoller.desktop +application/x-rar=org.gnome.FileRoller.desktop +application/x-rpm=org.gnome.FileRoller.desktop +application/x-tar=org.gnome.FileRoller.desktop +application/x-war=org.gnome.FileRoller.desktop +application/x-xz-compressed-tar=org.gnome.FileRoller.desktop +application/x-xz=org.gnome.FileRoller.desktop +application/x-xzpdf=org.gnome.Evince.desktop +application/x-zip-compressed=org.gnome.FileRoller.desktop +application/x-zip=org.gnome.FileRoller.desktop +application/x-zoo=org.gnome.FileRoller.desktop +application/xhtml+xml=org.gnome.Epiphany.desktop +application/zip=org.gnome.FileRoller.desktop +audio/3gpp=io.elementary.music.desktop +audio/ac3=io.elementary.music.desktop +audio/AMR-WB=io.elementary.music.desktop +audio/AMR=io.elementary.music.desktop +audio/basic=io.elementary.music.desktop +audio/flac=io.elementary.music.desktop +audio/midi=io.elementary.music.desktop +audio/mp4=io.elementary.music.desktop +audio/mpeg=io.elementary.music.desktop +audio/mpegurl=io.elementary.music.desktop +audio/ogg=io.elementary.music.desktop +audio/prs.sid=io.elementary.music.desktop +audio/vnd.rn-realaudio=io.elementary.music.desktop +audio/x-ape=io.elementary.music.desktop +audio/x-flac=io.elementary.music.desktop +audio/x-gsm=io.elementary.music.desktop +audio/x-it=io.elementary.music.desktop +audio/x-m4a=io.elementary.music.desktop +audio/x-matroska=io.elementary.music.desktop +audio/x-mod=io.elementary.music.desktop +audio/x-mp3=io.elementary.music.desktop +audio/x-mpeg=io.elementary.music.desktop +audio/x-mpegurl=io.elementary.music.desktop +audio/x-ms-asf=io.elementary.music.desktop +audio/x-ms-asx=io.elementary.music.desktop +audio/x-ms-wax=io.elementary.music.desktop +audio/x-ms-wma=io.elementary.music.desktop +audio/x-musepack=io.elementary.music.desktop +audio/x-pn-aiff=io.elementary.music.desktop +audio/x-pn-au=io.elementary.music.desktop +audio/x-pn-realaudio-plugin=io.elementary.music.desktop +audio/x-pn-realaudio=io.elementary.music.desktop +audio/x-pn-wav=io.elementary.music.desktop +audio/x-pn-windows-acm=io.elementary.music.desktop +audio/x-real-audio=io.elementary.music.desktop +audio/x-realaudio=io.elementary.music.desktop +audio/x-sbc=io.elementary.music.desktop +audio/x-scpls=io.elementary.music.desktop +audio/x-speex=io.elementary.music.desktop +audio/x-tta=io.elementary.music.desktop +audio/x-vorbis+ogg=io.elementary.music.desktop +audio/x-vorbis=io.elementary.music.desktop +audio/x-wav=io.elementary.music.desktop +audio/x-wavpack=io.elementary.music.desktop +audio/x-xm=io.elementary.music.desktop +image/bmp=io.elementary.photos-viewer.desktop +image/gif=io.elementary.photos-viewer.desktop +image/jpeg=io.elementary.photos-viewer.desktop +image/jpg=io.elementary.photos-viewer.desktop +image/pjpeg=io.elementary.photos-viewer.desktop +image/png=io.elementary.photos-viewer.desktop +image/tiff=io.elementary.photos-viewer.desktop +image/vnd.djvu=org.gnome.Evince.desktop +image/vnd.rn-realpix=io.elementary.videos.desktop +image/webp=io.elementary.photos-viewer.desktop +image/x-bmp=io.elementary.photos-viewer.desktop +image/x-bzeps=org.gnome.Evince.desktop +image/x-eps=org.gnome.Evince.desktop +image/x-gzeps=org.gnome.Evince.desktop +image/x-png=io.elementary.photos-viewer.desktop +inode/directory=io.elementary.files.desktop +misc/ultravox=io.elementary.videos.desktop +multipart/x-zip=org.gnome.FileRoller.desktop +text/calendar=io.elementary.calendar.desktop +text/html=org.gnome.Epiphany.desktop +text/mathml=io.elementary.code.desktop +text/plain=io.elementary.code.desktop +text/x-chdr=io.elementary.code.desktop +text/x-csrc=io.elementary.code.desktop +text/x-dtd=io.elementary.code.desktop +text/x-java=io.elementary.code.desktop +text/x-python=io.elementary.code.desktop +text/x-sql=io.elementary.code.desktop +text/xml=io.elementary.code.desktop +video/3gpp=io.elementary.videos.desktop +video/dv=io.elementary.videos.desktop +video/fli=io.elementary.videos.desktop +video/flv=io.elementary.videos.desktop +video/mp2t=io.elementary.videos.desktop +video/mp4=io.elementary.videos.desktop +video/mp4v-es=io.elementary.videos.desktop +video/mpeg=io.elementary.videos.desktop +video/msvideo=io.elementary.videos.desktop +video/ogg=io.elementary.videos.desktop +video/quicktime=io.elementary.videos.desktop +video/vivo=io.elementary.videos.desktop +video/vnd.divx=io.elementary.videos.desktop +video/vnd.rn-realvideo=io.elementary.videos.desktop +video/vnd.vivo=io.elementary.videos.desktop +video/webm=io.elementary.videos.desktop +video/x-anim=io.elementary.videos.desktop +video/x-avi=io.elementary.videos.desktop +video/x-flc=io.elementary.videos.desktop +video/x-fli=io.elementary.videos.desktop +video/x-flic=io.elementary.videos.desktop +video/x-flv=io.elementary.videos.desktop +video/x-m4v=io.elementary.videos.desktop +video/x-matroska=io.elementary.videos.desktop +video/x-mpeg=io.elementary.videos.desktop +video/x-ms-asf=io.elementary.videos.desktop +video/x-ms-asx=io.elementary.videos.desktop +video/x-ms-wm=io.elementary.videos.desktop +video/x-ms-wmv=io.elementary.videos.desktop +video/x-ms-wmx=io.elementary.videos.desktop +video/x-ms-wvx=io.elementary.videos.desktop +video/x-msvideo=io.elementary.videos.desktop +video/x-nsv=io.elementary.videos.desktop +video/x-ogm+ogg=io.elementary.videos.desktop +video/x-theora+ogg=io.elementary.videos.desktop +video/x-totem-stream=io.elementary.videos.desktop +x-content/image-dcf=io.elementary.photos.desktop +x-content/image-picturecd=io.elementary.photos.desktop +x-content/video-dvd=io.elementary.videos.desktop +x-content/video-svcd=io.elementary.videos.desktop +x-content/video-vcd=io.elementary.videos.desktop +x-scheme-handler/http=org.gnome.Epiphany.desktop +x-scheme-handler/https=org.gnome.Epiphany.desktop +x-scheme-handler/mailto=org.gnome.Evolution.desktop +x-scheme-handler/trash=io.elementary.files.desktop + diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 97acc2c791bf..e6a3f43f3d66 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "unstable-2018-12-16"; + version = "unstable-2019-07-01"; # Is tracking https://github.com/elementary/gala/commits/stable/juno src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = "7f1e392e03000df0bd47e7832bb3adab81f39ae5"; - sha256 = "1syqq0xfyg5nbnnmy0wp5d66k1bvq9qn27lvr37abxxqig9acpc8"; + rev = "5f1dbf15a7571bd16779d964b0cb3bd54232a928"; + sha256 = "1mbxqqfl54pydgs9pvvgfdbbck91vwyg770gd3vgzc6kmf6c34d5"; }; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index e4f7df107ba8..0d00ee2072dd 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, cmake, ninja +{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, python3 , pkgconfig, vala, granite, libgee, gettext, gtk3, appstream, gnome-menus -, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, libwnck3 -, zeitgeist, gobject-introspection, elementary-icon-theme, bc, wrapGAppsHook }: +, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, zeitgeist +, bc }: stdenv.mkDerivation rec { pname = "applications-menu"; - version = "2.4.2"; + version = "2.4.3"; name = "wingpanel-${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "0y7kh50ixvm4m56v18c70s05hhpfp683c4qi3sxy50p2368d772x"; + sha256 = "15mwfynaa57jii43x77iaz5gqjlylh5zxc70am8zgp8vhgzflvyd"; }; passthru = { @@ -25,18 +25,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream - cmake - ninja gettext - gobject-introspection + meson + ninja pkgconfig + python3 vala - wrapGAppsHook ]; buildInputs = [ bamf - elementary-icon-theme gnome-menus granite gtk3 @@ -44,24 +42,31 @@ stdenv.mkDerivation rec { libgee libsoup libunity - libwnck3 plank switchboard wingpanel zeitgeist ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + mesonFlags = [ + "--sysconfdir=${placeholder ''out''}/etc" + ]; + + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; patches = [ (substituteAll { src = ./bc.patch; exec = "${bc}/bin/bc"; }) - ./xdg.patch ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + meta = with stdenv.lib; { description = "Lightweight and stylish app launcher for Pantheon"; homepage = https://github.com/elementary/applications-menu; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch deleted file mode 100644 index f17e2581e07e..000000000000 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 928976a..7f0ea58 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -90,7 +90,7 @@ link_directories (${DEPS_LIBRARY_DIRS}) - - # Installation - install (TARGETS ${APPNAME} RUNTIME DESTINATION bin) --install (FILES ${applications_menu} DESTINATION /etc/xdg/menus) -+install (FILES ${applications_menu} DESTINATION etc/xdg/menus) - file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*") - - # Settings schema diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 16f3ae2e28e0..571dab02c318 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1gx0xglp6b3znxl4d2vpzhfkxz5z8q04hh7z2mrihj1in155bn44"; + sha256 = "04ggakf7qp4q0kah5xksbwjn78wpdrp9kdgkj6ibzsb97ngn70g9"; }; passthru = { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch deleted file mode 100644 index 2370fbcd3cb2..000000000000 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Widgets/calendar/Calendar.vala b/src/Widgets/calendar/Calendar.vala -index 76443ca..d86bd44 100644 ---- a/src/Widgets/calendar/Calendar.vala -+++ b/src/Widgets/calendar/Calendar.vala -@@ -19,7 +19,7 @@ - - namespace DateTime.Widgets { - public class Calendar : Gtk.Box { -- private const string CALENDAR_EXEC = "/usr/bin/io.elementary.calendar"; -+ private const string CALENDAR_EXEC = "@elementary-calendar@"; - - ControlHeader heading; - CalendarView cal; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index ee5cd5118186..297e99fe47b1 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -43,24 +43,30 @@ stdenv.mkDerivation rec { ]; patches = [ - (substituteAll { - src = ./calendar-exec.patch; - elementary-calendar = "${elementary-calendar}/bin/io.elementary.calendar"; - }) # Use "clock-format" GSettings key that's been moved to granite (fetchpatch { url = "https://src.fedoraproject.org/rpms/wingpanel-indicator-datetime/raw/c8d515b76aa812c141212d5515621a6febd781a3/f/00-move-clock-format-settings-to-granite.patch"; sha256 = "1sq3aw9ckkm057rnrclnw9lyrxbpl37fyzfnbixi2q3ypr70n880"; }) + # See: https://github.com/elementary/wingpanel-indicator-datetime/pull/117 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/4859e72a52d8dac5cad87b192fc912fb013b0ecd.patch"; + sha256 = "0jfhb5sax4sivdfx7il1rc1dvhy0yfv27qhvwbdy0hza9wf8q9k0"; + }) ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; + # launches elementary-calendar on selection + preFixup = '' + gappsWrapperArgs+=( --prefix PATH : "${elementary-calendar}/bin" ) + ''; + meta = with stdenv.lib; { description = "Date & Time Indicator for Wingpanel"; homepage = https://github.com/elementary/wingpanel-indicator-datetime; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index e2faccedbb70..f34ca29a98bb 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-keyboard"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0x0bdd9svw4sffx8pa0pqlh6mrj3fqp4mgrb4n7ys26k2w20ngnb"; + sha256 = "0lrd474m6p8di73hqjilqnnl7qg72ky5narkgcvm4lk8dyi78mz0"; }; passthru = { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }) ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; meta = with stdenv.lib; { description = "Keyboard Indicator for Wingpanel"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 245e12d45919..2ac05fdc6d82 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; meta = with stdenv.lib; { description = "Network Indicator for Wingpanel"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 53754c31d874..8e450726976b 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-nightlight"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "17pa048asbkhzz5945hjp96dnghdl72nqp1zq0b999nawnfrb339"; + sha256 = "0kw83ws91688xg96k9034dnz15szx2kva9smh1nb7xmdbpzn3qph"; }; passthru = { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; meta = with stdenv.lib; { description = "Night Light Indicator for Wingpanel"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index aff7d9891adf..6a7fcfbb4e03 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; meta = with stdenv.lib; { description = "Notifications Indicator for Wingpanel"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index d7627c511001..45a4e543b662 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index b910f6a71809..0b4a6f5e8f02 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-session"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "15ghhiabk74m7fm5pzr2qmdwpc330jczvvkwbf5pf7qczfyipjln"; + sha256 = "1x2p2sjal42bspmqcg9lzixv6rnihvgmwk92gfcccrmvk8j4bx6s"; }; passthru = { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; meta = with stdenv.lib; { description = "Session Indicator for Wingpanel"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 003e431bcf7e..fc40c2faf5ef 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-sound"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0hxbr5dp8d1czq8ffw339r41c7srqb72vr48hxph8g091d3mcgcl"; + sha256 = "0lgjl969c7s31nszh6d4pr1vsxfdsizplsihvd8r02mm1mlxmsda"; }; passthru = { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index a5ca227bbc20..a8fb5606a56f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -1,16 +1,15 @@ { stdenv, fetchFromGitHub, pantheon, wrapGAppsHook, pkgconfig, meson, ninja -, vala, gala, gtk3, libgee, granite, gettext, glib-networking, mutter, json-glib -, python3, gobject-introspection }: +, vala, gala, gtk3, libgee, granite, gettext, mutter, json-glib, python3, gobject-introspection }: stdenv.mkDerivation rec { pname = "wingpanel"; - version = "2.2.2"; + version = "2.2.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1knkqh9q6yp7qf27zi6ki20fq4w0ia2hklvv84ivfmfa0irz0j6r"; + sha256 = "15pl3km8jfmlgrrb2fcabdd0rkc849arz6sc3vz6azzpln7gxbq7"; }; passthru = { @@ -21,7 +20,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext - glib-networking gobject-introspection meson ninja @@ -40,7 +38,9 @@ stdenv.mkDerivation rec { mutter ]; - patches = [ ./indicators.patch ]; + patches = [ + ./indicators.patch + ]; postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/pkgs/desktops/pantheon/services/cerbere/default.nix index 59983469c114..4d8124c7fbed 100644 --- a/pkgs/desktops/pantheon/services/cerbere/default.nix +++ b/pkgs/desktops/pantheon/services/cerbere/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cerbere"; - version = "0.2.4"; + version = "2.5.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0f9jr6q5z6nir5b77f96wm9rx6r6s9i0sr1yrymg3n7jyjgrvdwp"; + sha256 = "12y6gg4vyc1rhdm2c7pr7bgmdrah7ddphyh25fgh3way8l9gh7vw"; }; passthru = { diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index a979b1341954..d7d3cdb03125 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja, pkgconfig, vala, glib, libgee, dbus, glib-networking, gobject-introspection }: +{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja, pkgconfig, vala, glib, libgee, dbus, glib-networking, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "contractor"; @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dbus - gobject-introspection meson ninja pkgconfig python3 vala + wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 99ca20afe988..3829cf551f7f 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -1,5 +1,6 @@ { fetchurl, fetchgit, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst , libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit +, geocode-glib, gtk3 , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager , docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss, pantheon, accountsservice }: @@ -75,16 +76,16 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = with gnome3; [ + buildInputs = [ accountsservice alsaLib colord geoclue2 geocode-glib glib - gnome-desktop - gsettings-desktop-schemas - gtk + gnome3.gnome-desktop + gnome3.gsettings-desktop-schemas + gtk3 ibus lcms2 libXtst diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 2487c4ba3af4..c41c359bd817 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pantheon-agent-geoclue2"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0fww65dnbg9zn0gy1q2db39kjra50ykzw05pmn9iwxkijyxi8hm5"; + sha256 = "1hjnbbzsch09090b200b3i85x8fv95agfqd6nrlc9za3jqjhm2xs"; }; passthru = { diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 814795499a99..5c27d0d2f182 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.14.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.5/ ) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index dd5f7321f0e2..dde4a3c819f2 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -81,7 +81,7 @@ index 714a9bf1..9733c612 100644 fi # Boot sequence: -@@ -33,61 +42,133 @@ fi +@@ -33,61 +42,142 @@ fi # # * Then ksmserver is started which takes control of the rest of the startup sequence @@ -102,6 +102,15 @@ index 714a9bf1..9733c612 100644 +# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html +rm -fv $HOME/.cache/icon-cache.kcache + ++# xdg-desktop-settings generates this empty file but ++# it makes kbuildsyscoca5 fail silently. To fix this ++# remove that menu if it exists. ++rm -fv $HOME/.config/menus/applications-merged/xdg-desktop-menu-dummy.menu ++ ++# Remove the kbuildsyscoca5 cache. It will be regenerated immediately after. ++# This is necessary for kbuildsyscoca5 to recognize that software that has been removed. ++rm -fv $HOME/.cache/ksycoca* ++ +# Qt writes a weird ‘libraryPath’ line to +# ~/.config/Trolltech.conf that causes the KDE plugin +# paths of previous KDE invocations to be searched. @@ -721,7 +730,7 @@ diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacomposit index dd9e304d..12132f9e 100644 --- a/startkde/startplasmacompositor.cmake +++ b/startkde/startplasmacompositor.cmake -@@ -1,118 +1,165 @@ +@@ -1,118 +1,174 @@ #!/bin/sh # -# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) @@ -749,6 +758,15 @@ index dd9e304d..12132f9e 100644 +# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html +rm -fv $HOME/.cache/icon-cache.kcache + ++# xdg-desktop-settings generates this empty file but ++# it makes kbuildsyscoca5 fail silently. To fix this ++# remove that menu if it exists. ++rm -fv $HOME/.config/menus/applications-merged/xdg-desktop-menu-dummy.menu ++ ++# Remove the kbuildsyscoca5 cache. It will be regenerated immediately after. ++# This is necessary for kbuildsyscoca5 to recognize that software that has been removed. ++rm -fv $HOME/.cache/ksycoca* ++ +# Qt writes a weird ‘libraryPath’ line to +# ~/.config/Trolltech.conf that causes the KDE plugin +# paths of previous KDE invocations to be searched. diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index fc77e163e8f9..ae1ee50a1211 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, gettext, kdoctools, python, - kcoreaddons, knotifications, kwayland, kwidgetsaddons, + kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, cups, pcre, pipewire }: @@ -10,6 +10,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ cups pcre pipewire - kcoreaddons knotifications kwayland kwidgetsaddons + kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem ]; } diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index e43dacce6250..b62dc2def7f1 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -18,19 +18,28 @@ let "x86_64-unknown-linux-gnu" = { double = "linux-x86_64"; }; - "armv5tel-unknown-linux-androideabi" = { - arch = "arm"; - triple = "arm-linux-androideabi"; - gccVer = "4.8"; + "i686-unknown-linux-android" = { + triple = "i686-linux-android"; + arch = "x86"; + toolchain = "x86"; + gccVer = "4.9"; + }; + "x86_64-unknown-linux-android" = { + triple = "x86_64-linux-android"; + arch = "x86_64"; + toolchain = "x86_64"; + gccVer = "4.9"; }; "armv7a-unknown-linux-androideabi" = { arch = "arm"; triple = "arm-linux-androideabi"; + toolchain = "arm-linux-androideabi"; gccVer = "4.9"; }; "aarch64-unknown-linux-android" = { arch = "arm64"; triple = "aarch64-linux-android"; + toolchain = "aarch64-linux-android"; gccVer = "4.9"; }; }.${config} or @@ -38,49 +47,49 @@ let hostInfo = ndkInfoFun stdenv.hostPlatform; targetInfo = ndkInfoFun stdenv.targetPlatform; + + prefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-"); in rec { # Misc tools - binaries = let - ndkBinDir = - "${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin"; - ndkGCCLibDir = - "${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/lib/gcc/${targetInfo.triple}/4.9.x"; + binaries = runCommand "ndk-gcc-binutils" { + isClang = true; # clang based cc, but bintools ld + nativeBuildInputs = [ makeWrapper ]; + propgatedBuildInputs = [ androidndk ]; + } '' + mkdir -p $out/bin - in runCommand "ndk-gcc-binutils" { - isGNU = true; # for cc-wrapper - nativeBuildInputs = [ makeWrapper ]; - propgatedBuildInputs = [ androidndk ]; - } '' - mkdir -p $out/bin - for prog in ${ndkBinDir}/${targetInfo.triple}-*; do - prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//') - cat > $out/bin/${stdenv.targetPlatform.config}-$prog_suffix <> $out/nix-support/libc-ldflags - ''; }; - gcc = wrapCCWith { + clang = wrapCCWith { cc = binaries; bintools = binutils; libc = targetAndroidndkPkgs.libraries; extraBuildCommands = '' echo "-D__ANDROID_API__=${stdenv.targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags + echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags + echo "-resource-dir=$(echo ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/lib*/clang/*)" >> $out/nix-support/cc-cflags + echo "--gcc-toolchain=${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}" >> $out/nix-support/cc-cflags '' + lib.optionalString stdenv.targetPlatform.isAarch32 (let p = stdenv.targetPlatform.platform.gcc or {} @@ -90,7 +99,6 @@ rec { (lib.optional (p ? cpu) "-mcpu=${p.cpu}") (lib.optional (p ? abi) "-mabi=${p.abi}") (lib.optional (p ? fpu) "-mfpu=${p.fpu}") - (lib.optional (p ? float) "-mfloat=${p.float}") (lib.optional (p ? float-abi) "-mfloat-abi=${p.float-abi}") (lib.optional (p ? mode) "-mmode=${p.mode}") ]; @@ -98,17 +106,10 @@ rec { sed -E -i \ $out/bin/${stdenv.targetPlatform.config}-cc \ $out/bin/${stdenv.targetPlatform.config}-c++ \ - $out/bin/${stdenv.targetPlatform.config}-gcc \ - $out/bin/${stdenv.targetPlatform.config}-g++ \ - -e '130i extraBefore+=(-Wl,--fix-cortex-a8)' \ - -e 's|^(extraBefore=)\(\)$|\1(${builtins.toString flags})|' - '') - # GCC 4.9 is the first relase with "-fstack-protector" - + lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") '' - sed -E \ - -i $out/nix-support/add-hardening.sh \ - -e 's|(-fstack-protector)-strong|\1|g' - ''; + $out/bin/${stdenv.targetPlatform.config}-clang \ + $out/bin/${stdenv.targetPlatform.config}-clang++ \ + -e 's|^(extraBefore=)\((.*)\)$|\1(\2 -Wl,--fix-cortex-a8 ${builtins.toString flags})|' + ''); }; # Bionic lib C and other libraries. @@ -116,17 +117,11 @@ rec { # We use androidndk from the previous stage, else we waste time or get cycles # cross-compiling packages to wrap incorrectly wrap binaries we don't include # anyways. - libraries = - let - includePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include"; - asmIncludePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}"; - libPath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib/"; - in - runCommand "bionic-prebuilt" {} '' - mkdir -p $out - cp -r ${includePath} $out/include - chmod +w $out/include - cp -r ${asmIncludePath}/* $out/include - ln -s ${libPath} $out/lib - ''; + libraries = runCommand "bionic-prebuilt" {} '' + mkdir -p $out + cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include $out/include + chmod +w $out/include + cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}/* $out/include + ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib $out/lib + ''; } diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index 8f93a0b37721..182f8fbefab5 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -13,7 +13,7 @@ let inherit version; sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a"; }; - patches = []; + postPatch = ""; }); platformio = self.callPackage ./core.nix { }; diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 9e160acf2d40..abe3c9e5122f 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -61,8 +61,9 @@ let export HEX_OFFLINE=1 export HEX_HOME=`pwd` export MIX_ENV=prod + export MIX_NO_DEPS=1 - MIX_ENV=prod mix compile ${debugInfoFlag} --no-deps-check + mix compile ${debugInfoFlag} runHook postBuild '' diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 6e3fe6c4ebf1..8e8b157aa229 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -72,6 +72,10 @@ let result = stdenv.mkDerivation rec { # Remove some broken manpages. rm -rf $out/man/ja* + # Remove embedded freetype to avoid problems like + # https://github.com/NixOS/nixpkgs/issues/57733 + rm $out/lib/libfreetype.so + # for backward compatibility ln -s $out $out/jre diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 0ed3d8c0049e..03febb6aa355 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -5,27 +5,27 @@ "hotspot": { "aarch64": { "build": "7", - "sha256": "95b14e954f96185d02afda1a3ab146011076a4d97b457c9333556bd5d9263c41", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.2_7.tar.gz", - "version": "11.0.2" + "sha256": "894a846600ddb0df474350037a2fb43e3343dc3606809a20c65e750580d8f2b9", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.3_7.tar.gz", + "version": "11.0.3" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "d02089d834f7702ac1a9776d8d0d13ee174d0656cf036c6b68b9ffb71a6f610e", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz", - "version": "11.0.2" + "build": "7", + "sha256": "23cded2b43261016f0f246c85c8948d4a9b7f2d44988f75dad69723a7a526094", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz", + "version": "11.0.3" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "9", - "sha256": "02de51ebe86897081f7998dd2f256e33fb8b15c70cf26715020795326cc50511", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jdk_x64_linux_openj9_11.0.2_9_openj9-0.12.0.tar.gz", - "version": "11.0.2" + "build": "7", + "sha256": "7012edd56fc958070bc4747073de14ea08eb43081eb6ea19bdbf4763186e2d17", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.3_7_openj9-0.14.0.tar.gz", + "version": "11.0.3" } } }, @@ -33,27 +33,27 @@ "hotspot": { "aarch64": { "build": "7", - "sha256": "b101c86948742a5a580f94596654ef7d200f629cfc1ffdded10fb6a0cbe34c34", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.2_7.tar.gz", - "version": "11.0.2" + "sha256": "de31fab70640c6d5099de5fc8fa8b4d6b484a7352fa48a9fafbdc088ca708564", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.3_7.tar.gz", + "version": "11.0.3" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "e762e4cd50cebd1c63dee2cf0d5737016e9e057520b67761df5ad2dc7bbc7d54", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz", - "version": "11.0.2" + "build": "7", + "sha256": "d2df8bc799b09c8375f79bf646747afac3d933bb1f65de71d6c78e7466ff8fe4", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.3_7.tar.gz", + "version": "11.0.3" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "9", - "sha256": "9c6283485a9fa07c1dca882e6427d785c9f4a99d2e49e91ccefbc6147da27343", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jre_x64_linux_openj9_11.0.2_9_openj9-0.12.0.tar.gz", - "version": "11.0.2" + "build": "7", + "sha256": "14c660294832c7b2deb2845d96dce83df677e204b4f0f1fee0052764c4a56720", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jre_x64_linux_openj9_11.0.3_7_openj9-0.14.0.tar.gz", + "version": "11.0.3" } } } @@ -64,20 +64,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "fffd4ed283e5cd443760a8ec8af215c8ca4d33ec5050c24c1277ba64b5b5e81a", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.2_9.tar.gz", - "version": "11.0.2" + "build": "7", + "sha256": "5ca2a24f1827bd7c110db99854693bf418f51ee3093c31332db5cd605278faad", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.3_7.tar.gz", + "version": "11.0.3" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "9", - "sha256": "0589fea4f9012299267dd3c533417a37540a3db61ae86f411bda67195b3636f4", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jdk_x64_mac_openj9_11.0.2_9_openj9-0.12.0.tar.gz", - "version": "11.0.2" + "build": "7", + "sha256": "01045a99ff23bda354f82c0fd3fa6e8222e4a5acce7494e82495f47b30bc5e18", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.3_7_openj9-0.14.0.tar.gz", + "version": "11.0.3" } } }, @@ -86,20 +86,20 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "7e70784f7833751b63cee9e197230877a4059b178a24858261f834ea39b29fd5", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.2_9.tar.gz", - "version": "11.0.2" + "build": "7", + "sha256": "9523b97288ff5d50e404565d346ed8ea8f19dd155092951af88d4be6b8414776", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.3_7.tar.gz", + "version": "11.0.3" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "9", - "sha256": "40d70bf570b2098b381b77ae62dfddfb8cf6fc500ed539d82b78405593a9c9e5", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jre_x64_mac_openj9_11.0.2_9_openj9-0.12.0.tar.gz", - "version": "11.0.2" + "build": "7", + "sha256": "150c4065a57ec368b692276e8e3320b183ee17b402b7db07e676dff5837f0c52", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7_openj9-0.14.0/OpenJDK11U-jre_x64_mac_openj9_11.0.3_7_openj9-0.14.0.tar.gz", + "version": "11.0.3" } } } diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 345bd1250254..09422a7a8623 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2018.09.08"; src = fetchFromGitHub { - owner = "cseed"; + owner = "yosyshq"; repo = "arachne-pnr"; rev = "840bdfdeb38809f9f6af4d89dd7b22959b176fdd"; sha256 = "1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl"; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index ae6af8dd4b4f..646963eedbca 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4 }: +{ stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: let options = rec { @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { cp -r . "$out/share/ccl-installation" mkdir -p "$out/bin" - echo -e '#!${stdenv.shell}\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" + echo -e '#!${runtimeShell}\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" chmod a+x "$out"/bin/"${CCL_RUNTIME}" ln -s "$out"/bin/"${CCL_RUNTIME}" "$out"/bin/ccl ''; diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 3d9fe3a59cfd..960a54489da4 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ stdenv, fetchurl, python, runtimeShell }: stdenv.mkDerivation rec { name = "cmdstan-2.17.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ln -s $out/opt/cmdstan/bin/stanc $out/bin/stanc ln -s $out/opt/cmdstan/bin/stansummary $out/bin/stansummary cat > $out/bin/stan <> $out/nix-support/setup-hook + '' + '' + runHook postInstall + ''; + + postInstall = '' + for b in nvvp nsight; do + wrapProgram "$out/bin/$b" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + done ''; preFixup = '' @@ -138,6 +147,27 @@ let done < <(find $out $lib $doc -type f -print0) ''; + # cuda-gdb doesn't run correctly when not using sandboxing, so + # temporarily disabling the install check. This should be set to true + # when we figure out how to get `cuda-gdb --version` to run correctly + # when not using sandboxing. + doInstallCheck = false; + postInstallCheck = let + in '' + # Smoke test binaries + pushd $out/bin + for f in *; do + case $f in + crt) continue;; + nvcc.profile) continue;; + nsight_ee_plugins_manage.sh) continue;; + uninstall_cuda_toolkit_6.5.pl) continue;; + computeprof|nvvp|nsight) continue;; # GUIs don't feature "--version" + *) echo "Executing '$f --version':"; ./$f --version;; + esac + done + popd + ''; passthru = { cc = gcc; majorVersion = @@ -199,6 +229,24 @@ in rec { version = "9.0.176.1"; url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run"; sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln"; + runPatches = [ + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/1/cuda_9.0.176.1_linux-run"; + sha256 = "1vbqg97pq9z9c8nqvckiwmq3ljm88m7gaizikzxbvz01izh67gx4"; + }) + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/2/cuda_9.0.176.2_linux-run"; + sha256 = "1sz5dijbx9yf7drfipdxav5a5g6sxy4w6vi9xav0lb6m2xnmyd7c"; + }) + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/3/cuda_9.0.176.3_linux-run"; + sha256 = "1jm83bxpscpjhzs5q3qijdgjm0r8qrdlgkj7y08fq8c0v8q2r7j2"; + }) + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/4/cuda_9.0.176.4_linux-run"; + sha256 = "0pymg3mymsa2n48y0njz3spzlkm15lvjzw8fms1q83zslz4x0lwk"; + }) + ]; gcc = gcc6; }; diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 3ab25c3a830b..a9f0e3ec0a51 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,199 +1,165 @@ -{ stdenv, fetchFromGitHub -, makeWrapper, unzip, which +{ stdenv, lib, fetchFromGitHub, fetchpatch +, makeWrapper, unzip, which, writeTextFile , curl, tzdata, gdb, darwin, git , callPackage, targetPackages, ldc -, version ? "2.084.0" -, dmdSha256 ? "1v61spdamncl8c1bzjc19b03p4jl0ih5zq9b7cqsy9ix7qaxmikf" -, druntimeSha256 ? "0vp414j6s11l9s54v81np49mv60ywmd7nnk41idkbwrq0nz4sfrq" -, phobosSha256 ? "1wp7z1x299b0w9ny1ah2wrfhrs05vc4bk51csgw9774l3dqcnv53" +, version ? "2.084.1" +, dmdSha256 ? "10ll5072rkv3ln7i5l88h2f9mzda567kw2jwh6466vm6ylzl4jms" +, druntimeSha256 ? "0i0g2cnzh097pmvb86gvyj79canaxppw33hp7ylqnd11q4kqc8pb" +, phobosSha256 ? "1hxpismj9gy5n1bc9kl9ykgd4lfmkq9i8xgrq09j0fybfwn9j1gc" }: let - dmdBuild = stdenv.mkDerivation rec { - name = "dmdBuild-${version}"; - inherit version; - - enableParallelBuilding = true; - - srcs = [ - (fetchFromGitHub { - owner = "dlang"; - repo = "dmd"; - rev = "v${version}"; - sha256 = dmdSha256; - name = "dmd"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "druntime"; - rev = "v${version}"; - sha256 = druntimeSha256; - name = "druntime"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "phobos"; - rev = "v${version}"; - sha256 = phobosSha256; - name = "phobos"; - }) - ]; - - sourceRoot = "."; - - # https://issues.dlang.org/show_bug.cgi?id=19553 - hardeningDisable = [ "fortify" ]; - - postUnpack = '' - patchShebangs . - ''; - - postPatch = '' - substituteInPlace dmd/test/compilable/extra-files/ddocYear.html \ - --replace "2018" "__YEAR__" - - substituteInPlace dmd/test/runnable/test16096.sh \ - --replace "{EXT}" "{EXE}" - ''; - - nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ] - - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); - - buildInputs = [ curl tzdata ]; - - bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then - "osx" - else - stdenv.hostPlatform.parsed.kernel.name; - top = "$(echo $NIX_BUILD_TOP)"; - pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd"; - - # Buid and install are based on http://wiki.dlang.org/Building_DMD - buildPhase = '' - cd dmd - make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2 - cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} - cd ../phobos - echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile - echo ${curl.out}/lib/libcurl.so > LibcurlPathFile - make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" - cd .. - ''; - - # Disable tests on Darwin for now because of - # https://github.com/NixOS/nixpkgs/issues/41099 - doCheck = true; - - checkPhase = '' - cd dmd - make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHARED=0 SHELL=$SHELL - cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release - cd .. - ''; - - dontStrip = true; - - installPhase = '' - cd dmd - mkdir $out - mkdir $out/bin - cp ${pathToDmd} $out/bin - - mkdir -p $out/share/man/man1 - mkdir -p $out/share/man/man5 - cp -r docs/man/man1/* $out/share/man/man1/ - cp -r docs/man/man5/* $out/share/man/man5/ - - cd ../druntime - mkdir $out/include - mkdir $out/include/d2 - cp -r import/* $out/include/d2 - - cd ../phobos - mkdir $out/lib - cp generated/${osname}/release/${bits}/libphobos2.* $out/lib - - cp -r std $out/include/d2 - cp -r etc $out/include/d2 - - wrapProgram $out/bin/dmd \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ - --set-default CC "${targetPackages.stdenv.cc}/bin/cc" - - cd $out/bin - tee dmd.conf << EOF - [Environment] - DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"} -fPIC - EOF - ''; - - meta = with stdenv.lib; { - description = "Official reference compiler for the D language"; - homepage = http://dlang.org/; - # Everything is now Boost licensed, even the backend. - # https://github.com/dlang/dmd/pull/6680 - license = licenses.boost; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; + dmdConfFile = writeTextFile { + name = "dmd.conf"; + text = (lib.generators.toINI {} { + "Environment" = { + DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; + }; + }); }; - # Need to test Phobos in a fixed-output derivation, otherwise the - # network stuff in Phobos would fail if sandbox mode is enabled. - # - # Disable tests on Darwin for now because of - # https://github.com/NixOS/nixpkgs/issues/41099 - phobosUnittests = if !stdenv.hostPlatform.isDarwin then - stdenv.mkDerivation rec { - name = "phobosUnittests-${version}"; - version = dmdBuild.version; - - enableParallelBuilding = dmdBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = dmdBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; - - srcs = dmdBuild.srcs; - - sourceRoot = "."; - - nativeBuildInputs = dmdBuild.nativeBuildInputs; - buildInputs = dmdBuild.buildInputs; - - buildPhase = '' - cd phobos - echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile - echo ${curl.out}/lib/libcurl.so > LibcurlPathFile - make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${dmdBuild}/bin/dmd DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" - ''; - - installPhase = '' - echo -n $inputString > $out - ''; - } - else - ""; - in stdenv.mkDerivation rec { - inherit phobosUnittests; name = "dmd-${version}"; - phases = "installPhase"; - buildInputs = dmdBuild.buildInputs; + inherit version; + + enableParallelBuilding = true; + + srcs = [ + (fetchFromGitHub { + owner = "dlang"; + repo = "dmd"; + rev = "v${version}"; + sha256 = dmdSha256; + name = "dmd"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "druntime"; + rev = "v${version}"; + sha256 = druntimeSha256; + name = "druntime"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "phobos"; + rev = "v${version}"; + sha256 = phobosSha256; + name = "phobos"; + }) + ]; + + patches = [ + (fetchpatch { + name = "fix-loader-import.patch"; + url = "https://github.com/dlang/dmd/commit/e7790436c4af1910b8c079dac9bb69627d7dea4b.patch"; + sha256 = "0w69hajx8agywc7m2hph5m27g2yclz8ml0gjjyjk9k6ii3jv45kx"; + }) + ]; + + patchFlags = [ "--directory=dmd" "-p1" ]; + + sourceRoot = "."; + + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; + + postUnpack = '' + patchShebangs . + ''; + + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' + + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + ''; + + nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ] + + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); + + buildInputs = [ curl tzdata ]; + + bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; + osname = if stdenv.hostPlatform.isDarwin then + "osx" + else + stdenv.hostPlatform.parsed.kernel.name; + top = "$(echo $NIX_BUILD_TOP)"; + pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd"; + + # Buid and install are based on http://wiki.dlang.org/Building_DMD + buildPhase = '' + cd dmd + make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2 + cd ../druntime + make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} + cd ../phobos + echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > LibcurlPathFile + make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" + cd .. + ''; + + doCheck = true; + + checkPhase = '' + cd dmd + # https://github.com/NixOS/nixpkgs/pull/55998#issuecomment-465871846 + #make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL + cd ../druntime + make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release + cd ../phobos + make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" + cd .. + ''; + + dontStrip = true; installPhase = '' - mkdir $out - cp -r --symbolic-link ${dmdBuild}/* $out/ + cd dmd + mkdir $out + mkdir $out/bin + cp ${pathToDmd} $out/bin + + mkdir -p $out/share/man/man1 + mkdir -p $out/share/man/man5 + cp -r docs/man/man1/* $out/share/man/man1/ + cp -r docs/man/man5/* $out/share/man/man5/ + + cd ../druntime + mkdir $out/include + mkdir $out/include/dmd + cp -r import/* $out/include/dmd + + cd ../phobos + mkdir $out/lib + cp generated/${osname}/release/${bits}/libphobos2.* $out/lib + + cp -r std $out/include/dmd + cp -r etc $out/include/dmd + + wrapProgram $out/bin/dmd \ + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" + + substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out ''; - meta = dmdBuild.meta; + + meta = with stdenv.lib; { + description = "Official reference compiler for the D language"; + homepage = http://dlang.org/; + # Everything is now Boost licensed, even the backend. + # https://github.com/dlang/dmd/pull/6680 + license = licenses.boost; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; } diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index bfaf24cd9872..f14bce5d96b3 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -4,7 +4,7 @@ let fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; - hsPkgs = haskell.packages.ghc863.override { + hsPkgs = haskell.packages.ghc864.override { overrides = self: super: with haskell.lib; let elmPkgs = { elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 82edf0e33cfa..9e5a172eed84 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -5,16 +5,17 @@ stdenv.mkDerivation rec { 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"; } + if stdenv.isLinux then + fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; + sha256="1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; + } + else if stdenv.isDarwin then + fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-mac.tar.bz2"; + sha256="0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; + } else throw "unsupported platform"; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 39fc3c517f81..80e042b5c2e9 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -7,9 +7,18 @@ stdenv.mkDerivation rec { version = "7-2018-q2-update"; subdir = "7-2018q2"; - urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; - - src = fetchurl { url=urlString; sha256="0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; }; + src = + if stdenv.isLinux then + fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; + sha256="0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; + } + else if stdenv.isDarwin then + fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-mac.tar.bz2"; + sha256="0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; + } + else throw "unsupported platform"; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index a26131cb0536..ee57dcc8c144 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -7,9 +7,18 @@ stdenv.mkDerivation rec { version = "8-2018-q4-major"; subdir = "8-2018q4"; - urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; - - src = fetchurl { url=urlString; sha256="fb31fbdfe08406ece43eef5df623c0b2deb8b53e405e2c878300f7a1f303ee52"; }; + src = + if stdenv.isLinux then + fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; + sha256="fb31fbdfe08406ece43eef5df623c0b2deb8b53e405e2c878300f7a1f303ee52"; + } + else if stdenv.isDarwin then + fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-mac.tar.bz2"; + sha256="0q44r57fizpk1z3ngcjwal3rxgsnzjyfknpgwlwzmw5r9p98wlhb"; + } + else throw "unsupported platform"; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index b36529ecb3cf..a0e5c866a967 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -411,7 +411,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ peti ]; + maintainers = with stdenv.lib.maintainers; [ peti veprbl ]; platforms = stdenv.lib.platforms.linux ++ diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 66b98cc6d64c..ce3395f0be03 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -37,7 +37,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "8.2.0"; +let version = "8.3.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -132,7 +132,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r"; + sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4"; }; inherit patches; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix new file mode 100644 index 000000000000..0d75de7557be --- /dev/null +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -0,0 +1,384 @@ +{ stdenv, targetPackages, fetchurl, noSysDirs +, langC ? true, langCC ? true, langFortran ? false +, langObjC ? stdenv.targetPlatform.isDarwin +, langObjCpp ? stdenv.targetPlatform.isDarwin +, langGo ? false +, profiledCompiler ? false +, staticCompiler ? false +, enableShared ? true +, texinfo ? null +, perl ? null # optional, for texi2pod (then pod2man) +, gmp, mpfr, libmpc, gettext, which +, libelf # optional, for link-time optimizations (LTO) +, isl ? null # optional, for the Graphite optimization framework. +, zlib ? null +, enableMultilib ? false +, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins +, name ? "gcc" +, libcCross ? null +, crossStageStatic ? false +, # Strip kills static libs of other archs (hence no cross) + stripped ? stdenv.hostPlatform == stdenv.buildPlatform + && stdenv.targetPlatform == stdenv.hostPlatform +, gnused ? null +, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, buildPackages +}: + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +# Make sure we get GNU sed. +assert stdenv.hostPlatform.isDarwin -> gnused != null; + +# The go frontend is written in c++ +assert langGo -> langCC; + +with stdenv.lib; +with builtins; + +let version = "9.1.0"; + + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + patches = + optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optional noSysDirs ../no-sys-dirs.patch + /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied + url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; + sha256 = ""; # TODO: uncomment and check hash when available. + }) */ + ++ optional langFortran ../gfortran-driving.patch + ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch; + + /* Cross-gcc settings (build == host != target) */ + crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; + crossConfigureFlags = + # Ensure that -print-prog-name is able to find the correct programs. + [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++ + (if crossMingw && crossStageStatic then [ + "--with-headers=${libcCross}/include" + "--with-gcc" + "--with-gnu-as" + "--with-gnu-ld" + "--with-gnu-ld" + "--disable-shared" + "--disable-nls" + "--disable-debug" + "--enable-sjlj-exceptions" + "--enable-threads=win32" + "--disable-win32-registry" + "--disable-libmpx" # requires libc + ] else if crossStageStatic then [ + "--disable-libssp" + "--disable-nls" + "--without-headers" + "--disable-threads" + "--disable-libgomp" + "--disable-libquadmath" + "--disable-shared" + "--disable-libatomic" # requires libc + "--disable-decimal-float" # requires libc + "--disable-libmpx" # requires libc + ] else [ + (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot" + else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}") + "--enable-__cxa_atexit" + "--enable-long-long" + ] ++ + (if crossMingw then [ + "--enable-threads=win32" + "--enable-sjlj-exceptions" + "--enable-hash-synchronization" + "--enable-libssp" + "--disable-nls" + "--with-dwarf2" + # To keep ABI compatibility with upstream mingw-w64 + "--enable-fully-dynamic-string" + ] else + optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ + # libsanitizer requires netrom/netrom.h which is not + # available in uclibc. + "--disable-libsanitizer" + # In uclibc cases, libgomp needs an additional '-ldl' + # and as I don't know how to pass it, I disable libgomp. + "--disable-libgomp" + # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 + "--disable-libmpx" + ] + ++ optional (targetPlatform.libc == "newlib") "--with-newlib" + ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" + ++ [ + "--enable-threads=${if targetPlatform.isUnix then "posix" + else if targetPlatform.isWindows then "win32" + else "single"}" + "--enable-nls" + "--disable-decimal-float" # No final libdecnumber (it may work only in 386) + ])); + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; + crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; + + bootstrap = targetPlatform == hostPlatform; + +in + +stdenv.mkDerivation ({ + name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; + + builder = ../builder.sh; + + src = fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; + sha256 = "1817nc2bqdc251k0lpc51cimna7v68xjrnvqzvc50q3ax4s6i9kr"; + }; + + inherit patches; + + outputs = [ "out" "lib" "man" "info" ]; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + + hardeningDisable = [ "format" "pie" ]; + + # 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 = '' + configureScripts=$(find . -name configure) + for configureScript in $configureScripts; do + patchShebangs $configureScript + done + '' + ( + if targetPlatform != hostPlatform || stdenv.cc.libc != null then + # On NixOS, use the right path to the dynamic linker instead of + # `/lib/ld*.so'. + let + libc = if libcCross != null then libcCross else stdenv.cc.libc; + in + ( + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..." + for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h + do + grep -q _DYNAMIC_LINKER "$header" || continue + echo " fixing \`$header'..." + sed -i "$header" \ + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' + done + '' + + stdenv.lib.optionalString (targetPlatform.libc == "musl") + '' + sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' + '' + ) + else ""); + + inherit noSysDirs staticCompiler crossStageStatic + libcCross crossMingw; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl); + + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) + ++ (optional (zlib != null) zlib) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional hostPlatform.isDarwin gnused) + ; + + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + + preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' + export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` + export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" + export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" + export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" + ''; + + dontDisableStatic = true; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + + configureFlags = + # Basic dependencies + [ + "--with-gmp-include=${gmp.dev}/include" + "--with-gmp-lib=${gmp.out}/lib" + "--with-mpfr-include=${mpfr.dev}/include" + "--with-mpfr-lib=${mpfr.out}/lib" + "--with-mpc=${libmpc}" + ] ++ + optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ + + # Basic configuration + [ + "--enable-lto" + "--disable-libstdcxx-pch" + "--without-included-gettext" + "--with-system-zlib" + "--enable-static" + "--enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" + ++ optionals crossDarwin [ "objc" "obj-c++" ] + ) + ) + }" + ] ++ + + (if (enableMultilib || targetPlatform.isAvr) + then ["--enable-multilib" "--disable-libquadmath"] + else ["--disable-multilib"]) ++ + optional (!enableShared) "--disable-shared" ++ + (if enablePlugin + then ["--enable-plugin"] + else ["--disable-plugin"]) ++ + + # Optional features + optional (isl != null) "--with-isl=${isl}" ++ + + (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++ + optional (targetPlatform != hostPlatform) crossConfigureFlags ++ + optional (!bootstrap) "--disable-bootstrap" ++ + + # Platform-specific flags + optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++ + optionals hostPlatform.isSunOS [ + "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit" + # On Illumos/Solaris GNU as is preferred + "--with-gnu-as" "--without-gnu-ld" + ] + ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [ + "--disable-libsanitizer" + "--disable-symvers" + "libat_cv_have_ifunc=no" + "--disable-gnu-indirect-function" + ] + ; + + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + + buildFlags = optional + (bootstrap && hostPlatform == buildPlatform) + (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + + dontStrip = !stripped; + + installTargets = + if stripped + then "install-strip" + else "install"; + + # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. + + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + )); + + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); + + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}${libcCross.libdir or "/lib"}" + ]); + + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" + ] ++ (if crossStageStatic then [ + "-B${libcCross.out}${libcCross.libdir or "/lib"}" + ] else [ + "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" + "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" + ])); + + passthru = { + inherit langC langCC langObjC langObjCpp langFortran langGo version; + isGNU = true; + }; + + enableParallelBuilding = true; + inherit enableMultilib; + + inherit (stdenv) is64bit; + + meta = { + homepage = https://gcc.gnu.org/; + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as + libraries for these languages (libstdc++, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = with stdenv.lib.maintainers; [ synthetica ]; + + platforms = + stdenv.lib.platforms.linux ++ + stdenv.lib.platforms.freebsd ++ + stdenv.lib.platforms.illumos ++ + stdenv.lib.platforms.darwin; + }; +} + +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } +) diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix index 678245d3e437..9fe3a7d9dba3 100644 --- a/pkgs/development/compilers/ghc/8.2.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix @@ -107,6 +107,15 @@ stdenv.mkDerivation rec { sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + '' + + # We're kludging a glibc bindist into working with non-glibc... + # Here we patch up the use of `__strdup` (part of glibc binary ABI) + # to instead use `strdup` since musl doesn't provide __strdup + # (`__strdup` is defined to be an alias of `strdup` anyway[1]). + # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html + # Use objcopy magic to make the change: + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \; ''; configurePlatforms = [ ]; @@ -114,6 +123,7 @@ stdenv.mkDerivation rec { let gcc-clang-wrapper = substituteAll { inherit (stdenv) shell; + isExecutable = true; src = ./gcc-clang-wrapper.sh; }; in diff --git a/pkgs/development/compilers/ghc/8.6.2.nix b/pkgs/development/compilers/ghc/8.6.2.nix deleted file mode 100644 index 07d4420804dd..000000000000 --- a/pkgs/development/compilers/ghc/8.6.2.nix +++ /dev/null @@ -1,230 +0,0 @@ -{ stdenv, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx - -, libiconv ? null, ncurses - -, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt - -, # Whetherto build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp - ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - toolsForTarget = - if hostPlatform == buildPlatform then - [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm - else assert targetPlatform == hostPlatform; # build != host == target - [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - -in -stdenv.mkDerivation (rec { - version = "8.6.2"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "1mbn3n2ynmpfpb7jfnhpzzli31qqxqyi8ws71blws3i846fq3ana"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [(fetchpatch rec { # https://phabricator.haskell.org/D5123 - url = "http://tarballs.nixos.org/sha256/${sha256}"; - name = "D5123.diff"; - sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; - })]; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + stdenv.lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ - # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatability. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl ] ++ (libDeps hostPlatform); - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ stdenv.lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # Our Cabal compiler name - haskellCompilerName = "ghc-8.6.2"; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/pkgs/development/compilers/ghc/8.6.3-binary.nix b/pkgs/development/compilers/ghc/8.6.3-binary.nix index cde67183ef49..7e845da5b648 100644 --- a/pkgs/development/compilers/ghc/8.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.3-binary.nix @@ -99,6 +99,15 @@ stdenv.mkDerivation rec { sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + '' + + # We're kludging a glibc bindist into working with non-glibc... + # Here we patch up the use of `__strdup` (part of glibc binary ABI) + # to instead use `strdup` since musl doesn't provide __strdup + # (`__strdup` is defined to be an alias of `strdup` anyway[1]). + # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html + # Use objcopy magic to make the change: + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \; ''; configurePlatforms = [ ]; diff --git a/pkgs/development/compilers/ghc/8.6.3.nix b/pkgs/development/compilers/ghc/8.6.4.nix similarity index 96% rename from pkgs/development/compilers/ghc/8.6.3.nix rename to pkgs/development/compilers/ghc/8.6.4.nix index c57e4d96ae2e..140cea22442e 100644 --- a/pkgs/development/compilers/ghc/8.6.3.nix +++ b/pkgs/development/compilers/ghc/8.6.4.nix @@ -82,12 +82,12 @@ let in stdenv.mkDerivation (rec { - version = "8.6.3"; + version = "8.6.4"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "08vzq0dpg4a39bs61j6rq4z0n7jby5mc69h4m25xhd8rjyvkg7lz"; + sha256 = "0fihs1sr0hpk67dn9cmrsav13kkcp9hz8ggdqcrs80rj8vj0fpav"; }; enableParallelBuilding = true; @@ -153,7 +153,7 @@ stdenv.mkDerivation (rec { configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${libffi}/include" "--with-ffi-libraries=${libffi}/lib" + ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${libffi.dev}/include" "--with-ffi-libraries=${libffi.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ @@ -172,6 +172,9 @@ stdenv.mkDerivation (rec { # Make sure we never relax`$PATH` and hooks support for compatability. strictDeps = true; + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour @@ -215,7 +218,7 @@ stdenv.mkDerivation (rec { inherit enableShared; # Our Cabal compiler name - haskellCompilerName = "ghc-8.6.3"; + haskellCompilerName = "ghc-8.6.4"; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.5.nix similarity index 86% rename from pkgs/development/compilers/ghc/8.6.1.nix rename to pkgs/development/compilers/ghc/8.6.5.nix index b54164ccc696..b0078978ad37 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -6,6 +6,9 @@ , libiconv ? null, ncurses +, # GHC can be built with system libffi or a bundled one. + libffi ? null + , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a @@ -29,6 +32,10 @@ , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 }: assert !enableIntegerSimple -> gmp != null; @@ -65,6 +72,7 @@ let # Splicer will pull out correct variations libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -74,27 +82,37 @@ let else assert targetPlatform == hostPlatform; # build != host == target [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + targetCC = builtins.head toolsForTarget; in stdenv.mkDerivation (rec { - version = "8.6.1"; + version = "8.6.5"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c"; + sha256 = "0qg3zsmbk4rkwkc3jpas3zs74qaxmw4sp4v1mhsbj0a0dzls2jjd"; }; enableParallelBuilding = true; outputs = [ "out" "doc" ]; - patches = [(fetchpatch rec { # https://phabricator.haskell.org/D5123 - url = "http://tarballs.nixos.org/sha256/${sha256}"; - name = "D5123.diff"; - sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; - })]; + patches = [ + (fetchpatch rec { # https://phabricator.haskell.org/D5123 + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D5123.diff"; + sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; + }) + (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; + name = "loadpluginsinmodules.diff"; + sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + ]; postPatch = "patchShebangs ."; @@ -149,6 +167,7 @@ stdenv.mkDerivation (rec { configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ @@ -159,8 +178,7 @@ stdenv.mkDerivation (rec { "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ - # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" ]; @@ -168,7 +186,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx @@ -213,7 +231,7 @@ stdenv.mkDerivation (rec { inherit enableShared; # Our Cabal compiler name - haskellCompilerName = "ghc-8.6.1"; + haskellCompilerName = "ghc-${version}"; }; meta = { diff --git a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix index a88e2c48d03e..52f3ad497ad6 100644 --- a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix +++ b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix @@ -5,4 +5,5 @@ in self: super: { ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy]; ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install"); haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs; + system-fileio = doJailbreak super.system-fileio; } diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 14a210783896..068d7b578dfe 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -105,4 +105,5 @@ in stdenv.mkDerivation { meta.platforms = passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; + meta.hydraPlatforms = []; } diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index 1c9bc0a30091..f161b49c72bc 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin +{ stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation -, mailcap +, mailcap, runtimeShell , buildPackages, targetPackages }: let @@ -28,14 +28,12 @@ let in stdenv.mkDerivation rec { - name = "go-${version}"; - version = "1.11.5"; + pname = "go"; + version = "1.11.12"; - src = fetchFromGitHub { - owner = "golang"; - repo = "go"; - rev = "go${version}"; - sha256 = "0d45057rc0bngq0nja847cagxji42qmlywr68f0dkg51im8nyr9y"; + src = fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "09k9zmq7hhgg0bf1y7rwa0kn7q1vkkr94cmg2iv9lq3najh5nykd"; }; # perl is used for testing go vet @@ -55,7 +53,7 @@ stdenv.mkDerivation rec { # This source produces shell script at run time, # and thus it is not corrected by patchShebangs. substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' # Patch the mimetype database location which is missing on NixOS. substituteInPlace src/mime/type_unix.go \ @@ -100,7 +98,7 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go '' + optionalString stdenv.isAarch32 '' - echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true @@ -125,7 +123,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.11.patch - ./ssl-cert-file-1.9.patch + ./ssl-cert-file-1.12.1.patch ./remove-test-pie.patch ./creds-test.patch ./go-1.9-skip-flaky-19608.patch diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix new file mode 100644 index 000000000000..c9cf03e96526 --- /dev/null +++ b/pkgs/development/compilers/go/1.12.nix @@ -0,0 +1,245 @@ +{ stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin +, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation +, mailcap, runtimeShell +, buildPackages, targetPackages }: + +let + + inherit (stdenv.lib) optionals optionalString; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${buildPackages.go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + + goarch = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + +in + +stdenv.mkDerivation rec { + pname = "go"; + version = "1.12.9"; + + src = fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "1z32imbwmpkzgyh5c3vi7rbvzbq94xjk5qi2xm9sccj7kknmc3mb"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkgconfig patch procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + + propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' + + # Patch the mimetype database location which is missing on NixOS. + substituteInPlace src/mime/type_unix.go \ + --replace '/etc/mime.types' '${mailcap}/etc/mime.types' + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/areturn' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/areturn' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/areturn' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/areturn' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go + '' + optionalString stdenv.isAarch32 '' + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/areturn' src/os/os_test.go + sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + # TestCurrent fails because Current is not implemented on Darwin + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-1.12.1.patch + ./remove-test-pie.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./skip-external-network-tests.patch + ./skip-nohup-tests.patch + # breaks under load: https://github.com/golang/go/issues/25628 + ./skip-test-extra-files-on-386.patch + ]; + + postPatch = '' + find . -name '*.orig' -exec rm {} ';' + '' + optionalString stdenv.isDarwin '' + echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" + substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil + ''; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then + "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc" + else if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${stdenv.cc.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then + "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++" + else if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${stdenv.cc.targetPrefix}c++" + else + null; + + GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + GO_BUILDER_NAME = "nix"; + + GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; + + postConfigure = '' + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + # Independent from host/target, CC should produce code for the building system. + export CC=${buildPackages.stdenv.cc}/bin/cc + ulimit -a + ''; + + postBuild = '' + (cd src && ./make.bash) + ''; + + doCheck = stdenv.hostPlatform == stdenv.targetPlatform; + + checkPhase = '' + runHook preCheck + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) + runHook postCheck + ''; + + preInstall = '' + rm -r pkg/{bootstrap,obj} + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + setupHook = ./setup-hook.sh; + + disallowedReferences = [ goBootstrap ]; + + meta = with stdenv.lib; { + branch = "1.12"; + homepage = http://golang.org/; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan orivej velovix mic92 ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch b/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch new file mode 100644 index 000000000000..aa3116d76c12 --- /dev/null +++ b/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch @@ -0,0 +1,59 @@ +diff -Naur a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go +--- a/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:33:55.920232337 -0700 ++++ b/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:34:53.323180897 -0700 +@@ -270,11 +270,20 @@ + import "C" + import ( + "errors" ++ "io/ioutil" ++ "os" + "unsafe" + ) + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + var data C.CFDataRef = 0 + var untrustedData C.CFDataRef = 0 +diff -Naur a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go +--- a/src/crypto/x509/root_darwin.go 2019-03-15 11:33:55.920232337 -0700 ++++ b/src/crypto/x509/root_darwin.go 2019-03-15 11:36:21.205123541 -0700 +@@ -92,6 +92,14 @@ + verifyCh = make(chan rootCandidate) + ) + ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } ++ + // Using 4 goroutines to pipe into verify-cert seems to be + // about the best we can do. The verify-cert binary seems to + // just RPC to another server with coarse locking anyway, so +diff -Naur a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +--- a/src/crypto/x509/root_unix.go 2019-03-15 11:33:55.920232337 -0700 ++++ b/src/crypto/x509/root_unix.go 2019-03-15 11:37:15.737326340 -0700 +@@ -38,6 +38,13 @@ + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + files := certFiles + if f := os.Getenv(certFileEnv); f != "" { diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix index 9390cbde6377..32321327a8df 100644 --- a/pkgs/development/compilers/icedtea-web/default.nix +++ b/pkgs/development/compilers/icedtea-web/default.nix @@ -1,20 +1,44 @@ -{ stdenv, fetchurl, jdk, gtk2, xulrunner, zip, pkgconfig, perl, npapi_sdk, bash, bc }: +{ stdenv, fetchurl, jdk, glib, xulrunner, zip, pkgconfig, perl, npapi_sdk, bash, bc, git }: +let + +cveFixes = fetchurl { + # CVE-2019-10185: zip-slip attack during auto-extraction of a JAR file. + # CVE-2019-10181: executable code could be injected in a JAR file without + # compromising the signature verification. + # CVE-2019-10182: improper path sanitization from elements in JNLP + # files. + url = "https://patch-diff.githubusercontent.com/raw/AdoptOpenJDK/IcedTea-Web/pull/346.patch"; + sha256 = "1lzwib5affz9nm3iyd0ij33km9k8ny9r6p9429zlgxfq4s6jdrqc"; +}; + +in stdenv.mkDerivation rec { name = "icedtea-web-${version}"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz"; - sha256 = "1b9z0i9b1dsc2qpfdzbn2fi4vi3idrhm7ig45g1ny40ymvxcwwn9"; + sha256 = "1gsgcf2h25kg12d4mzsw0kaf3i72bfqkr8vi70d0yq9lqinrfkl2"; }; nativeBuildInputs = [ pkgconfig bc perl ]; - buildInputs = [ gtk2 xulrunner zip npapi_sdk ]; + buildInputs = [ glib xulrunner zip npapi_sdk ]; + + postPatch = '' + # The patch includes binary blobs for tests so we must use `git apply` + # directly instead of relying on `git patch` from `patchPhase` + ${git}/bin/git apply --verbose --exclude=ChangeLog ${cveFixes} + ''; + + postInstall = '' + mv $out/bin/itweb-settings{.sh,} + mv $out/bin/javaws{.sh,} + mv $out/bin/policyeditor{.sh,} + ''; preConfigure = '' - #patchShebangs javac.in configureFlagsArray+=("BIN_BASH=${bash}/bin/bash") ''; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 876e474bed97..62934dd9eeb3 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -7,12 +7,12 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; - version = "152b1248.6"; + version = "202b1483.37"; name = pname + "-" + version; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbsdk8u${version}_linux_x64.tar.gz"; + url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk8u${version}_linux_x64.tar.gz"; sha256 = "12l81g8zhaymh4rzyfl9nyzmpkgzc7wrphm3j4plxx129yn9i7d7"; } else diff --git a/pkgs/development/compilers/julia/0002-use-system-suitesparse.patch b/pkgs/development/compilers/julia/0002-use-system-suitesparse.patch deleted file mode 100644 index 17f49ad5ca9f..000000000000 --- a/pkgs/development/compilers/julia/0002-use-system-suitesparse.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e2b0ed6664fe4adfd0f9ce8fa14732d47b30ab5c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sat, 10 Oct 2015 16:18:53 -0500 -Subject: [PATCH 2/3] use system suitesparse - ---- - base/sparse/cholmod.jl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/base/sparse/cholmod.jl b/base/sparse/cholmod.jl -index ec7e980..f834cc1 100644 ---- a/base/sparse/cholmod.jl -+++ b/base/sparse/cholmod.jl -@@ -151,7 +151,7 @@ function __init__() - - # Register gc tracked allocator if CHOLMOD is new enough - if current_version >= v"3.0.0" -- cnfg = cglobal((:SuiteSparse_config, :libsuitesparseconfig), Ptr{Void}) -+ cnfg = cglobal((:SuiteSparse_config, :libsuitesparse), Ptr{Void}) - unsafe_store!(cnfg, cglobal(:jl_malloc, Ptr{Void}), 1) - unsafe_store!(cnfg, cglobal(:jl_calloc, Ptr{Void}), 2) - unsafe_store!(cnfg, cglobal(:jl_realloc, Ptr{Void}), 3) --- -2.5.2 - diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix deleted file mode 100644 index 4c0b1359bd8d..000000000000 --- a/pkgs/development/compilers/julia/default.nix +++ /dev/null @@ -1,201 +0,0 @@ -{ stdenv, fetchurl, fetchzip -# build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python2 -# libjulia dependencies -, libunwind, readline, utf8proc, zlib -, llvm -# standard library dependencies -, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 -# linear algebra -, openblas, arpack, suitesparse -# Darwin frameworks -, CoreServices, ApplicationServices -}: - -with stdenv.lib; - -# All dependencies must use the same OpenBLAS. -let - arpack_ = arpack; - suitesparse_ = suitesparse; -in -let - arpack = arpack_.override { inherit openblas; }; - suitesparse = suitesparse_.override { inherit openblas; }; -in - -let - dsfmtVersion = "2.2.3"; - dsfmt = fetchurl { - url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz"; - sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; - }; - - libuvVersion = "d8ab1c6a33e77bf155facb54215dd8798e13825d"; - libuv = fetchurl { - url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; - sha256 = "0q5ahc9dzca2yc6cjbhpfi9nwc4yhhjbgxgsychksn13d24gv7ba"; - }; - - rmathVersion = "0.1"; - rmath-julia = fetchurl { - url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; - sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; - }; - - virtualenvVersion = "15.0.0"; - virtualenv = fetchurl { - url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz"; - sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh"; - }; - - majorVersion = "0"; - minorVersion = "6"; - maintenanceVersion = "4"; - version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; -in - -stdenv.mkDerivation rec { - pname = "julia"; - inherit version; - name = "${pname}-${version}"; - - src = fetchzip { - url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "09axkkj914al7lzvcvhb33hz5wp083lk18llsvrn622fqhmyqabl"; - }; - prePatch = '' - mkdir deps/srccache - cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz" - cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz" - cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz" - cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz" - ''; - - patches = [ - ./0001.1-use-system-utf8proc.patch - ./0002-use-system-suitesparse.patch - ]; - - postPatch = '' - patchShebangs . contrib - for i in backtrace replutil cmdlineargs compile; do - mv test/$i.jl{,.off} - touch test/$i.jl - done - - sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i test/libgit2.jl - sed -e 's/Failed to resolve /failed to resolve /g' -i test/libgit2.jl - ''; - - buildInputs = [ - arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr - pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc - zlib llvm - ] - ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] - ; - - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; - - makeFlags = - let - arch = head (splitString "-" stdenv.hostPlatform.system); - march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" - or (throw "unsupported architecture: ${arch}"); - # Julia requires Pentium 4 (SSE2) or better - cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" - or (throw "unsupported architecture: ${arch}"); - in [ - "ARCH=${arch}" - "MARCH=${march}" - "JULIA_CPU_TARGET=${cpuTarget}" - "PREFIX=$(out)" - "prefix=$(out)" - "SHELL=${stdenv.shell}" - - "USE_SYSTEM_BLAS=1" - "USE_BLAS64=${if openblas.blas64 then "1" else "0"}" - "LIBBLAS=-lopenblas" - "LIBBLASNAME=libopenblas" - - "USE_SYSTEM_LAPACK=1" - "LIBLAPACK=-lopenblas" - "LIBLAPACKNAME=libopenblas" - - "USE_SYSTEM_SUITESPARSE=1" - "SUITESPARSE_LIB=-lsuitesparse" - "SUITESPARSE_INC=-I${suitesparse}/include" - - "USE_SYSTEM_ARPACK=1" - "USE_SYSTEM_FFTW=1" - "USE_SYSTEM_GMP=1" - "USE_SYSTEM_LIBGIT2=1" - "USE_SYSTEM_LIBUNWIND=1" - - "USE_SYSTEM_LLVM=1" - "LLVM_VER=3.9.1" - - "USE_SYSTEM_MPFR=1" - "USE_SYSTEM_OPENLIBM=1" - "USE_SYSTEM_OPENSPECFUN=1" - "USE_SYSTEM_PATCHELF=1" - "USE_SYSTEM_PCRE=1" - "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" - "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" - "USE_SYSTEM_READLINE=1" - "USE_SYSTEM_UTF8PROC=1" - "USE_SYSTEM_ZLIB=1" - ]; - - NIX_CFLAGS_COMPILE = [ "-fPIC" ]; - - LD_LIBRARY_PATH = makeLibraryPath [ - arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm - openspecfun pcre2 suitesparse llvm - ]; - - dontStrip = true; - dontPatchELF = true; - - enableParallelBuilding = true; - - doCheck = !stdenv.isDarwin; - checkTarget = "testall"; - # Julia's tests require read/write access to $HOME - preCheck = '' - export HOME="$NIX_BUILD_TOP" - ''; - - preBuild = '' - sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile - sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} - ''; - - postInstall = '' - # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, - # as using a wrapper with LD_LIBRARY_PATH causes segmentation - # faults when program returns an error: - # $ julia -e 'throw(Error())' - find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do - if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then - ln -sv $lib $out/lib/julia/$(basename $lib) - fi - done - ''; - - passthru = { - inherit majorVersion minorVersion maintenanceVersion; - site = "share/julia/site/v${majorVersion}.${minorVersion}"; - }; - - meta = { - description = "High-level performance-oriented dynamical language for technical computing"; - homepage = https://julialang.org/; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isi686; - }; -} diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 80ccb0dbbd30..a290d2b6cfe6 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -2,8 +2,8 @@ , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, targetPackages , bootstrapVersion ? false -, version ? "1.12.0" -, ldcSha256 ? "1fdma1w8j37wkr0pqdar11slkk36qymamxnk6d9k8ybhjmxaaawm" +, version ? "1.14.0" +, ldcSha256 ? "147vlzzzjx2n6zyz9wj54gj046i1mw5p5wixwzi5wkllgxghyy9c" }: let @@ -18,208 +18,156 @@ let else ""; - ldcBuild = stdenv.mkDerivation rec { - name = "ldcBuild-${version}"; - - enableParallelBuilding = true; - - src = fetchurl { - url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; - sha256 = ldcSha256; - }; - - postUnpack = '' - patchShebangs . - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # http://forum.dlang.org/thread/xtbbqthxutdoyhnxjhxl@forum.dlang.org - rm -r ldc-${version}-src/tests/dynamiccompile - - # https://github.com/NixOS/nixpkgs/issues/34817 - rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall - - # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 - rm -r ldc-${version}-src/tests/debuginfo/classtypes_gdb.d - rm -r ldc-${version}-src/tests/debuginfo/nested_gdb.d - - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/test16096.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ldc_output_filenames.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/crlf.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/issue15574.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/test6461.sh - '' - - + stdenv.lib.optionalString (!bootstrapVersion) '' - echo ${tzdata}/share/zoneinfo/ > ldc-${version}-src/TZDatabaseDirFile - - # Remove cppa test for now because it doesn't work. - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/cppa.d - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp - ''; - - datetimePath = if bootstrapVersion then - "phobos/std/datetime.d" - else - "phobos/std/datetime/timezone.d"; - - postPatch = '' - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace runtime/phobos/std/net/curl.d \ - --replace libcurl.so ${curl.out}/lib/libcurl.so - - substituteInPlace tests/d2/dmd-testsuite/Makefile \ - --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" - '' - - + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan - ''; - - nativeBuildInputs = [ cmake makeWrapper llvm bootstrapLdc python lit gdb unzip ] - - ++ stdenv.lib.optional (bootstrapVersion) [ - libconfig - ] - - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); - - - buildInputs = [ curl tzdata ]; - - #"-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc" - # Xcode 9.0.1 fixes that bug according to ldc release notes - #"-DRT_ARCHIVE_WITH_LDC=OFF" - #"-DD_FLAGS=TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/" - #"-DCMAKE_BUILD_TYPE=Release" - #"-DCMAKE_SKIP_RPATH=ON" - - #-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc - # - cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) '' - "-DD_FLAGS=-d-version=TZDatabaseDir;-J$PWD" - ''; - - preConfigure = stdenv.lib.optionalString (!bootstrapVersion) '' - cmakeFlagsArray=( - ${cmakeFlagsString} - ) - ''; - - postConfigure = '' - export DMD=$PWD/bin/ldmd2 - ''; - - makeFlags = [ "DMD=$DMD" ]; - - doCheck = !bootstrapVersion; - - checkPhase = '' - # Build and run LDC D unittests. - ctest --output-on-failure -R "ldc2-unittest" - # Run LIT testsuite. - ctest -V -R "lit-tests" - # Run DMD testsuite. - DMD_TESTSUITE_MAKE_ARGS=-j$NIX_BUILD_CORES ctest -V -R "dmd-testsuite" - ''; - - postInstall = '' - wrapProgram $out/bin/ldc2 \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ - --set-default CC "${targetPackages.stdenv.cc}/bin/cc" - ''; - - meta = with stdenv.lib; { - description = "The LLVM-based D compiler"; - homepage = https://github.com/ldc-developers/ldc; - # from https://github.com/ldc-developers/ldc/blob/master/LICENSE - license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; - }; - - # Need to test Phobos in a fixed-output derivation, otherwise the - # network stuff in Phobos would fail if sandbox mode is enabled. - # - # Disable tests on Darwin for now because of - # https://github.com/NixOS/nixpkgs/issues/41099 - # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 - ldcUnittests = if (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) then - stdenv.mkDerivation rec { - name = "ldcUnittests-${version}"; - - enableParallelBuilding = ldcBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = ldcBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; - - src = ldcBuild.src; - - postUnpack = ldcBuild.postUnpack; - - postPatch = ldcBuild.postPatch; - - nativeBuildInputs = ldcBuild.nativeBuildInputs - - ++ [ - ldcBuild - ]; - - buildInputs = ldcBuild.buildInputs; - - preConfigure = '' - cmakeFlagsArray=( - ${ldcBuild.cmakeFlagsString} - "-DD_COMPILER=${ldcBuild.out}/bin/ldmd2" - ) - ''; - - postConfigure = ldcBuild.postConfigure; - - makeFlags = ldcBuild.makeFlags; - - buildCmd = if bootstrapVersion then - "ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\"" - else - "make -j$NIX_BUILD_CORES DMD=${ldcBuild.out}/bin/ldc2 phobos2-test-runner phobos2-test-runner-debug"; - - testCmd = if bootstrapVersion then - "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\"" - else - "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest\""; - - buildPhase = '' - ${buildCmd} - ln -s ${ldcBuild.out}/bin/ldmd2 $PWD/bin/ldmd2 - ${testCmd} - ''; - - installPhase = '' - echo -n $inputString > $out - ''; - } - else - ""; - in stdenv.mkDerivation rec { - inherit ldcUnittests; name = "ldc-${version}"; - phases = "installPhase"; - buildInputs = ldcBuild.buildInputs; - installPhase = '' - mkdir $out - cp -r --symbolic-link ${ldcBuild}/* $out/ + enableParallelBuilding = true; + + src = fetchurl { + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; + sha256 = ldcSha256; + }; + + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; + + postUnpack = '' + patchShebangs . + '' + + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + # https://github.com/NixOS/nixpkgs/issues/34817 + rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall + '' + + + stdenv.lib.optionalString (!bootstrapVersion) '' + echo ${tzdata}/share/zoneinfo/ > ldc-${version}-src/TZDatabaseDirFile + + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > ldc-${version}-src/LibcurlPathFile ''; - meta = ldcBuild.meta; + postPatch = '' + # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow + substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" + '' + + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) '' + substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' + + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + '' + + + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + # Was not able to compile on darwin due to "__inline_isnanl" + # being undefined. + # TODO Remove with version > 0.17.6 + substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan + ''; + + nativeBuildInputs = [ cmake makeWrapper llvm unzip ] + + ++ stdenv.lib.optional (!bootstrapVersion) [ + bootstrapLdc python lit + ] + + ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [ + # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 + gdb + ] + + ++ stdenv.lib.optional (bootstrapVersion) [ + libconfig + ] + + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); + + + buildInputs = [ curl tzdata ]; + + cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) '' + "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J$PWD" + "-DCMAKE_BUILD_TYPE=Release" + ''; + + preConfigure = stdenv.lib.optionalString (!bootstrapVersion) '' + cmakeFlagsArray=( + ${cmakeFlagsString} + ) + ''; + + postConfigure = '' + export DMD=$PWD/bin/ldmd2 + ''; + + makeFlags = [ "DMD=$DMD" ]; + + fixNames = if stdenv.hostPlatform.isDarwin then '' + fixDarwinDylibNames() { + local flags=() + + for fn in "$@"; do + flags+=(-change "$(basename "$fn")" "$fn") + done + + for fn in "$@"; do + if [ -L "$fn" ]; then continue; fi + echo "$fn: fixing dylib" + install_name_tool -id "$fn" "''${flags[@]}" "$fn" + done + } + + fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") + '' + else + ""; + + # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 + additionalExceptions = if stdenv.hostPlatform.isDarwin then + "|druntime-test-shared" + else + ""; + + doCheck = !bootstrapVersion; + + checkPhase = stdenv.lib.optionalString doCheck '' + # Build default lib test runners + make -j$NIX_BUILD_CORES all-test-runners + + ${fixNames} + + # Run dmd testsuite + export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD CC=$CXX" + ctest -V -R "dmd-testsuite" + + # Build and run LDC D unittests. + ctest --output-on-failure -R "ldc2-unittest" + + # Run LIT testsuite. + ctest -V -R "lit-tests" + + # Run default lib unittests + ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" + ''; + + postInstall = '' + wrapProgram $out/bin/ldc2 \ + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" + ''; + + meta = with stdenv.lib; { + description = "The LLVM-based D compiler"; + homepage = https://github.com/ldc-developers/ldc; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; } diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index ca6723172d7a..261a1d0f94ca 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -79,8 +79,8 @@ in stdenv.mkDerivation rec { "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 678ec759425d..6c935fd88de5 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -120,8 +120,8 @@ in stdenv.mkDerivation rec { "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 6344304b84bf..2b543b9d793a 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -44,11 +44,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/4/libc++/libc++.a b/pkgs/development/compilers/llvm/4/libc++/libc++.a deleted file mode 100644 index f676948115eb..000000000000 --- a/pkgs/development/compilers/llvm/4/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index aac9c4275ad4..5cd7901fe22c 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -100,8 +100,8 @@ in stdenv.mkDerivation (rec { "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 6dc81e10163f..b182f1250e72 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -38,11 +38,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/5/libc++/libc++.a b/pkgs/development/compilers/llvm/5/libc++/libc++.a deleted file mode 100644 index f676948115eb..000000000000 --- a/pkgs/development/compilers/llvm/5/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index b90b6b7b58c8..3a165e9da7b1 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -38,11 +38,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/6/libc++/libc++.a b/pkgs/development/compilers/llvm/6/libc++/libc++.a deleted file mode 100644 index f676948115eb..000000000000 --- a/pkgs/development/compilers/llvm/6/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index f16f3f721379..16a716d32fa6 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -94,7 +94,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" ] ++ optionals enableSharedLibraries [ diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index bc6767e8766e..e2aceb79bfae 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -1,6 +1,7 @@ { stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false +, enablePolly ? false # TODO: get this info from llvm (passthru?) }: let @@ -30,6 +31,9 @@ let "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ stdenv.lib.optionals enablePolly [ + "-DWITH_POLLY=ON" + "-DLINK_POLLY_INTO_TOOLS=ON" ]; patches = [ ./purity.patch ]; diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 3f1192d96263..55a177fa1aa6 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -29,10 +29,16 @@ let in { llvm = callPackage ./llvm.nix { }; + llvm-polly = callPackage ./llvm.nix { enablePolly = true; }; clang-unwrapped = callPackage ./clang { inherit clang-tools-extra_src; }; + clang-polly-unwrapped = callPackage ./clang { + inherit clang-tools-extra_src; + llvm = tools.llvm-polly; + enablePolly = true; + }; llvm-manpages = lowPrio (tools.llvm.override { enableManpages = true; diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index 8a13f3eb5903..d372984dac7c 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -36,11 +36,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/7/libc++/libc++.a b/pkgs/development/compilers/llvm/7/libc++/libc++.a deleted file mode 100644 index f676948115eb..000000000000 --- a/pkgs/development/compilers/llvm/7/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 5bb629931fd5..44bb13897ae0 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -15,13 +15,17 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -, enablePFM ? !stdenv.isDarwin +, enablePFM ? !(stdenv.isDarwin + || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + ) +, enablePolly ? false }: let inherit (stdenv.lib) optional optionals optionalString; src = fetch "llvm" "16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3"; + polly_src = fetch "polly" "0wgvayfilgb530bq51l7szxfb13l24nnrmyji2f6ncq95a24dw8v"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; @@ -34,6 +38,9 @@ in stdenv.mkDerivation (rec { unpackFile ${src} mv llvm-${version}* llvm sourceRoot=$PWD/llvm + '' + optionalString enablePolly '' + unpackFile ${polly_src} + mv polly-* $sourceRoot/tools/polly ''; outputs = [ "out" "python" ] @@ -101,7 +108,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" ] ++ optionals enableSharedLibraries [ diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 8709c7186491..bfb3c154a3c7 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { name = "nasm-${version}"; version = "2.14.02"; - src = fetchurl { - url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "1g409sr1kj7v1089s9kv0i4azvddkcwcypnbakfryyi71b3jdz9l"; + src = fetchFromRepoOrCz { + repo = "nasm"; + rev = name; + sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa"; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ autoreconfHook perl asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + + postBuild = "make manpages"; doCheck = true; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 156657d61d6b..ef07b01a750b 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { name = "nextpnr-${version}"; - version = "2019.01.08"; + version = "2019.02.20"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "c1d15c749c2aa105ee7b38ebe1b60a27e3743e8c"; - sha256 = "082ac03s6164s7dwz1l9phshl8m1lizn45jykabrhks5jcccchbh"; + rev = "e8d3aaaf34895a073e4023192d97fc936d090990"; + sha256 = "0ijqpjnn7x16crd6cmd4nmgay320flizmjb7bbvg9hv464z3p4x7"; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index ae36041b33eb..0d319d235fd3 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "nim-${version}"; - version = "0.19.0"; + version = "0.19.4"; src = fetchurl { url = "https://nim-lang.org/download/${name}.tar.xz"; - sha256 = "0biwvw1gividp5lkf0daq1wp9v6ms4xy6dkf5zj0sn9w4m3n76d1"; + sha256 = "0k59dhfsg5wnkc3nxg5a336pjd9jnfxabns63bl9n28iwdg16hgl"; }; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index a389f0f5ca1a..5840061ed53e 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -18,16 +18,16 @@ let else "amd64"; major = "11"; - update = ".0.1"; - build = "13"; - repover = "jdk-${major}${update}+${build}"; + update = ".0.3"; + build = "ga"; + repover = "jdk-${major}${update}-${build}"; openjdk = stdenv.mkDerivation { - name = "openjdk-${major}${update}-b${build}"; + name = "openjdk-${major}${update}-${build}"; src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz"; - sha256 = "1ri3fv67rvs9xxhc3ynklbprhxbdsgpwafbw6wqj950xy5crgysm"; + sha256 = "1v6pam38iidlhz46046h17hf5kki6n3kl302awjcyxzk7bmkvb8x"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index a3a0a9d59346..832954dd67f2 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -21,44 +21,44 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "202"; + update = "212"; build = "ga"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; repover = "jdk8u${update}-${build}"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "0asx7qkhmrlfmhrljck5gb3yp4v0aa8k35y4xfcph41x0m0mvrdb"; + sha256 = "00rl33h4cl4b4p3hcid765h38x2jdkb14ylh8k1zhnd0ka76crgg"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "07q6l3slmi5fgwjnsk6bd8miv8glmw15w5f6yyvp8nlp2d54l33n"; + sha256 = "0va6g2dccf1ph6mpwxswbks5axp7zz258cl89qq9r8jn4ni04agw"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "01k4pwhn3nmkzdhdj1v58dgir4iwsj9mm2ml1541z31s53g037cq"; + sha256 = "0sgr9df10hs49pjld6c6kr374v4zwd9s52pc3drz68zrlk71ja4s"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "0v39kl2iiyh74p3cp6bjhshkwxpgbffza9abzjgp7cpdfhcc73p0"; + sha256 = "1hq0sr4k4k4iv815kg72i9lvd7n7mn5pmw96ckk9p1rnyagn9z03"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "0z1cy6aq09j25jyryj47rms15h5175p2h23fg5pv035zapf8nb1b"; + sha256 = "1fc59jrbfq8l067mggzy5dnrvni7lwaqd7hahs4nqv87kyrfg545"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "0y0mk4sra9d29kgx842m5y4bz9gczc9ypkajv6m5igjv7sizzsv7"; + sha256 = "1ka2fvyxdmpfhk814s314gx53yvdr19vpsqygx283v9nbq90l1yg"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "07ssrjhffkdncxxhsbid21hlg51y7js3x7sb4g474vmmi3qj6vmb"; + sha256 = "15vlgs5v2ax8sqwh7bg50fnlrwlpnkp0myzrvpqs1mcza8pyasp8"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "0r0b8ra0ibzbdpxz6nv6i2zrzh2j5sxgprpnl6gf4d9h0i29ickj"; + sha256 = "1jzn0yi0v6lda5y8ib07g1p6zymnbcx9yy6iz8niggpm7205y93h"; }; openjdk8 = stdenv.mkDerivation { - name = "openjdk-8u${update}b${build}"; + name = "openjdk-8u${update}-${build}"; srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ]; sourceRoot = "."; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 8342c9fd3359..ea6b9d2a9fe7 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -89,8 +89,9 @@ let result = stdenv.mkDerivation rec { armv7l-linux = "linux-arm32-vfp-hflt"; aarch64-linux = "linux-arm64-vfp-hflt"; }.${stdenv.hostPlatform.system}; + javadlPlatformName = "linux-i586"; in fetchurl { - url = "http://download.oracle.com/otn-pub/java/jdk/${productVersion}u${patchVersion}-b${buildVersion}/${releaseToken}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; + url = "http://javadl.oracle.com/webapps/download/GetFile/1.${productVersion}.0_${patchVersion}-b${buildVersion}/${releaseToken}/${javadlPlatformName}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; curlOpts = "-b oraclelicense=a"; sha256 = sha256.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 81f4ef3c7dba..d9ee5010f7cf 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -2,13 +2,13 @@ # jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "201"; - buildVersion = "09"; - sha256.i686-linux = "1f9n93zmkggchaxkchp4bqasvxznn96zjci34f52h7v392jkzqac"; - sha256.x86_64-linux = "0w730v2q0iaxf2lprabwmy7129byrs0hhdbwas575p1xmk00qw6b"; - sha256.armv7l-linux = "0y6bvq93lsf21v6ca536dpfhkk5ljsj7c6di0qzkban37bivj0si"; - sha256.aarch64-linux = "1bybysgg9llqzllsmdszmmb73v5az2l1shxn6lxwv3wwiazpf47q"; - releaseToken = "42970487e3af4f5aa5bca3f542482c60"; + patchVersion = "211"; + buildVersion = "12"; + sha256.i686-linux = "0mdrljs0rw9s4pvaa3sn791nqgdrp8749z3qn80y7hhad74kvsnp"; + sha256.x86_64-linux = "13b6qk4sn8jdhxa22na9d2aazm4yjh6yxrlxr189gxy3619y9dy0"; + sha256.armv7l-linux = "1ij1x925k7lyp5f98gy8r0xfr41qhczf2rb74plwwmrccc1k00p5"; + sha256.aarch64-linux = "041r615qj9qy34a9gxm8968qlmf060ba2as5w97v86mbik4rca05"; + releaseToken = "478a62b7d4e34b78b671c754eaaf38ab"; jceName = "jce_policy-8.zip"; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; } diff --git a/pkgs/development/compilers/rust-1_35/binaryBuild.nix b/pkgs/development/compilers/rust-1_35/binaryBuild.nix new file mode 100644 index 000000000000..77dba7f9e620 --- /dev/null +++ b/pkgs/development/compilers/rust-1_35/binaryBuild.nix @@ -0,0 +1,115 @@ +{ stdenv, makeWrapper, bash, curl, darwin +, version +, src +, platform +, versionType +}: + +let + inherit (stdenv.lib) optionalString; + inherit (darwin.apple_sdk.frameworks) Security; + + bootstrapping = versionType == "bootstrap"; + + installComponents + = "rustc,rust-std-${platform}" + + (optionalString bootstrapping ",cargo") + ; +in + +rec { + rustc = stdenv.mkDerivation rec { + name = "rustc-${versionType}-${version}"; + + inherit version; + inherit src; + + meta = with stdenv.lib; { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ qknight ]; + license = [ licenses.mit licenses.asl20 ]; + }; + + buildInputs = [ bash ] ++ stdenv.lib.optional stdenv.isDarwin Security; + + postPatch = '' + patchShebangs . + ''; + + installPhase = '' + ./install.sh --prefix=$out \ + --components=${installComponents} + + ${optionalString (stdenv.isLinux && bootstrapping) '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/rustc" + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/rustdoc" + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/cargo" + ''} + + ${optionalString (stdenv.isDarwin && bootstrapping) '' + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustc" + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustdoc" + install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo" + for f in $out/lib/lib*.dylib; do + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$f" + done + ''} + + # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc + # (or similar) here. It causes strange effects where rustc loads + # the wrong libraries in a bootstrap-build causing failures that + # are very hard to track down. For details, see + # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943 + ''; + }; + + cargo = stdenv.mkDerivation rec { + name = "cargo-${versionType}-${version}"; + + inherit version; + inherit src; + + meta = with stdenv.lib; { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ qknight ]; + license = [ licenses.mit licenses.asl20 ]; + }; + + buildInputs = [ makeWrapper bash ] ++ stdenv.lib.optional stdenv.isDarwin Security; + + postPatch = '' + patchShebangs . + ''; + + installPhase = '' + patchShebangs ./install.sh + ./install.sh --prefix=$out \ + --components=cargo + + ${optionalString (stdenv.isLinux && bootstrapping) '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/cargo" + ''} + + ${optionalString (stdenv.isDarwin && bootstrapping) '' + install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo" + ''} + + wrapProgram "$out/bin/cargo" \ + --suffix PATH : "${rustc}/bin" + ''; + }; +} diff --git a/pkgs/development/compilers/rust-1_35/bootstrap.nix b/pkgs/development/compilers/rust-1_35/bootstrap.nix new file mode 100644 index 000000000000..5eccc92a0c7d --- /dev/null +++ b/pkgs/development/compilers/rust-1_35/bootstrap.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, callPackage }: + +let + # Note: the version MUST be one version prior to the version we're + # building + version = "1.34.2"; + + # fetch hashes by running `print-hashes.sh 1.34.2` + hashes = { + i686-unknown-linux-gnu = "926bafd09eb90ba7d5a0195fcffb8f33dd57e515af4f8987a143459f6b1d3f04"; + x86_64-unknown-linux-gnu = "2bf6622d980a52832bae141304e96f317c8a1ccd2dfd69a134a14033e6e43c0f"; + armv7-unknown-linux-gnueabihf = "70d1057fcc133dc3e44377060a00d2f9d3a134e2670963d3f1d93f3dbfa0548e"; + aarch64-unknown-linux-gnu = "15fc6b7ec121df9d4e42483dd12c677203680bec8c69b6f4f62e5a35a07341a8"; + i686-apple-darwin = "b9fc44cbb06050975664f1033d1337bb38d5ea73b503a5d3af5409033397be5c"; + x86_64-apple-darwin = "6fdd4bf7fe26dded0cd57b41ab5f0500a5a99b7bc770523a425e9e34f63d0fd8"; + }; + + platform = + if stdenv.hostPlatform.system == "i686-linux" + then "i686-unknown-linux-gnu" + else if stdenv.hostPlatform.system == "x86_64-linux" + then "x86_64-unknown-linux-gnu" + else if stdenv.hostPlatform.system == "armv7l-linux" + then "armv7-unknown-linux-gnueabihf" + else if stdenv.hostPlatform.system == "aarch64-linux" + then "aarch64-unknown-linux-gnu" + else if stdenv.hostPlatform.system == "i686-darwin" + then "i686-apple-darwin" + else if stdenv.hostPlatform.system == "x86_64-darwin" + then "x86_64-apple-darwin" + else throw "missing bootstrap url for platform ${stdenv.hostPlatform.system}"; + + src = fetchurl { + url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz"; + sha256 = hashes."${platform}"; + }; + +in callPackage ./binaryBuild.nix + { inherit version src platform; + versionType = "bootstrap"; + } diff --git a/pkgs/development/compilers/rust-1_35/cargo.nix b/pkgs/development/compilers/rust-1_35/cargo.nix new file mode 100644 index 000000000000..a7e2a40597bc --- /dev/null +++ b/pkgs/development/compilers/rust-1_35/cargo.nix @@ -0,0 +1,65 @@ +{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib +, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 +, CoreFoundation, Security +, version +, patches ? [] +, src }: + +rustPlatform.buildRustPackage rec { + name = "cargo-${version}"; + inherit version src patches; + + # the rust source tarball already has all the dependencies vendored, no need to fetch them again + cargoVendorDir = "vendor"; + preBuild = "pushd src/tools/cargo"; + postBuild = "popd"; + + passthru.rustc = rustc; + + # changes hash of vendor directory otherwise + dontUpdateAutotoolsGnuConfigScripts = true; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; + + LIBGIT2_SYS_USE_PKG_CONFIG=1; + + # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel + RUSTC_BOOTSTRAP=1; + + # FIXME: Use impure version of CoreFoundation because of missing symbols. + # CFURLSetResourcePropertyForKey is defined in the headers but there's no + # corresponding implementation in the sources from opensource.apple.com. + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" + ''; + + postInstall = '' + # NOTE: We override the `http.cainfo` option usually specified in + # `.cargo/config`. This is an issue when users want to specify + # their own certificate chain as environment variables take + # precedence + wrapProgram "$out/bin/cargo" \ + --suffix PATH : "${rustc}/bin" \ + --set CARGO_HTTP_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \ + --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" + ''; + + checkPhase = '' + # Disable cross compilation tests + export CFG_DISABLE_CROSS_TESTS=1 + cargo test + ''; + + # Disable check phase as there are failures (4 tests fail) + doCheck = false; + + meta = with stdenv.lib; { + 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 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/rust-1_35/default.nix b/pkgs/development/compilers/rust-1_35/default.nix new file mode 100644 index 000000000000..8d7ff380ef82 --- /dev/null +++ b/pkgs/development/compilers/rust-1_35/default.nix @@ -0,0 +1,47 @@ +{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl +, CoreFoundation, Security +, targets ? [] +, targetToolchains ? [] +, targetPatches ? [] +}: + +let + rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); + version = "1.35.0"; + cargoVersion = "1.35.0"; + src = fetchurl { + url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; + sha256 = "0bbizy6b7002v1rdhrxrf5gijclbyizdhkglhp81ib3bf5x66kas"; + }; +in rec { + rustc = callPackage ./rustc.nix { + inherit stdenv llvm targets targetPatches targetToolchains rustPlatform version src; + + patches = [ + ./patches/net-tcp-disable-tests.patch + + # Re-evaluate if this we need to disable this one + #./patches/stdsimd-disable-doctest.patch + ]; + + withBundledLLVM = false; + + configureFlags = [ "--release-channel=stable" ]; + + # 1. Upstream is not running tests on aarch64: + # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567 + # So we do the same. + # 2. Tests run out of memory for i686 + #doCheck = !stdenv.isAarch64 && !stdenv.isi686; + + # Disabled for now; see https://github.com/NixOS/nixpkgs/pull/42348#issuecomment-402115598. + doCheck = false; + }; + + cargo = callPackage ./cargo.nix rec { + version = cargoVersion; + inherit src stdenv CoreFoundation Security; + inherit rustc; # the rustc that will be wrapped by cargo + inherit rustPlatform; # used to build cargo + }; +} diff --git a/pkgs/development/compilers/rust-1_35/patches/net-tcp-disable-tests.patch b/pkgs/development/compilers/rust-1_35/patches/net-tcp-disable-tests.patch new file mode 100644 index 000000000000..57abb3117ec1 --- /dev/null +++ b/pkgs/development/compilers/rust-1_35/patches/net-tcp-disable-tests.patch @@ -0,0 +1,95 @@ +diff -ru -x '*~' rustc-1.35.0-src-orig/src/libstd/net/tcp.rs rustc-1.35.0-src/src/libstd/net/tcp.rs +--- rustc-1.35.0-src-orig/src/libstd/net/tcp.rs 2019-05-20 14:10:15.000000000 +0200 ++++ rustc-1.35.0-src/src/libstd/net/tcp.rs 2019-06-13 19:59:46.740611889 +0200 +@@ -973,6 +973,7 @@ + } + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn listen_localhost() { + let socket_addr = next_test_ip4(); +@@ -1031,6 +1032,7 @@ + }) + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn read_eof() { + each_ip(&mut |addr| { +@@ -1050,6 +1052,7 @@ + }) + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn write_close() { + each_ip(&mut |addr| { +@@ -1076,6 +1079,7 @@ + }) + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn multiple_connect_serial() { + each_ip(&mut |addr| { +@@ -1098,6 +1102,7 @@ + }) + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + fn multiple_connect_interleaved_greedy_schedule() { + const MAX: usize = 10; +@@ -1134,6 +1139,7 @@ + } + + #[test] ++ #[cfg_attr(target_os = "macos", ignore)] + fn multiple_connect_interleaved_lazy_schedule() { + const MAX: usize = 10; + each_ip(&mut |addr| { +@@ -1467,6 +1473,7 @@ + } + + #[test] ++ #[cfg_attr(target_os = "macos", ignore)] + fn clone_while_reading() { + each_ip(&mut |addr| { + let accept = t!(TcpListener::bind(&addr)); +@@ -1597,7 +1604,10 @@ + + // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code + // no longer has rounding errors. +- #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)] ++ #[cfg_attr(any(target_os = "bitrig", ++ target_os = "netbsd", ++ target_os = "openbsd", ++ target_os = "macos"), ignore)] + #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31 + #[test] + fn timeouts() { +@@ -1643,6 +1653,7 @@ + drop(listener); + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31 + fn test_read_with_timeout() { +@@ -1687,6 +1698,7 @@ + drop(listener); + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + #[cfg_attr(target_env = "sgx", ignore)] + fn nodelay() { +@@ -1719,6 +1731,7 @@ + assert_eq!(ttl, t!(stream.ttl())); + } + ++ #[cfg_attr(target_os = "macos", ignore)] + #[test] + #[cfg_attr(target_env = "sgx", ignore)] + fn set_nonblocking() { diff --git a/pkgs/development/compilers/rust-1_35/patches/stdsimd-disable-doctest.patch b/pkgs/development/compilers/rust-1_35/patches/stdsimd-disable-doctest.patch new file mode 100644 index 000000000000..6ef7fd0f7ce4 --- /dev/null +++ b/pkgs/development/compilers/rust-1_35/patches/stdsimd-disable-doctest.patch @@ -0,0 +1,20 @@ +diff --git a/src/stdsimd/coresimd/x86/mod.rs b/src/stdsimd/coresimd/x86/mod.rs +index 32915c332..7cb54f31e 100644 +--- a/src/stdsimd/coresimd/x86/mod.rs ++++ b/src/stdsimd/coresimd/x86/mod.rs +@@ -279,7 +279,6 @@ types! { + /// + /// # Examples + /// +- /// ``` + /// # #![feature(cfg_target_feature, target_feature, stdsimd)] + /// # #![cfg_attr(not(dox), no_std)] + /// # #[cfg(not(dox))] +@@ -301,7 +300,6 @@ types! { + /// # } + /// # if is_x86_feature_detected!("sse") { unsafe { foo() } } + /// # } +- /// ``` + pub struct __m256(f32, f32, f32, f32, f32, f32, f32, f32); + + /// 256-bit wide set of four `f64` types, x86-specific diff --git a/pkgs/development/compilers/rust-1_35/print-hashes.sh b/pkgs/development/compilers/rust-1_35/print-hashes.sh new file mode 100755 index 000000000000..7eb00a30ad73 --- /dev/null +++ b/pkgs/development/compilers/rust-1_35/print-hashes.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash +set -euo pipefail + +# All rust-related downloads can be found at +# https://static.rust-lang.org/dist/index.html. To find the date on +# which a particular thing was last updated, look for the *-date.txt +# file, e.g. +# https://static.rust-lang.org/dist/channel-rust-beta-date.txt + +PLATFORMS=( + i686-unknown-linux-gnu + x86_64-unknown-linux-gnu + armv7-unknown-linux-gnueabihf + aarch64-unknown-linux-gnu + i686-apple-darwin + x86_64-apple-darwin +) +BASEURL=https://static.rust-lang.org/dist +VERSION=${1:-} +DATE=${2:-} + +if [[ -z $VERSION ]] +then + echo "No version supplied" + exit -1 +fi + +if [[ -n $DATE ]] +then + BASEURL=$BASEURL/$DATE +fi + +for PLATFORM in "${PLATFORMS[@]}" +do + URL="$BASEURL/rust-$VERSION-$PLATFORM.tar.gz.sha256" + SHA256=$(curl -sSfL $URL | cut -d ' ' -f 1) + echo "$PLATFORM = \"$SHA256\";" +done diff --git a/pkgs/development/compilers/rust-1_35/rust-src.nix b/pkgs/development/compilers/rust-1_35/rust-src.nix new file mode 100644 index 000000000000..1b819a7f6068 --- /dev/null +++ b/pkgs/development/compilers/rust-1_35/rust-src.nix @@ -0,0 +1,11 @@ +{ stdenv, rustc }: + +stdenv.mkDerivation { + name = "rust-src"; + src = rustc.src; + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + mv src $out + rm -rf $out/{ci,doc,driver,etc,grammar,llvm,rt,rtstartup,rustllvm,test,tools,vendor} + ''; +} diff --git a/pkgs/development/compilers/rust-1_35/rustc.nix b/pkgs/development/compilers/rust-1_35/rustc.nix new file mode 100644 index 000000000000..1f43832716bd --- /dev/null +++ b/pkgs/development/compilers/rust-1_35/rustc.nix @@ -0,0 +1,175 @@ +{ stdenv, targetPackages, removeReferencesTo +, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps +, llvm, ncurses, darwin, rustPlatform, git, cmake, curl +, which, libffi, gdb +, version +, withBundledLLVM ? false +, src +, configureFlags ? [] +, patches +, targets +, targetPatches +, targetToolchains +, doCheck ? true +, broken ? false +}: + +let + inherit (stdenv.lib) optional optionalString; + inherit (darwin.apple_sdk.frameworks) Security; + + llvmShared = llvm.override { enableSharedLibraries = true; }; + + target = builtins.replaceStrings [" "] [","] (builtins.toString targets); +in + +stdenv.mkDerivation { + name = "rustc-${version}"; + inherit version; + + inherit src; + + __darwinAllowLocalNetworking = true; + + # rustc complains about modified source files otherwise + dontUpdateAutotoolsGnuConfigScripts = true; + + # Running the default `strip -S` command on Darwin corrupts the + # .rlib files in "lib/". + # + # See https://github.com/NixOS/nixpkgs/pull/34227 + stripDebugList = if stdenv.isDarwin then [ "bin" ] else null; + + NIX_LDFLAGS = + # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' + optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" + ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++" + ++ optional stdenv.isDarwin "-rpath ${llvmShared}/lib"; + + # Enable nightly features in stable compiles (used for + # bootstrapping, see https://github.com/rust-lang/rust/pull/37265). + # This loosens the hard restrictions on bootstrapping-compiler + # versions. + RUSTC_BOOTSTRAP = "1"; + + # Increase codegen units to introduce parallelism within the compiler. + RUSTFLAGS = "-Ccodegen-units=10"; + + # We need rust to build rust. If we don't provide it, configure will try to download it. + # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py + configureFlags = configureFlags + ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" + "--enable-vendor" + "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ] + ++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ] + ++ optional (targets != []) "--target=${target}"; + + # The bootstrap.py will generated a Makefile that then executes the build. + # The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass + # to the bootstrap builder. + postConfigure = '' + substituteInPlace Makefile --replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)' + ''; + + patches = patches ++ targetPatches; + + # the rust build system complains that nix alters the checksums + dontFixLibtool = true; + + passthru.target = target; + + postPatch = '' + patchShebangs src/etc + + ${optionalString (!withBundledLLVM) ''rm -rf src/llvm''} + + # Fix the configure script to not require curl as we won't use it + sed -i configure \ + -e '/probe_need CFG_CURL curl/d' + + # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)' + sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs + + # https://github.com/rust-lang/rust/issues/39522 + echo removing gdb-version-sensitive tests... + find src/test/debuginfo -type f -execdir grep -q ignore-gdb-version '{}' \; -print -delete + rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums.rs,generic-enum-with-different-disr-sizes.rs} + + # Useful debugging parameter + # export VERBOSE=1 + '' + optionalString stdenv.isDarwin '' + # Disable all lldb tests. + # error: Can't run LLDB test because LLDB's python path is not set + rm -vr src/test/debuginfo/* + rm -v src/test/run-pass/backtrace-debuginfo.rs || true + + # error: No such file or directory + rm -v src/test/ui/run-pass/issues/issue-45731.rs || true + + # Disable tests that fail when sandboxing is enabled. + substituteInPlace src/libstd/sys/unix/ext/net.rs \ + --replace '#[test]' '#[test] #[ignore]' + substituteInPlace src/test/run-pass/env-home-dir.rs \ + --replace 'home_dir().is_some()' true + rm -v src/test/run-pass/fds-are-cloexec.rs || true # FIXME: pipes? + rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true # FIXME: ??? + ''; + + # rustc unfortunately need cmake for compiling llvm-rt but doesn't + # use it for the normal build. This disables cmake in Nix. + dontUseCmakeConfigure = true; + + # ps is needed for one of the test cases + nativeBuildInputs = + [ file python2 ps rustPlatform.rust.rustc git cmake + which libffi removeReferencesTo + ] + # Only needed for the debuginfo tests + ++ optional (!stdenv.isDarwin) gdb; + + buildInputs = targetToolchains + ++ optional stdenv.isDarwin Security + ++ optional (!withBundledLLVM) llvmShared; + + outputs = [ "out" "man" "doc" ]; + setOutputFlags = false; + + # Disable codegen units and hardening for the tests. + preCheck = '' + export RUSTFLAGS= + export TZDIR=${tzdata}/share/zoneinfo + export hardeningDisable=all + '' + + # Ensure TMPDIR is set, and disable a test that removing the HOME + # variable from the environment falls back to another home + # directory. + optionalString stdenv.isDarwin '' + export TMPDIR=/tmp + sed -i '28s/home_dir().is_some()/true/' ./src/test/run-pass/env-home-dir.rs + ''; + + inherit doCheck; + + # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so + # and thus a transitive dependency on ncurses + postInstall = '' + find $out/lib -name "*.so" -type f -exec remove-references-to -t ${llvmShared} '{}' '+' + ''; + + configurePlatforms = []; + + # https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764 + # https://github.com/rust-lang/rust/issues/30181 + # enableParallelBuilding = false; + + requiredSystemFeatures = [ "big-parallel" ]; + + meta = with stdenv.lib; { + homepage = https://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy ]; + license = [ licenses.mit licenses.asl20 ]; + platforms = platforms.linux ++ platforms.darwin; + broken = broken; + }; +} diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 80ca6ade8453..bca506169889 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.16"; + version = "1.5.0"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1myg4wkxnbfn5nz38xy62r1jhjy07x3h0b04vg858n41chdsv4wd"; + sha256 = "1a4c84b6qqi4w4l1zzhnhnywk73j3wb0gjgghzcw0h5syqbqzy8z"; }; buildInputs = [texinfo]; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index ce863ef9c915..0e4207dccac6 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.8"; + name = "scala-2.12.9"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "18w0vdbsp0q5rxglgalwlgkggld926bqi1fxc598rn4gh46a03j4"; + sha256 = "0wpnxrhnhhscfk0k8yxk86akpvxbr5w1i8jb2igj2q4vax7h97sy"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index 5f1d384a3283..ab42eae31a68 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, ncurses }: stdenv.mkDerivation rec { - version = "0.10.0-RC1"; + version = "0.14.0-RC1"; name = "dotty-bare-${version}"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; - sha256 = "0s9vh0d6xx99gl0ji0dgmbq36f79c0iwfbrfqwmaclqm9yq5m54k"; + sha256 = "0nrgsyhqjlpvnjqgb18pryr8q7knq3dq25jhp98s4wh76nssm1zr"; }; propagatedBuildInputs = [ jre ncurses.dev ] ; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index b7a2f602cc63..bd4b10ddec05 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }: +{ stdenv, fetchzip, fetchFromGitHub, boost, cmake +, z3Support ? true, z3 ? null +}: + +assert z3Support -> z3 != null; let version = "0.5.3"; @@ -33,6 +37,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" "-DBUILD_SHARED_LIBS=ON" + ] ++ stdenv.lib.optionals (!z3Support) [ + "-DUSE_Z3=OFF" ]; doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform; @@ -40,7 +46,8 @@ stdenv.mkDerivation { "./test/soltest -p -- --no-ipc --no-smt --testpath ../test"; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost z3 ]; + buildInputs = [ boost ] + ++ stdenv.lib.optionals z3Support [ z3 ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 0523e099e497..87eac5418625 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,40 +1,53 @@ { stdenv, fetchFromGitHub -, boost, bison, flex, openjdk, doxygen -, perl, graphviz, ncurses, zlib, sqlite -, autoreconfHook }: +, perl, ncurses, zlib, sqlite, libffi +, autoreconfHook, mcpp, bison, flex, doxygen, graphviz +, makeWrapper +}: + +let + toolsPath = stdenv.lib.makeBinPath [ mcpp ]; +in stdenv.mkDerivation rec { - version = "1.2.0"; name = "souffle-${version}"; + version = "1.5.1"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "1g8yvm40h102mab8lacpl1cwgqsw1js0s1yn4l84l9fjdvlh2ygd"; + sha256 = "06sa250z3v8hs91p6cqdzlwwaq96j6zmfrrld1fzd1b620aa5iys"; }; - nativeBuildInputs = [ autoreconfHook bison flex ]; + nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; + buildInputs = [ ncurses zlib sqlite libffi ]; - buildInputs = [ - boost openjdk ncurses zlib sqlite doxygen perl graphviz - ]; + # these propagated inputs are needed for the compiled Souffle mode to work, + # since generated compiler code uses them. TODO: maybe write a g++ wrapper + # that adds these so we can keep the propagated inputs clean? + propagatedBuildInputs = [ ncurses zlib sqlite libffi ]; + # see 565a8e73e80a1bedbb6cc037209c39d631fc393f and parent commits upstream for + # Wno-error fixes patchPhase = '' + substituteInPlace ./src/Makefile.am \ + --replace '-Werror' '-Werror -Wno-error=deprecated -Wno-error=other' + substituteInPlace configure.ac \ - --replace "m4_esyscmd([git describe --tags --abbrev=0 --always | tr -d '\n'])" "${version}" + --replace "m4_esyscmd([git describe --tags --always | tr -d '\n'])" "${version}" ''; - # Without this, we get an obscure error about not being able to find a library version - # without saying what library it's looking for. Turns out it's searching global paths - # for boost and failing there, so we tell it what's what here. - configureFlags = [ "--with-boost-libdir=${boost}/lib" ]; + postInstall = '' + wrapProgram "$out/bin/souffle" --prefix PATH : "${toolsPath}" + ''; + + outputs = [ "out" ]; meta = with stdenv.lib; { description = "A translator of declarative Datalog programs into the C++ language"; homepage = "http://souffle-lang.github.io/"; platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin wchresta ]; + maintainers = with maintainers; [ thoughtpolice copumpkin wchresta ]; license = licenses.upl; }; } diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 1afeae73f2f1..7167a967c1c9 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -8,14 +8,14 @@ with builtins; stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2019.01.08"; + version = "2019.02.22"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "2a2e0a4722ded7628b71f436b94a06aebd57bb62"; - sha256 = "19wzh7yssk90s58l2f89m0q5bjjrjpkhvikf5zc0563wccvl712c"; + rev = "c521f4632f1c82b48a5538c832980668044e8fd9"; + sha256 = "18pg1ry5qhhx8c49n2gqwlf55sd9bfsfk3khfyh1a1vjh1qpfgdf"; name = "yosys"; }) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index eb45f446dc9d..fed0234b46c2 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,11 +1,14 @@ -{ go, govers, lib, fetchgit, fetchhg, fetchbzr, rsync -, removeReferencesTo, fetchFromGitHub, stdenv }: +{ go, cacert, git, lib, removeReferencesTo, stdenv }: -{ buildInputs ? [] +{ name ? "${args'.pname}-${args'.version}" +, src +, buildInputs ? [] , nativeBuildInputs ? [] , passthru ? {} -, preFixup ? "" -, shellHook ? "" +, patches ? [] + +# modSha256 is the sha256 of the vendored dependencies +, modSha256 # We want parallel builds by default , enableParallelBuilding ? true @@ -13,121 +16,96 @@ # Disabled flag , disabled ? false -# Go import path of the package -, goPackagePath - -# Go package aliases -, goPackageAliases ? [ ] - -# Extra sources to include in the gopath -, extraSrcs ? [ ] - -# Extra gopaths containing src subfolder -# with sources to include in the gopath -, extraSrcPaths ? [ ] - -# go2nix dependency file -, goDeps ? null - -, dontRenameImports ? false - # Do not enable this without good reason # IE: programs coupled with the compiler , allowGoReference ? false -, meta ? {}, ... } @ args': +, meta ? {} +, ... }@args': with builtins; let - args = lib.filterAttrs (name: _: name != "extraSrcs") args'; + args = removeAttrs args' [ "modSha256" "disabled" ]; removeReferences = [ ] ++ lib.optional (!allowGoReference) go; removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; - dep2src = goDep: - { - inherit (goDep) goPackagePath; - src = if goDep.fetch.type == "git" then - fetchgit { - inherit (goDep.fetch) url rev sha256; - } - else if goDep.fetch.type == "hg" then - fetchhg { - inherit (goDep.fetch) url rev sha256; - } - else if goDep.fetch.type == "bzr" then - fetchbzr { - inherit (goDep.fetch) url rev sha256; - } - else if goDep.fetch.type == "FromGitHub" then - fetchFromGitHub { - inherit (goDep.fetch) owner repo rev sha256; - } - else abort "Unrecognized package fetch type: ${goDep.fetch.type}"; - }; + go-modules = go.stdenv.mkDerivation { + name = "${name}-go-modules"; - importGodeps = { depsFile }: - map dep2src (import depsFile); - - goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs - else extraSrcs; - package = go.stdenv.mkDerivation ( - (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // { - - nativeBuildInputs = [ removeReferencesTo go ] - ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; - buildInputs = buildInputs; + nativeBuildInputs = [ go git cacert ]; + inherit (args) src; inherit (go) GOOS GOARCH; - configurePhase = args.configurePhase or '' + patches = args.patches or []; + + GO111MODULE = "on"; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" "SOCKS_SERVER" + ]; + + configurePhase = args.modConfigurePhase or '' runHook preConfigure - # Extract the source - cd "$NIX_BUILD_TOP" - mkdir -p "go/src/$(dirname "$goPackagePath")" - mv "$sourceRoot" "go/src/$goPackagePath" - - '' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: '' - mkdir goPath - (cd goPath; unpackFile "${src}") - mkdir -p "go/src/$(dirname "${goPackagePath}")" - chmod -R u+w goPath/* - mv goPath/* "go/src/${goPackagePath}" - rmdir goPath - - '') + (lib.optionalString (extraSrcPaths != []) '' - ${rsync}/bin/rsync -a ${lib.concatMapStringsSep " " (p: "${p}/src") extraSrcPaths} go - - '') + '' - export GOPATH=$NIX_BUILD_TOP/go:$GOPATH export GOCACHE=$TMPDIR/go-cache + export GOPATH="$TMPDIR/go" runHook postConfigure ''; - renameImports = args.renameImports or ( - let - inputsWithAliases = lib.filter (x: x ? goPackageAliases) - (buildInputs ++ (args.propagatedBuildInputs or [ ])); - rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}"; - renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases; - in lib.concatMapStringsSep "\n" renames inputsWithAliases); + buildPhase = args.modBuildPhase or '' + runHook preBuild + + go mod download + + runHook postBuild + ''; + + installPhase = args.modInstallPhase or '' + runHook preInstall + + cp -r "''${GOPATH}/pkg/mod/cache/download" $out + + runHook postInstall + ''; + + dontFixup = true; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = modSha256; + }; + + package = go.stdenv.mkDerivation (args // { + nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs; + + inherit (go) GOOS GOARCH; + + GO111MODULE = "on"; + + configurePhase = args.configurePhase or '' + runHook preConfigure + + export GOCACHE=$TMPDIR/go-cache + export GOPATH="$TMPDIR/go" + export GOPROXY=file://${go-modules} + + runHook postConfigure + ''; buildPhase = args.buildPhase or '' runHook preBuild - runHook renameImports - buildGoDir() { local d; local cmd; cmd="$1" d="$2" . $TMPDIR/buildFlagsArray - echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 + echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0 [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 local OUT if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v -p $NIX_BUILD_CORES $d 2>&1)"; then @@ -146,11 +124,9 @@ let local type; type="$1" if [ -n "$subPackages" ]; then - echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g" + echo "./$subPackages" else - pushd "$NIX_BUILD_TOP/go/src" >/dev/null - find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq - popd >/dev/null + find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique fi } @@ -172,7 +148,7 @@ let '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' # normalize cross-compiled builds w.r.t. native builds ( - dir=$NIX_BUILD_TOP/go/bin/${go.GOOS}_${go.GOARCH} + dir=$GOPATH/bin/${go.GOOS}_${go.GOARCH} if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then mv $dir/* $dir/.. fi @@ -198,47 +174,28 @@ let installPhase = args.installPhase or '' runHook preInstall - mkdir -p $bin - dir="$NIX_BUILD_TOP/go/bin" - [ -e "$dir" ] && cp -r $dir $bin + mkdir -p $out + dir="$GOPATH/bin" + [ -e "$dir" ] && cp -r $dir $out runHook postInstall ''; - preFixup = preFixup + '' - find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + preFixup = (args.preFixup or "") + '' + find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true ''; - shellHook = '' - d=$(mktemp -d "--suffix=-$name") - '' + toString (map (dep: '' - mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")" - ln -s "${dep.src}" "$d/src/${dep.goPackagePath}" - '' - ) goPath) + '' - export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)} - '' + shellHook; + disallowedReferences = lib.optional (!allowGoReference) go; - disallowedReferences = lib.optional (!allowGoReference) go - ++ lib.optional (!dontRenameImports) govers; - - passthru = passthru // - { inherit go; } // - lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; }; - - enableParallelBuilding = enableParallelBuilding; - - # I prefer to call this dev but propagatedBuildInputs expects $out to exist - outputs = args.outputs or [ "bin" "out" ]; + passthru = passthru // { inherit go go-modules; }; meta = { # Add default meta information - homepage = "https://${goPackagePath}"; platforms = go.meta.platforms or lib.platforms.all; } // meta // { # add an extra maintainer to every package maintainers = (meta.maintainers or []) ++ - [ lib.maintainers.ehmry lib.maintainers.lethalman ]; + [ lib.maintainers.kalbasit ]; }; }); in if disabled then diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix new file mode 100644 index 000000000000..8e016fadface --- /dev/null +++ b/pkgs/development/go-packages/generic/default.nix @@ -0,0 +1,245 @@ +{ go, govers, lib, fetchgit, fetchhg, fetchbzr, rsync +, removeReferencesTo, fetchFromGitHub, stdenv }: + +{ buildInputs ? [] +, nativeBuildInputs ? [] +, passthru ? {} +, preFixup ? "" +, shellHook ? "" + +# We want parallel builds by default +, enableParallelBuilding ? true + +# Disabled flag +, disabled ? false + +# Go import path of the package +, goPackagePath + +# Go package aliases +, goPackageAliases ? [ ] + +# Extra sources to include in the gopath +, extraSrcs ? [ ] + +# Extra gopaths containing src subfolder +# with sources to include in the gopath +, extraSrcPaths ? [ ] + +# go2nix dependency file +, goDeps ? null + +, dontRenameImports ? false + +# Do not enable this without good reason +# IE: programs coupled with the compiler +, allowGoReference ? false + +, meta ? {}, ... } @ args: + + +with builtins; + +let + removeReferences = [ ] ++ lib.optional (!allowGoReference) go; + + removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; + + dep2src = goDep: + { + inherit (goDep) goPackagePath; + src = if goDep.fetch.type == "git" then + fetchgit { + inherit (goDep.fetch) url rev sha256; + } + else if goDep.fetch.type == "hg" then + fetchhg { + inherit (goDep.fetch) url rev sha256; + } + else if goDep.fetch.type == "bzr" then + fetchbzr { + inherit (goDep.fetch) url rev sha256; + } + else if goDep.fetch.type == "FromGitHub" then + fetchFromGitHub { + inherit (goDep.fetch) owner repo rev sha256; + } + else abort "Unrecognized package fetch type: ${goDep.fetch.type}"; + }; + + importGodeps = { depsFile }: + map dep2src (import depsFile); + + goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs + else extraSrcs; + package = go.stdenv.mkDerivation ( + (builtins.removeAttrs args [ "goPackageAliases" "disabled" "extraSrcs"]) // { + + nativeBuildInputs = [ removeReferencesTo go ] + ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; + buildInputs = buildInputs; + + inherit (go) GOOS GOARCH; + + configurePhase = args.configurePhase or '' + runHook preConfigure + + # Extract the source + cd "$NIX_BUILD_TOP" + mkdir -p "go/src/$(dirname "$goPackagePath")" + mv "$sourceRoot" "go/src/$goPackagePath" + + '' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: '' + mkdir goPath + (cd goPath; unpackFile "${src}") + mkdir -p "go/src/$(dirname "${goPackagePath}")" + chmod -R u+w goPath/* + mv goPath/* "go/src/${goPackagePath}" + rmdir goPath + + '') + (lib.optionalString (extraSrcPaths != []) '' + ${rsync}/bin/rsync -a ${lib.concatMapStringsSep " " (p: "${p}/src") extraSrcPaths} go + + '') + '' + export GOPATH=$NIX_BUILD_TOP/go:$GOPATH + export GOCACHE=$TMPDIR/go-cache + + runHook postConfigure + ''; + + renameImports = args.renameImports or ( + let + inputsWithAliases = lib.filter (x: x ? goPackageAliases) + (buildInputs ++ (args.propagatedBuildInputs or [ ])); + rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}"; + renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases; + in lib.concatMapStringsSep "\n" renames inputsWithAliases); + + buildPhase = args.buildPhase or '' + runHook preBuild + + runHook renameImports + + buildGoDir() { + local d; local cmd; + cmd="$1" + d="$2" + . $TMPDIR/buildFlagsArray + echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 + [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 + local OUT + if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v -p $NIX_BUILD_CORES $d 2>&1)"; then + if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then + echo "$OUT" >&2 + return 1 + fi + fi + if [ -n "$OUT" ]; then + echo "$OUT" >&2 + fi + return 0 + } + + getGoDirs() { + local type; + type="$1" + if [ -n "$subPackages" ]; then + echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g" + else + pushd "$NIX_BUILD_TOP/go/src" >/dev/null + find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq + popd >/dev/null + fi + } + + if (( "''${NIX_DEBUG:-0}" >= 1 )); then + buildFlagsArray+=(-x) + fi + + if [ ''${#buildFlagsArray[@]} -ne 0 ]; then + declare -p buildFlagsArray > $TMPDIR/buildFlagsArray + else + touch $TMPDIR/buildFlagsArray + fi + if [ -z "$enableParallelBuilding" ]; then + export NIX_BUILD_CORES=1 + fi + for pkg in $(getGoDirs ""); do + buildGoDir install "$pkg" + done + '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # normalize cross-compiled builds w.r.t. native builds + ( + dir=$NIX_BUILD_TOP/go/bin/${go.GOOS}_${go.GOARCH} + if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then + mv $dir/* $dir/.. + fi + if [[ -d $dir ]]; then + rmdir $dir + fi + ) + '' + '' + runHook postBuild + ''; + + doCheck = args.doCheck or false; + checkPhase = args.checkPhase or '' + runHook preCheck + + for pkg in $(getGoDirs test); do + buildGoDir test "$pkg" + done + + runHook postCheck + ''; + + installPhase = args.installPhase or '' + runHook preInstall + + mkdir -p $bin + dir="$NIX_BUILD_TOP/go/bin" + [ -e "$dir" ] && cp -r $dir $bin + + runHook postInstall + ''; + + preFixup = preFixup + '' + find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + ''; + + shellHook = '' + d=$(mktemp -d "--suffix=-$name") + '' + toString (map (dep: '' + mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")" + ln -s "${dep.src}" "$d/src/${dep.goPackagePath}" + '' + ) goPath) + '' + export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)} + '' + shellHook; + + disallowedReferences = lib.optional (!allowGoReference) go + ++ lib.optional (!dontRenameImports) govers; + + passthru = passthru // + { inherit go; } // + lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; }; + + enableParallelBuilding = enableParallelBuilding; + + # I prefer to call this dev but propagatedBuildInputs expects $out to exist + outputs = args.outputs or [ "bin" "out" ]; + + meta = { + # Add default meta information + homepage = "https://${goPackagePath}"; + platforms = go.meta.platforms or lib.platforms.all; + } // meta // { + # add an extra maintainer to every package + maintainers = (meta.maintainers or []) ++ + [ lib.maintainers.ehmry lib.maintainers.lethalman ]; + }; + }); +in if disabled then + throw "${package.name} not supported for go ${go.meta.branch}" +else + package diff --git a/pkgs/development/go-packages/tools/setup-hook.sh b/pkgs/development/go-packages/tools/setup-hook.sh new file mode 100644 index 000000000000..e354e50c35aa --- /dev/null +++ b/pkgs/development/go-packages/tools/setup-hook.sh @@ -0,0 +1 @@ +export GOTOOLDIR=@bin@/bin diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 41d050531a3a..5ef67abc017b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -85,7 +85,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "06385r9rlncrrmzdfl8q600bw6plbvkmkwgl3llg595xrm711a97"; + sha256 = "1v2v6cwy957y5rgclb66ia7bl5j5mx291s3lh2swa39q3420m6v0"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -143,6 +143,7 @@ self: super: { feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 hoodle-core = dontHaddock super.hoodle-core; hsc3-db = dontHaddock super.hsc3-db; + classy-prelude-yesod = dontHaddock super.classy-prelude-yesod; # https://github.com/haskell/haddock/issues/979 # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; @@ -165,8 +166,10 @@ self: super: { then dontCheck (overrideCabal super.hakyll (drv: { testToolDepends = []; })) - # https://github.com/jaspervdj/hakyll/issues/491 - else dontCheck super.hakyll; + else appendPatch super.hakyll (pkgs.fetchpatch { + url = "https://github.com/jaspervdj/hakyll/pull/691/commits/a44ad37cd15310812e78f7dab58d6d460451f20c.patch"; + sha256 = "13xpznm19rjp51ds165ll9ahyps1r4131c77b8r7gpjd6i505832"; + }); double-conversion = if !pkgs.stdenv.isDarwin then super.double-conversion @@ -953,17 +956,13 @@ self: super: { # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env; - # hledger needs a newer megaparsec version than we have in LTS 12.x. - hledger-lib = super.hledger-lib.overrideScope (self: super: { - # cassava-megaparsec = self.cassava-megaparsec_2_0_0; - # hspec-megaparsec = self.hspec-megaparsec_2_0_0; - # megaparsec = self.megaparsec_7_0_4; - }); - # Copy hledger man pages from data directory into the proper place. This code # should be moved into the cabal2nix generator. hledger = overrideCabal super.hledger (drv: { postInstall = '' + # Don't install files that don't belong into this package to avoid + # conflicts when hledger and hledger-ui end up in the same profile. + rm embeddedfiles/hledger-{api,ui,web}.* for i in $(seq 1 9); do for j in embeddedfiles/*.$i; do mkdir -p $out/share/man/man$i @@ -974,7 +973,7 @@ self: super: { cp -v embeddedfiles/*.info* $out/share/info/ ''; }); - hledger-ui = (overrideCabal super.hledger-ui (drv: { + hledger-ui = overrideCabal super.hledger-ui (drv: { postInstall = '' for i in $(seq 1 9); do for j in *.$i; do @@ -985,11 +984,6 @@ self: super: { mkdir -p $out/share/info cp -v *.info* $out/share/info/ ''; - })).overrideScope (self: super: { - # cassava-megaparsec = self.cassava-megaparsec_2_0_0; - # config-ini = self.config-ini_0_2_4_0; - # hspec-megaparsec = self.hspec-megaparsec_2_0_0; - # megaparsec = self.megaparsec_7_0_4; }); hledger-web = overrideCabal super.hledger-web (drv: { postInstall = '' @@ -1084,6 +1078,9 @@ self: super: { cborg = doJailbreak super.cborg; serialise = doJailbreak (dontCheck super.serialise); + # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 + netrc = doJailbreak super.netrc; + # https://github.com/phadej/tree-diff/issues/19 tree-diff = doJailbreak super.tree-diff; @@ -1160,7 +1157,13 @@ self: super: { xmonad-extras = doJailbreak super.xmonad-extras; - arbtt = doJailbreak super.arbtt; + arbtt = overrideCabal super.arbtt (drv: { + # See this for context: + # https://github.com/NixOS/nixpkgs/commit/7c04e3eb7571ad8ce31a15a22beb11bfe921a387 + preCheck = '' + for n in $PWD/dist/build/*; do PATH+=":$n"; done + ''; + }); # https://github.com/danfran/cabal-macosx/issues/13 cabal-macosx = dontCheck super.cabal-macosx; @@ -1175,9 +1178,6 @@ self: super: { # }); libnix = dontCheck super.libnix; - # https://github.com/jmillikin/chell/issues/1 - chell = super.chell.override { patience = self.patience_0_1_1; }; - # The test suite tries to mess with ALSA, which doesn't work in the build sandbox. xmobar = dontCheck super.xmobar; @@ -1225,10 +1225,33 @@ self: super: { # Use latest pandoc despite what LTS says. # Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309. - pandoc = doDistribute (dontCheck super.pandoc_2_6); - pandoc-citeproc = self.pandoc-citeproc_0_16_1; + pandoc = doDistribute super.pandoc_2_7_1; + pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_1_3; # https://github.com/qfpl/tasty-hedgehog/issues/24 tasty-hedgehog = dontCheck super.tasty-hedgehog; + # The latest release version is ancient. You really need this tool from git. + haskell-ci = generateOptparseApplicativeCompletion "haskell-ci" + (addBuildDepend (overrideSrc (dontCheck super.haskell-ci) { + version = "20190307-git"; + src = pkgs.fetchFromGitHub { + owner = "haskell-CI"; + repo = "haskell-ci"; + rev = "2baceb59bc2f36e798ff9fb6e8865c449f01d3a2"; + sha256 = "1wqhqajxni6h9rrj22xj6421d4m0gs8qk2glghpdp307ns5gr2j4"; + }; + }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck])); + + # Fix build with attr-2.4.48 (see #53716) + xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; + + # Break out of pandoc >=2.0 && <2.7 (https://github.com/pbrisbin/yesod-markdown/pull/65) + yesod-markdown = doJailbreak super.yesod-markdown; + + # Some tests depend on a postgresql instance + # Haddock failure: https://github.com/haskell/haddock/issues/979 + esqueleto = dontHaddock (dontCheck super.esqueleto); + + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super 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 c2fbb4d6126c..de01fe4cd120 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -20,6 +20,7 @@ self: super: { ghc-boot = null; ghc-boot-th = null; ghc-compact = null; + ghc-heap = null; ghc-prim = null; ghci = null; haskeline = null; @@ -42,11 +43,6 @@ self: super: { stm = self.stm_2_5_0_0; text = self.text_1_2_3_1; - # Make sure we can still build Cabal 1.x. - Cabal_1_24_2_0 = overrideCabal super.Cabal_1_24_2_0 (drv: { - prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal"; - }); - # Build with the latest Cabal version, which works best albeit not perfectly. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_2_2_0_1; }; @@ -89,10 +85,10 @@ self: super: { cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - # GHC 8.2 doesn't have semigroups included by default + # Older GHC versions need these additional dependencies. ListLike = addBuildDepend super.ListLike self.semigroups; + base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 2a72eced2ba9..e8c138e594cd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -20,6 +20,7 @@ self: super: { ghc-boot = null; ghc-boot-th = null; ghc-compact = null; + ghc-heap = null; ghc-prim = null; ghci = null; haskeline = null; @@ -39,6 +40,10 @@ self: super: { unix = null; xhtml = null; + # Restricts aeson to <1.4 + # https://github.com/purescript/purescript/pull/3537 + purescript = doJailbreak super.purescript; + # https://github.com/jcristovao/enclosed-exceptions/issues/12 enclosed-exceptions = dontCheck super.enclosed-exceptions; @@ -63,15 +68,12 @@ self: super: { # more verbose but friendlier for Hydra. stack = (doJailbreak super.stack).override { Cabal = self.Cabal_2_4_1_0; - hpack = self.hpack_0_31_1.override { Cabal = self.Cabal_2_4_1_0; }; - yaml = self.yaml_0_11_0_0; + hpack = self.hpack.override { Cabal = self.Cabal_2_4_1_0; }; hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_1_0; }; }; - hpack_0_31_1 = super.hpack_0_31_1.override { - yaml = self.yaml_0_11_0_0; - }; - # cabal2nix doesn't list this because of a conditional on the GHC version. + # Older GHC versions need these additional dependencies. aeson = addBuildDepend super.aeson self.contravariant; + base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index abfbe69568a0..2d382e906325 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -45,7 +45,6 @@ self: super: { unordered-containers = dontCheck super.unordered-containers; # Test suite does not compile. - cereal = dontCheck super.cereal; data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x dates = doJailbreak super.dates; # base >=4.9 && <4.12 Diff = dontCheck super.Diff; @@ -54,7 +53,6 @@ self: super: { hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 http-api-data = doJailbreak super.http-api-data; persistent-sqlite = dontCheck super.persistent-sqlite; - psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience" unicode-transforms = dontCheck super.unicode-transforms; wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 2118be375348..09755e4cc947 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -52,7 +52,6 @@ self: super: { unordered-containers = dontCheck super.unordered-containers; # Test suite does not compile. - cereal = dontCheck super.cereal; data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x dates = doJailbreak super.dates; # base >=4.9 && <4.12 Diff = dontCheck super.Diff; @@ -60,7 +59,6 @@ self: super: { hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 http-api-data = doJailbreak super.http-api-data; persistent-sqlite = dontCheck super.persistent-sqlite; - psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience" unicode-transforms = dontCheck super.unicode-transforms; wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7071f3450374..91f6a6a334be 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,6 +1,6 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.6.3 +compiler: ghc-8.6.4 core-packages: - array-0.5.3.0 @@ -12,13 +12,13 @@ core-packages: - deepseq-1.4.4.0 - directory-1.3.3.0 - filepath-1.4.2.1 - - ghc-8.6.3 - - ghc-boot-8.6.3 - - ghc-boot-th-8.6.3 + - ghc-8.6.4 + - ghc-boot-8.6.4 + - ghc-boot-th-8.6.4 - ghc-compact-0.1.0.0 - - ghc-heap-8.6.3 + - ghc-heap-8.6.4 - ghc-prim-0.5.3 - - ghci-8.6.3 + - ghci-8.6.4 - haskeline-0.7.4.3 - hpc-0.6.0.3 - integer-gmp-1.0.2.0 @@ -26,14 +26,14 @@ core-packages: - mtl-2.2.2 - parsec-3.1.13.0 - pretty-1.1.3.6 - - process-1.6.3.0 + - process-1.6.5.0 - rts-1.0 - stm-2.5.0.0 - template-haskell-2.14.0.0 - terminfo-0.4.1.2 - text-1.2.3.1 - time-1.8.0.2 - - transformers-0.5.5.0 + - transformers-0.5.6.2 - unix-2.7.2.2 - xhtml-3000.2.2.1 @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.7 + # LTS Haskell 13.13 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -54,7 +54,7 @@ default-package-overrides: - ace ==0.6 - action-permutations ==0.0.0.1 - active ==0.2.0.13 - - ad ==4.3.5 + - ad ==4.3.6 - adjunctions ==4.4 - adler32 ==0.1.2.0 - advent-of-code-api ==0.1.2.3 @@ -62,7 +62,7 @@ default-package-overrides: - aeson ==1.4.2.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - - aeson-casing ==0.1.0.5 + - aeson-casing ==0.1.1.0 - aeson-compat ==0.3.9 - aeson-diff ==1.1.0.5 - aeson-extra ==0.4.1.1 @@ -78,8 +78,9 @@ default-package-overrides: - alarmclock ==0.6.0.2 - alerts ==0.1.0.0 - alex ==3.2.4 - - alg ==0.2.9.0 + - alg ==0.2.10.0 - algebraic-graphs ==0.3 + - Allure ==0.8.3.0 - almost-fix ==0.0.2 - alsa-core ==0.5.0.1 - alsa-mixer ==0.3.0 @@ -191,9 +192,9 @@ default-package-overrides: - antiope-sqs ==6.2.0 - ANum ==0.2.0.2 - aos-signature ==0.1.1 - - apecs ==0.7.1 + - apecs ==0.7.3 - apecs-gloss ==0.2.0 - - apecs-physics ==0.3.1 + - apecs-physics ==0.3.2 - api-field-json-th ==0.1.0.2 - appar ==0.1.7 - appendmap ==0.1.5 @@ -234,16 +235,16 @@ default-package-overrides: - authenticate-oauth ==1.6 - auto ==0.4.3.1 - autoexporter ==1.1.13 - - auto-update ==0.1.4 + - auto-update ==0.1.4.1 - avers ==0.0.17.1 - avers-api ==0.1.0 - avers-server ==0.1.0.1 - - avro ==0.4.2.0 + - avro ==0.4.3.0 - avwx ==0.3.0.2 - axel ==0.0.9 - backprop ==0.2.6.1 - bank-holidays-england ==0.1.0.8 - - barbies ==1.1.0.0 + - barbies ==1.1.1.0 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 - base32string ==0.9.1 @@ -350,7 +351,8 @@ default-package-overrides: - cabal-doctest ==1.0.6 - cabal-rpm ==0.12.6 - cache ==0.1.1.1 - - cachix-api ==0.1.0.3 + - cachix ==0.2.0 + - cachix-api ==0.2.0 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 - call-stack ==0.1.0 @@ -365,7 +367,7 @@ default-package-overrides: - cassava-records ==0.1.0.4 - cast ==0.1.0.2 - category ==0.2.2.0 - - cayley-client ==0.4.8 + - cayley-client ==0.4.9 - cborg ==0.2.1.0 - cborg-json ==0.2.1.0 - cereal ==0.5.8.0 @@ -409,8 +411,8 @@ default-package-overrides: - clr-host ==0.2.1.0 - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.2 - - cmark ==0.5.6 - - cmark-gfm ==0.1.6 + - cmark ==0.5.6.3 + - cmark-gfm ==0.1.8 - cmdargs ==0.10.20 - codec ==0.2.1 - codec-beam ==0.2.0 @@ -442,12 +444,12 @@ default-package-overrides: - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - - conduit ==1.3.1 + - conduit ==1.3.1.1 - conduit-algorithms ==0.0.9.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 - conduit-connection ==0.1.0.4 - - conduit-extra ==1.3.0 + - conduit-extra ==1.3.1.1 - conduit-iconv ==0.1.1.3 - conduit-parse ==0.2.1.0 - conduit-throttle ==0.3.1.0 @@ -481,7 +483,7 @@ default-package-overrides: - cql-io ==1.0.1.1 - crackNum ==2.3 - credential-store ==0.1.2 - - criterion ==1.5.3.0 + - criterion ==1.5.4.0 - criterion-measurement ==0.1.1.0 - cron ==0.6.1 - crypto-api ==0.13.3 @@ -557,12 +559,12 @@ default-package-overrides: - dataurl ==0.1.0.0 - DAV ==1.3.3 - dbcleaner ==0.1.3 - - DBFunctor ==0.1.1.0 - - dbus ==1.2.3 + - DBFunctor ==0.1.1.1 + - dbus ==1.2.4 - debian-build ==0.10.1.2 - debug ==0.1.1 - debug-trace-var ==0.2.0 - - decidable ==0.1.4.0 + - decidable ==0.1.5.0 - Decimal ==0.5.1 - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 @@ -580,7 +582,7 @@ default-package-overrides: - dhall ==1.19.1 - dhall-bash ==1.0.18 - dhall-json ==1.2.6 - - dhall-text ==1.0.15 + - dhall-text ==1.0.16 - diagrams ==1.4 - diagrams-contrib ==1.4.3 - diagrams-core ==1.4.1.1 @@ -595,7 +597,7 @@ default-package-overrides: - digits ==0.3.1 - di-monad ==1.3 - directory-tree ==0.12.1 - - direct-sqlite ==2.3.23 + - direct-sqlite ==2.3.24 - discount ==0.1.1 - disk-free-space ==0.1.0.1 - distributed-closure ==0.4.1 @@ -610,14 +612,14 @@ default-package-overrides: - doctemplates ==0.2.2.1 - doctest ==0.16.0.1 - doctest-discover ==0.2.0.0 - - doctest-driver-gen ==0.3.0.0 + - doctest-driver-gen ==0.3.0.1 - do-list ==1.0.1 - dom-parser ==3.1.0 - dotenv ==0.8.0.0 - dotgen ==0.4.2 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 - - download ==0.3.2.6 + - download ==0.3.2.7 - drinkery ==0.4 - dsp ==0.2.4.1 - dual-tree ==0.2.2 @@ -628,7 +630,7 @@ default-package-overrides: - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 - dyre ==0.8.12 - - Earley ==0.13.0.0 + - Earley ==0.13.0.1 - easy-file ==0.2.2 - easytest ==0.2.1 - Ebnf2ps ==1.0.15 @@ -639,12 +641,14 @@ default-package-overrides: - editor-open ==0.6.0.0 - either ==5.0.1 - either-both ==0.1.0.0 + - ekg ==0.4.0.15 - ekg-core ==0.1.1.6 + - ekg-json ==0.1.0.6 - ekg-statsd ==0.2.4.0 - elerea ==2.9.0 - elf ==0.29 - eliminators ==0.5 - - elm2nix ==0.1.0 + - elm2nix ==0.1.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - emacs-module ==0.1.1 @@ -652,6 +656,7 @@ default-package-overrides: - emd ==0.1.4.0 - enclosed-exceptions ==1.0.3 - entropy ==0.4.1.4 + - enummapset ==0.6.0.1 - enumset ==0.0.4.1 - enum-subset-generate ==0.1.0.0 - envelope ==0.2.2.0 @@ -664,6 +669,7 @@ default-package-overrides: - errors-ext ==0.4.2 - error-util ==0.0.1.2 - ersatz ==0.4.4 + - esqueleto ==2.6.0 - etc ==0.4.1.0 - eventful-core ==0.2.0 - eventful-memory ==0.2.0 @@ -671,7 +677,7 @@ default-package-overrides: - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventstore ==1.2.1 + - eventstore ==1.2.2 - every ==0.0.1 - exact-combinatorics ==0.2.0.8 - exact-pi ==0.5.0.1 @@ -698,7 +704,7 @@ default-package-overrides: - fb ==1.2.1 - fclabels ==2.0.3.3 - feature-flags ==0.1.0.1 - - fedora-dists ==1.0.0.2 + - fedora-dists ==1.0.1 - fedora-haskell-tools ==0.6 - feed ==1.0.1.0 - FenwickTree ==0.1.2.1 @@ -710,6 +716,7 @@ default-package-overrides: - filelock ==0.1.1.2 - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 + - filepattern ==0.1.1 - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - filtrable ==0.1.1.0 @@ -780,15 +787,15 @@ default-package-overrides: - generic-lens ==1.1.0.0 - GenericPretty ==1.2.2 - generic-random ==1.2.0.0 - - generics-eot ==0.4 + - generics-eot ==0.4.0.1 - generics-mrsop ==1.2.2 - generics-sop ==0.4.0.1 - generics-sop-lens ==0.1.2.1 - - genvalidity ==0.7.0.0 + - genvalidity ==0.7.0.2 - genvalidity-aeson ==0.2.0.2 - genvalidity-bytestring ==0.3.0.1 - genvalidity-containers ==0.5.1.1 - - genvalidity-hspec ==0.6.2.2 + - genvalidity-hspec ==0.6.2.3 - genvalidity-hspec-aeson ==0.3.0.1 - genvalidity-hspec-binary ==0.2.0.3 - genvalidity-hspec-cereal ==0.2.0.3 @@ -806,8 +813,8 @@ default-package-overrides: - getopt-generics ==0.13.0.3 - ghc-core ==0.5.6 - ghc-exactprint ==0.5.8.2 - - ghcid ==0.7.1 - - ghci-hexcalc ==0.1.0.1 + - ghcid ==0.7.2 + - ghci-hexcalc ==0.1.0.2 - ghcjs-codemirror ==0.0.0.2 - ghc-paths ==0.1.0.9 - ghc-prof ==1.4.1.5 @@ -821,7 +828,7 @@ default-package-overrides: - gi-cairo ==1.0.17 - gi-gdk ==3.0.16 - gi-gdkpixbuf ==2.0.18 - - gi-gio ==2.0.18 + - gi-gio ==2.0.19 - gi-glib ==2.0.17 - gi-gobject ==2.0.16 - gi-gtk ==3.0.27 @@ -850,7 +857,7 @@ default-package-overrides: - gloss-rendering ==1.13.0.2 - GLURaw ==2.0.0.4 - GLUT ==2.7.0.14 - - gnuplot ==0.5.5.3 + - gnuplot ==0.5.6 - goggles ==0.3.2 - google-isbn ==1.0.3 - google-oauth2-jwt ==0.3.1 @@ -865,9 +872,11 @@ default-package-overrides: - greskell-websocket ==0.1.1.2 - groom ==0.1.2.1 - groundhog ==0.10.0 + - groundhog-inspector ==0.10.0 - groundhog-mysql ==0.10 - groundhog-postgresql ==0.10 - groundhog-sqlite ==0.10.0 + - groundhog-th ==0.10.2 - groups ==0.4.1.0 - guarded-allocation ==0.0.1 - gym-http-api ==0.1.0.1 @@ -875,7 +884,7 @@ default-package-overrides: - hackage-db ==2.0.1 - hackage-security ==0.5.3.0 - haddock-library ==1.7.0 - - hailgun ==0.4.1.8 + - hailgun ==0.4.2 - half ==0.3 - hamilton ==0.1.0.3 - hamtsolo ==1.0.3 @@ -893,7 +902,7 @@ default-package-overrides: - haskell-gi-base ==0.21.5 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.0.2 - - haskell-lsp ==0.8.0.1 + - haskell-lsp ==0.8.1.0 - haskell-lsp-types ==0.8.0.1 - haskell-names ==0.9.4 - HaskellNet ==0.5.1 @@ -901,7 +910,7 @@ default-package-overrides: - haskell-src ==1.0.3.0 - haskell-src-exts ==1.20.3 - haskell-src-exts-util ==0.2.4 - - haskell-src-meta ==0.8.0.3 + - haskell-src-meta ==0.8.2 - haskey-btree ==0.3.0.0 - haskoin-core ==0.8.4 - hasql ==1.3.0.3 @@ -918,11 +927,11 @@ default-package-overrides: - HDBC-session ==0.1.2.0 - heap ==1.0.4 - heaps ==0.3.6.1 - - hebrew-time ==0.1.1 + - hebrew-time ==0.1.2 - hedgehog ==0.6.1 - hedgehog-corpus ==0.1.0 - hedis ==0.10.10 - - hedn ==0.2.0.0 + - hedn ==0.2.0.1 - here ==1.2.13 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.3 @@ -961,8 +970,8 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.9 - - hpack ==0.31.1 - - hpack-dhall ==0.5.1 + - hpack ==0.31.2 + - hpack-dhall ==0.5.2 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - hruby ==0.3.6 @@ -1013,7 +1022,7 @@ default-package-overrides: - hs-php-session ==0.0.9.3 - hstatsd ==0.1 - HStringTemplate ==0.8.7 - - HSvm ==0.1.0.3.22 + - HSvm ==0.1.1.3.22 - HsYAML ==0.1.1.3 - hsyslog ==5.0.2 - htaglib ==1.2.0 @@ -1021,23 +1030,23 @@ default-package-overrides: - html ==1.0.1.2 - html-conduit ==1.3.2 - html-email-validate ==0.2.0.0 - - html-entities ==1.1.4.2 + - html-entities ==1.1.4.3 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - - HTTP ==4000.3.12 - http2 ==1.6.4 + - HTTP ==4000.3.12 - http-api-data ==0.4 - http-client ==0.5.14 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - - http-conduit ==2.3.5 + - http-conduit ==2.3.6.1 - http-date ==0.0.8 - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3.1 - http-media ==0.7.1.3 - http-reverse-proxy ==0.6.0 - http-streams ==0.8.6.1 - - http-types ==0.12.2 + - http-types ==0.12.3 - human-readable-duration ==0.2.1.3 - HUnit ==1.6.0.0 - HUnit-approx ==1.1.1.1 @@ -1103,18 +1112,17 @@ default-package-overrides: - inline-c-cpp ==0.3.0.1 - inliterate ==0.1.0 - insert-ordered-containers ==0.2.1.0 - - inspection-testing ==0.4.1.1 + - inspection-testing ==0.4.1.2 - instance-control ==0.1.2.0 - integer-logarithms ==1.0.2.2 - integration ==0.2.1 - intern ==0.9.2 - interpolate ==0.2.0 - interpolatedstring-perl6 ==1.0.1 - - interpolation ==0.1.0.3 + - interpolation ==0.1.1 - interpolator ==0.1.1 - IntervalMap ==0.6.1.0 - intervals ==0.8.1 - - intro ==0.5.2.1 - intset-imperative ==0.1.0.0 - invariant ==0.5.1 - invertible ==0.2.0.5 @@ -1126,7 +1134,7 @@ default-package-overrides: - io-storage ==0.3 - io-streams ==1.5.1.0 - io-streams-haproxy ==1.0.1.0 - - ip ==1.4.1 + - ip ==1.4.2 - ip6addr ==1.0.0 - iproute ==1.7.7 - IPv6Addr ==1.1.2 @@ -1175,16 +1183,17 @@ default-package-overrides: - kraken ==0.1.0 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==1.0.8 + - lackey ==1.0.9 + - LambdaHack ==0.8.3.0 - lame ==0.1.1 - language-c ==0.8.2 - language-c-quote ==0.12.2 - - language-docker ==8.0.0 + - language-docker ==8.0.1 - language-ecmascript ==0.19 - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - language-javascript ==0.6.0.11 - - language-puppet ==1.4.2 + - language-puppet ==1.4.3 - lapack-ffi ==0.0.2 - lapack-ffi-tools ==0.1.2 - largeword ==1.2.5 @@ -1216,7 +1225,7 @@ default-package-overrides: - libgraph ==1.14 - libmpd ==0.9.0.9 - libraft ==0.1.1.0 - - libyaml ==0.1.0.0 + - libyaml ==0.1.1.0 - LibZip ==1.0.1 - lifted-async ==0.10.0.3 - lifted-base ==0.2.3.12 @@ -1266,7 +1275,7 @@ default-package-overrides: - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.2.7.0 + - massiv ==0.2.8.0 - massiv-io ==0.1.5.0 - mathexpr ==0.3.0.0 - math-functions ==0.3.1.0 @@ -1319,9 +1328,9 @@ default-package-overrides: - mixpanel-client ==0.1.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - - mmark ==0.0.6.1 + - mmark ==0.0.6.2 - mmark-cli ==0.0.5.0 - - mmark-ext ==0.2.1.1 + - mmark-ext ==0.2.1.2 - mmorph ==1.1.2 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 @@ -1335,7 +1344,7 @@ default-package-overrides: - monad-journal ==0.8.1 - monad-logger ==0.3.30 - monad-logger-json ==0.1.0.0 - - monad-logger-prefix ==0.1.10 + - monad-logger-prefix ==0.1.11 - monad-logger-syslog ==0.1.4.0 - monad-loops ==0.4.3 - monad-memo ==0.5.1 @@ -1352,7 +1361,7 @@ default-package-overrides: - monad-time ==0.3.1.0 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - - mongoDB ==2.4.0.0 + - mongoDB ==2.4.0.1 - monoidal-containers ==0.4.0.0 - monoid-extras ==0.5 - monoid-subclasses ==0.4.6.1 @@ -1393,6 +1402,7 @@ default-package-overrides: - neat-interpolation ==0.3.2.4 - netlib-ffi ==0.1.1 - netpbm ==1.0.2 + - netrc ==0.2.0.0 - nettle ==0.3.0 - netwire ==5.0.3 - netwire-input ==0.0.7 @@ -1441,6 +1451,7 @@ default-package-overrides: - oblivious-transfer ==0.1.0 - odbc ==0.2.2 - oeis ==0.3.9 + - oeis2 ==1.0.2 - ofx ==0.4.2.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 @@ -1491,10 +1502,10 @@ default-package-overrides: - parsers ==0.12.9 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - - partial-semigroup ==0.5.0.0 + - partial-semigroup ==0.5.1.0 - path ==0.6.1 - path-extra ==0.2.0 - - path-io ==1.4.1 + - path-io ==1.4.2 - path-pieces ==0.2.1 - path-text-utf8 ==0.0.1.2 - pathtype ==0.8.1 @@ -1561,7 +1572,7 @@ default-package-overrides: - postgresql-binary ==0.12.1.2 - postgresql-libpq ==0.9.4.2 - postgresql-schema ==0.1.14 - - postgresql-simple ==0.6 + - postgresql-simple ==0.6.1 - postgresql-simple-migration ==0.1.14.0 - postgresql-simple-queue ==1.0.1 - postgresql-simple-url ==0.2.1.0 @@ -1614,7 +1625,7 @@ default-package-overrides: - proto-lens-runtime ==0.4.0.2 - proto-lens-setup ==0.4.0.2 - protolude ==0.2.3 - - proxied ==0.3 + - proxied ==0.3.1 - psql-helpers ==0.1.0.0 - psqueues ==0.2.7.1 - pureMD5 ==2.1.3 @@ -1668,11 +1679,10 @@ default-package-overrides: - rebase ==1.3 - record-dot-preprocessor ==0.1.5 - records-sop ==0.1.0.2 - - recursion-schemes ==5.1.1 + - recursion-schemes ==5.1.2 - reducers ==3.12.3 - refact ==0.3.0.2 - references ==0.3.3.1 - - refined ==0.3.0.0 - reflection ==2.1.4 - RefSerialize ==0.4.0 - regex ==1.0.2.0 @@ -1776,7 +1786,7 @@ default-package-overrides: - servant-auth ==0.3.2.0 - servant-auth-client ==0.3.3.0 - servant-auth-docs ==0.2.10.0 - - servant-auth-server ==0.4.3.0 + - servant-auth-server ==0.4.4.0 - servant-auth-swagger ==0.2.10.0 - servant-blaze ==0.8 - servant-cassava ==0.10 @@ -1784,13 +1794,14 @@ default-package-overrides: - servant-checked-exceptions-core ==2.0.0.0 - servant-client ==0.15 - servant-client-core ==0.15 + - servant-conduit ==0.15 - servant-docs ==0.11.3 - servant-elm ==0.5.0.0 - servant-exceptions ==0.1.1 - servant-foreign ==0.15 - servant-js ==0.9.4 - servant-JuicyPixels ==0.3.0.4 - - servant-kotlin ==0.1.1.6 + - servant-kotlin ==0.1.1.7 - servant-lucid ==0.8.1 - servant-mock ==0.8.5 - servant-pandoc ==0.5.0.0 @@ -1806,7 +1817,7 @@ default-package-overrides: - servant-tracing ==0.1.0.2 - servant-websockets ==1.1.0 - servant-yaml ==0.1.0.1 - - serverless-haskell ==0.8.5 + - serverless-haskell ==0.8.6 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - servius ==1.2.3.0 @@ -1825,11 +1836,12 @@ default-package-overrides: - shortcut-links ==0.4.2.1 - should-not-typecheck ==2.1.0 - show-combinators ==0.1.1.0 - - show-prettyprint ==0.2.2 + - show-prettyprint ==0.2.3 - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5 - - simple-cmd ==0.1.2 + - simple-cmd ==0.1.3 + - simple-cmd-args ==0.1.0.1 - simple-log ==0.9.11 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.28 @@ -1842,11 +1854,11 @@ default-package-overrides: - size-based ==0.1.2.0 - sized-grid ==0.1.1.6 - skein ==1.0.9.4 - - skews ==0.1.0.1 + - skews ==0.1.0.2 - skip-var ==0.1.1.0 - - skylighting ==0.7.6 - - skylighting-core ==0.7.6 - - slack-web ==0.2.0.10 + - skylighting ==0.7.7 + - skylighting-core ==0.7.7 + - slack-web ==0.2.0.11 - smallcheck ==1.1.5 - smoothie ==0.4.2.9 - smtp-mail ==0.1.4.6 @@ -1962,7 +1974,7 @@ default-package-overrides: - tar-conduit ==0.3.2 - tardis ==0.4.1.0 - tasty ==1.2 - - tasty-ant-xml ==1.1.5 + - tasty-ant-xml ==1.1.6 - tasty-dejafu ==1.2.1.0 - tasty-discover ==4.2.1 - tasty-expected-failure ==0.11.1.1 @@ -1998,7 +2010,7 @@ default-package-overrides: - test-framework-th ==0.2.4 - testing-feat ==1.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.11.2 + - texmath ==0.11.2.2 - text ==1.2.3.1 - text-binary ==0.2.1.1 - text-builder ==0.6.5 @@ -2017,7 +2029,7 @@ default-package-overrides: - text-show ==3.7.5 - tfp ==1.0.1.1 - tf-random ==0.5 - - th-abstraction ==0.2.10.0 + - th-abstraction ==0.2.11.0 - th-data-compat ==0.0.2.7 - th-desugar ==1.9 - these ==0.7.6 @@ -2038,6 +2050,7 @@ default-package-overrides: - th-strict-compat ==0.1.0.1 - th-utilities ==0.2.1.0 - thyme ==0.3.5.5 + - tidal ==1.0.8 - tile ==0.3.0.0 - time-compat ==0.1.0.3 - timeit ==2.0 @@ -2069,7 +2082,6 @@ default-package-overrides: - transformers-bifunctors ==0.1 - transformers-compat ==0.6.2 - transformers-fix ==1.0 - - transformers-lift ==0.2.0.1 - traverse-with-class ==1.0.0.0 - tree-diff ==0.0.2 - tree-fun ==0.8.1.0 @@ -2142,14 +2154,14 @@ default-package-overrides: - users-test ==0.5.0.1 - utf8-light ==0.4.2 - utf8-string ==1.0.1.1 - - util ==0.1.11.0 + - util ==0.1.12.0 - utility-ht ==0.0.14 - uuid ==1.3.13 - uuid-types ==1.0.3 - validation ==1 - - validity ==0.9.0.0 + - validity ==0.9.0.1 - validity-aeson ==0.2.0.2 - - validity-bytestring ==0.4.0.0 + - validity-bytestring ==0.4.1.0 - validity-containers ==0.3.1.0 - validity-path ==0.3.0.2 - validity-scientific ==0.2.0.2 @@ -2183,7 +2195,7 @@ default-package-overrides: - void ==0.7.2 - vty ==5.25.1 - wai ==3.2.2 - - wai-app-static ==3.1.6.2 + - wai-app-static ==3.1.6.3 - wai-cli ==0.1.1 - wai-conduit ==3.0.0.4 - wai-cors ==0.2.6 @@ -2221,7 +2233,7 @@ default-package-overrides: - websockets-snap ==0.10.3.0 - weigh ==0.0.13 - wide-word ==0.1.0.8 - - wikicfp-scraper ==0.1.0.9 + - wikicfp-scraper ==0.1.0.10 - wild-bind ==0.1.2.3 - wild-bind-x11 ==0.2.0.6 - Win32-notify ==0.3.0.3 @@ -2241,12 +2253,6 @@ default-package-overrides: - world-peace ==0.1.0.0 - wrap ==0.0.0 - wreq ==0.5.3.1 - - writer-cps-exceptions ==0.1.0.0 - - writer-cps-full ==0.1.0.0 - - writer-cps-lens ==0.1.0.1 - - writer-cps-morph ==0.1.0.2 - - writer-cps-mtl ==0.1.1.5 - - writer-cps-transformers ==0.1.1.4 - ws ==0.0.5 - wuss ==1.1.12 - X11 ==1.9 @@ -2286,26 +2292,26 @@ default-package-overrides: - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yam ==0.5.11 - - yam-datasource ==0.5.11 + - yam ==0.5.14 + - yam-datasource ==0.5.14 - yaml ==0.11.0.0 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 - yeshql-hdbc ==4.1.0.2 - yesod ==1.6.0 - yesod-alerts ==0.1.2.0 - - yesod-auth ==1.6.5 + - yesod-auth ==1.6.6 - yesod-auth-hashdb ==1.7.1 - - yesod-auth-oauth2 ==0.6.1.0 + - yesod-auth-oauth2 ==0.6.1.1 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.11 + - yesod-core ==1.6.12 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - yesod-form ==1.6.4 - yesod-form-bootstrap4 ==2.1.0 - yesod-gitrepo ==0.3.0 - - yesod-gitrev ==0.2.0.0 + - yesod-gitrev ==0.2.1 - yesod-markdown ==0.12.6.1 - yesod-newsfeed ==1.6.1.0 - yesod-paginator ==1.1.0.1 @@ -2452,8 +2458,7 @@ package-maintainers: abbradar: - Agda -dont-distribute-packages: - # hard restrictions that really belong into meta.platforms +unsupported-platforms: alsa-mixer: [ x86_64-darwin ] alsa-pcm: [ x86_64-darwin ] alsa-seq: [ x86_64-darwin ] @@ -2467,8 +2472,8 @@ dont-distribute-packages: freenect: [ x86_64-darwin ] FTGL: [ x86_64-darwin ] gi-ostree: [ x86_64-darwin ] + gtk-mac-integration: [ i686-linux, x86_64-linux ] hcwiid: [ x86_64-darwin ] - hfsevents: [ x86_64-darwin ] HFuse: [ x86_64-darwin ] hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin ] lio-fs: [ x86_64-darwin ] @@ -2486,7822 +2491,7485 @@ dont-distribute-packages: Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - Win32: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin ] - Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] + Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin ] + Win32: [ i686-linux, x86_64-linux, x86_64-darwin ] xattr: [ x86_64-darwin ] XInput: [ i686-linux, x86_64-linux, x86_64-darwin ] xmobar: [ x86_64-darwin ] +dont-distribute-packages: # Depends on shine, which is a ghcjs project. - shine-varying: [ i686-linux, x86_64-linux, x86_64-darwin ] + - shine-varying # these packages depend on software with an unfree license - accelerate-bignum: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-blas: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-cublas: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-cuda: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-cufft: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-fourier-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-llvm-ptx: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-yices: [ i686-linux, x86_64-linux, x86_64-darwin ] - boolector: [ i686-linux, x86_64-linux, x86_64-darwin ] - ccelerate-cuda: [ i686-linux, x86_64-linux, x86_64-darwin ] - cplex-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - cublas: [ i686-linux, x86_64-linux, x86_64-darwin ] - cufft: [ i686-linux, x86_64-linux, x86_64-darwin ] - cusolver: [ i686-linux, x86_64-linux, x86_64-darwin ] - cusparse: [ i686-linux, x86_64-linux, x86_64-darwin ] - gloss-raster-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - libnvvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - matlab: [ i686-linux, x86_64-linux, x86_64-darwin ] - nvvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - Obsidian: [ i686-linux, x86_64-linux, x86_64-darwin ] - odpic-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] - patch-image: [ i686-linux, x86_64-linux, x86_64-darwin ] - yices-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] - yices-painless: [ i686-linux, x86_64-linux, x86_64-darwin ] + - accelerate-bignum + - accelerate-blas + - accelerate-cublas + - accelerate-cuda + - accelerate-cufft + - accelerate-examples + - accelerate-fft + - accelerate-fourier-benchmark + - accelerate-llvm-ptx + - bindings-yices + - boolector + - ccelerate-cuda + - cplex-hs + - cublas + - cufft + - cusolver + - cusparse + - gloss-raster-accelerate + - libnvvm + - matlab + - nvvm + - Obsidian + - odpic-raw + - patch-image + - yices-easy + - yices-painless - # these packages don't evaluate because they have broken dependencies - comark: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] - dialog: [ i686-linux, x86_64-linux, x86_64-darwin ] - fltkhs-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] - fltkhs-fluid-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] - fltkhs-hello-world: [ i686-linux, x86_64-linux, x86_64-darwin ] - fltkhs-themes: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - haste-gapi: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] - hbro: [ i686-linux, x86_64-linux, x86_64-darwin ] - hplayground: [ i686-linux, x86_64-linux, x86_64-darwin ] - imprevu-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle-webkit2gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle-webkitgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - passman-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - passman-core: [ 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-fragment-shader-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflex-dom-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflex-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflex-jsx: [ i686-linux, x86_64-linux, x86_64-darwin ] - sneathlane-haste: [ i686-linux, x86_64-linux, x86_64-darwin ] - spike: [ i686-linux, x86_64-linux, x86_64-darwin ] - tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] - trasa-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] - treersec: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-brotli: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-browser-in-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkitgtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkitgtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] - websnap: [ i686-linux, x86_64-linux, x86_64-darwin ] - XML: [ i686-linux, x86_64-linux, x86_64-darwin ] + # these packages don't evaluate because they have broken (system) dependencies + - comark + - diagrams-reflex + - dialog + - fltkhs-demos + - fltkhs-fluid-demos + - fltkhs-hello-world + - fltkhs-themes + - ghcjs-dom-hello + - ghcjs-dom-webkit + - gi-javascriptcore + - gi-webkit2 + - gi-webkit2webextension + - gi-webkit + - gsmenu + - haste-gapi + - haste-perch + - hbro + - hplayground + - imprevu-happstack + - jsaddle-webkit2gtk + - jsaddle-webkitgtk + - jsc + - lambdacat + - leksah + - manatee-all + - manatee-browser + - manatee-reader + - markup-preview + - nomyx-api + - nomyx-core + - nomyx-language + - nomyx-library + - nomyx-server + - passman-cli + - passman-core + - reflex-dom-colonnade + - reflex-dom-contrib + - reflex-dom-fragment-shader-canvas + - reflex-dom-helpers + - reflex-dom + - reflex-jsx + - sneathlane-haste + - spike + - tianbar + - trasa-reflex + - treersec + - wai-middleware-brotli + - web-browser-in-haskell + - webkit + - webkitgtk3-javascriptcore + - webkitgtk3 + - websnap + - XML - # soft restrictions because of build errors - 3dmodels: [ i686-linux, x86_64-linux, x86_64-darwin ] - 4Blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] - a50: [ i686-linux, x86_64-linux, x86_64-darwin ] - AAI: [ i686-linux, x86_64-linux, x86_64-darwin ] - abcBridge: [ i686-linux, x86_64-linux, x86_64-darwin ] - abcnotation: [ i686-linux, x86_64-linux, x86_64-darwin ] - abeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - abnf: [ i686-linux, x86_64-linux, x86_64-darwin ] - AbortT-monadstf: [ i686-linux, x86_64-linux, x86_64-darwin ] - AbortT-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - AbortT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - abstract-par-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - abt: [ i686-linux, x86_64-linux, x86_64-darwin ] - AC-BuildPlatform: [ i686-linux, x86_64-linux, x86_64-darwin ] - AC-EasyRaster-GTK: [ i686-linux, x86_64-linux, x86_64-darwin ] - AC-HalfInteger: [ i686-linux, x86_64-linux, x86_64-darwin ] - ac-machine-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - ac-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] - AC-MiniTest: [ i686-linux, x86_64-linux, x86_64-darwin ] - AC-Terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] - AC-VanillaArray: [ i686-linux, x86_64-linux, x86_64-darwin ] - AC-Vector-Fancy: [ i686-linux, x86_64-linux, x86_64-darwin ] - AC-Vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-fourier: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-llvm-native: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-utility: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - accentuateus: [ i686-linux, x86_64-linux, x86_64-darwin ] - access-time: [ i686-linux, x86_64-linux, x86_64-darwin ] - access-token-provider: [ i686-linux, x86_64-linux, x86_64-darwin ] - acid-state-dist: [ i686-linux, x86_64-linux, x86_64-darwin ] - acid-state-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-all-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-comonad: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-flipping-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-hq9plus: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-inator: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-kitchen-sink: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-left-pad: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-miscorder: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-mutable-package: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-now: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-numbersystem: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-operators: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-php: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-schoenfinkel: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-strfry: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-stringly-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-zalgo: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-zero: [ i686-linux, x86_64-linux, x86_64-darwin ] - ACME: [ 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 ] - activitypub: [ i686-linux, x86_64-linux, x86_64-darwin ] - activitystreams-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - actor: [ i686-linux, x86_64-linux, x86_64-darwin ] - Adaptive-Blaisorblade: [ i686-linux, x86_64-linux, x86_64-darwin ] - adaptive-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - adaptive-tuple: [ i686-linux, x86_64-linux, x86_64-darwin ] - Adaptive: [ i686-linux, x86_64-linux, x86_64-darwin ] - adb: [ i686-linux, x86_64-linux, x86_64-darwin ] - adhoc-network: [ i686-linux, x86_64-linux, x86_64-darwin ] - adict: [ i686-linux, x86_64-linux, x86_64-darwin ] - adobe-swatch-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] - adp-multi-monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] - adp-multi: [ i686-linux, x86_64-linux, x86_64-darwin ] - ADPfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] - ADPfusionForest: [ i686-linux, x86_64-linux, x86_64-darwin ] - ADPfusionSet: [ i686-linux, x86_64-linux, x86_64-darwin ] - Advgame: [ i686-linux, x86_64-linux, x86_64-darwin ] - AERN-Basics: [ i686-linux, x86_64-linux, x86_64-darwin ] - AERN-Net: [ i686-linux, x86_64-linux, x86_64-darwin ] - AERN-Real-Double: [ i686-linux, x86_64-linux, x86_64-darwin ] - AERN-Real-Interval: [ i686-linux, x86_64-linux, x86_64-darwin ] - AERN-Real: [ i686-linux, x86_64-linux, x86_64-darwin ] - AERN-RnToRm-Plot: [ i686-linux, x86_64-linux, x86_64-darwin ] - AERN-RnToRm: [ i686-linux, x86_64-linux, x86_64-darwin ] - aern2-mp: [ i686-linux, x86_64-linux, x86_64-darwin ] - aern2-real: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-decode: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-diff-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-flowtyped: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-injector: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-native: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-options: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-prefix: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-smart: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-t: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-tiled: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-value-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - affection: [ i686-linux, x86_64-linux, x86_64-darwin ] - affine-invariant-ensemble-mcmc: [ i686-linux, x86_64-linux, x86_64-darwin ] - afv: [ i686-linux, x86_64-linux, x86_64-darwin ] - ag-pictgen: [ i686-linux, x86_64-linux, x86_64-darwin ] - Agata: [ i686-linux, x86_64-linux, x86_64-darwin ] - agda-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - agda-snippets-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] - agda-snippets: [ i686-linux, x86_64-linux, x86_64-darwin ] - agentx: [ i686-linux, x86_64-linux, x86_64-darwin ] - AGI: [ i686-linux, x86_64-linux, x86_64-darwin ] - AhoCorasick: [ i686-linux, x86_64-linux, x86_64-darwin ] - aig: [ i686-linux, x86_64-linux, x86_64-darwin ] - aip: [ i686-linux, x86_64-linux, x86_64-darwin ] - air-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - airbrake: [ i686-linux, x86_64-linux, x86_64-darwin ] - airship: [ i686-linux, x86_64-linux, x86_64-darwin ] - airtable-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - aivika-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] - aivika-experiment-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - aivika-experiment-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] - aivika-experiment-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] - AlanDeniseEricLauren: [ i686-linux, x86_64-linux, x86_64-darwin ] - alerta: [ i686-linux, x86_64-linux, x86_64-darwin ] - alex-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] - alex-prelude: [ 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 ] - algebra-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] - algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] - algebraic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] - algo-s: [ i686-linux, x86_64-linux, x86_64-darwin ] - algolia: [ i686-linux, x86_64-linux, x86_64-darwin ] - AlgoRhythm: [ i686-linux, x86_64-linux, x86_64-darwin ] - AlgorithmW: [ i686-linux, x86_64-linux, x86_64-darwin ] - align-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] - alms: [ i686-linux, x86_64-linux, x86_64-darwin ] - alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] - alphachar: [ i686-linux, x86_64-linux, x86_64-darwin ] - alsa-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] - alsa-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] - alsa-pcm-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - alsa-seq-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] - altcomposition: [ i686-linux, x86_64-linux, x86_64-darwin ] - alternative-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - alternative-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - alto: [ i686-linux, x86_64-linux, x86_64-darwin ] - alure: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazon-emailer-client-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] - amazonka-s3-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] - amby: [ i686-linux, x86_64-linux, x86_64-darwin ] - AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] - ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] - amqp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - analyze-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] - anansi-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - anatomy: [ i686-linux, x86_64-linux, x86_64-darwin ] - android-activity: [ i686-linux, x86_64-linux, x86_64-darwin ] - android-lint-summary: [ i686-linux, x86_64-linux, x86_64-darwin ] - android: [ i686-linux, x86_64-linux, x86_64-darwin ] - AndroidViewHierarchyImporter: [ i686-linux, x86_64-linux, x86_64-darwin ] - angel: [ i686-linux, x86_64-linux, x86_64-darwin ] - angle: [ i686-linux, x86_64-linux, x86_64-darwin ] - Animas: [ i686-linux, x86_64-linux, x86_64-darwin ] - animascii: [ i686-linux, x86_64-linux, x86_64-darwin ] - animate-example: [ i686-linux, x86_64-linux, x86_64-darwin ] - animate-frames: [ i686-linux, x86_64-linux, x86_64-darwin ] - animate-preview: [ i686-linux, x86_64-linux, x86_64-darwin ] - animate-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] - animate: [ i686-linux, x86_64-linux, x86_64-darwin ] - annah: [ i686-linux, x86_64-linux, x86_64-darwin ] - Annotations: [ i686-linux, x86_64-linux, x86_64-darwin ] - anonymous-sums-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - anonymous-sums: [ i686-linux, x86_64-linux, x86_64-darwin ] - ansi-terminal-game: [ i686-linux, x86_64-linux, x86_64-darwin ] - ansigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - antagonist: [ i686-linux, x86_64-linux, x86_64-darwin ] - antfarm: [ i686-linux, x86_64-linux, x86_64-darwin ] - anticiv: [ i686-linux, x86_64-linux, x86_64-darwin ] - antigate: [ i686-linux, x86_64-linux, x86_64-darwin ] - antimirov: [ i686-linux, x86_64-linux, x86_64-darwin ] - antiope-contract: [ i686-linux, x86_64-linux, x86_64-darwin ] - antiope-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - antiope-dynamodb: [ i686-linux, x86_64-linux, x86_64-darwin ] - antiope-messages: [ i686-linux, x86_64-linux, x86_64-darwin ] - antiope-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] - antiope-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] - antiope-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ] - antisplice: [ i686-linux, x86_64-linux, x86_64-darwin ] - antlr-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - antlrc: [ i686-linux, x86_64-linux, x86_64-darwin ] - anydbm: [ i686-linux, x86_64-linux, x86_64-darwin ] - aosd: [ i686-linux, x86_64-linux, x86_64-darwin ] - apart: [ i686-linux, x86_64-linux, x86_64-darwin ] - apelsin: [ i686-linux, x86_64-linux, x86_64-darwin ] - api-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] - api-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary-authenticate: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary-clientsession: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary-cookie: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary-eventsource: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary-helics: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary-memcached: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary-session: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] - apiary: [ i686-linux, x86_64-linux, x86_64-darwin ] - apis: [ i686-linux, x86_64-linux, x86_64-darwin ] - apns-http2: [ i686-linux, x86_64-linux, x86_64-darwin ] - apotiki: [ i686-linux, x86_64-linux, x86_64-darwin ] - app-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - appc: [ i686-linux, x86_64-linux, x86_64-darwin ] - ApplePush: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - arb-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] - arbb-vm: [ i686-linux, x86_64-linux, x86_64-darwin ] - arbor-datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] - arbor-lru-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] - arbor-monad-counter: [ i686-linux, x86_64-linux, x86_64-darwin ] - arbor-monad-metric-datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] - arbor-monad-metric: [ i686-linux, x86_64-linux, x86_64-darwin ] - arbor-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] - arbtt: [ i686-linux, x86_64-linux, x86_64-darwin ] - archiver: [ i686-linux, x86_64-linux, x86_64-darwin ] - archlinux-web: [ i686-linux, x86_64-linux, x86_64-darwin ] - archlinux: [ i686-linux, x86_64-linux, x86_64-darwin ] - archnews: [ i686-linux, x86_64-linux, x86_64-darwin ] - arena: [ 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 ] - argon: [ i686-linux, x86_64-linux, x86_64-darwin ] - argparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - arguedit: [ i686-linux, x86_64-linux, x86_64-darwin ] - ariadne: [ i686-linux, x86_64-linux, x86_64-darwin ] - arion: [ i686-linux, x86_64-linux, x86_64-darwin ] - arith-encode: [ i686-linux, x86_64-linux, x86_64-darwin ] - arithmoi: [ i686-linux, x86_64-linux, x86_64-darwin ] - armada: [ i686-linux, x86_64-linux, x86_64-darwin ] - armor: [ i686-linux, x86_64-linux, x86_64-darwin ] - arpa: [ i686-linux, x86_64-linux, x86_64-darwin ] - arpack: [ i686-linux, x86_64-linux, x86_64-darwin ] - array-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] - array-primops: [ i686-linux, x86_64-linux, x86_64-darwin ] - ArrayRef: [ i686-linux, x86_64-linux, x86_64-darwin ] - arrow-improve: [ i686-linux, x86_64-linux, x86_64-darwin ] - arrow-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - arrowapply-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - arrowp-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - arrowp: [ i686-linux, x86_64-linux, x86_64-darwin ] - ArrowVHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] - artery: [ i686-linux, x86_64-linux, x86_64-darwin ] - artifact: [ i686-linux, x86_64-linux, x86_64-darwin ] - ascii-flatten: [ i686-linux, x86_64-linux, x86_64-darwin ] - ascii-table: [ i686-linux, x86_64-linux, x86_64-darwin ] - ascii-vector-avc: [ i686-linux, x86_64-linux, x86_64-darwin ] - ascii85-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - asic: [ i686-linux, x86_64-linux, x86_64-darwin ] - asif: [ i686-linux, x86_64-linux, x86_64-darwin ] - asil: [ i686-linux, x86_64-linux, x86_64-darwin ] - asn1-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] - asn: [ i686-linux, x86_64-linux, x86_64-darwin ] - AspectAG: [ i686-linux, x86_64-linux, x86_64-darwin ] - assert: [ i686-linux, x86_64-linux, x86_64-darwin ] - assertions: [ i686-linux, x86_64-linux, x86_64-darwin ] - asset-map: [ i686-linux, x86_64-linux, x86_64-darwin ] - assimp: [ i686-linux, x86_64-linux, x86_64-darwin ] - ast-monad-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - ast-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - astrds: [ i686-linux, x86_64-linux, x86_64-darwin ] - astview: [ i686-linux, x86_64-linux, x86_64-darwin ] - async-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] - async-dejafu: [ i686-linux, x86_64-linux, x86_64-darwin ] - async-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] - async-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] - async-timer: [ i686-linux, x86_64-linux, x86_64-darwin ] - asynchronous-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] - aterm-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - aterm: [ i686-linux, x86_64-linux, x86_64-darwin ] - atlassian-connect-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - atmos-dimensional-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - atmos-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] - atmos: [ i686-linux, x86_64-linux, x86_64-darwin ] - atndapi: [ i686-linux, x86_64-linux, x86_64-darwin ] - atom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - atom-msp430: [ i686-linux, x86_64-linux, x86_64-darwin ] - atomic-modify: [ i686-linux, x86_64-linux, x86_64-darwin ] - atomic-primops-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] - atomic-primops-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - atomo: [ i686-linux, x86_64-linux, x86_64-darwin ] - ats-format: [ i686-linux, x86_64-linux, x86_64-darwin ] - ats-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] - ats-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] - attic-schedule: [ i686-linux, x86_64-linux, x86_64-darwin ] - AttoBencode: [ i686-linux, x86_64-linux, x86_64-darwin ] - AttoJson: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-data: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-ip: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-text-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-time: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] - attoparsec-varword: [ i686-linux, x86_64-linux, x86_64-darwin ] - attosplit: [ i686-linux, x86_64-linux, x86_64-darwin ] - Attrac: [ i686-linux, x86_64-linux, x86_64-darwin ] - atuin: [ 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 ] - aur-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - aur: [ i686-linux, x86_64-linux, x86_64-darwin ] - aura: [ i686-linux, x86_64-linux, x86_64-darwin ] - Aurochs: [ i686-linux, x86_64-linux, x86_64-darwin ] - authenticate-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] - authoring: [ i686-linux, x86_64-linux, x86_64-darwin ] - AutoForms: [ i686-linux, x86_64-linux, x86_64-darwin ] - autom: [ i686-linux, x86_64-linux, x86_64-darwin ] - automata: [ i686-linux, x86_64-linux, x86_64-darwin ] - autonix-deps-kf5: [ i686-linux, x86_64-linux, x86_64-darwin ] - autonix-deps: [ i686-linux, x86_64-linux, x86_64-darwin ] - avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] - avers-api-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] - avers-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - avers-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - avers: [ 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 ] - 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 ] - awesomium-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] - awesomium: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-configuration-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-dynamodb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-dynamodb-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-ec2-knownhosts: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-elastic-transcoder: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-general: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-kinesis-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-kinesis-reshard: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-kinesis: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-mfa-credentials: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-performance-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-sdk-text-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-sdk-xml-unordered: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-sdk: [ 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 ] - b9: [ i686-linux, x86_64-linux, x86_64-darwin ] - babylon: [ i686-linux, x86_64-linux, x86_64-darwin ] - backdropper: [ i686-linux, x86_64-linux, x86_64-darwin ] - backtracking-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] - backward-state: [ i686-linux, x86_64-linux, x86_64-darwin ] - bag: [ i686-linux, x86_64-linux, x86_64-darwin ] - Baggins: [ i686-linux, x86_64-linux, x86_64-darwin ] - bake: [ i686-linux, x86_64-linux, x86_64-darwin ] - ballast: [ i686-linux, x86_64-linux, x86_64-darwin ] - bamboo-launcher: [ i686-linux, x86_64-linux, x86_64-darwin ] - bamboo-plugin-highlight: [ i686-linux, x86_64-linux, x86_64-darwin ] - bamboo-plugin-photo: [ i686-linux, x86_64-linux, x86_64-darwin ] - bamboo-theme-blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] - bamboo-theme-mini-html5: [ i686-linux, x86_64-linux, x86_64-darwin ] - bamboo: [ i686-linux, x86_64-linux, x86_64-darwin ] - bamse: [ i686-linux, x86_64-linux, x86_64-darwin ] - bamstats: [ i686-linux, x86_64-linux, x86_64-darwin ] - Bang: [ i686-linux, x86_64-linux, x86_64-darwin ] - bank-holiday-usa: [ i686-linux, x86_64-linux, x86_64-darwin ] - banwords: [ i686-linux, x86_64-linux, x86_64-darwin ] - barchart: [ i686-linux, x86_64-linux, x86_64-darwin ] - barcodes-code128: [ i686-linux, x86_64-linux, x86_64-darwin ] - barecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - Barracuda: [ i686-linux, x86_64-linux, x86_64-darwin ] - barrie: [ i686-linux, x86_64-linux, x86_64-darwin ] - barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - barrier: [ i686-linux, x86_64-linux, x86_64-darwin ] - base-compat-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ] - base-feature-macros: [ i686-linux, x86_64-linux, x86_64-darwin ] - base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] - base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] - base64-bytestring-type: [ i686-linux, x86_64-linux, x86_64-darwin ] - base64-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - baserock-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] - BASIC: [ i686-linux, x86_64-linux, x86_64-darwin ] - baskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - batch: [ i686-linux, x86_64-linux, x86_64-darwin ] - batchd: [ i686-linux, x86_64-linux, x86_64-darwin ] - battlenet-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] - battlenet: [ i686-linux, x86_64-linux, x86_64-darwin ] - battleplace-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - battleship-combinatorics: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - bdcs-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - bdcs: [ i686-linux, x86_64-linux, x86_64-darwin ] - beam-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - beam-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ] - beam-newtype-field: [ i686-linux, x86_64-linux, x86_64-darwin ] - beam-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] - beam-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - beam: [ i686-linux, x86_64-linux, x86_64-darwin ] - beamable: [ i686-linux, x86_64-linux, x86_64-darwin ] - beautifHOL: [ i686-linux, x86_64-linux, x86_64-darwin ] - beeminder-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - Befunge93: [ i686-linux, x86_64-linux, x86_64-darwin ] - bein: [ i686-linux, x86_64-linux, x86_64-darwin ] - belka: [ i686-linux, x86_64-linux, x86_64-darwin ] - bench-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] - bench-show: [ i686-linux, x86_64-linux, x86_64-darwin ] - BenchmarkHistory: [ i686-linux, x86_64-linux, x86_64-darwin ] - bencodex: [ i686-linux, x86_64-linux, x86_64-darwin ] - berkeleydb: [ i686-linux, x86_64-linux, x86_64-darwin ] - BerkeleyDBXML: [ i686-linux, x86_64-linux, x86_64-darwin ] - BerlekampAlgorithm: [ i686-linux, x86_64-linux, x86_64-darwin ] - berp: [ i686-linux, x86_64-linux, x86_64-darwin ] - besout: [ i686-linux, x86_64-linux, x86_64-darwin ] - bet: [ i686-linux, x86_64-linux, x86_64-darwin ] - betacode: [ i686-linux, x86_64-linux, x86_64-darwin ] - betris: [ i686-linux, x86_64-linux, x86_64-darwin ] - bff: [ i686-linux, x86_64-linux, x86_64-darwin ] - bgmax: [ i686-linux, x86_64-linux, x86_64-darwin ] - bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] - bhoogle: [ i686-linux, x86_64-linux, x86_64-darwin ] - bibdb: [ i686-linux, x86_64-linux, x86_64-darwin ] - bidirectionalization-combined: [ i686-linux, x86_64-linux, x86_64-darwin ] - bidispec-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - bidispec: [ i686-linux, x86_64-linux, x86_64-darwin ] - bifunctor: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiGUL: [ i686-linux, x86_64-linux, x86_64-darwin ] - billboard-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - billeksah-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - binary-communicator: [ i686-linux, x86_64-linux, x86_64-darwin ] - binary-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] - binary-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] - binary-file: [ i686-linux, x86_64-linux, x86_64-darwin ] - binary-indexed-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - binary-orphans: [ i686-linux, x86_64-linux, x86_64-darwin ] - binary-protocol-zmq: [ i686-linux, x86_64-linux, x86_64-darwin ] - binary-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] - binary-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - binary-strict: [ i686-linux, x86_64-linux, x86_64-darwin ] - binary-tagged: [ i686-linux, x86_64-linux, x86_64-darwin ] - binary-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] - bind-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] - binding-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - binding-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-apr-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-apr: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-bfd: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-cctools: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-common: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-dc1394: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-eskit: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-fann: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-fluidsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-friso: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-gsl: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-gts: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-hamlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-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-monetdb-mapi: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-mpdecimal: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-portaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-sc3: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-sipc: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-wlc: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] - binembed-example: [ i686-linux, x86_64-linux, x86_64-darwin ] - binembed: [ i686-linux, x86_64-linux, x86_64-darwin ] - bins: [ i686-linux, x86_64-linux, x86_64-darwin ] - bio-sequence: [ i686-linux, x86_64-linux, x86_64-darwin ] - bio: [ i686-linux, x86_64-linux, x86_64-darwin ] - bioace: [ i686-linux, x86_64-linux, x86_64-darwin ] - bioalign: [ i686-linux, x86_64-linux, x86_64-darwin ] - Biobase: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseBlast: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseDotP: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseEnsembl: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseFR3D: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseHTTPTools: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseInfernal: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseMAF: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseNewick: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseTrainingData: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseTurner: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] - biocore: [ i686-linux, x86_64-linux, x86_64-darwin ] - biofasta: [ i686-linux, x86_64-linux, x86_64-darwin ] - biofastq: [ i686-linux, x86_64-linux, x86_64-darwin ] - biohazard: [ i686-linux, x86_64-linux, x86_64-darwin ] - BioHMM: [ i686-linux, x86_64-linux, x86_64-darwin ] - bioinformatics-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] - biophd: [ i686-linux, x86_64-linux, x86_64-darwin ] - biopsl: [ i686-linux, x86_64-linux, x86_64-darwin ] - biosff: [ i686-linux, x86_64-linux, x86_64-darwin ] - biostockholm: [ i686-linux, x86_64-linux, x86_64-darwin ] - birch-beer: [ i686-linux, x86_64-linux, x86_64-darwin ] - bird: [ i686-linux, x86_64-linux, x86_64-darwin ] - BirdPP: [ i686-linux, x86_64-linux, x86_64-darwin ] - bisect-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - bit-array: [ i686-linux, x86_64-linux, x86_64-darwin ] - bit-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - bitcoin-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - bitcoin-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - bitly-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - Bitly: [ i686-linux, x86_64-linux, x86_64-darwin ] - bitmaps: [ i686-linux, x86_64-linux, x86_64-darwin ] - bits-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - bitset: [ i686-linux, x86_64-linux, x86_64-darwin ] - bitspeak: [ i686-linux, x86_64-linux, x86_64-darwin ] - bitstream: [ i686-linux, x86_64-linux, x86_64-darwin ] - BitStringRandomMonad: [ i686-linux, x86_64-linux, x86_64-darwin ] - bittorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] - bitvec: [ i686-linux, x86_64-linux, x86_64-darwin ] - bizzlelude-js: [ i686-linux, x86_64-linux, x86_64-darwin ] - bizzlelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - bkr: [ i686-linux, x86_64-linux, x86_64-darwin ] - bla: [ i686-linux, x86_64-linux, x86_64-darwin ] - blakesum-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] - blakesum: [ i686-linux, x86_64-linux, x86_64-darwin ] - blank-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - blas-carray: [ i686-linux, x86_64-linux, x86_64-darwin ] - blas-comfort-array: [ i686-linux, x86_64-linux, x86_64-darwin ] - blas-ffi: [ i686-linux, x86_64-linux, x86_64-darwin ] - blas-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - blas: [ i686-linux, x86_64-linux, x86_64-darwin ] - BlastHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] - blastxml: [ i686-linux, x86_64-linux, x86_64-darwin ] - blatex: [ i686-linux, x86_64-linux, x86_64-darwin ] - blaze-builder-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - blaze-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 ] - blazeT: [ i686-linux, x86_64-linux, x86_64-darwin ] - ble: [ i686-linux, x86_64-linux, x86_64-darwin ] - blink1: [ i686-linux, x86_64-linux, x86_64-darwin ] - blip: [ i686-linux, x86_64-linux, x86_64-darwin ] - bliplib: [ i686-linux, x86_64-linux, x86_64-darwin ] - Blobs: [ i686-linux, x86_64-linux, x86_64-darwin ] - blockchain: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - bloodhound: [ i686-linux, x86_64-linux, x86_64-darwin ] - bloomfilter-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] - blosum: [ i686-linux, x86_64-linux, x86_64-darwin ] - blubber-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - blubber: [ i686-linux, x86_64-linux, x86_64-darwin ] - Blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] - bluetile: [ i686-linux, x86_64-linux, x86_64-darwin ] - bluetileutils: [ i686-linux, x86_64-linux, x86_64-darwin ] - blunk-hask-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - blunt: [ i686-linux, x86_64-linux, x86_64-darwin ] - BNFC-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - boltzmann-brain: [ 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 ] - bookkeeper-permissions: [ i686-linux, x86_64-linux, x86_64-darwin ] - bookkeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] - Bookshelf: [ i686-linux, x86_64-linux, x86_64-darwin ] - boolexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] - boombox: [ i686-linux, x86_64-linux, x86_64-darwin ] - boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] - borel: [ i686-linux, x86_64-linux, x86_64-darwin ] - boring-window-switcher: [ i686-linux, x86_64-linux, x86_64-darwin ] - boring: [ i686-linux, x86_64-linux, x86_64-darwin ] - bot: [ i686-linux, x86_64-linux, x86_64-darwin ] - bound-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - bounded-array: [ i686-linux, x86_64-linux, x86_64-darwin ] - bowntz: [ i686-linux, x86_64-linux, x86_64-darwin ] - braid: [ i686-linux, x86_64-linux, x86_64-darwin ] - brain-bleep: [ i686-linux, x86_64-linux, x86_64-darwin ] - Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ] - breakout: [ i686-linux, x86_64-linux, x86_64-darwin ] - breve: [ i686-linux, x86_64-linux, x86_64-darwin ] - brians-brain: [ i686-linux, x86_64-linux, x86_64-darwin ] - brick-dropdownmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] - bricks-internal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - bricks-internal: [ i686-linux, x86_64-linux, x86_64-darwin ] - bricks-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - bricks-rendering: [ i686-linux, x86_64-linux, x86_64-darwin ] - bricks-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - bricks: [ i686-linux, x86_64-linux, x86_64-darwin ] - brillig: [ i686-linux, x86_64-linux, x86_64-darwin ] - brittany: [ i686-linux, x86_64-linux, x86_64-darwin ] - broadcast-chan-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - broadcast-chan-pipes: [ i686-linux, x86_64-linux, x86_64-darwin ] - broadcast-chan-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - broadcast-chan: [ i686-linux, x86_64-linux, x86_64-darwin ] - broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ] - broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - bronyradiogermany-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] - browscap: [ i686-linux, x86_64-linux, x86_64-darwin ] - bson-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] - bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] - btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] - buchhaltung: [ i686-linux, x86_64-linux, x86_64-darwin ] - buffer-builder-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] - BufferedSocket: [ i686-linux, x86_64-linux, x86_64-darwin ] - buffon: [ i686-linux, x86_64-linux, x86_64-darwin ] - bugzilla: [ i686-linux, x86_64-linux, x86_64-darwin ] - build: [ i686-linux, x86_64-linux, x86_64-darwin ] - buildable: [ i686-linux, x86_64-linux, x86_64-darwin ] - buildbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - buildwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] - bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] - bulletproofs: [ i686-linux, x86_64-linux, x86_64-darwin ] - bumper: [ i686-linux, x86_64-linux, x86_64-darwin ] - bunz: [ i686-linux, x86_64-linux, x86_64-darwin ] - burnt-explorer: [ i686-linux, x86_64-linux, x86_64-darwin ] - burst-detection: [ i686-linux, x86_64-linux, x86_64-darwin ] - bus-pirate: [ i686-linux, x86_64-linux, x86_64-darwin ] - buster-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - buster-network: [ i686-linux, x86_64-linux, x86_64-darwin ] - buster: [ i686-linux, x86_64-linux, x86_64-darwin ] - Buster: [ i686-linux, x86_64-linux, x86_64-darwin ] - butcher: [ i686-linux, x86_64-linux, x86_64-darwin ] - butter: [ i686-linux, x86_64-linux, x86_64-darwin ] - butterflies: [ i686-linux, x86_64-linux, x86_64-darwin ] - bv-sized: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytable: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-builder-varword: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-class: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-handle: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-plain: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-read: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-show: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-time: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-typenats: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestringparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestringreadp: [ i686-linux, x86_64-linux, x86_64-darwin ] - c-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ] - c-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - c0check: [ i686-linux, x86_64-linux, x86_64-darwin ] - c0parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - c2ats: [ i686-linux, x86_64-linux, x86_64-darwin ] - c2hsc: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-cargs: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-constraints: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-db: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-debian: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-dependency-licenses: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-dev: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-dir: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-file-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-ghc-dynflags: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-graphdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-helper: [ i686-linux, x86_64-linux, x86_64-darwin ] - Cabal-ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-info: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-install-bundle: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-install-ghc72: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-install-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-mon: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-nirvana: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-progdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-query: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-src: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal2arch: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal2doap: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal2ebuild: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal2ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabalgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabalish: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabalmdvrpm: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabalQuery: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabalrpmdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] - CabalSearch: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabalvchk: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabin: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabocha: [ i686-linux, x86_64-linux, x86_64-darwin ] - cachix-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - cachix: [ i686-linux, x86_64-linux, x86_64-darwin ] - caffegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - cairo-appbase: [ i686-linux, x86_64-linux, x86_64-darwin ] - cairo-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] - cake: [ i686-linux, x86_64-linux, x86_64-darwin ] - cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ] - cal-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] - cal3d-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - cal3d-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] - cal3d: [ i686-linux, x86_64-linux, x86_64-darwin ] - calc: [ i686-linux, x86_64-linux, x86_64-darwin ] - calculator: [ i686-linux, x86_64-linux, x86_64-darwin ] - caldims: [ i686-linux, x86_64-linux, x86_64-darwin ] - caledon: [ 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 ] - canon: [ i686-linux, x86_64-linux, x86_64-darwin ] - canonical-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ] - canonical-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - canteven-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - canteven-listen-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - canteven-log: [ i686-linux, x86_64-linux, x86_64-darwin ] - canteven-parsedate: [ i686-linux, x86_64-linux, x86_64-darwin ] - cantor-pairing: [ i686-linux, x86_64-linux, x86_64-darwin ] - cantor: [ i686-linux, x86_64-linux, x86_64-darwin ] - cao: [ i686-linux, x86_64-linux, x86_64-darwin ] - cap: [ i686-linux, x86_64-linux, x86_64-darwin ] - Capabilities: [ i686-linux, x86_64-linux, x86_64-darwin ] - capability: [ i686-linux, x86_64-linux, x86_64-darwin ] - capataz: [ i686-linux, x86_64-linux, x86_64-darwin ] - capnp: [ i686-linux, x86_64-linux, x86_64-darwin ] - capped-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - capri: [ i686-linux, x86_64-linux, x86_64-darwin ] - car-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] - carbonara: [ i686-linux, x86_64-linux, x86_64-darwin ] - carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] - carettah: [ i686-linux, x86_64-linux, x86_64-darwin ] - CarneadesDSL: [ i686-linux, x86_64-linux, x86_64-darwin ] - CarneadesIntoDung: [ i686-linux, x86_64-linux, x86_64-darwin ] - carte: [ i686-linux, x86_64-linux, x86_64-darwin ] - cartel: [ i686-linux, x86_64-linux, x86_64-darwin ] - Cartesian: [ i686-linux, x86_64-linux, x86_64-darwin ] - casa-abbreviations-and-acronyms: [ i686-linux, x86_64-linux, x86_64-darwin ] - casadi-bindings-control: [ i686-linux, x86_64-linux, x86_64-darwin ] - casadi-bindings-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - casadi-bindings-internal: [ i686-linux, x86_64-linux, x86_64-darwin ] - casadi-bindings-ipopt-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] - casadi-bindings-snopt-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] - casadi-bindings: [ 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 ] - cash: [ i686-linux, x86_64-linux, x86_64-darwin ] - cassandra-cql: [ i686-linux, x86_64-linux, x86_64-darwin ] - cassava-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - Cassava: [ i686-linux, x86_64-linux, x86_64-darwin ] - cassette: [ i686-linux, x86_64-linux, x86_64-darwin ] - cassy: [ i686-linux, x86_64-linux, x86_64-darwin ] - castle: [ i686-linux, x86_64-linux, x86_64-darwin ] - casui: [ i686-linux, x86_64-linux, x86_64-darwin ] - catamorphism: [ i686-linux, x86_64-linux, x86_64-darwin ] - Catana: [ i686-linux, x86_64-linux, x86_64-darwin ] - catch-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] - categorical-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] - category-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - category-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] - category: [ i686-linux, x86_64-linux, x86_64-darwin ] - catnplus: [ i686-linux, x86_64-linux, x86_64-darwin ] - cautious-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - cayley-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - CBOR: [ i686-linux, x86_64-linux, x86_64-darwin ] - CC-delcont-alt: [ i686-linux, x86_64-linux, x86_64-darwin ] - CC-delcont-cxe: [ i686-linux, x86_64-linux, x86_64-darwin ] - CC-delcont-exc: [ i686-linux, x86_64-linux, x86_64-darwin ] - CC-delcont-ref-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - CC-delcont-ref: [ i686-linux, x86_64-linux, x86_64-darwin ] - CCA: [ i686-linux, x86_64-linux, x86_64-darwin ] - cci: [ i686-linux, x86_64-linux, x86_64-darwin ] - ccnx: [ i686-linux, x86_64-linux, x86_64-darwin ] - cctools-workqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] - cedict: [ i686-linux, x86_64-linux, x86_64-darwin ] - cef3-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] - cef3-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - cef: [ i686-linux, x86_64-linux, x86_64-darwin ] - ceilometer-common: [ i686-linux, x86_64-linux, x86_64-darwin ] - cellrenderer-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - celtchar: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - cflp: [ i686-linux, x86_64-linux, x86_64-darwin ] - cfopu: [ i686-linux, x86_64-linux, x86_64-darwin ] - cg: [ i686-linux, x86_64-linux, x86_64-darwin ] - cgen: [ i686-linux, x86_64-linux, x86_64-darwin ] - cgi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - cgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] - chalkboard-viewer: [ i686-linux, x86_64-linux, x86_64-darwin ] - chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ] - charade: [ i686-linux, x86_64-linux, x86_64-darwin ] - Chart-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - Chart-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - Chart-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - chart-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] - Chart-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - chart-unit: [ i686-linux, x86_64-linux, x86_64-darwin ] - Chart: [ i686-linux, x86_64-linux, x86_64-darwin ] - chatter: [ i686-linux, x86_64-linux, x86_64-darwin ] - chatty-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - chatwork: [ i686-linux, x86_64-linux, x86_64-darwin ] - cheapskate-terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] - check-pvp: [ i686-linux, x86_64-linux, x86_64-darwin ] - checked: [ i686-linux, x86_64-linux, x86_64-darwin ] - Checked: [ i686-linux, x86_64-linux, x86_64-darwin ] - checkmate: [ i686-linux, x86_64-linux, x86_64-darwin ] - chell-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] - chell-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - chell: [ i686-linux, x86_64-linux, x86_64-darwin ] - chevalier-common: [ i686-linux, x86_64-linux, x86_64-darwin ] - chiasma: [ i686-linux, x86_64-linux, x86_64-darwin ] - chitauri: [ i686-linux, x86_64-linux, x86_64-darwin ] - Chitra: [ i686-linux, x86_64-linux, x86_64-darwin ] - choose-exe: [ i686-linux, x86_64-linux, x86_64-darwin ] - choose: [ i686-linux, x86_64-linux, x86_64-darwin ] - chorale-geo: [ i686-linux, x86_64-linux, x86_64-darwin ] - chorale: [ i686-linux, x86_64-linux, x86_64-darwin ] - chp-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - chp-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] - chp-spec: [ i686-linux, x86_64-linux, x86_64-darwin ] - chp-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - chp: [ i686-linux, x86_64-linux, x86_64-darwin ] - chr-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - chr-lang: [ i686-linux, x86_64-linux, x86_64-darwin ] - chr-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] - ChristmasTree: [ i686-linux, x86_64-linux, x86_64-darwin ] - chromatin: [ i686-linux, x86_64-linux, x86_64-darwin ] - chronograph: [ i686-linux, x86_64-linux, x86_64-darwin ] - chu2: [ i686-linux, x86_64-linux, x86_64-darwin ] - chunks: [ i686-linux, x86_64-linux, x86_64-darwin ] - chunky: [ i686-linux, x86_64-linux, x86_64-darwin ] - cielo: [ i686-linux, x86_64-linux, x86_64-darwin ] - cil: [ i686-linux, x86_64-linux, x86_64-darwin ] - cinvoke: [ i686-linux, x86_64-linux, x86_64-darwin ] - cio: [ i686-linux, x86_64-linux, x86_64-darwin ] - circlehs: [ i686-linux, x86_64-linux, x86_64-darwin ] - citation-resolve: [ i686-linux, x86_64-linux, x86_64-darwin ] - citeproc-hs-pandoc-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] - citeproc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - cj-token: [ i686-linux, x86_64-linux, x86_64-darwin ] - cjk: [ i686-linux, x86_64-linux, x86_64-darwin ] - clac: [ i686-linux, x86_64-linux, x86_64-darwin ] - clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] - claferIG: [ i686-linux, x86_64-linux, x86_64-darwin ] - claferwiki: [ i686-linux, x86_64-linux, x86_64-darwin ] - clang-compilation-database: [ i686-linux, x86_64-linux, x86_64-darwin ] - clang-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] - clanki: [ i686-linux, x86_64-linux, x86_64-darwin ] - clarifai: [ i686-linux, x86_64-linux, x86_64-darwin ] - CLASE: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-multisignal: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - Clash-Royale-Hack-Cheats: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-systemverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash: [ i686-linux, x86_64-linux, x86_64-darwin ] - classify-frog: [ i686-linux, x86_64-linux, x86_64-darwin ] - ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ] - classy-miso: [ i686-linux, x86_64-linux, x86_64-darwin ] - classy-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] - classy-prelude-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] - ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - clay: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-dot-com: [ i686-linux, x86_64-linux, x86_64-darwin ] - clckwrks-plugin-bugs: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] - clean-unions: [ i686-linux, x86_64-linux, x86_64-darwin ] - Clean: [ i686-linux, x86_64-linux, x86_64-darwin ] - cless: [ i686-linux, x86_64-linux, x86_64-darwin ] - clevercss: [ i686-linux, x86_64-linux, x86_64-darwin ] - clexer: [ i686-linux, x86_64-linux, x86_64-darwin ] - cli-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] - CLI: [ i686-linux, x86_64-linux, x86_64-darwin ] - cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - clif: [ i686-linux, x86_64-linux, x86_64-darwin ] - clifford: [ i686-linux, x86_64-linux, x86_64-darwin ] - clifm: [ i686-linux, x86_64-linux, x86_64-darwin ] - clingo: [ i686-linux, x86_64-linux, x86_64-darwin ] - clippard: [ i686-linux, x86_64-linux, x86_64-darwin ] - clipper: [ i686-linux, x86_64-linux, x86_64-darwin ] - clippings: [ i686-linux, x86_64-linux, x86_64-darwin ] - clit: [ i686-linux, x86_64-linux, x86_64-darwin ] - clocked: [ i686-linux, x86_64-linux, x86_64-darwin ] - clogparse: [ i686-linux, x86_64-linux, x86_64-darwin ] - clone-all: [ i686-linux, x86_64-linux, x86_64-darwin ] - closure: [ i686-linux, x86_64-linux, x86_64-darwin ] - cloud-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - cloud-seeder: [ i686-linux, x86_64-linux, x86_64-darwin ] - cloudfront-signer: [ i686-linux, x86_64-linux, x86_64-darwin ] - clr-inline: [ i686-linux, x86_64-linux, x86_64-darwin ] - clua: [ i686-linux, x86_64-linux, x86_64-darwin ] - cluss: [ i686-linux, x86_64-linux, x86_64-darwin ] - ClustalParser: [ i686-linux, x86_64-linux, x86_64-darwin ] - clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] - clustertools: [ i686-linux, x86_64-linux, x86_64-darwin ] - clutterhs: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - cmd-item: [ i686-linux, x86_64-linux, x86_64-darwin ] - cmdargs-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] - cmdlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - cmdtheline: [ i686-linux, x86_64-linux, x86_64-darwin ] - cmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] - cmph: [ i686-linux, x86_64-linux, x86_64-darwin ] - CMQ: [ i686-linux, x86_64-linux, x86_64-darwin ] - cmv: [ i686-linux, x86_64-linux, x86_64-darwin ] - cnc-spec-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] - co-log-sys: [ i686-linux, x86_64-linux, x86_64-darwin ] - Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ] - coalpit: [ i686-linux, x86_64-linux, x86_64-darwin ] - code-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] - codec-beam: [ i686-linux, x86_64-linux, x86_64-darwin ] - codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ] - codec-rpm: [ i686-linux, x86_64-linux, x86_64-darwin ] - codecov-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - codemonitor: [ i686-linux, x86_64-linux, x86_64-darwin ] - codepad: [ i686-linux, x86_64-linux, x86_64-darwin ] - codeworld-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - codex: [ i686-linux, x86_64-linux, x86_64-darwin ] - coin: [ i686-linux, x86_64-linux, x86_64-darwin ] - coinbase-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] - coincident-root-loci: [ i686-linux, x86_64-linux, x86_64-darwin ] - colada: [ i686-linux, x86_64-linux, x86_64-darwin ] - colchis: [ i686-linux, x86_64-linux, x86_64-darwin ] - collada-output: [ i686-linux, x86_64-linux, x86_64-darwin ] - collada-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - collapse-duplication: [ i686-linux, x86_64-linux, x86_64-darwin ] - collapse-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ] - colorless-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - colorless-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] - colorless: [ i686-linux, x86_64-linux, x86_64-darwin ] - colour-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ] - coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] - columbia: [ i686-linux, x86_64-linux, x86_64-darwin ] - com: [ i686-linux, x86_64-linux, x86_64-darwin ] - comark-syntax: [ 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 ] - combinator-interactive: [ i686-linux, x86_64-linux, x86_64-darwin ] - combinatorial-problems: [ i686-linux, x86_64-linux, x86_64-darwin ] - Combinatorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] - combobuffer: [ i686-linux, x86_64-linux, x86_64-darwin ] - comic: [ i686-linux, x86_64-linux, x86_64-darwin ] - Command: [ i686-linux, x86_64-linux, x86_64-darwin ] - commander: [ i686-linux, x86_64-linux, x86_64-darwin ] - Commando: [ i686-linux, x86_64-linux, x86_64-darwin ] - commodities: [ i686-linux, x86_64-linux, x86_64-darwin ] - commsec-keyexchange: [ i686-linux, x86_64-linux, x86_64-darwin ] - commsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - comonad-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - ComonadSheet: [ i686-linux, x86_64-linux, x86_64-darwin ] - compact-map: [ i686-linux, x86_64-linux, x86_64-darwin ] - compact-mutable: [ i686-linux, x86_64-linux, x86_64-darwin ] - compact-socket: [ i686-linux, x86_64-linux, x86_64-darwin ] - compact-string-fix: [ i686-linux, x86_64-linux, x86_64-darwin ] - compact-string: [ i686-linux, x86_64-linux, x86_64-darwin ] - Compactable: [ i686-linux, x86_64-linux, x86_64-darwin ] - compactable: [ i686-linux, x86_64-linux, x86_64-darwin ] - compdata-dags: [ i686-linux, x86_64-linux, x86_64-darwin ] - competition: [ i686-linux, x86_64-linux, x86_64-darwin ] - compilation: [ i686-linux, x86_64-linux, x86_64-darwin ] - complexity: [ i686-linux, x86_64-linux, x86_64-darwin ] - componentm-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] - componentm: [ i686-linux, x86_64-linux, x86_64-darwin ] - compose-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] - composite-aeson-refined: [ i686-linux, x86_64-linux, x86_64-darwin ] - composite-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - composite-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] - composition-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - compound-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - compressed: [ i686-linux, x86_64-linux, x86_64-darwin ] - compstrat: [ i686-linux, x86_64-linux, x86_64-darwin ] - comptrans: [ i686-linux, x86_64-linux, x86_64-darwin ] - computational-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] - computations: [ i686-linux, x86_64-linux, x86_64-darwin ] - concraft-hr: [ i686-linux, x86_64-linux, x86_64-darwin ] - concraft-pl: [ i686-linux, x86_64-linux, x86_64-darwin ] - concraft: [ i686-linux, x86_64-linux, x86_64-darwin ] - concrete-haskell-autogen: [ i686-linux, x86_64-linux, x86_64-darwin ] - concrete-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - concrete-relaxng-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - concrete-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] - concurrency-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ] - concurrent-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] - Concurrent-Cache: [ i686-linux, x86_64-linux, x86_64-darwin ] - concurrent-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] - concurrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] - concurrent-utilities: [ i686-linux, x86_64-linux, x86_64-darwin ] - Concurrential: [ i686-linux, x86_64-linux, x86_64-darwin ] - ConcurrentUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] - Condor: [ i686-linux, x86_64-linux, x86_64-darwin ] - condor: [ i686-linux, x86_64-linux, x86_64-darwin ] - condorcet: [ i686-linux, x86_64-linux, x86_64-darwin ] - conductive-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - conductive-hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] - conductive-song: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-audio-lame: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-audio-samplerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-find: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-merge: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-resumablesink: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-throttle: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-tokenize-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-zstd: [ i686-linux, x86_64-linux, x86_64-darwin ] - conf: [ i686-linux, x86_64-linux, x86_64-darwin ] - conffmt: [ i686-linux, x86_64-linux, x86_64-darwin ] - confide: [ i686-linux, x86_64-linux, x86_64-darwin ] - config-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - config-select: [ i686-linux, x86_64-linux, x86_64-darwin ] - ConfigFileTH: [ i686-linux, x86_64-linux, x86_64-darwin ] - Configger: [ i686-linux, x86_64-linux, x86_64-darwin ] - configifier: [ i686-linux, x86_64-linux, x86_64-darwin ] - Configurable: [ i686-linux, x86_64-linux, x86_64-darwin ] - configuration: [ i686-linux, x86_64-linux, x86_64-darwin ] - configurator-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] - congruence-relation: [ i686-linux, x86_64-linux, x86_64-darwin ] - conjure: [ i686-linux, x86_64-linux, x86_64-darwin ] - conkin: [ i686-linux, x86_64-linux, x86_64-darwin ] - conlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] - connection-string: [ i686-linux, x86_64-linux, x86_64-darwin ] - Conscript: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-category: [ i686-linux, x86_64-linux, x86_64-darwin ] - constrained-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] - constrained-monads: [ i686-linux, x86_64-linux, x86_64-darwin ] - constraint-manip: [ i686-linux, x86_64-linux, x86_64-darwin ] - constraint-reflection: [ i686-linux, x86_64-linux, x86_64-darwin ] - constraint: [ i686-linux, x86_64-linux, x86_64-darwin ] - ConstraintKinds: [ i686-linux, x86_64-linux, x86_64-darwin ] - constraints-emerge: [ i686-linux, x86_64-linux, x86_64-darwin ] - constraints-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - constructible: [ i686-linux, x86_64-linux, x86_64-darwin ] - constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] - consul-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - Consumer: [ i686-linux, x86_64-linux, x86_64-darwin ] - consumers: [ i686-linux, x86_64-linux, x86_64-darwin ] - containers-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ] - containers-unicode-symbols: [ i686-linux, x86_64-linux, x86_64-darwin ] - ContArrow: [ i686-linux, x86_64-linux, x86_64-darwin ] - content-store: [ i686-linux, x86_64-linux, x86_64-darwin ] - context-free-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] - context-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] - ContextAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] - contiguous-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] - continue: [ i686-linux, x86_64-linux, x86_64-darwin ] - continuum-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - continuum: [ i686-linux, x86_64-linux, x86_64-darwin ] - Contract: [ i686-linux, x86_64-linux, x86_64-darwin ] - control-event: [ i686-linux, x86_64-linux, x86_64-darwin ] - control-iso: [ i686-linux, x86_64-linux, x86_64-darwin ] - control-monad-attempt: [ i686-linux, x86_64-linux, x86_64-darwin ] - control-monad-exception-monadsfd: [ i686-linux, x86_64-linux, x86_64-darwin ] - control-monad-exception-monadstf: [ i686-linux, x86_64-linux, x86_64-darwin ] - control-monad-exception-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - control-monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ] - control-monad-failure-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - control-monad-failure: [ i686-linux, x86_64-linux, x86_64-darwin ] - Control-Monad-MultiPass: [ i686-linux, x86_64-linux, x86_64-darwin ] - Control-Monad-ST2: [ i686-linux, x86_64-linux, x86_64-darwin ] - contstuff-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - contstuff-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - convert-annotation: [ i686-linux, x86_64-linux, x86_64-darwin ] - convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] - convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-c99: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-cbmc: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-language: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-sbv: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-theorem: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot: [ i686-linux, x86_64-linux, x86_64-darwin ] - copr: [ i686-linux, x86_64-linux, x86_64-darwin ] - COrdering: [ i686-linux, x86_64-linux, x86_64-darwin ] - core-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - core: [ i686-linux, x86_64-linux, x86_64-darwin ] - corebot-bliki: [ 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 ] - coroutine-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - coroutine-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] - coroutine-object: [ i686-linux, x86_64-linux, x86_64-darwin ] - Coroutine: [ i686-linux, x86_64-linux, x86_64-darwin ] - couch-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - couch-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - couchdb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - couchdb-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - CouchDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - countable-inflections: [ i686-linux, x86_64-linux, x86_64-darwin ] - counter: [ i686-linux, x86_64-linux, x86_64-darwin ] - courier: [ i686-linux, x86_64-linux, x86_64-darwin ] - court: [ i686-linux, x86_64-linux, x86_64-darwin ] - coverage: [ i686-linux, x86_64-linux, x86_64-darwin ] - cparsing: [ i686-linux, x86_64-linux, x86_64-darwin ] - CPBrainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] - cpio-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - cplusplus-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - cprng-aes-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - cpuperf: [ i686-linux, x86_64-linux, x86_64-darwin ] - cpython: [ i686-linux, x86_64-linux, x86_64-darwin ] - cql-io-tinylog: [ i686-linux, x86_64-linux, x86_64-darwin ] - cql-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - cqrs-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - cqrs-example: [ i686-linux, x86_64-linux, x86_64-darwin ] - cqrs-memory: [ i686-linux, x86_64-linux, x86_64-darwin ] - cqrs-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - cqrs-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] - cqrs-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - cqrs-testkit: [ i686-linux, x86_64-linux, x86_64-darwin ] - cr: [ i686-linux, x86_64-linux, x86_64-darwin ] - crack: [ i686-linux, x86_64-linux, x86_64-darwin ] - Craft3e: [ i686-linux, x86_64-linux, x86_64-darwin ] - craft: [ i686-linux, x86_64-linux, x86_64-darwin ] - craftwerk-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - craftwerk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - craftwerk: [ i686-linux, x86_64-linux, x86_64-darwin ] - crawlchain: [ i686-linux, x86_64-linux, x86_64-darwin ] - craze: [ i686-linux, x86_64-linux, x86_64-darwin ] - crc16: [ i686-linux, x86_64-linux, x86_64-darwin ] - crc: [ i686-linux, x86_64-linux, x86_64-darwin ] - crdt: [ i686-linux, x86_64-linux, x86_64-darwin ] - creatur: [ i686-linux, x86_64-linux, x86_64-darwin ] - credential-store: [ i686-linux, x86_64-linux, x86_64-darwin ] - crf-chain1-constrained: [ i686-linux, x86_64-linux, x86_64-darwin ] - crf-chain1: [ i686-linux, x86_64-linux, x86_64-darwin ] - crf-chain2-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] - crf-chain2-tiers: [ i686-linux, x86_64-linux, x86_64-darwin ] - critbit: [ i686-linux, x86_64-linux, x86_64-darwin ] - criterion-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] - criterion-to-html: [ i686-linux, x86_64-linux, x86_64-darwin ] - criu-rpc-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - criu-rpc: [ 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 ] - cron: [ i686-linux, x86_64-linux, x86_64-darwin ] - cruncher-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - crunghc: [ i686-linux, x86_64-linux, x86_64-darwin ] - crypto-cipher-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ] - crypto-classical: [ i686-linux, x86_64-linux, x86_64-darwin ] - crypto-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - crypto-multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] - crypto-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - crypto-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - cryptocompare: [ i686-linux, x86_64-linux, x86_64-darwin ] - cryptoconditions: [ i686-linux, x86_64-linux, x86_64-darwin ] - cryptol: [ 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 ] - csg: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] - CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ] - CSPM-FiringRules: [ i686-linux, x86_64-linux, x86_64-darwin ] - CSPM-Frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] - CSPM-Interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ] - CSPM-ToProlog: [ i686-linux, x86_64-linux, x86_64-darwin ] - cspmchecker: [ i686-linux, x86_64-linux, x86_64-darwin ] - cspretty: [ i686-linux, x86_64-linux, x86_64-darwin ] - css: [ i686-linux, x86_64-linux, x86_64-darwin ] - csv-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - csv-nptools: [ i686-linux, x86_64-linux, x86_64-darwin ] - ctemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] - ctkl: [ i686-linux, x86_64-linux, x86_64-darwin ] - ctpl: [ i686-linux, x86_64-linux, x86_64-darwin ] - cube: [ i686-linux, x86_64-linux, x86_64-darwin ] - cuboid: [ i686-linux, x86_64-linux, x86_64-darwin ] - cudd: [ i686-linux, x86_64-linux, x86_64-darwin ] - curl-runnings: [ i686-linux, x86_64-linux, x86_64-darwin ] - currency-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] - curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] - CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - cursedcsv: [ i686-linux, x86_64-linux, x86_64-darwin ] - cursor-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - curve25519: [ i686-linux, x86_64-linux, x86_64-darwin ] - curves: [ i686-linux, x86_64-linux, x86_64-darwin ] - custom-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - CV: [ i686-linux, x86_64-linux, x86_64-darwin ] - cyclotomic: [ i686-linux, x86_64-linux, x86_64-darwin ] - cypher: [ i686-linux, x86_64-linux, x86_64-darwin ] - d-bus: [ i686-linux, x86_64-linux, x86_64-darwin ] - d3js: [ i686-linux, x86_64-linux, x86_64-darwin ] - DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] - dag: [ i686-linux, x86_64-linux, x86_64-darwin ] - Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ] - dao: [ i686-linux, x86_64-linux, x86_64-darwin ] - Dao: [ i686-linux, x86_64-linux, x86_64-darwin ] - dapi: [ i686-linux, x86_64-linux, x86_64-darwin ] - darcs-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ] - darcs-beta: [ i686-linux, x86_64-linux, x86_64-darwin ] - darcs-buildpackage: [ i686-linux, x86_64-linux, x86_64-darwin ] - darcs-cabalized: [ i686-linux, x86_64-linux, x86_64-darwin ] - darcs-fastconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] - darcs-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] - darcs-monitor: [ i686-linux, x86_64-linux, x86_64-darwin ] - darcs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] - darcsden: [ i686-linux, x86_64-linux, x86_64-darwin ] - DarcsHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] - darcswatch: [ i686-linux, x86_64-linux, x86_64-darwin ] - darkplaces-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] - darkplaces-rcon-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - darkplaces-rcon: [ i686-linux, x86_64-linux, x86_64-darwin ] - darkplaces-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - dash-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-accessor-monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-accessor-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-category: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-check: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-concurrent-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-construction: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-cycle: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-dispersal: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-emoticons: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-fin-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-fin: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-flagset: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-forest: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-interval: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-ivar: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-kiln: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-layer: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-lens-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-lens-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-lens-template: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-map-multikey: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-named: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-nat: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-object-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-object-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-object: [ 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-r-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-reify-cse: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-repr: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-result: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-rev: [ i686-linux, x86_64-linux, x86_64-darwin ] - Data-Rope: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-rope: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-rtuple: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-size: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-standards: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-store: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-stringmap: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-structure-inferrer: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-type: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-variant: [ i686-linux, x86_64-linux, x86_64-darwin ] - database-study: [ i686-linux, x86_64-linux, x86_64-darwin ] - datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] - datafix: [ i686-linux, x86_64-linux, x86_64-darwin ] - dataflow: [ i686-linux, x86_64-linux, x86_64-darwin ] - datalog: [ i686-linux, x86_64-linux, x86_64-darwin ] - DataTreeView: [ i686-linux, x86_64-linux, x86_64-darwin ] - date-conversions: [ i686-linux, x86_64-linux, x86_64-darwin ] - dates: [ i686-linux, x86_64-linux, x86_64-darwin ] - datetime-sb: [ i686-linux, x86_64-linux, x86_64-darwin ] - datetime: [ i686-linux, x86_64-linux, x86_64-darwin ] - dawdle: [ i686-linux, x86_64-linux, x86_64-darwin ] - dawg-ord: [ i686-linux, x86_64-linux, x86_64-darwin ] - dawg: [ i686-linux, x86_64-linux, x86_64-darwin ] - dbcleaner: [ i686-linux, x86_64-linux, x86_64-darwin ] - DBFunctor: [ i686-linux, x86_64-linux, x86_64-darwin ] - dbjava: [ i686-linux, x86_64-linux, x86_64-darwin ] - DBlimited: [ i686-linux, x86_64-linux, x86_64-darwin ] - dbm: [ i686-linux, x86_64-linux, x86_64-darwin ] - dbmigrations-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - dbmigrations-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - dbmigrations-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - dbus-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - dbus-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - dbus-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - DBus: [ i686-linux, x86_64-linux, x86_64-darwin ] - dclabel-eci11: [ i686-linux, x86_64-linux, x86_64-darwin ] - dclabel: [ i686-linux, x86_64-linux, x86_64-darwin ] - dcpu16: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddate: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-build: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-code: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-core-babel: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-core-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-core-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-core-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-core-salt: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-core-simpl: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-core-tetra: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-driver: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-source-tetra: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddc-war: [ i686-linux, x86_64-linux, x86_64-darwin ] - ddci-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - dde: [ 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 ] - Deadpan-DDP: [ i686-linux, x86_64-linux, x86_64-darwin ] - debian: [ i686-linux, x86_64-linux, x86_64-darwin ] - debug-me: [ i686-linux, x86_64-linux, x86_64-darwin ] - debug-trace-var: [ i686-linux, x86_64-linux, x86_64-darwin ] - debug-tracy: [ i686-linux, x86_64-linux, x86_64-darwin ] - debug: [ i686-linux, x86_64-linux, x86_64-darwin ] - decepticons: [ i686-linux, x86_64-linux, x86_64-darwin ] - decimal-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] - decimal-literals: [ i686-linux, x86_64-linux, x86_64-darwin ] - DecisionTree: [ i686-linux, x86_64-linux, x86_64-darwin ] - declarative: [ i686-linux, x86_64-linux, x86_64-darwin ] - decoder-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - dedukti: [ i686-linux, x86_64-linux, x86_64-darwin ] - deepcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] - deeplearning-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - deepseq-bounded: [ i686-linux, x86_64-linux, x86_64-darwin ] - deepseq-magic: [ i686-linux, x86_64-linux, x86_64-darwin ] - deepseq-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - deepzoom: [ i686-linux, x86_64-linux, x86_64-darwin ] - defargs: [ i686-linux, x86_64-linux, x86_64-darwin ] - DefendTheKing: [ i686-linux, x86_64-linux, x86_64-darwin ] - deka-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - deka: [ i686-linux, x86_64-linux, x86_64-darwin ] - delaunay: [ i686-linux, x86_64-linux, x86_64-darwin ] - delay: [ i686-linux, x86_64-linux, x86_64-darwin ] - delicious: [ i686-linux, x86_64-linux, x86_64-darwin ] - delimited-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - delimiter-separated: [ i686-linux, x86_64-linux, x86_64-darwin ] - delta-h: [ i686-linux, x86_64-linux, x86_64-darwin ] - Delta-Lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] - delta: [ i686-linux, x86_64-linux, x86_64-darwin ] - delude: [ i686-linux, x86_64-linux, x86_64-darwin ] - demarcate: [ i686-linux, x86_64-linux, x86_64-darwin ] - denominate: [ i686-linux, x86_64-linux, x86_64-darwin ] - dense-int-set: [ i686-linux, x86_64-linux, x86_64-darwin ] - dependent-monoidal-map: [ i686-linux, x86_64-linux, x86_64-darwin ] - dependent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] - dependent-sum-aeson-orphans: [ i686-linux, x86_64-linux, x86_64-darwin ] - depends: [ i686-linux, x86_64-linux, x86_64-darwin ] - dephd: [ i686-linux, x86_64-linux, x86_64-darwin ] - deptrack-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - deptrack-devops: [ i686-linux, x86_64-linux, x86_64-darwin ] - deptrack-dot: [ i686-linux, x86_64-linux, x86_64-darwin ] - derangement: [ i686-linux, x86_64-linux, x86_64-darwin ] - derivation-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] - derive-enumerable: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] - derive-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] - derive: [ i686-linux, x86_64-linux, x86_64-darwin ] - derp-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - descript-lang: [ i686-linux, x86_64-linux, x86_64-darwin ] - deterministic-game-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] - detour-via-uom: [ i686-linux, x86_64-linux, x86_64-darwin ] - deunicode: [ i686-linux, x86_64-linux, x86_64-darwin ] - devil: [ i686-linux, x86_64-linux, x86_64-darwin ] - dewdrop: [ i686-linux, x86_64-linux, x86_64-darwin ] - df1: [ i686-linux, x86_64-linux, x86_64-darwin ] - dfinity-radix-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - Dflow: [ i686-linux, x86_64-linux, x86_64-darwin ] - dfsbuild: [ i686-linux, x86_64-linux, x86_64-darwin ] - dgim: [ i686-linux, x86_64-linux, x86_64-darwin ] - dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] - dhall-check: [ i686-linux, x86_64-linux, x86_64-darwin ] - dhall-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] - dhall-to-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - dhcp-lease-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - di-df1: [ i686-linux, x86_64-linux, x86_64-darwin ] - di-handle: [ i686-linux, x86_64-linux, x86_64-darwin ] - di: [ i686-linux, x86_64-linux, x86_64-darwin ] - dia-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - dia-functions: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-graphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-hsqml: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-html5: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-postscript: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-qrcode: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-tikz: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - dib: [ i686-linux, x86_64-linux, x86_64-darwin ] - dice-entropy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - dice2tex: [ i686-linux, x86_64-linux, x86_64-darwin ] - dicom: [ i686-linux, x86_64-linux, x86_64-darwin ] - dictionaries: [ i686-linux, x86_64-linux, x86_64-darwin ] - dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - diet: [ i686-linux, x86_64-linux, x86_64-darwin ] - diffcabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - difference-monoid: [ i686-linux, x86_64-linux, x86_64-darwin ] - DifferenceLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] - differential: [ i686-linux, x86_64-linux, x86_64-darwin ] - DifferentialEvolution: [ i686-linux, x86_64-linux, x86_64-darwin ] - difftodo: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-foundation-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-heist: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] - digestive-functors-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] - digitalocean-kzs: [ i686-linux, x86_64-linux, x86_64-darwin ] - DigitalOcean: [ i686-linux, x86_64-linux, x86_64-darwin ] - dimensional-codata: [ i686-linux, x86_64-linux, x86_64-darwin ] - dimensional-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] - DimensionalHash: [ i686-linux, x86_64-linux, x86_64-darwin ] - dingo-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - dingo-example: [ i686-linux, x86_64-linux, x86_64-darwin ] - dingo-widgets: [ i686-linux, x86_64-linux, x86_64-darwin ] - diophantine: [ i686-linux, x86_64-linux, x86_64-darwin ] - diplomacy-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - diplomacy: [ i686-linux, x86_64-linux, x86_64-darwin ] - direct-binary-files: [ 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 ] - direct-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] - direct-rocksdb: [ i686-linux, x86_64-linux, x86_64-darwin ] - directed-cubical: [ i686-linux, x86_64-linux, x86_64-darwin ] - dirfiles: [ i686-linux, x86_64-linux, x86_64-darwin ] - discogs-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - discord-gateway: [ i686-linux, x86_64-linux, x86_64-darwin ] - discord-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - discord-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - discord-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] - discord-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - discordian-calendar: [ i686-linux, x86_64-linux, x86_64-darwin ] - DiscussionSupportSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] - Dish: [ i686-linux, x86_64-linux, x86_64-darwin ] - disjoint-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - disjoint-set-stateful: [ i686-linux, x86_64-linux, x86_64-darwin ] - disjoint-set: [ i686-linux, x86_64-linux, x86_64-darwin ] - diskhash: [ i686-linux, x86_64-linux, x86_64-darwin ] - disposable: [ i686-linux, x86_64-linux, x86_64-darwin ] - dist-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] - Dist: [ i686-linux, x86_64-linux, x86_64-darwin ] - distance: [ i686-linux, x86_64-linux, x86_64-darwin ] - DisTract: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-closure: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-fork-aws-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-async: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-azure: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-client-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-execution: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-fsm: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-monad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-p2p: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-registry: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-simplelocalnet: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-systest: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-task: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-static: [ i686-linux, x86_64-linux, x86_64-darwin ] - distribution-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] - distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] - diversity: [ i686-linux, x86_64-linux, x86_64-darwin ] - dixi: [ i686-linux, x86_64-linux, x86_64-darwin ] - djembe: [ i686-linux, x86_64-linux, x86_64-darwin ] - djinn-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - dmenu-pkill: [ i686-linux, x86_64-linux, x86_64-darwin ] - dmenu-pmount: [ i686-linux, x86_64-linux, x86_64-darwin ] - dmenu-search: [ i686-linux, x86_64-linux, x86_64-darwin ] - dmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] - DMuCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - DnaProteinAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] - dnscache: [ i686-linux, x86_64-linux, x86_64-darwin ] - dnsrbl: [ i686-linux, x86_64-linux, x86_64-darwin ] - dnssd: [ i686-linux, x86_64-linux, x86_64-darwin ] - doc-review: [ i686-linux, x86_64-linux, x86_64-darwin ] - doccheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - docidx: [ i686-linux, x86_64-linux, x86_64-darwin ] - docker-build-cacher: [ i686-linux, x86_64-linux, x86_64-darwin ] - docker: [ i686-linux, x86_64-linux, x86_64-darwin ] - dockercook: [ i686-linux, x86_64-linux, x86_64-darwin ] - doctest-discover-configurator: [ i686-linux, x86_64-linux, x86_64-darwin ] - doctest-driver-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - doctest-prop: [ i686-linux, x86_64-linux, x86_64-darwin ] - DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ] - docusign-base-minimal: [ i686-linux, x86_64-linux, x86_64-darwin ] - docusign-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - docusign-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - docusign-example: [ i686-linux, x86_64-linux, x86_64-darwin ] - docvim: [ i686-linux, x86_64-linux, x86_64-darwin ] - doi: [ i686-linux, x86_64-linux, x86_64-darwin ] - dom-lt: [ i686-linux, x86_64-linux, x86_64-darwin ] - DOM: [ i686-linux, x86_64-linux, x86_64-darwin ] - domain-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] - domplate: [ i686-linux, x86_64-linux, x86_64-darwin ] - dot-linker: [ i686-linux, x86_64-linux, x86_64-darwin ] - dot: [ i686-linux, x86_64-linux, x86_64-darwin ] - dotenv: [ i686-linux, x86_64-linux, x86_64-darwin ] - dotfs: [ i686-linux, x86_64-linux, x86_64-darwin ] - doublify-toolkit: [ 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 ] - DP: [ i686-linux, x86_64-linux, x86_64-darwin ] - dph-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - dph-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - dph-lifted-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - dph-lifted-copy: [ i686-linux, x86_64-linux, x86_64-darwin ] - dph-lifted-vseg: [ i686-linux, x86_64-linux, x86_64-darwin ] - dph-prim-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] - dph-prim-par: [ i686-linux, x86_64-linux, x86_64-darwin ] - dph-prim-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] - dpkg: [ i686-linux, x86_64-linux, x86_64-darwin ] - DPM: [ i686-linux, x86_64-linux, x86_64-darwin ] - dpor: [ i686-linux, x86_64-linux, x86_64-darwin ] - dragen: [ i686-linux, x86_64-linux, x86_64-darwin ] - drawille: [ i686-linux, x86_64-linux, x86_64-darwin ] - drClickOn: [ i686-linux, x86_64-linux, x86_64-darwin ] - dresdner-verkehrsbetriebe: [ i686-linux, x86_64-linux, x86_64-darwin ] - DrHylo: [ i686-linux, x86_64-linux, x86_64-darwin ] - DrIFT-cabalized: [ i686-linux, x86_64-linux, x86_64-darwin ] - DrIFT: [ i686-linux, x86_64-linux, x86_64-darwin ] - drifter-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - drifter-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - drifter: [ i686-linux, x86_64-linux, x86_64-darwin ] - drmaa: [ i686-linux, x86_64-linux, x86_64-darwin ] - dropbox-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] - dropsolve: [ i686-linux, x86_64-linux, x86_64-darwin ] - ds-kanren: [ i686-linux, x86_64-linux, x86_64-darwin ] - DSA: [ i686-linux, x86_64-linux, x86_64-darwin ] - dsh-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] - DSH: [ i686-linux, x86_64-linux, x86_64-darwin ] - dsmc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - dsmc: [ i686-linux, x86_64-linux, x86_64-darwin ] - dson-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - dson: [ i686-linux, x86_64-linux, x86_64-darwin ] - DSTM: [ i686-linux, x86_64-linux, x86_64-darwin ] - dstring: [ i686-linux, x86_64-linux, x86_64-darwin ] - dtab: [ i686-linux, x86_64-linux, x86_64-darwin ] - DTC: [ i686-linux, x86_64-linux, x86_64-darwin ] - dtd-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] - dtw: [ i686-linux, x86_64-linux, x86_64-darwin ] - dual-game: [ i686-linux, x86_64-linux, x86_64-darwin ] - dual: [ i686-linux, x86_64-linux, x86_64-darwin ] - dublincore-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - dumb-cas: [ i686-linux, x86_64-linux, x86_64-darwin ] - Dung: [ i686-linux, x86_64-linux, x86_64-darwin ] - duplo: [ i686-linux, x86_64-linux, x86_64-darwin ] - Dust-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] - Dust-tools-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] - Dust-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - Dust: [ i686-linux, x86_64-linux, x86_64-darwin ] - dvda: [ i686-linux, x86_64-linux, x86_64-darwin ] - dvdread: [ i686-linux, x86_64-linux, x86_64-darwin ] - dvi-processing: [ i686-linux, x86_64-linux, x86_64-darwin ] - dwarfadt: [ i686-linux, x86_64-linux, x86_64-darwin ] - dyckword: [ 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-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 ] - DynamicTimeWarp: [ i686-linux, x86_64-linux, x86_64-darwin ] - dynamodb-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - dynobud: [ i686-linux, x86_64-linux, x86_64-darwin ] - DysFRP-Cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - DysFRP-Craftwerk: [ i686-linux, x86_64-linux, x86_64-darwin ] - DysFRP: [ i686-linux, x86_64-linux, x86_64-darwin ] - dywapitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ] - dzen-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - earclipper: [ i686-linux, x86_64-linux, x86_64-darwin ] - Earley: [ i686-linux, x86_64-linux, x86_64-darwin ] - ease: [ i686-linux, x86_64-linux, x86_64-darwin ] - easy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - easyjson: [ i686-linux, x86_64-linux, x86_64-darwin ] - easyplot: [ i686-linux, x86_64-linux, x86_64-darwin ] - easytensor-vulkan: [ i686-linux, x86_64-linux, x86_64-darwin ] - easytensor: [ i686-linux, x86_64-linux, x86_64-darwin ] - ebeats: [ i686-linux, x86_64-linux, x86_64-darwin ] - ebnf-bff: [ i686-linux, x86_64-linux, x86_64-darwin ] - eccrypto: [ i686-linux, x86_64-linux, x86_64-darwin ] - ecma262: [ i686-linux, x86_64-linux, x86_64-darwin ] - ecu: [ i686-linux, x86_64-linux, x86_64-darwin ] - eddie: [ i686-linux, x86_64-linux, x86_64-darwin ] - edenmodules: [ i686-linux, x86_64-linux, x86_64-darwin ] - edenskel: [ i686-linux, x86_64-linux, x86_64-darwin ] - edentv: [ i686-linux, x86_64-linux, x86_64-darwin ] - edge: [ i686-linux, x86_64-linux, x86_64-darwin ] - edges: [ i686-linux, x86_64-linux, x86_64-darwin ] - edit-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] - edit: [ i686-linux, x86_64-linux, x86_64-darwin ] - editable: [ i686-linux, x86_64-linux, x86_64-darwin ] - editline: [ i686-linux, x86_64-linux, x86_64-darwin ] - EditTimeReport: [ i686-linux, x86_64-linux, x86_64-darwin ] - effect-handlers: [ i686-linux, x86_64-linux, x86_64-darwin ] - effects-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - effects: [ i686-linux, x86_64-linux, x86_64-darwin ] - effin: [ i686-linux, x86_64-linux, x86_64-darwin ] - egison-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] - egison-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] - ehaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - ehs: [ i686-linux, x86_64-linux, x86_64-darwin ] - eibd-client-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - eigen: [ i686-linux, x86_64-linux, x86_64-darwin ] - Eight-Ball-Pool-Hack-Cheats: [ i686-linux, x86_64-linux, x86_64-darwin ] - either-list-functions: [ i686-linux, x86_64-linux, x86_64-darwin ] - EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ] - ekg-bosun: [ i686-linux, x86_64-linux, x86_64-darwin ] - ekg-elastic: [ i686-linux, x86_64-linux, x86_64-darwin ] - ekg-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] - ekg-influxdb: [ i686-linux, x86_64-linux, x86_64-darwin ] - ekg-log: [ i686-linux, x86_64-linux, x86_64-darwin ] - ekg-prometheus-adapter: [ i686-linux, x86_64-linux, x86_64-darwin ] - ekg-push: [ i686-linux, x86_64-linux, x86_64-darwin ] - ekg-rrd: [ i686-linux, x86_64-linux, x86_64-darwin ] - elevator: [ i686-linux, x86_64-linux, x86_64-darwin ] - elision: [ i686-linux, x86_64-linux, x86_64-darwin ] - elm-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] - elsa: [ i686-linux, x86_64-linux, x86_64-darwin ] - emacs-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] - email-header: [ i686-linux, x86_64-linux, x86_64-darwin ] - email-postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] - email-validator: [ i686-linux, x86_64-linux, x86_64-darwin ] - email: [ i686-linux, x86_64-linux, x86_64-darwin ] - emailparse: [ i686-linux, x86_64-linux, x86_64-darwin ] - embeddock-example: [ i686-linux, x86_64-linux, x86_64-darwin ] - embeddock: [ i686-linux, x86_64-linux, x86_64-darwin ] - embroidery: [ i686-linux, x86_64-linux, x86_64-darwin ] - emd: [ i686-linux, x86_64-linux, x86_64-darwin ] - emgm: [ i686-linux, x86_64-linux, x86_64-darwin ] - Emping: [ i686-linux, x86_64-linux, x86_64-darwin ] - empty-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - Empty: [ i686-linux, x86_64-linux, x86_64-darwin ] - encoding-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] - engine-io-growler: [ i686-linux, x86_64-linux, x86_64-darwin ] - engine-io-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - engine-io-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] - engine-io-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] - entangle: [ i686-linux, x86_64-linux, x86_64-darwin ] - EntrezHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] - entwine: [ i686-linux, x86_64-linux, x86_64-darwin ] - EnumContainers: [ i686-linux, x86_64-linux, x86_64-darwin ] - enumerate-function: [ i686-linux, x86_64-linux, x86_64-darwin ] - enumerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - enumeration: [ i686-linux, x86_64-linux, x86_64-darwin ] - enumerator-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] - enumerator-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - enumerator: [ 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 ] - enummapset-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - enummapset: [ i686-linux, x86_64-linux, x86_64-darwin ] - env-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - envstatus: [ i686-linux, x86_64-linux, x86_64-darwin ] - epanet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - epass: [ i686-linux, x86_64-linux, x86_64-darwin ] - epic: [ i686-linux, x86_64-linux, x86_64-darwin ] - epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] - eprocess: [ i686-linux, x86_64-linux, x86_64-darwin ] - epubname: [ i686-linux, x86_64-linux, x86_64-darwin ] - Eq: [ i686-linux, x86_64-linux, x86_64-darwin ] - EqualitySolver: [ i686-linux, x86_64-linux, x86_64-darwin ] - equeue: [ i686-linux, x86_64-linux, x86_64-darwin ] - equivalence: [ i686-linux, x86_64-linux, x86_64-darwin ] - erd: [ i686-linux, x86_64-linux, x86_64-darwin ] - erf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] - eros-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - eros-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - eros: [ i686-linux, x86_64-linux, x86_64-darwin ] - error-context: [ i686-linux, x86_64-linux, x86_64-darwin ] - error-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ] - error-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - error-loc: [ i686-linux, x86_64-linux, x86_64-darwin ] - error-message: [ i686-linux, x86_64-linux, x86_64-darwin ] - errors-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] - ersaconcat: [ i686-linux, x86_64-linux, x86_64-darwin ] - ersatz-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] - ersatz: [ i686-linux, x86_64-linux, x86_64-darwin ] - ert: [ i686-linux, x86_64-linux, x86_64-darwin ] - escape-artist: [ i686-linux, x86_64-linux, x86_64-darwin ] - escoger: [ 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 ] - espial: [ i686-linux, x86_64-linux, x86_64-darwin ] - esqueleto: [ i686-linux, x86_64-linux, x86_64-darwin ] - ess: [ i686-linux, x86_64-linux, x86_64-darwin ] - estimators: [ i686-linux, x86_64-linux, x86_64-darwin ] - EstProgress: [ i686-linux, x86_64-linux, x86_64-darwin ] - estreps: [ i686-linux, x86_64-linux, x86_64-darwin ] - Etage-Graph: [ i686-linux, x86_64-linux, x86_64-darwin ] - Etage: [ i686-linux, x86_64-linux, x86_64-darwin ] - EtaMOO: [ i686-linux, x86_64-linux, x86_64-darwin ] - Eternal10Seconds: [ i686-linux, x86_64-linux, x86_64-darwin ] - eternal: [ i686-linux, x86_64-linux, x86_64-darwin ] - eternity-timestamped: [ i686-linux, x86_64-linux, x86_64-darwin ] - eternity: [ i686-linux, x86_64-linux, x86_64-darwin ] - Etherbunny: [ i686-linux, x86_64-linux, x86_64-darwin ] - ethereum-analyzer-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - ethereum-analyzer-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] - ethereum-analyzer: [ i686-linux, x86_64-linux, x86_64-darwin ] - ethereum-client-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - ethereum-merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ] - eths-rlp: [ i686-linux, x86_64-linux, x86_64-darwin ] - euler-tour-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - euphoria: [ i686-linux, x86_64-linux, x86_64-darwin ] - eurofxref: [ i686-linux, x86_64-linux, x86_64-darwin ] - Euterpea: [ i686-linux, x86_64-linux, x86_64-darwin ] - eve-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - eve: [ i686-linux, x86_64-linux, x86_64-darwin ] - event-driven: [ i686-linux, x86_64-linux, x86_64-darwin ] - event-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - event: [ i686-linux, x86_64-linux, x86_64-darwin ] - eventful-dynamodb: [ i686-linux, x86_64-linux, x86_64-darwin ] - eventful-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - eventloop: [ i686-linux, x86_64-linux, x86_64-darwin ] - EventSocket: [ i686-linux, x86_64-linux, x86_64-darwin ] - eventsource-geteventstore-store: [ i686-linux, x86_64-linux, x86_64-darwin ] - eventstore: [ i686-linux, x86_64-linux, x86_64-darwin ] - every-bit-counts: [ i686-linux, x86_64-linux, x86_64-darwin ] - ewe: [ i686-linux, x86_64-linux, x86_64-darwin ] - exact-cover: [ i686-linux, x86_64-linux, x86_64-darwin ] - exact-pi: [ i686-linux, x86_64-linux, x86_64-darwin ] - exact-real-positional: [ i686-linux, x86_64-linux, x86_64-darwin ] - exact-real: [ i686-linux, x86_64-linux, x86_64-darwin ] - except-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] - exception-hierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] - exception-monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] - exchangerates: [ i686-linux, x86_64-linux, x86_64-darwin ] - execs: [ i686-linux, x86_64-linux, x86_64-darwin ] - executor: [ i686-linux, x86_64-linux, x86_64-darwin ] - exference: [ i686-linux, x86_64-linux, x86_64-darwin ] - exherbo-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - exif: [ i686-linux, x86_64-linux, x86_64-darwin ] - exinst-deepseq: [ i686-linux, x86_64-linux, x86_64-darwin ] - exinst-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] - exists: [ i686-linux, x86_64-linux, x86_64-darwin ] - exitcode: [ 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 ] - expiring-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - explain: [ i686-linux, x86_64-linux, x86_64-darwin ] - explicit-constraint-lens: [ 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 ] - explicit-iomodes-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - explicit-iomodes: [ i686-linux, x86_64-linux, x86_64-darwin ] - explicit-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] - explore: [ i686-linux, x86_64-linux, x86_64-darwin ] - exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - expressions-z3: [ i686-linux, x86_64-linux, x86_64-darwin ] - expressions: [ i686-linux, x86_64-linux, x86_64-darwin ] - extcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - extemp: [ i686-linux, x86_64-linux, x86_64-darwin ] - extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] - extensible-data: [ i686-linux, x86_64-linux, x86_64-darwin ] - extensible-effects-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] - Extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - extract-dependencies: [ i686-linux, x86_64-linux, x86_64-darwin ] - extractelf: [ i686-linux, x86_64-linux, x86_64-darwin ] - ez-couch: [ i686-linux, x86_64-linux, x86_64-darwin ] - f-ree-hack-cheats-free-v-bucks-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] - Facebook-Password-Hacker-Online-Latest-Version: [ i686-linux, x86_64-linux, x86_64-darwin ] - faceted: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - fadno-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] - fadno: [ i686-linux, x86_64-linux, x86_64-darwin ] - failable-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - failure-detector: [ i686-linux, x86_64-linux, x86_64-darwin ] - FailureT: [ i686-linux, x86_64-linux, x86_64-darwin ] - fake-type: [ i686-linux, x86_64-linux, x86_64-darwin ] - fake: [ i686-linux, x86_64-linux, x86_64-darwin ] - faktory: [ i686-linux, x86_64-linux, x86_64-darwin ] - falling-turnip: [ i686-linux, x86_64-linux, x86_64-darwin ] - fallingblocks: [ i686-linux, x86_64-linux, x86_64-darwin ] - family-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - fast-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] - fast-combinatorics: [ i686-linux, x86_64-linux, x86_64-darwin ] - fast-downward: [ i686-linux, x86_64-linux, x86_64-darwin ] - fast-nats: [ i686-linux, x86_64-linux, x86_64-darwin ] - fasta: [ i686-linux, x86_64-linux, x86_64-darwin ] - fastbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] - fastedit: [ i686-linux, x86_64-linux, x86_64-darwin ] - fastirc: [ i686-linux, x86_64-linux, x86_64-darwin ] - fastly: [ i686-linux, x86_64-linux, x86_64-darwin ] - fastparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - FastPush: [ i686-linux, x86_64-linux, x86_64-darwin ] - FastxPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - fathead-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - fault-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-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 ] - fay-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - fay-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] - fay-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] - fay: [ i686-linux, x86_64-linux, x86_64-darwin ] - fb-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] - fbmessenger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - fca: [ i686-linux, x86_64-linux, x86_64-darwin ] - fcache: [ i686-linux, x86_64-linux, x86_64-darwin ] - fcd: [ i686-linux, x86_64-linux, x86_64-darwin ] - fcg: [ i686-linux, x86_64-linux, x86_64-darwin ] - fckeditor: [ i686-linux, x86_64-linux, x86_64-darwin ] - fclabels-monadlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - FComp: [ i686-linux, x86_64-linux, x86_64-darwin ] - fdo-trash: [ i686-linux, x86_64-linux, x86_64-darwin ] - feature-flipper-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] - feature-flipper: [ i686-linux, x86_64-linux, x86_64-darwin ] - fedora-packages: [ i686-linux, x86_64-linux, x86_64-darwin ] - feed-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - feed-collect: [ i686-linux, x86_64-linux, x86_64-darwin ] - feed-crawl: [ i686-linux, x86_64-linux, x86_64-darwin ] - feed-gipeda: [ i686-linux, x86_64-linux, x86_64-darwin ] - feed-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] - feed2lj: [ i686-linux, x86_64-linux, x86_64-darwin ] - feed2twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] - feldspar-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] - feldspar-language: [ i686-linux, x86_64-linux, x86_64-darwin ] - fenfire: [ i686-linux, x86_64-linux, x86_64-darwin ] - FermatsLastMargin: [ i686-linux, x86_64-linux, x86_64-darwin ] - fernet: [ i686-linux, x86_64-linux, x86_64-darwin ] - FerryCore: [ i686-linux, x86_64-linux, x86_64-darwin ] - festung: [ i686-linux, x86_64-linux, x86_64-darwin ] - Feval: [ i686-linux, x86_64-linux, x86_64-darwin ] - ffeed: [ i686-linux, x86_64-linux, x86_64-darwin ] - ffmpeg-light: [ 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 ] - FieldTrip: [ i686-linux, x86_64-linux, x86_64-darwin ] - fieldwise: [ i686-linux, x86_64-linux, x86_64-darwin ] - fig: [ i686-linux, x86_64-linux, x86_64-darwin ] - file-collection: [ i686-linux, x86_64-linux, x86_64-darwin ] - file-command-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - file-location: [ i686-linux, x86_64-linux, x86_64-darwin ] - filediff: [ i686-linux, x86_64-linux, x86_64-darwin ] - FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] - FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] - fileneglect: [ i686-linux, x86_64-linux, x86_64-darwin ] - filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] - FilePather: [ i686-linux, x86_64-linux, x86_64-darwin ] - filepather: [ i686-linux, x86_64-linux, x86_64-darwin ] - Files: [ i686-linux, x86_64-linux, x86_64-darwin ] - filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - filesystem-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - filesystem-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] - FileSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] - fillit: [ i686-linux, x86_64-linux, x86_64-darwin ] - filter-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] - fin: [ i686-linux, x86_64-linux, x86_64-darwin ] - final-pretty-printer: [ i686-linux, x86_64-linux, x86_64-darwin ] - Finance-Quote-Yahoo: [ i686-linux, x86_64-linux, x86_64-darwin ] - Finance-Treasury: [ i686-linux, x86_64-linux, x86_64-darwin ] - find-clumpiness: [ i686-linux, x86_64-linux, x86_64-darwin ] - find-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - find-source-files: [ i686-linux, x86_64-linux, x86_64-darwin ] - fingertree-psqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] - fingertree-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - FiniteMap: [ i686-linux, x86_64-linux, x86_64-darwin ] - firefly-example: [ i686-linux, x86_64-linux, x86_64-darwin ] - first-and-last: [ i686-linux, x86_64-linux, x86_64-darwin ] - firstify: [ i686-linux, x86_64-linux, x86_64-darwin ] - FirstOrderTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] - fit: [ i686-linux, x86_64-linux, x86_64-darwin ] - fitsio: [ i686-linux, x86_64-linux, x86_64-darwin ] - fix-parser-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - fix-symbols-gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixed-point-vector-space: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixed-point-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixed-point: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixed-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixed-storable-array: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixed-vector-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixed-vector-cborg: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixed-vector-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixed-width: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixer: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixhs: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixie: [ i686-linux, x86_64-linux, x86_64-darwin ] - fizzbuzz-as-a-service: [ i686-linux, x86_64-linux, x86_64-darwin ] - fizzbuzz: [ i686-linux, x86_64-linux, x86_64-darwin ] - flac-picture: [ i686-linux, x86_64-linux, x86_64-darwin ] - flac: [ i686-linux, x86_64-linux, x86_64-darwin ] - flamethrower: [ i686-linux, x86_64-linux, x86_64-darwin ] - flamingra: [ i686-linux, x86_64-linux, x86_64-darwin ] - flat-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] - flexible-time: [ i686-linux, x86_64-linux, x86_64-darwin ] - flexiwrap-smallcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - flexiwrap: [ i686-linux, x86_64-linux, x86_64-darwin ] - flickr: [ i686-linux, x86_64-linux, x86_64-darwin ] - Flippi: [ i686-linux, x86_64-linux, x86_64-darwin ] - flite: [ i686-linux, x86_64-linux, x86_64-darwin ] - float-binstring: [ i686-linux, x86_64-linux, x86_64-darwin ] - floating-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] - flow-er: [ i686-linux, x86_64-linux, x86_64-darwin ] - flow2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] - flowdock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - flowdock-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] - flowdock: [ i686-linux, x86_64-linux, x86_64-darwin ] - flower: [ i686-linux, x86_64-linux, x86_64-darwin ] - flowlocks-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] - flowsim: [ i686-linux, x86_64-linux, x86_64-darwin ] - fltkhs-fluid-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - fluent-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] - fluffy-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - fluidsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] - flux-monoid: [ i686-linux, x86_64-linux, x86_64-darwin ] - FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] - fmark: [ i686-linux, x86_64-linux, x86_64-darwin ] - FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] - fn-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - focuslist: [ i686-linux, x86_64-linux, x86_64-darwin ] - foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ] - foldl-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] - folds-common: [ i686-linux, x86_64-linux, x86_64-darwin ] - follow: [ i686-linux, x86_64-linux, x86_64-darwin ] - follower: [ i686-linux, x86_64-linux, x86_64-darwin ] - foma: [ i686-linux, x86_64-linux, x86_64-darwin ] - font-opengl-basic4x6: [ i686-linux, x86_64-linux, x86_64-darwin ] - foo: [ i686-linux, x86_64-linux, x86_64-darwin ] - for-free: [ i686-linux, x86_64-linux, x86_64-darwin ] - forbidden-fruit: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - forest-fire: [ i686-linux, x86_64-linux, x86_64-darwin ] - Forestry: [ i686-linux, x86_64-linux, x86_64-darwin ] - forger: [ i686-linux, x86_64-linux, x86_64-darwin ] - ForkableT: [ i686-linux, x86_64-linux, x86_64-darwin ] - formal: [ i686-linux, x86_64-linux, x86_64-darwin ] - FormalGrammars: [ i686-linux, x86_64-linux, x86_64-darwin ] - format-status: [ i686-linux, x86_64-linux, x86_64-darwin ] - format: [ i686-linux, x86_64-linux, x86_64-darwin ] - formattable: [ i686-linux, x86_64-linux, x86_64-darwin ] - forml: [ i686-linux, x86_64-linux, x86_64-darwin ] - formlets-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] - formlets: [ i686-linux, x86_64-linux, x86_64-darwin ] - formura: [ i686-linux, x86_64-linux, x86_64-darwin ] - forsyde-deep: [ i686-linux, x86_64-linux, x86_64-darwin ] - ForSyDe: [ i686-linux, x86_64-linux, x86_64-darwin ] - forth-hll: [ i686-linux, x86_64-linux, x86_64-darwin ] - Fortnite-Hack-Cheats-Free-V-Bucks-Generator: [ i686-linux, x86_64-linux, x86_64-darwin ] - fortran-src: [ i686-linux, x86_64-linux, x86_64-darwin ] - fortytwo: [ i686-linux, x86_64-linux, x86_64-darwin ] - foscam-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] - foscam-filename: [ i686-linux, x86_64-linux, x86_64-darwin ] - foscam-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] - Foster: [ i686-linux, x86_64-linux, x86_64-darwin ] - fpco-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - fpnla-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - FPretty: [ i686-linux, x86_64-linux, x86_64-darwin ] - fptest: [ i686-linux, x86_64-linux, x86_64-darwin ] - Fractaler: [ i686-linux, x86_64-linux, x86_64-darwin ] - fractals: [ i686-linux, x86_64-linux, x86_64-darwin ] - frag: [ i686-linux, x86_64-linux, x86_64-darwin ] - Frames-beam: [ i686-linux, x86_64-linux, x86_64-darwin ] - Frames-dsv: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-category: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-game: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-operational: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-theorems-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-theorems-seq-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-theorems-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-theorems-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-theorems: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-v-bucks-generator-no-survey: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-v-bucks-generator-ps4-no-survey: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-vector-spaces: [ i686-linux, x86_64-linux, x86_64-darwin ] - freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] - freelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - freer-converse: [ i686-linux, x86_64-linux, x86_64-darwin ] - freer-effects: [ i686-linux, x86_64-linux, x86_64-darwin ] - freer-simple-catching: [ i686-linux, x86_64-linux, x86_64-darwin ] - freer-simple-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - freer-simple-profiling: [ i686-linux, x86_64-linux, x86_64-darwin ] - freer-simple-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - freer-simple-time: [ i686-linux, x86_64-linux, x86_64-darwin ] - freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] - freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] - freetype-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - FreeTypeGL: [ i686-linux, x86_64-linux, x86_64-darwin ] - freq: [ i686-linux, x86_64-linux, x86_64-darwin ] - fresh: [ i686-linux, x86_64-linux, x86_64-darwin ] - friday-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] - friday-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] - friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ] - friday: [ i686-linux, x86_64-linux, x86_64-darwin ] - friendly: [ i686-linux, x86_64-linux, x86_64-darwin ] - frown: [ i686-linux, x86_64-linux, x86_64-darwin ] - frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] - frpnow-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] - frpnow-gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] - frpnow-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - frpnow-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] - frpnow: [ 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 ] - ftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] - FTGL-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] - ftp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - FTPLine: [ i686-linux, x86_64-linux, x86_64-darwin ] - ftree: [ i686-linux, x86_64-linux, x86_64-darwin ] - ftshell: [ i686-linux, x86_64-linux, x86_64-darwin ] - full-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] - full-text-search: [ i686-linux, x86_64-linux, x86_64-darwin ] - fullstop: [ i686-linux, x86_64-linux, x86_64-darwin ] - funbot-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - funbot-git-hook: [ i686-linux, x86_64-linux, x86_64-darwin ] - funbot: [ i686-linux, x86_64-linux, x86_64-darwin ] - funcons-lambda-cbv-mp: [ i686-linux, x86_64-linux, x86_64-darwin ] - funcons-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - funcons-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - funcons-values: [ i686-linux, x86_64-linux, x86_64-darwin ] - function-combine: [ i686-linux, x86_64-linux, x86_64-darwin ] - function-instances-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] - functional-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ] - functor: [ i686-linux, x86_64-linux, x86_64-darwin ] - functorm: [ i686-linux, x86_64-linux, x86_64-darwin ] - funflow-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] - funflow: [ i686-linux, x86_64-linux, x86_64-darwin ] - FunGEn: [ i686-linux, x86_64-linux, x86_64-darwin ] - Fungi: [ i686-linux, x86_64-linux, x86_64-darwin ] - funion: [ i686-linux, x86_64-linux, x86_64-darwin ] - funpat: [ i686-linux, x86_64-linux, x86_64-darwin ] - funsat: [ i686-linux, x86_64-linux, x86_64-darwin ] - fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] - futhark: [ i686-linux, x86_64-linux, x86_64-darwin ] - futun: [ i686-linux, x86_64-linux, x86_64-darwin ] - future: [ i686-linux, x86_64-linux, x86_64-darwin ] - fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] - fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] - fwgl-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] - fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ] - g-npm: [ i686-linux, x86_64-linux, x86_64-darwin ] - g4ip: [ i686-linux, x86_64-linux, x86_64-darwin ] - gact: [ i686-linux, x86_64-linux, x86_64-darwin ] - game-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] - gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] - Gamgine: [ i686-linux, x86_64-linux, x86_64-darwin ] - Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] - garepinoh: [ i686-linux, x86_64-linux, x86_64-darwin ] - gargoyle-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - gargoyle: [ i686-linux, x86_64-linux, x86_64-darwin ] - gas: [ i686-linux, x86_64-linux, x86_64-darwin ] - gbu: [ i686-linux, x86_64-linux, x86_64-darwin ] - gc-monitoring-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] - gcodehs: [ i686-linux, x86_64-linux, x86_64-darwin ] - gconf: [ i686-linux, x86_64-linux, x86_64-darwin ] - gdax: [ i686-linux, x86_64-linux, x86_64-darwin ] - gdiff-ig: [ i686-linux, x86_64-linux, x86_64-darwin ] - gdiff-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - GeBoP: [ i686-linux, x86_64-linux, x86_64-darwin ] - gedcom: [ i686-linux, x86_64-linux, x86_64-darwin ] - geek-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - geek: [ i686-linux, x86_64-linux, x86_64-darwin ] - gegl: [ i686-linux, x86_64-linux, x86_64-darwin ] - gelatin-freetype2: [ i686-linux, x86_64-linux, x86_64-darwin ] - gelatin-fruity: [ i686-linux, x86_64-linux, x86_64-darwin ] - gelatin-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] - gelatin-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] - gelatin-shaders: [ i686-linux, x86_64-linux, x86_64-darwin ] - gelatin: [ i686-linux, x86_64-linux, x86_64-darwin ] - gemstone: [ i686-linux, x86_64-linux, x86_64-darwin ] - gen-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] - gen-passwd: [ i686-linux, x86_64-linux, x86_64-darwin ] - Genbank: [ i686-linux, x86_64-linux, x86_64-darwin ] - gencheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - gender: [ i686-linux, x86_64-linux, x86_64-darwin ] - genders: [ i686-linux, x86_64-linux, x86_64-darwin ] - Gene-CluEDO: [ i686-linux, x86_64-linux, x86_64-darwin ] - general-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - GeneralTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] - generators: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-accessors: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-church: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-lens-labels: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-lucid-scaffold: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] - generic-xmlpickler: [ i686-linux, x86_64-linux, x86_64-darwin ] - genericserialize: [ i686-linux, x86_64-linux, x86_64-darwin ] - genesis-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - genesis: [ i686-linux, x86_64-linux, x86_64-darwin ] - genetics: [ i686-linux, x86_64-linux, x86_64-darwin ] - geni-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] - geni-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - GenI: [ i686-linux, x86_64-linux, x86_64-darwin ] - geniconvert: [ 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 ] - 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-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-hspec-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-hspec-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-hspec-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-hspec-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-hspec-optics: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-hspec: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-path: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-scientific: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-time: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-unordered-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-uuid: [ i686-linux, x86_64-linux, x86_64-darwin ] - genvalidity-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - geo-resolver: [ i686-linux, x86_64-linux, x86_64-darwin ] - GeocoderOpenCage: [ i686-linux, x86_64-linux, x86_64-darwin ] - geodetic-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - geodetic: [ i686-linux, x86_64-linux, x86_64-darwin ] - geodetics: [ i686-linux, x86_64-linux, x86_64-darwin ] - geojson-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - geolite-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] - geom2d: [ i686-linux, x86_64-linux, x86_64-darwin ] - GeomPredicates-SSE: [ i686-linux, x86_64-linux, x86_64-darwin ] - geos: [ i686-linux, x86_64-linux, x86_64-darwin ] - Get: [ i686-linux, x86_64-linux, x86_64-darwin ] - getemx: [ i686-linux, x86_64-linux, x86_64-darwin ] - getflag: [ i686-linux, x86_64-linux, x86_64-darwin ] - GGg: [ i686-linux, x86_64-linux, x86_64-darwin ] - ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ] - gh-labeler: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-core-smallstep: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-datasize: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-dump-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-dump-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-dump-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-dup: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-generic-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-heap-view: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-man-completion: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-mod: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-parmake: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-pkg-autofix: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-pkg-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-proofs: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-session: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-srcspan-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-syb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-time-alloc-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-trace-events: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-typelits-presburger: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-usage: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghci-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghci-haskeline: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghci-history-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghci-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghci-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-base-stub: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-jsffi: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-fetch: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-hplay: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-promise: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] - ght: [ 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-gtkosxapplication: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-wnck: [ i686-linux, x86_64-linux, x86_64-darwin ] - giak: [ i686-linux, x86_64-linux, x86_64-darwin ] - Gifcurry: [ i686-linux, x86_64-linux, x86_64-darwin ] - ginsu: [ i686-linux, x86_64-linux, x86_64-darwin ] - gio: [ i686-linux, x86_64-linux, x86_64-darwin ] - gipeda: [ i686-linux, x86_64-linux, x86_64-darwin ] - giphy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - GiST: [ i686-linux, x86_64-linux, x86_64-darwin ] - gist: [ i686-linux, x86_64-linux, x86_64-darwin ] - git-checklist: [ i686-linux, x86_64-linux, x86_64-darwin ] - git-config: [ i686-linux, x86_64-linux, x86_64-darwin ] - git-date: [ i686-linux, x86_64-linux, x86_64-darwin ] - git-fmt: [ i686-linux, x86_64-linux, x86_64-darwin ] - git-gpush: [ i686-linux, x86_64-linux, x86_64-darwin ] - git-jump: [ 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 ] - git-sanity: [ i686-linux, x86_64-linux, x86_64-darwin ] - git-vogue: [ i686-linux, x86_64-linux, x86_64-darwin ] - git: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitdo: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-backup: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-data: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-webhook-handler-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - github-webhook-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] - github: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitignore: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitlab-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitlib-cross: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitlib-libgit2: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitlib-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitlib-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitlib-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitson: [ i686-linux, x86_64-linux, x86_64-darwin ] - gitter: [ i686-linux, x86_64-linux, x86_64-darwin ] - givegif: [ 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-pipes: [ i686-linux, x86_64-linux, x86_64-darwin ] - glazier-react-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - glazier-react-widget: [ i686-linux, x86_64-linux, x86_64-darwin ] - glazier-react: [ i686-linux, x86_64-linux, x86_64-darwin ] - GLFW-b-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] - GLFW-OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] - gli: [ i686-linux, x86_64-linux, x86_64-darwin ] - glib: [ i686-linux, x86_64-linux, x86_64-darwin ] - glicko: [ i686-linux, x86_64-linux, x86_64-darwin ] - glider-nlp: [ i686-linux, x86_64-linux, x86_64-darwin ] - GLMatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] - glob-posix: [ i686-linux, x86_64-linux, x86_64-darwin ] - global-config: [ i686-linux, x86_64-linux, x86_64-darwin ] - global-variables: [ i686-linux, x86_64-linux, x86_64-darwin ] - global: [ i686-linux, x86_64-linux, x86_64-darwin ] - glome-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - GlomeTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] - GlomeView: [ i686-linux, x86_64-linux, x86_64-darwin ] - gloss-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] - gloss-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] - gloss-export: [ i686-linux, x86_64-linux, x86_64-darwin ] - gloss-game: [ i686-linux, x86_64-linux, x86_64-darwin ] - gloss-sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] - glpk-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - glue-common: [ i686-linux, x86_64-linux, x86_64-darwin ] - glue-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - glue-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] - glue-example: [ i686-linux, x86_64-linux, x86_64-darwin ] - glue: [ i686-linux, x86_64-linux, x86_64-darwin ] - gmap: [ i686-linux, x86_64-linux, x86_64-darwin ] - gmndl: [ i686-linux, x86_64-linux, x86_64-darwin ] - gnome-desktop: [ i686-linux, x86_64-linux, x86_64-darwin ] - gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ] - gnss-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] - gnuidn: [ i686-linux, x86_64-linux, x86_64-darwin ] - goal-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - goal-geometry: [ i686-linux, x86_64-linux, x86_64-darwin ] - goal-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] - goal-simulation: [ i686-linux, x86_64-linux, x86_64-darwin ] - goatee-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - goatee: [ i686-linux, x86_64-linux, x86_64-darwin ] - gochan: [ i686-linux, x86_64-linux, x86_64-darwin ] - gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - gooey: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-cloud: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-mail-filters: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-maps-geocoding: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-oauth2-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-search: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-server-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-static-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] - google-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] - GoogleCodeJam: [ i686-linux, x86_64-linux, x86_64-darwin ] - GoogleDirections: [ i686-linux, x86_64-linux, x86_64-darwin ] - googleplus: [ i686-linux, x86_64-linux, x86_64-darwin ] - googlepolyline: [ i686-linux, x86_64-linux, x86_64-darwin ] - GoogleSB: [ i686-linux, x86_64-linux, x86_64-darwin ] - GoogleTranslate: [ i686-linux, x86_64-linux, x86_64-darwin ] - gopher-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] - gopherbot: [ i686-linux, x86_64-linux, x86_64-darwin ] - gore-and-ash-actor: [ i686-linux, x86_64-linux, x86_64-darwin ] - gore-and-ash-async: [ i686-linux, x86_64-linux, x86_64-darwin ] - gore-and-ash-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] - gore-and-ash-glfw: [ 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 ] - gore-and-ash: [ 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 ] - 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-TextureLoad: [ i686-linux, x86_64-linux, x86_64-darwin ] - GPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - gps2htmlReport: [ i686-linux, x86_64-linux, x86_64-darwin ] - gps: [ i686-linux, x86_64-linux, x86_64-darwin ] - gpx-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - GPX: [ i686-linux, x86_64-linux, x86_64-darwin ] - graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] - graflog: [ i686-linux, x86_64-linux, x86_64-darwin ] - Grafos: [ i686-linux, x86_64-linux, x86_64-darwin ] - grakn: [ i686-linux, x86_64-linux, x86_64-darwin ] - grammar-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] - GrammarProducts: [ i686-linux, x86_64-linux, x86_64-darwin ] - grammatical-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] - grapefruit-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 ] - graph-matchings: [ 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-lambdascope: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-ski: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-strategies: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-trs: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting-ww: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-serialize: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - graph-visit: [ i686-linux, x86_64-linux, x86_64-darwin ] - Graph500: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - GraphHammer: [ i686-linux, x86_64-linux, x86_64-darwin ] - graphics-drawingcombinators: [ i686-linux, x86_64-linux, x86_64-darwin ] - graphics-formats-collada: [ i686-linux, x86_64-linux, x86_64-darwin ] - graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] - graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] - graphql-w-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] - graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ] - graql: [ i686-linux, x86_64-linux, x86_64-darwin ] - grasp: [ i686-linux, x86_64-linux, x86_64-darwin ] - gray-code: [ i686-linux, x86_64-linux, x86_64-darwin ] - greencard-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - greencard: [ i686-linux, x86_64-linux, x86_64-darwin ] - greenclip: [ i686-linux, x86_64-linux, x86_64-darwin ] - greg-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - gremlin-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - Grempa: [ i686-linux, x86_64-linux, x86_64-darwin ] - grenade: [ i686-linux, x86_64-linux, x86_64-darwin ] - gridbounds: [ i686-linux, x86_64-linux, x86_64-darwin ] - gridland: [ i686-linux, x86_64-linux, x86_64-darwin ] - grids: [ i686-linux, x86_64-linux, x86_64-darwin ] - grm: [ i686-linux, x86_64-linux, x86_64-darwin ] - groot: [ i686-linux, x86_64-linux, x86_64-darwin ] - gross: [ i686-linux, x86_64-linux, x86_64-darwin ] - GroteTrap: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] - group-with: [ i686-linux, x86_64-linux, x86_64-darwin ] - grouped-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - growler: [ i686-linux, x86_64-linux, x86_64-darwin ] - GrowlNotify: [ i686-linux, x86_64-linux, x86_64-darwin ] - grpc-etcd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - gruff-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - gruff: [ i686-linux, x86_64-linux, x86_64-darwin ] - gsc-weighting: [ i686-linux, x86_64-linux, x86_64-darwin ] - gscholar-rss: [ i686-linux, x86_64-linux, x86_64-darwin ] - gsl-random-fu: [ i686-linux, x86_64-linux, x86_64-darwin ] - gsl-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - gstorable: [ i686-linux, x86_64-linux, x86_64-darwin ] - gstreamer: [ i686-linux, x86_64-linux, x86_64-darwin ] - GTALib: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-jsinput: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-largeTreeStore: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-serialized-event: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-simple-list-view: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-sni-tray: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-toggle-button-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-toy: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-traymanager: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk2hs-buildtools: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk2hs-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk2hs-rpn: [ i686-linux, x86_64-linux, x86_64-darwin ] - Gtk2hsGenerics: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk3-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtkglext: [ i686-linux, x86_64-linux, x86_64-darwin ] - GtkGLTV: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtkimageview: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtkrsync: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtksourceview2: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtksourceview3: [ i686-linux, x86_64-linux, x86_64-darwin ] - GtkTV: [ i686-linux, x86_64-linux, x86_64-darwin ] - guarded-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] - guess-combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] - guid: [ i686-linux, x86_64-linux, x86_64-darwin ] - GuiHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - GuiTV: [ i686-linux, x86_64-linux, x86_64-darwin ] - gulcii: [ i686-linux, x86_64-linux, x86_64-darwin ] - gyah-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] - gym-http-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - h-booru: [ i686-linux, x86_64-linux, x86_64-darwin ] - h-gpgme: [ i686-linux, x86_64-linux, x86_64-darwin ] - h-reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] - h2048: [ i686-linux, x86_64-linux, x86_64-darwin ] - h2c: [ i686-linux, x86_64-linux, x86_64-darwin ] - H: [ 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 ] - HABQT: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hach: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-contrib-press: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-frontend-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-handler-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-handler-epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-handler-evhttp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-handler-fastcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-handler-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-handler-hyena: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-handler-kibro: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-handler-simpleserver: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-middleware-cleanpath: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-middleware-clientsession: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-middleware-jsonp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack2-handler-happstack-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack2-handler-mongrel2-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack2-handler-snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack2-handler-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-mirror: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-processing: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-repo-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-security-HTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage2hwn: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage2twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackager: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackernews: [ i686-linux, x86_64-linux, x86_64-darwin ] - HackMail: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackmanager: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackport: [ i686-linux, x86_64-linux, x86_64-darwin ] - hactor: [ i686-linux, x86_64-linux, x86_64-darwin ] - hactors: [ i686-linux, x86_64-linux, x86_64-darwin ] - haddock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - haddock-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] - haddock-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] - haddocset: [ i686-linux, x86_64-linux, x86_64-darwin ] - hadolint: [ 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 ] - hahp: [ i686-linux, x86_64-linux, x86_64-darwin ] - haiji: [ i686-linux, x86_64-linux, x86_64-darwin ] - hail: [ i686-linux, x86_64-linux, x86_64-darwin ] - hailgun-send: [ i686-linux, x86_64-linux, x86_64-darwin ] - hairy: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakaru: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakismet: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakka: [ i686-linux, x86_64-linux, x86_64-darwin ] - hako: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-agda: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-blaze-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-contrib-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-contrib-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-contrib-hyphenation: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-contrib-links: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-dhall: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-dir-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-favicon: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-filestore: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-images: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-series: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-shakespeare: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-shortcode: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] - hal: [ i686-linux, x86_64-linux, x86_64-darwin ] - halberd: [ i686-linux, x86_64-linux, x86_64-darwin ] - halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] - halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] - halive: [ i686-linux, x86_64-linux, x86_64-darwin ] - hall-symbols: [ i686-linux, x86_64-linux, x86_64-darwin ] - halma-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] - halma-telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] - halves: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaMinitel: [ i686-linux, x86_64-linux, x86_64-darwin ] - hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hamsql: [ i686-linux, x86_64-linux, x86_64-darwin ] - hamtmap: [ i686-linux, x86_64-linux, x86_64-darwin ] - hamusic: [ i686-linux, x86_64-linux, x86_64-darwin ] - handa-gdata: [ i686-linux, x86_64-linux, x86_64-darwin ] - handle-like: [ i686-linux, x86_64-linux, x86_64-darwin ] - handsy: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hangman: [ i686-linux, x86_64-linux, x86_64-darwin ] - hannahci: [ i686-linux, x86_64-linux, x86_64-darwin ] - hans-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] - hans: [ i686-linux, x86_64-linux, x86_64-darwin ] - haphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] - hapistrano: [ i686-linux, x86_64-linux, x86_64-darwin ] - happindicator3: [ i686-linux, x86_64-linux, x86_64-darwin ] - happindicator: [ i686-linux, x86_64-linux, x86_64-darwin ] - happlets-lib-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - happlets: [ i686-linux, x86_64-linux, x86_64-darwin ] - happraise: [ i686-linux, x86_64-linux, x86_64-darwin ] - HAppS-Data: [ i686-linux, x86_64-linux, x86_64-darwin ] - happs-hsp-template: [ i686-linux, x86_64-linux, x86_64-darwin ] - happs-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - happs-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] - HAppS-Util: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-authenticate: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-clientsession: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-data: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-dlg: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-facebook: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-fay-ajax: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-hamlet: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-heist: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-hstringtemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-jmacro: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-monad-peel: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-server-tls-cryptonite: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-state: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-yui: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] - happy-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] - happybara-webkit-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - happybara-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] - happybara: [ i686-linux, x86_64-linux, x86_64-darwin ] - HappyTree: [ i686-linux, x86_64-linux, x86_64-darwin ] - hapstone: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaPy: [ i686-linux, x86_64-linux, x86_64-darwin ] - haquery: [ i686-linux, x86_64-linux, x86_64-darwin ] - haquil: [ i686-linux, x86_64-linux, x86_64-darwin ] - harchive: [ i686-linux, x86_64-linux, x86_64-darwin ] - hArduino: [ i686-linux, x86_64-linux, x86_64-darwin ] - hardware-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaRe: [ i686-linux, x86_64-linux, x86_64-darwin ] - hark: [ i686-linux, x86_64-linux, x86_64-darwin ] - harmony: [ i686-linux, x86_64-linux, x86_64-darwin ] - HarmTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] - haroonga-httpd: [ i686-linux, x86_64-linux, x86_64-darwin ] - haroonga: [ i686-linux, x86_64-linux, x86_64-darwin ] - harpy: [ i686-linux, x86_64-linux, x86_64-darwin ] - harvest-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - has-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - has: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasbolt-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - HasCacBDD: [ i686-linux, x86_64-linux, x86_64-darwin ] - hascas: [ i686-linux, x86_64-linux, x86_64-darwin ] - Haschoo: [ i686-linux, x86_64-linux, x86_64-darwin ] - HasGP: [ i686-linux, x86_64-linux, x86_64-darwin ] - hash: [ i686-linux, x86_64-linux, x86_64-darwin ] - hashable-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - hashable-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] - hashable-orphans: [ i686-linux, x86_64-linux, x86_64-darwin ] - hashabler: [ i686-linux, x86_64-linux, x86_64-darwin ] - hashed-storage: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hashell: [ i686-linux, x86_64-linux, x86_64-darwin ] - hashflare: [ i686-linux, x86_64-linux, x86_64-darwin ] - hashring: [ i686-linux, x86_64-linux, x86_64-darwin ] - hashtables-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasim: [ i686-linux, x86_64-linux, x86_64-darwin ] - hask-home: [ i686-linux, x86_64-linux, x86_64-darwin ] - hask: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - haskeem: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskeline-class: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelisp: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-abci: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-aliyun: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-awk: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-bitmex-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-bitmex-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-brainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-ci: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-cnc: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-coffee: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-conll: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-dap: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-disque: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-eigen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-gettext: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-go-checkers: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-holes-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-in-space: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-kubernetes: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-lsp-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-ml: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-mpfr: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-names: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-neo4j-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-overridez: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-packages: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-pdf-presenter: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-platform-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-player: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-postal: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-read-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-src-exts-observe: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-src-exts-prisms: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-src-exts-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-src-exts-sc: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-src-meta-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-stack-trace-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-token-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-ast-fromghc: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-ast-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-ast: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-backend-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-builtin-refactorings: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-debug: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-experimental-refactorings: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-prettyprint: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-refactor: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tools-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-tyrant: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - 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 ] - haskelldb-connect-hdbc-catchio-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-connect-hdbc-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-connect-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-flat: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hdbc-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hdbc-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hdbc-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hdbc-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hsql-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hsql-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hsql-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hsql-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelldb-hsql: [ 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 ] - haskelldb: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaskellLM: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaskellNN: [ i686-linux, x86_64-linux, x86_64-darwin ] - Haskelloids: [ 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 ] - HaskellTorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaskellTutorials: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelzinc: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskey-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskey: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskgame: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskheap: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskhol-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskintex: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskmon: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoin-bitcoind: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoin-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoin-node: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoin-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoin-script: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoin-store: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoin-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoin-wallet: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoin: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoon-httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoon-salvia: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoon: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskore-realtime: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskore-supercollider: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskore-synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskore: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaskRel: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasktorch-ffi-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasktorch-ffi-thc: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasktorch-indef: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasktorch-signatures-partial: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasktorch-signatures-support: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasktorch-signatures: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasktorch-zoo: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasktorch: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskus-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskus-system-build: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskus-utils-data: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskus-utils-variant: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskus-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - haslo: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasloGUI: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-optparse-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-postgres-options: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - hastache-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - hastache: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste-app: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste-markup: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste-prim: [ i686-linux, x86_64-linux, x86_64-darwin ] - haste: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hate: [ i686-linux, x86_64-linux, x86_64-darwin ] - hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaTeX-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaTeX-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - hats: [ i686-linux, x86_64-linux, x86_64-darwin ] - hatt: [ i686-linux, x86_64-linux, x86_64-darwin ] - haven: [ i686-linux, x86_64-linux, x86_64-darwin ] - haverer: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaVSA: [ i686-linux, x86_64-linux, x86_64-darwin ] - hawitter: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - haxparse: [ i686-linux, x86_64-linux, x86_64-darwin ] - haxr-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - haxr: [ i686-linux, x86_64-linux, x86_64-darwin ] - haxy: [ i686-linux, x86_64-linux, x86_64-darwin ] - hayland: [ i686-linux, x86_64-linux, x86_64-darwin ] - hayoo-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hayoo: [ i686-linux, x86_64-linux, x86_64-darwin ] - hback: [ i686-linux, x86_64-linux, x86_64-darwin ] - hbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] - hbb: [ i686-linux, x86_64-linux, x86_64-darwin ] - hBDD-CMUBDD: [ i686-linux, x86_64-linux, x86_64-darwin ] - hBDD-CUDD: [ i686-linux, x86_64-linux, x86_64-darwin ] - hbeat: [ i686-linux, x86_64-linux, x86_64-darwin ] - hbf: [ i686-linux, x86_64-linux, x86_64-darwin ] - hblas: [ i686-linux, x86_64-linux, x86_64-darwin ] - hblock: [ 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 ] - hcg-minus-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - hcg-minus: [ i686-linux, x86_64-linux, x86_64-darwin ] - hcheat: [ i686-linux, x86_64-linux, x86_64-darwin ] - hchesslib: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - hcube: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdaemonize-buildfix: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdbc-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - HDBC-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - HDBC-postgresql-hstore: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdbc-postgresql-hstore: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdbi-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdbi-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdbi-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdbi-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdbi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdevtools: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdf: [ i686-linux, x86_64-linux, x86_64-darwin ] - hDFA: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdigest: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdirect: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdis86: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdiscount: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdm: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdo: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdocs: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdph-closure: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdph: [ i686-linux, x86_64-linux, x86_64-darwin ] - hdr-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] - HDRUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] - headergen: [ i686-linux, x86_64-linux, x86_64-darwin ] - heap: [ i686-linux, x86_64-linux, x86_64-darwin ] - heartbeat-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - heatitup-complete: [ i686-linux, x86_64-linux, x86_64-darwin ] - heatitup: [ i686-linux, x86_64-linux, x86_64-darwin ] - hecc: [ i686-linux, x86_64-linux, x86_64-darwin ] - heckle: [ i686-linux, x86_64-linux, x86_64-darwin ] - hedgehog-checkers-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - hedgehog-checkers: [ i686-linux, x86_64-linux, x86_64-darwin ] - hedgehog-gen-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hedi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hedis-config: [ i686-linux, x86_64-linux, x86_64-darwin ] - hedis-pile: [ i686-linux, x86_64-linux, x86_64-darwin ] - hedis-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - hedis-tags: [ i686-linux, x86_64-linux, x86_64-darwin ] - hein: [ i686-linux, x86_64-linux, x86_64-darwin ] - heist-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - heist-async: [ i686-linux, x86_64-linux, x86_64-darwin ] - heist: [ i686-linux, x86_64-linux, x86_64-darwin ] - helics-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] - helics: [ i686-linux, x86_64-linux, x86_64-darwin ] - helisp: [ i686-linux, x86_64-linux, x86_64-darwin ] - helium: [ i686-linux, x86_64-linux, x86_64-darwin ] - helix: [ i686-linux, x86_64-linux, x86_64-darwin ] - hell: [ i686-linux, x86_64-linux, x86_64-darwin ] - hellage: [ 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 ] - hen: [ i686-linux, x86_64-linux, x86_64-darwin ] - henet: [ i686-linux, x86_64-linux, x86_64-darwin ] - hepevt: [ i686-linux, x86_64-linux, x86_64-darwin ] - her-lexer-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - her-lexer: [ i686-linux, x86_64-linux, x86_64-darwin ] - HERA: [ i686-linux, x86_64-linux, x86_64-darwin ] - herbalizer: [ i686-linux, x86_64-linux, x86_64-darwin ] - HerbiePlugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - heredocs: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hermes: [ i686-linux, x86_64-linux, x86_64-darwin ] - hermit-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] - hermit: [ i686-linux, x86_64-linux, x86_64-darwin ] - herms: [ i686-linux, x86_64-linux, x86_64-darwin ] - herringbone-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] - herringbone-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] - herringbone: [ i686-linux, x86_64-linux, x86_64-darwin ] - hesh: [ i686-linux, x86_64-linux, x86_64-darwin ] - hesql: [ i686-linux, x86_64-linux, x86_64-darwin ] - hetero-dict: [ i686-linux, x86_64-linux, x86_64-darwin ] - heterogeneous-list-literals: [ i686-linux, x86_64-linux, x86_64-darwin ] - heterolist: [ i686-linux, x86_64-linux, x86_64-darwin ] - hetris: [ i686-linux, x86_64-linux, x86_64-darwin ] - heukarya: [ i686-linux, x86_64-linux, x86_64-darwin ] - hevm: [ i686-linux, x86_64-linux, x86_64-darwin ] - hevolisa-dph: [ i686-linux, x86_64-linux, x86_64-darwin ] - hevolisa: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexchat: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexif: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexmino: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexml-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexpat-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexpat-pickle-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexpress: [ i686-linux, x86_64-linux, x86_64-darwin ] - hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ] - hext: [ i686-linux, x86_64-linux, x86_64-darwin ] - heyefi: [ i686-linux, x86_64-linux, x86_64-darwin ] - heyting-algebras: [ i686-linux, x86_64-linux, x86_64-darwin ] - hF2: [ i686-linux, x86_64-linux, x86_64-darwin ] - hfann: [ i686-linux, x86_64-linux, x86_64-darwin ] - hfd: [ i686-linux, x86_64-linux, x86_64-darwin ] - hfiar: [ i686-linux, x86_64-linux, x86_64-darwin ] - HFitUI: [ i686-linux, x86_64-linux, x86_64-darwin ] - hfmt: [ i686-linux, x86_64-linux, x86_64-darwin ] - hfoil: [ i686-linux, x86_64-linux, x86_64-darwin ] - hfov: [ i686-linux, x86_64-linux, x86_64-darwin ] - hfractal: [ i686-linux, x86_64-linux, x86_64-darwin ] - HFrequencyQueue: [ i686-linux, x86_64-linux, x86_64-darwin ] - hfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] - hg-buildpackage: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgalib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgdbmi: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGE2D: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgearman: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgen: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgeometry: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgeos: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgettext: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgis: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgithub: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGL: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgom: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgopher: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGraphStorage: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgrev: [ i686-linux, x86_64-linux, x86_64-darwin ] - hgrib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hharp: [ i686-linux, x86_64-linux, x86_64-darwin ] - HHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] - hi3status: [ i686-linux, x86_64-linux, x86_64-darwin ] - hiccup: [ i686-linux, x86_64-linux, x86_64-darwin ] - hichi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hid-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - hieraclus: [ i686-linux, x86_64-linux, x86_64-darwin ] - hierarchical-clustering-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - hierarchical-clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] - hierarchical-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] - hierarchical-spectral-clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] - hierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] - hiernotify: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hieroglyph: [ i686-linux, x86_64-linux, x86_64-darwin ] - HiggsSet: [ i686-linux, x86_64-linux, x86_64-darwin ] - higherorder: [ i686-linux, x86_64-linux, x86_64-darwin ] - highjson-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] - highjson-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - highjson: [ i686-linux, x86_64-linux, x86_64-darwin ] - highlight-versions: [ i686-linux, x86_64-linux, x86_64-darwin ] - highWaterMark: [ i686-linux, x86_64-linux, x86_64-darwin ] - himg: [ i686-linux, x86_64-linux, x86_64-darwin ] - himpy: [ i686-linux, x86_64-linux, x86_64-darwin ] - hindley-milner: [ i686-linux, x86_64-linux, x86_64-darwin ] - hinduce-classifier-decisiontree: [ i686-linux, x86_64-linux, x86_64-darwin ] - hinduce-classifier: [ i686-linux, x86_64-linux, x86_64-darwin ] - hinduce-examples: [ 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 ] - hint-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hinter: [ i686-linux, x86_64-linux, x86_64-darwin ] - hinterface: [ i686-linux, x86_64-linux, x86_64-darwin ] - hinvaders: [ i686-linux, x86_64-linux, x86_64-darwin ] - hinze-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - hip: [ i686-linux, x86_64-linux, x86_64-darwin ] - hipbot: [ i686-linux, x86_64-linux, x86_64-darwin ] - hipchat-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - hipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - hircules: [ i686-linux, x86_64-linux, x86_64-darwin ] - hirt: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hish: [ i686-linux, x86_64-linux, x86_64-darwin ] - hissmetrics: [ i686-linux, x86_64-linux, x86_64-darwin ] - hist-pl-dawg: [ i686-linux, x86_64-linux, x86_64-darwin ] - hist-pl-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] - hist-pl-lexicon: [ i686-linux, x86_64-linux, x86_64-darwin ] - hist-pl-lmf: [ i686-linux, x86_64-linux, x86_64-darwin ] - hist-pl-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - hist-pl: [ i686-linux, x86_64-linux, x86_64-darwin ] - historian: [ i686-linux, x86_64-linux, x86_64-darwin ] - hit-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] - hit: [ i686-linux, x86_64-linux, x86_64-darwin ] - HJavaScript: [ i686-linux, x86_64-linux, x86_64-darwin ] - hjcase: [ i686-linux, x86_64-linux, x86_64-darwin ] - hjs: [ i686-linux, x86_64-linux, x86_64-darwin ] - HJScript: [ i686-linux, x86_64-linux, x86_64-darwin ] - hjson-query: [ i686-linux, x86_64-linux, x86_64-darwin ] - hjsonpointer: [ i686-linux, x86_64-linux, x86_64-darwin ] - hjsonschema: [ i686-linux, x86_64-linux, x86_64-darwin ] - HJVM: [ i686-linux, x86_64-linux, x86_64-darwin ] - hlatex: [ i686-linux, x86_64-linux, x86_64-darwin ] - hlbfgsb: [ i686-linux, x86_64-linux, x86_64-darwin ] - hlcm: [ i686-linux, x86_64-linux, x86_64-darwin ] - hleap: [ i686-linux, x86_64-linux, x86_64-darwin ] - HLearn-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] - HLearn-approximation: [ i686-linux, x86_64-linux, x86_64-darwin ] - HLearn-classification: [ i686-linux, x86_64-linux, x86_64-darwin ] - HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] - HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-irr: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] - hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] - hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] - hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ] - HList: [ i686-linux, x86_64-linux, x86_64-darwin ] - HListPP: [ i686-linux, x86_64-linux, x86_64-darwin ] - hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] - HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] - hlongurl: [ i686-linux, x86_64-linux, x86_64-darwin ] - hlrdb-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - hlrdb: [ i686-linux, x86_64-linux, x86_64-darwin ] - hls: [ i686-linux, x86_64-linux, x86_64-darwin ] - hlwm: [ i686-linux, x86_64-linux, x86_64-darwin ] - hly: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmark: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-backprop: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-banded: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-morpheus: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-sparse: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-sundials: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmk: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmm-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmm-lapack: [ i686-linux, x86_64-linux, x86_64-darwin ] - HMM: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmm: [ i686-linux, x86_64-linux, x86_64-darwin ] - hMollom: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmp3: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hmpf: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmt-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmt: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmumps: [ i686-linux, x86_64-linux, x86_64-darwin ] - hnetcdf: [ i686-linux, x86_64-linux, x86_64-darwin ] - hnix: [ i686-linux, x86_64-linux, x86_64-darwin ] - HNM: [ i686-linux, x86_64-linux, x86_64-darwin ] - hnormalise: [ i686-linux, x86_64-linux, x86_64-darwin ] - ho-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoauth: [ i686-linux, x86_64-linux, x86_64-darwin ] - hob: [ i686-linux, x86_64-linux, x86_64-darwin ] - hobbes: [ i686-linux, x86_64-linux, x86_64-darwin ] - hobbits: [ i686-linux, x86_64-linux, x86_64-darwin ] - hocilib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hocker: [ i686-linux, x86_64-linux, x86_64-darwin ] - hodatime: [ i686-linux, x86_64-linux, x86_64-darwin ] - HODE: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hoed: [ i686-linux, x86_64-linux, x86_64-darwin ] - hog: [ i686-linux, x86_64-linux, x86_64-darwin ] - hogg: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoggl: [ i686-linux, x86_64-linux, x86_64-darwin ] - hogre-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - hogre: [ i686-linux, x86_64-linux, x86_64-darwin ] - hois: [ i686-linux, x86_64-linux, x86_64-darwin ] - hol: [ i686-linux, x86_64-linux, x86_64-darwin ] - hold-em: [ i686-linux, x86_64-linux, x86_64-darwin ] - hole: [ i686-linux, x86_64-linux, x86_64-darwin ] - Holumbus-Searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] - holy-project: [ i686-linux, x86_64-linux, x86_64-darwin ] - homeomorphic: [ i686-linux, x86_64-linux, x86_64-darwin ] - hommage: [ i686-linux, x86_64-linux, x86_64-darwin ] - homoiconic: [ i686-linux, x86_64-linux, x86_64-darwin ] - homplexity: [ i686-linux, x86_64-linux, x86_64-darwin ] - HongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - honi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoobuddy: [ i686-linux, x86_64-linux, x86_64-darwin ] - hood-off: [ i686-linux, x86_64-linux, x86_64-darwin ] - hood2: [ i686-linux, x86_64-linux, x86_64-darwin ] - hood: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoodie: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoodle-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoodle-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoodle-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoodle-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoodle-publish: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoodle-render: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoodle-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoodle: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoogle-index: [ i686-linux, x86_64-linux, x86_64-darwin ] - hooks-dir: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoovie: [ i686-linux, x86_64-linux, x86_64-darwin ] - hopencc: [ i686-linux, x86_64-linux, x86_64-darwin ] - hopencl: [ i686-linux, x86_64-linux, x86_64-darwin ] - hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoppy-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoppy-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoppy-runtime: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoppy-std: [ i686-linux, x86_64-linux, x86_64-darwin ] - hops: [ i686-linux, x86_64-linux, x86_64-darwin ] - hoq: [ i686-linux, x86_64-linux, x86_64-darwin ] - hora: [ i686-linux, x86_64-linux, x86_64-darwin ] - horizon: [ i686-linux, x86_64-linux, x86_64-darwin ] - horname: [ i686-linux, x86_64-linux, x86_64-darwin ] - hosc-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - hosts-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hothasktags: [ i686-linux, x86_64-linux, x86_64-darwin ] - hotswap: [ i686-linux, x86_64-linux, x86_64-darwin ] - hourglass-fuzzy-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] - houseman: [ i686-linux, x86_64-linux, x86_64-darwin ] - hp2any-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - hp2any-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] - hp2any-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpack-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpaco-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpaco: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpage: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpapi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpaste: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpasteit: [ i686-linux, x86_64-linux, x86_64-darwin ] - HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] - hPDB-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - hPDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - HPDF: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpg: [ i686-linux, x86_64-linux, x86_64-darwin ] - HPi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpio: [ i686-linux, x86_64-linux, x86_64-darwin ] - hplaylist: [ i686-linux, x86_64-linux, x86_64-darwin ] - HPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpodder: [ i686-linux, x86_64-linux, x86_64-darwin ] - HPong: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpqtypes-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpqtypes: [ i686-linux, x86_64-linux, x86_64-darwin ] - hprotoc-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - hps-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - hps-kmeans: [ i686-linux, x86_64-linux, x86_64-darwin ] - hps: [ i686-linux, x86_64-linux, x86_64-darwin ] - hPushover: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpygments: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpylos: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpyrg: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpython: [ i686-linux, x86_64-linux, x86_64-darwin ] - hquantlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hR: [ i686-linux, x86_64-linux, x86_64-darwin ] - hranker: [ i686-linux, x86_64-linux, x86_64-darwin ] - HRay: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] - hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] - hriemann: [ i686-linux, x86_64-linux, x86_64-darwin ] - HROOT-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - HROOT-graf: [ i686-linux, x86_64-linux, x86_64-darwin ] - HROOT-hist: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - HROOT: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-blake2: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-carbon-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-conllu: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-di: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-dotnet: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-excelx: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-ffmpeg: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-gizapp: [ 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 ] - hs-logo: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-mesos: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-nombre-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-pgms: [ 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 ] - hs-re: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-rs-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-scrape: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-server-starter: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-snowtify: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-twitterarchiver: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs-watchman: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs2bf: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsaml2: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsay: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsbackup: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsbencher-codespeed: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsbencher-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsbencher: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-auditor: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-db: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-dot: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-lang: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-lisp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-process: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-rec: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-rw: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-sf-hsndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-sf: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-unsafe: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - hscaffold: [ i686-linux, x86_64-linux, x86_64-darwin ] - hscamwire: [ i686-linux, x86_64-linux, x86_64-darwin ] - hscassandra: [ i686-linux, x86_64-linux, x86_64-darwin ] - hscd: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsclock: [ i686-linux, x86_64-linux, x86_64-darwin ] - hscope: [ i686-linux, x86_64-linux, x86_64-darwin ] - hScraper: [ i686-linux, x86_64-linux, x86_64-darwin ] - hscuid: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsdev: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsdif: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsdip: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsdns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hsed: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsenv: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsfacter: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsfcsh: [ i686-linux, x86_64-linux, x86_64-darwin ] - HSFFIG: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsfilt: [ i686-linux, x86_64-linux, x86_64-darwin ] - HSGEP: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsgnutls-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsgnutls: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsgsom: [ i686-linux, x86_64-linux, x86_64-darwin ] - HsHaruPDF: [ i686-linux, x86_64-linux, x86_64-darwin ] - HSHHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] - HsHTSLib: [ i686-linux, x86_64-linux, x86_64-darwin ] - HsHyperEstraier: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsI2C: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsignal: [ i686-linux, x86_64-linux, x86_64-darwin ] - hSimpleDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsimport: [ i686-linux, x86_64-linux, x86_64-darwin ] - HsJudy: [ i686-linux, x86_64-linux, x86_64-darwin ] - hskeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] - hslackbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] - hslibsvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - hslinks: [ i686-linux, x86_64-linux, x86_64-darwin ] - hslogger-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] - hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsluv-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ] - HSmarty: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsmodetweaks: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsmtpclient: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsnock: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsns: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - 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 ] - hsp-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsparql: [ i686-linux, x86_64-linux, x86_64-darwin ] - HsParrot: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspear: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-expectations-match: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-expectations-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - hspec-pg-transact: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-structured-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec2: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspecVariant: [ i686-linux, x86_64-linux, x86_64-darwin ] - HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspkcs11: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspread: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspresent: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsprocess: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsql-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsql-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsql-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsql-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsql: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsqml-datamodel-vinyl: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsqml-datamodel: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsqml-demo-manic: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsqml-demo-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsqml-demo-notes: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsqml-demo-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsqml-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsqml: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsreadability: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsseccomp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsSqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] - hssqlppp-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - hssqlppp: [ i686-linux, x86_64-linux, x86_64-darwin ] - HsSVN: [ i686-linux, x86_64-linux, x86_64-darwin ] - hstatistics: [ 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 ] - hstidy: [ i686-linux, x86_64-linux, x86_64-darwin ] - hstorchat: [ i686-linux, x86_64-linux, x86_64-darwin ] - hstox: [ i686-linux, x86_64-linux, x86_64-darwin ] - hstradeking: [ i686-linux, x86_64-linux, x86_64-darwin ] - HStringTemplateHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] - hstyle: [ i686-linux, x86_64-linux, x86_64-darwin ] - hstzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsubconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsudoku: [ i686-linux, x86_64-linux, x86_64-darwin ] - hswip: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsx-jmacro: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsx-xhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsXenCtrl: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsyscall: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsyslog-tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsyslog-udp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hszephyr: [ i686-linux, x86_64-linux, x86_64-darwin ] - HTab: [ i686-linux, x86_64-linux, x86_64-darwin ] - hTalos: [ i686-linux, x86_64-linux, x86_64-darwin ] - htar: [ i686-linux, x86_64-linux, x86_64-darwin ] - hTensor: [ i686-linux, x86_64-linux, x86_64-darwin ] - htestu: [ i686-linux, x86_64-linux, x86_64-darwin ] - HTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] - htiled: [ i686-linux, x86_64-linux, x86_64-darwin ] - htlset: [ i686-linux, x86_64-linux, x86_64-darwin ] - html-charset: [ i686-linux, x86_64-linux, x86_64-darwin ] - html-entities: [ i686-linux, x86_64-linux, x86_64-darwin ] - html-kure: [ i686-linux, x86_64-linux, x86_64-darwin ] - html-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] - html-tokenizer: [ i686-linux, x86_64-linux, x86_64-darwin ] - hts: [ i686-linux, x86_64-linux, x86_64-darwin ] - htsn-import: [ i686-linux, x86_64-linux, x86_64-darwin ] - htsn: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-request-modifiers: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-client-session: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-client-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-conduit-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-io-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-kinder: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-pony-serve-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-querystring: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-response-decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-shed: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-wget: [ i686-linux, x86_64-linux, x86_64-darwin ] - http2-client-grpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - https-everywhere-rules-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] - https-everywhere-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] - httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ] - htune: [ i686-linux, x86_64-linux, x86_64-darwin ] - htvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - htzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] - hubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - huck: [ i686-linux, x86_64-linux, x86_64-darwin ] - HueAPI: [ i686-linux, x86_64-linux, x86_64-darwin ] - huff: [ i686-linux, x86_64-linux, x86_64-darwin ] - huffman: [ i686-linux, x86_64-linux, x86_64-darwin ] - hugs2yc: [ i686-linux, x86_64-linux, x86_64-darwin ] - hulk: [ i686-linux, x86_64-linux, x86_64-darwin ] - HulkImport: [ i686-linux, x86_64-linux, x86_64-darwin ] - human-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] - human-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - hums: [ i686-linux, x86_64-linux, x86_64-darwin ] - HUnit-Diff: [ i686-linux, x86_64-linux, x86_64-darwin ] - hunit-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] - hunit-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] - hunp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hunspell-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - hunt-searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] - hunt-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hup: [ i686-linux, x86_64-linux, x86_64-darwin ] - hurdle: [ i686-linux, x86_64-linux, x86_64-darwin ] - hurriyet: [ i686-linux, x86_64-linux, x86_64-darwin ] - husk-scheme-libs: [ i686-linux, x86_64-linux, x86_64-darwin ] - husk-scheme: [ i686-linux, x86_64-linux, x86_64-darwin ] - husky: [ i686-linux, x86_64-linux, x86_64-darwin ] - hutton: [ i686-linux, x86_64-linux, x86_64-darwin ] - huttons-razor: [ i686-linux, x86_64-linux, x86_64-darwin ] - huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] - hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-balancedparens: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-dsv: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-dump: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-eliasfano: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-excess: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-ip: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-json-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-packed-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-prim: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-rankselect-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-rankselect: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-succinct: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] - hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] - hweblib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hwhile: [ i686-linux, x86_64-linux, x86_64-darwin ] - hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] - hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] - hwormhole: [ i686-linux, x86_64-linux, x86_64-darwin ] - hws: [ i686-linux, x86_64-linux, x86_64-darwin ] - hwsl2-bytevector: [ i686-linux, x86_64-linux, x86_64-darwin ] - hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ] - hwsl2: [ i686-linux, x86_64-linux, x86_64-darwin ] - hXmixer: [ i686-linux, x86_64-linux, x86_64-darwin ] - HXMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] - hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ] - hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ] - HXQ: [ i686-linux, x86_64-linux, x86_64-darwin ] - hxt-pickle-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - hxthelper: [ i686-linux, x86_64-linux, x86_64-darwin ] - hxweb: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyahtzee: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyakko: [ i686-linux, x86_64-linux, x86_64-darwin ] - hybrid: [ i686-linux, x86_64-linux, x86_64-darwin ] - hydra-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - hydra-print: [ i686-linux, x86_64-linux, x86_64-darwin ] - hydrogen-cli-args: [ i686-linux, x86_64-linux, x86_64-darwin ] - hydrogen-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - hydrogen-data: [ i686-linux, x86_64-linux, x86_64-darwin ] - hydrogen-multimap: [ i686-linux, x86_64-linux, x86_64-darwin ] - hydrogen-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] - hydrogen-prelude-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - hydrogen-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - hydrogen-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - hydrogen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - hydrogen: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hydrogen: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyena: [ i686-linux, x86_64-linux, x86_64-darwin ] - hylide: [ i686-linux, x86_64-linux, x86_64-darwin ] - hylolib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hylotab: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyloutils: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyper-haskell-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyperdrive: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyperfunctions: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyperion: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyperloglogplus: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyperpublic: [ i686-linux, x86_64-linux, x86_64-darwin ] - hypher: [ i686-linux, x86_64-linux, x86_64-darwin ] - hzulip: [ i686-linux, x86_64-linux, x86_64-darwin ] - i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] - iap-verifier: [ i686-linux, x86_64-linux, x86_64-darwin ] - ib-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - iban: [ i686-linux, x86_64-linux, x86_64-darwin ] - ical: [ i686-linux, x86_64-linux, x86_64-darwin ] - iCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ] - IcoGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] - iconv-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] - ide-backend-common: [ i686-linux, x86_64-linux, x86_64-darwin ] - ide-backend-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] - ideas-math: [ i686-linux, x86_64-linux, x86_64-darwin ] - ideas: [ i686-linux, x86_64-linux, x86_64-darwin ] - idempotent: [ i686-linux, x86_64-linux, x86_64-darwin ] - identifiers: [ i686-linux, x86_64-linux, x86_64-darwin ] - idiii: [ i686-linux, x86_64-linux, x86_64-darwin ] - idna2008: [ i686-linux, x86_64-linux, x86_64-darwin ] - idris: [ i686-linux, x86_64-linux, x86_64-darwin ] - IDynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] - ieee-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - ifcxt: [ i686-linux, x86_64-linux, x86_64-darwin ] - IFS: [ i686-linux, x86_64-linux, x86_64-darwin ] - ig: [ i686-linux, x86_64-linux, x86_64-darwin ] - ige-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] - ige: [ i686-linux, x86_64-linux, x86_64-darwin ] - ignore: [ i686-linux, x86_64-linux, x86_64-darwin ] - igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - igrf: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-blaze: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-charts: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-display: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-gnuplot: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-hatex: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-hvega: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-magic: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-rlangqq: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell-widgets: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - ihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] - illuminate: [ i686-linux, x86_64-linux, x86_64-darwin ] - imagepaste: [ i686-linux, x86_64-linux, x86_64-darwin ] - imap: [ i686-linux, x86_64-linux, x86_64-darwin ] - imapget: [ i686-linux, x86_64-linux, x86_64-darwin ] - imbib: [ i686-linux, x86_64-linux, x86_64-darwin ] - imgurder: [ i686-linux, x86_64-linux, x86_64-darwin ] - imj-animation: [ i686-linux, x86_64-linux, x86_64-darwin ] - imj-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - imj-game-hamazed: [ i686-linux, x86_64-linux, x86_64-darwin ] - imj-measure-stdout: [ i686-linux, x86_64-linux, x86_64-darwin ] - imj-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - imm: [ i686-linux, x86_64-linux, x86_64-darwin ] - imparse: [ i686-linux, x86_64-linux, x86_64-darwin ] - imperative-edsl-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] - imperative-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] - ImperativeHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - implicit-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] - implicit-params: [ i686-linux, x86_64-linux, x86_64-darwin ] - importify: [ i686-linux, x86_64-linux, x86_64-darwin ] - imports: [ i686-linux, x86_64-linux, x86_64-darwin ] - improve: [ i686-linux, x86_64-linux, x86_64-darwin ] - impure-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - INblobs: [ i686-linux, x86_64-linux, x86_64-darwin ] - inch: [ i686-linux, x86_64-linux, x86_64-darwin ] - inchworm: [ i686-linux, x86_64-linux, x86_64-darwin ] - include-file: [ i686-linux, x86_64-linux, x86_64-darwin ] - incremental-computing: [ i686-linux, x86_64-linux, x86_64-darwin ] - incremental-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] - increments: [ i686-linux, x86_64-linux, x86_64-darwin ] - indents: [ i686-linux, x86_64-linux, x86_64-darwin ] - indexation: [ i686-linux, x86_64-linux, x86_64-darwin ] - IndexedList: [ i686-linux, x86_64-linux, x86_64-darwin ] - indextype: [ i686-linux, x86_64-linux, x86_64-darwin ] - indian-language-font-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] - indices: [ i686-linux, x86_64-linux, x86_64-darwin ] - indieweb-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] - inf-interval: [ i686-linux, x86_64-linux, x86_64-darwin ] - infer-upstream: [ i686-linux, x86_64-linux, x86_64-darwin ] - infernu: [ i686-linux, x86_64-linux, x86_64-darwin ] - infinity: [ i686-linux, x86_64-linux, x86_64-darwin ] - infix: [ i686-linux, x86_64-linux, x86_64-darwin ] - InfixApplicative: [ i686-linux, x86_64-linux, x86_64-darwin ] - inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] - informative: [ i686-linux, x86_64-linux, x86_64-darwin ] - inilist: [ i686-linux, x86_64-linux, x86_64-darwin ] - inject-function: [ i686-linux, x86_64-linux, x86_64-darwin ] - inline-java: [ i686-linux, x86_64-linux, x86_64-darwin ] - inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ] - insert-ordered-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - inserts: [ i686-linux, x86_64-linux, x86_64-darwin ] - inspector-wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] - instant-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - instant-bytes: [ i686-linux, x86_64-linux, x86_64-darwin ] - instant-deepseq: [ i686-linux, x86_64-linux, x86_64-darwin ] - instant-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] - instant-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] - instant-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] - instapaper-sender: [ i686-linux, x86_64-linux, x86_64-darwin ] - instinct: [ i686-linux, x86_64-linux, x86_64-darwin ] - int-multimap: [ i686-linux, x86_64-linux, x86_64-darwin ] - integer-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] - integreat: [ i686-linux, x86_64-linux, x86_64-darwin ] - intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ] - internetmarke: [ i686-linux, x86_64-linux, x86_64-darwin ] - intero: [ i686-linux, x86_64-linux, x86_64-darwin ] - interpol: [ i686-linux, x86_64-linux, x86_64-darwin ] - interpolatedstring-qq-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] - interpolatedstring-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - interruptible: [ i686-linux, x86_64-linux, x86_64-darwin ] - interval: [ i686-linux, x86_64-linux, x86_64-darwin ] - intricacy: [ i686-linux, x86_64-linux, x86_64-darwin ] - intro-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - introduction-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - introduction: [ i686-linux, x86_64-linux, x86_64-darwin ] - intset: [ i686-linux, x86_64-linux, x86_64-darwin ] - invertible-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] - invertible-hlist: [ i686-linux, x86_64-linux, x86_64-darwin ] - io-capture: [ i686-linux, x86_64-linux, x86_64-darwin ] - io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] - ion: [ i686-linux, x86_64-linux, x86_64-darwin ] - IOR: [ i686-linux, x86_64-linux, x86_64-darwin ] - IORefCAS: [ i686-linux, x86_64-linux, x86_64-darwin ] - iostring: [ i686-linux, x86_64-linux, x86_64-darwin ] - iothread: [ i686-linux, x86_64-linux, x86_64-darwin ] - iotransaction: [ i686-linux, x86_64-linux, x86_64-darwin ] - ip2location: [ i686-linux, x86_64-linux, x86_64-darwin ] - ip2proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] - ip: [ i686-linux, x86_64-linux, x86_64-darwin ] - ipatch: [ i686-linux, x86_64-linux, x86_64-darwin ] - ipc: [ i686-linux, x86_64-linux, x86_64-darwin ] - ipopt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - iptables-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] - iptadmin: [ i686-linux, x86_64-linux, x86_64-darwin ] - IPv6DB: [ i686-linux, x86_64-linux, x86_64-darwin ] - ipython-kernel: [ i686-linux, x86_64-linux, x86_64-darwin ] - irc-dcc: [ i686-linux, x86_64-linux, x86_64-darwin ] - irc-fun-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] - irc-fun-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - irc-fun-color: [ i686-linux, x86_64-linux, x86_64-darwin ] - irc-fun-messages: [ i686-linux, x86_64-linux, x86_64-darwin ] - irc-fun-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - Irc: [ i686-linux, x86_64-linux, x86_64-darwin ] - ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] - iri: [ i686-linux, x86_64-linux, x86_64-darwin ] - iridium: [ i686-linux, x86_64-linux, x86_64-darwin ] - iron-mq: [ i686-linux, x86_64-linux, x86_64-darwin ] - ironforge: [ i686-linux, x86_64-linux, x86_64-darwin ] - irt: [ i686-linux, x86_64-linux, x86_64-darwin ] - isdicom: [ i686-linux, x86_64-linux, x86_64-darwin ] - isevaluated: [ i686-linux, x86_64-linux, x86_64-darwin ] - isiz: [ i686-linux, x86_64-linux, x86_64-darwin ] - ismtp: [ i686-linux, x86_64-linux, x86_64-darwin ] - IsNull: [ i686-linux, x86_64-linux, x86_64-darwin ] - iso8601-duration: [ i686-linux, x86_64-linux, x86_64-darwin ] - isobmff-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] - isohunt: [ i686-linux, x86_64-linux, x86_64-darwin ] - isotope: [ i686-linux, x86_64-linux, x86_64-darwin ] - itcli: [ i686-linux, x86_64-linux, x86_64-darwin ] - itemfield: [ i686-linux, x86_64-linux, x86_64-darwin ] - iter-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] - iteratee-compress: [ i686-linux, x86_64-linux, x86_64-darwin ] - iteratee-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - iteratee-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - iteratee-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] - iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] - iterio-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - iterIO: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivor: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-backend-c: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-bitdata: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-hw: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-opts: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-serialize: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory-stdlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivory: [ i686-linux, x86_64-linux, x86_64-darwin ] - ivy-web: [ i686-linux, x86_64-linux, x86_64-darwin ] - ixdopp: [ i686-linux, x86_64-linux, x86_64-darwin ] - ixmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] - ixshader: [ i686-linux, x86_64-linux, x86_64-darwin ] - iyql: [ i686-linux, x86_64-linux, x86_64-darwin ] - j2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - jack-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] - JackMiniMix: [ i686-linux, x86_64-linux, x86_64-darwin ] - jackminimix: [ i686-linux, x86_64-linux, x86_64-darwin ] - jacobi-roots: [ i686-linux, x86_64-linux, x86_64-darwin ] - jaeger-flamegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - jail: [ i686-linux, x86_64-linux, x86_64-darwin ] - jalaali: [ i686-linux, x86_64-linux, x86_64-darwin ] - jalla: [ i686-linux, x86_64-linux, x86_64-darwin ] - jammittools: [ i686-linux, x86_64-linux, x86_64-darwin ] - jarfind: [ i686-linux, x86_64-linux, x86_64-darwin ] - jarify: [ i686-linux, x86_64-linux, x86_64-darwin ] - jason: [ i686-linux, x86_64-linux, x86_64-darwin ] - java-bridge-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - java-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] - java-character: [ i686-linux, x86_64-linux, x86_64-darwin ] - java-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ] - javascript-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - Javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] - javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] - javav: [ i686-linux, x86_64-linux, x86_64-darwin ] - Javav: [ i686-linux, x86_64-linux, x86_64-darwin ] - jbi: [ i686-linux, x86_64-linux, x86_64-darwin ] - jcdecaux-vls: [ i686-linux, x86_64-linux, x86_64-darwin ] - Jdh: [ i686-linux, x86_64-linux, x86_64-darwin ] - jdi: [ i686-linux, x86_64-linux, x86_64-darwin ] - jenga: [ i686-linux, x86_64-linux, x86_64-darwin ] - jenkinsPlugins2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] - jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ] - jinquantities: [ i686-linux, x86_64-linux, x86_64-darwin ] - jmacro-rpc-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] - jmacro-rpc-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - jmacro-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - jmacro: [ i686-linux, x86_64-linux, x86_64-darwin ] - jml-web-service: [ i686-linux, x86_64-linux, x86_64-darwin ] - jmonkey: [ i686-linux, x86_64-linux, x86_64-darwin ] - jni: [ i686-linux, x86_64-linux, x86_64-darwin ] - jobqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] - join-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - join: [ i686-linux, x86_64-linux, x86_64-darwin ] - joinlist: [ i686-linux, x86_64-linux, x86_64-darwin ] - jonathanscard: [ i686-linux, x86_64-linux, x86_64-darwin ] - jpeg: [ i686-linux, x86_64-linux, x86_64-darwin ] - js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle-clib: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle-wkwebview: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] - JsContracts: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsmw: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-ast-json-encoder: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-ast-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-b: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-bytes-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] - JSON-Combinator-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - JSON-Combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-fu: [ 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 ] - json-pointer-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-pointer-hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-pointer: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-python: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-togo: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] - json2-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - json2: [ i686-linux, x86_64-linux, x86_64-darwin ] - JSONb: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsonextfilter: [ i686-linux, x86_64-linux, x86_64-darwin ] - JsonGrammar: [ i686-linux, x86_64-linux, x86_64-darwin ] - JSONParser: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsonresume: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsonrpc-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsons-to-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsonschema-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsonsql: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsontsv: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsonxlsx: [ i686-linux, x86_64-linux, x86_64-darwin ] - jspath: [ i686-linux, x86_64-linux, x86_64-darwin ] - juandelacosa: [ i686-linux, x86_64-linux, x86_64-darwin ] - judge: [ i686-linux, x86_64-linux, x86_64-darwin ] - judy: [ i686-linux, x86_64-linux, x86_64-darwin ] - juicy-gcode: [ i686-linux, x86_64-linux, x86_64-darwin ] - JuicyPixels-canvas: [ 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-notebook: [ i686-linux, x86_64-linux, x86_64-darwin ] - jupyter: [ i686-linux, x86_64-linux, x86_64-darwin ] - JustParse: [ i686-linux, x86_64-linux, x86_64-darwin ] - jvm-batching: [ i686-linux, x86_64-linux, x86_64-darwin ] - jvm-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - jvm-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - jvm-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] - jvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - kademlia: [ i686-linux, x86_64-linux, x86_64-darwin ] - kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - kafka-device-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] - kafka-device-joystick: [ i686-linux, x86_64-linux, x86_64-darwin ] - kafka-device-leap: [ i686-linux, x86_64-linux, x86_64-darwin ] - kafka-device-spacenav: [ i686-linux, x86_64-linux, x86_64-darwin ] - kafka-device-vrpn: [ i686-linux, x86_64-linux, x86_64-darwin ] - kafka-device: [ i686-linux, x86_64-linux, x86_64-darwin ] - kaleidoscope: [ i686-linux, x86_64-linux, x86_64-darwin ] - Kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] - kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] - kangaroo: [ i686-linux, x86_64-linux, x86_64-darwin ] - kanji: [ i686-linux, x86_64-linux, x86_64-darwin ] - kansas-comet: [ i686-linux, x86_64-linux, x86_64-darwin ] - kansas-lava-cores: [ i686-linux, x86_64-linux, x86_64-darwin ] - kansas-lava-papilio: [ i686-linux, x86_64-linux, x86_64-darwin ] - kansas-lava-shake: [ i686-linux, x86_64-linux, x86_64-darwin ] - kansas-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-rollbar: [ i686-linux, x86_64-linux, x86_64-darwin ] - katip-scalyr-scribe: [ i686-linux, x86_64-linux, x86_64-darwin ] - katip-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] - katt: [ i686-linux, x86_64-linux, x86_64-darwin ] - kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ] - kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] - kd-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - kdesrc-build-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - kdt: [ i686-linux, x86_64-linux, x86_64-darwin ] - keccak: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-mvc-environment-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-mvc-model-lightmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-mvc-model-protectedmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-mvc-solutions-config: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-mvc-solutions-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-mvc-view-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactive-fs: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactive-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactive-network: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactive-polling: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactive-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactive-yampa: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactivelenses: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactivevalues: [ i686-linux, x86_64-linux, x86_64-darwin ] - Ketchup: [ i686-linux, x86_64-linux, x86_64-darwin ] - keter: [ i686-linux, x86_64-linux, x86_64-darwin ] - kevin: [ i686-linux, x86_64-linux, x86_64-darwin ] - keyed: [ i686-linux, x86_64-linux, x86_64-darwin ] - keyring: [ i686-linux, x86_64-linux, x86_64-darwin ] - keysafe: [ i686-linux, x86_64-linux, x86_64-darwin ] - keystore: [ i686-linux, x86_64-linux, x86_64-darwin ] - keyvaluehash: [ i686-linux, x86_64-linux, x86_64-darwin ] - keyword-args: [ i686-linux, x86_64-linux, x86_64-darwin ] - khph: [ i686-linux, x86_64-linux, x86_64-darwin ] - kicad-data: [ i686-linux, x86_64-linux, x86_64-darwin ] - kickass-torrents-dump-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - kickchan: [ i686-linux, x86_64-linux, x86_64-darwin ] - kif-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - kit: [ i686-linux, x86_64-linux, x86_64-darwin ] - kleene: [ i686-linux, x86_64-linux, x86_64-darwin ] - kmeans-par: [ i686-linux, x86_64-linux, x86_64-darwin ] - kmeans-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - kmp-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] - knead-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] - knead: [ i686-linux, x86_64-linux, x86_64-darwin ] - knots: [ i686-linux, x86_64-linux, x86_64-darwin ] - koellner-phonetic: [ 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 ] - Kriens: [ i686-linux, x86_64-linux, x86_64-darwin ] - krpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - KSP: [ i686-linux, x86_64-linux, x86_64-darwin ] - ktx: [ i686-linux, x86_64-linux, x86_64-darwin ] - kure-your-boilerplate: [ i686-linux, x86_64-linux, x86_64-darwin ] - kure: [ i686-linux, x86_64-linux, x86_64-darwin ] - KyotoCabinet: [ i686-linux, x86_64-linux, x86_64-darwin ] - l-bfgs-b: [ i686-linux, x86_64-linux, x86_64-darwin ] - L-seed: [ i686-linux, x86_64-linux, x86_64-darwin ] - labeled-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] - laborantin-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - labsat: [ i686-linux, x86_64-linux, x86_64-darwin ] - labyrinth-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - labyrinth: [ i686-linux, x86_64-linux, x86_64-darwin ] - lagrangian: [ i686-linux, x86_64-linux, x86_64-darwin ] - laika: [ 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 ] - lambda-devs: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda-options: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdabot-haskell-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdabot-zulip: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdabot: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacms-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacms-media: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacube-bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacube-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacube-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacube-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacube-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacube-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacube-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacube-ir: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacube-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdacube: [ i686-linux, x86_64-linux, x86_64-darwin ] - LambdaDesigner: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdaFeed: [ i686-linux, x86_64-linux, x86_64-darwin ] - LambdaHack: [ i686-linux, x86_64-linux, x86_64-darwin ] - LambdaINet: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - LambdaPrettyQuote: [ i686-linux, x86_64-linux, x86_64-darwin ] - LambdaShell: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdatex: [ 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 ] - lambdiff: [ i686-linux, x86_64-linux, x86_64-darwin ] - lame-tester: [ i686-linux, x86_64-linux, x86_64-darwin ] - lame: [ i686-linux, x86_64-linux, x86_64-darwin ] - lang: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-bash: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-boogie: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-c-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-c-inline: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-conf: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-css: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-dart: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-dockerfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-dot: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-ecmascript-analysis: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-eiffel: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-gcl: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-go: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-guess: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-hcl: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-java-classfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-kort: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-lua-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-lua2: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-lua: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-mixal: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-ninja: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-oberon: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-ocaml: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-openscad: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-puppet: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-python-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-python: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - language-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-webidl: [ i686-linux, x86_64-linux, x86_64-darwin ] - lapack: [ i686-linux, x86_64-linux, x86_64-darwin ] - Lastik: [ i686-linux, x86_64-linux, x86_64-darwin ] - lat: [ i686-linux, x86_64-linux, x86_64-darwin ] - latest-npm-version: [ i686-linux, x86_64-linux, x86_64-darwin ] - latex-formulae-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] - latex-formulae-image: [ i686-linux, x86_64-linux, x86_64-darwin ] - latex-formulae-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - latex-function-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] - LATS: [ i686-linux, x86_64-linux, x86_64-darwin ] - lattices: [ i686-linux, x86_64-linux, x86_64-darwin ] - launchpad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] - lawless-concurrent-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] - layers-game: [ i686-linux, x86_64-linux, x86_64-darwin ] - layers: [ i686-linux, x86_64-linux, x86_64-darwin ] - layout-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] - layout-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] - layout: [ i686-linux, x86_64-linux, x86_64-darwin ] - layouting: [ i686-linux, x86_64-linux, x86_64-darwin ] - lazy-hash-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] - lazy-hash: [ i686-linux, x86_64-linux, x86_64-darwin ] - lazy-io-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - lazyarray: [ i686-linux, x86_64-linux, x86_64-darwin ] - lazyset: [ i686-linux, x86_64-linux, x86_64-darwin ] - lazysplines: [ i686-linux, x86_64-linux, x86_64-darwin ] - LazyVault: [ i686-linux, x86_64-linux, x86_64-darwin ] - ld-intervals: [ i686-linux, x86_64-linux, x86_64-darwin ] - lda: [ i686-linux, x86_64-linux, x86_64-darwin ] - ldap-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - ldapply: [ i686-linux, x86_64-linux, x86_64-darwin ] - ldif: [ i686-linux, x86_64-linux, x86_64-darwin ] - leaf: [ i686-linux, x86_64-linux, x86_64-darwin ] - leaky: [ i686-linux, x86_64-linux, x86_64-darwin ] - leapseconds: [ i686-linux, x86_64-linux, x86_64-darwin ] - learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] - learn: [ i686-linux, x86_64-linux, x86_64-darwin ] - Learning: [ i686-linux, x86_64-linux, x86_64-darwin ] - leetify: [ i686-linux, x86_64-linux, x86_64-darwin ] - legion-discovery-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - lendingclub: [ i686-linux, x86_64-linux, x86_64-darwin ] - lens-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - lens-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - lens-text-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] - lens-time: [ i686-linux, x86_64-linux, x86_64-darwin ] - lens-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] - lensref: [ i686-linux, x86_64-linux, x86_64-darwin ] - lentil: [ i686-linux, x86_64-linux, x86_64-darwin ] - level-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - Level0: [ i686-linux, x86_64-linux, x86_64-darwin ] - levmar-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] - levmar: [ i686-linux, x86_64-linux, x86_64-darwin ] - lfst: [ i686-linux, x86_64-linux, x86_64-darwin ] - lgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - lha: [ i686-linux, x86_64-linux, x86_64-darwin ] - lhae: [ i686-linux, x86_64-linux, x86_64-darwin ] - lhc: [ i686-linux, x86_64-linux, x86_64-darwin ] - lhe: [ i686-linux, x86_64-linux, x86_64-darwin ] - lhs2TeX-hl: [ i686-linux, x86_64-linux, x86_64-darwin ] - lhslatex: [ i686-linux, x86_64-linux, x86_64-darwin ] - LibClang: [ i686-linux, x86_64-linux, x86_64-darwin ] - libconfig: [ i686-linux, x86_64-linux, x86_64-darwin ] - libcspm: [ i686-linux, x86_64-linux, x86_64-darwin ] - libexpect: [ i686-linux, x86_64-linux, x86_64-darwin ] - libGenI: [ i686-linux, x86_64-linux, x86_64-darwin ] - libhbb: [ i686-linux, x86_64-linux, x86_64-darwin ] - libinfluxdb: [ 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 ] - libltdl: [ i686-linux, x86_64-linux, x86_64-darwin ] - libmolude: [ i686-linux, x86_64-linux, x86_64-darwin ] - libnotify: [ i686-linux, x86_64-linux, x86_64-darwin ] - liboath-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - liboleg: [ i686-linux, x86_64-linux, x86_64-darwin ] - libpafe: [ i686-linux, x86_64-linux, x86_64-darwin ] - libpq: [ i686-linux, x86_64-linux, x86_64-darwin ] - librandomorg: [ i686-linux, x86_64-linux, x86_64-darwin ] - librato: [ i686-linux, x86_64-linux, x86_64-darwin ] - libravatar: [ i686-linux, x86_64-linux, x86_64-darwin ] - libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] - libsystemd-journal: [ i686-linux, x86_64-linux, x86_64-darwin ] - libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ] - libxls: [ i686-linux, x86_64-linux, x86_64-darwin ] - libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] - licensor: [ i686-linux, x86_64-linux, x86_64-darwin ] - life-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] - lifted-base-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - lifted-protolude: [ i686-linux, x86_64-linux, x86_64-darwin ] - lifter: [ i686-linux, x86_64-linux, x86_64-darwin ] - ligature: [ i686-linux, x86_64-linux, x86_64-darwin ] - lightning-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - lighttpd-conf-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - lighttpd-conf: [ i686-linux, x86_64-linux, x86_64-darwin ] - lilypond: [ i686-linux, x86_64-linux, x86_64-darwin ] - Limit: [ i686-linux, x86_64-linux, x86_64-darwin ] - limp-cbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - linda: [ i686-linux, x86_64-linux, x86_64-darwin ] - linden: [ i686-linux, x86_64-linux, x86_64-darwin ] - line: [ i686-linux, x86_64-linux, x86_64-darwin ] - linear-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - linear-algebra-cblas: [ i686-linux, x86_64-linux, x86_64-darwin ] - linear-circuit: [ i686-linux, x86_64-linux, x86_64-darwin ] - linear-code: [ i686-linux, x86_64-linux, x86_64-darwin ] - linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] - linear-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] - linear-vect: [ i686-linux, x86_64-linux, x86_64-darwin ] - linearmap-category: [ i686-linux, x86_64-linux, x86_64-darwin ] - linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] - linearscan: [ i686-linux, x86_64-linux, x86_64-darwin ] - LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] - lines-of-action: [ i686-linux, x86_64-linux, x86_64-darwin ] - link-relations: [ i686-linux, x86_64-linux, x86_64-darwin ] - LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] - linkchk: [ i686-linux, x86_64-linux, x86_64-darwin ] - linkcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - linked-list-with-iterator: [ i686-linux, x86_64-linux, x86_64-darwin ] - linkedhashmap: [ i686-linux, x86_64-linux, x86_64-darwin ] - linklater: [ i686-linux, x86_64-linux, x86_64-darwin ] - linode-v4: [ i686-linux, x86_64-linux, x86_64-darwin ] - linux-blkid: [ i686-linux, x86_64-linux, x86_64-darwin ] - linux-cgroup: [ i686-linux, x86_64-linux, x86_64-darwin ] - linux-inotify: [ i686-linux, x86_64-linux, x86_64-darwin ] - linux-kmod: [ i686-linux, x86_64-linux, x86_64-darwin ] - linux-perf: [ i686-linux, x86_64-linux, x86_64-darwin ] - linux-ptrace: [ i686-linux, x86_64-linux, x86_64-darwin ] - linx-gateway: [ i686-linux, x86_64-linux, x86_64-darwin ] - lio-eci11: [ i686-linux, x86_64-linux, x86_64-darwin ] - lio-fs: [ i686-linux, x86_64-linux, x86_64-darwin ] - lio-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - lio: [ i686-linux, x86_64-linux, x86_64-darwin ] - lipsum-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - liquid-fixpoint: [ i686-linux, x86_64-linux, x86_64-darwin ] - liquid: [ i686-linux, x86_64-linux, x86_64-darwin ] - liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] - liquidhaskell-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - liquidhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-fusion-probe: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-prompt: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-remote-forwards: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-t-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-t-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] - listenbrainz-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - ListT: [ i686-linux, x86_64-linux, x86_64-darwin ] - lit: [ i686-linux, x86_64-linux, x86_64-darwin ] - literals: [ 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 ] - llvm-base-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-base-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-general-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-general: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-hs-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-pkg-config: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-pretty-bc-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - lmonad-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] - lmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] - load-balancing: [ i686-linux, x86_64-linux, x86_64-darwin ] - load-font: [ i686-linux, x86_64-linux, x86_64-darwin ] - local-search: [ i686-linux, x86_64-linux, x86_64-darwin ] - localize: [ i686-linux, x86_64-linux, x86_64-darwin ] - located-monad-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] - located: [ i686-linux, x86_64-linux, x86_64-darwin ] - loch: [ i686-linux, x86_64-linux, x86_64-darwin ] - locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] - log-effect-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] - log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - log-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] - log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] - log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - log-warper: [ i686-linux, x86_64-linux, x86_64-darwin ] - log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] - log: [ i686-linux, x86_64-linux, x86_64-darwin ] - logentries: [ i686-linux, x86_64-linux, x86_64-darwin ] - logger: [ i686-linux, x86_64-linux, x86_64-darwin ] - logging-effect-extra-file: [ i686-linux, x86_64-linux, x86_64-darwin ] - logging-effect-extra-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] - logging-effect-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - logging-facade-journald: [ i686-linux, x86_64-linux, x86_64-darwin ] - logic-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] - logic-TPTP: [ i686-linux, x86_64-linux, x86_64-darwin ] - Logic: [ i686-linux, x86_64-linux, x86_64-darwin ] - LogicGrowsOnTrees-MPI: [ i686-linux, x86_64-linux, x86_64-darwin ] - LogicGrowsOnTrees-network: [ i686-linux, x86_64-linux, x86_64-darwin ] - LogicGrowsOnTrees-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] - LogicGrowsOnTrees: [ i686-linux, x86_64-linux, x86_64-darwin ] - logplex-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] - lojban: [ i686-linux, x86_64-linux, x86_64-darwin ] - lojbanParser: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-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 ] - lol: [ i686-linux, x86_64-linux, x86_64-darwin ] - loli: [ i686-linux, x86_64-linux, x86_64-darwin ] - longboi: [ i686-linux, x86_64-linux, x86_64-darwin ] - lookup-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] - loop-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] - loop-while: [ i686-linux, x86_64-linux, x86_64-darwin ] - loops: [ i686-linux, x86_64-linux, x86_64-darwin ] - loopy: [ i686-linux, x86_64-linux, x86_64-darwin ] - lord: [ i686-linux, x86_64-linux, x86_64-darwin ] - lorem: [ i686-linux, x86_64-linux, x86_64-darwin ] - loris: [ i686-linux, x86_64-linux, x86_64-darwin ] - loshadka: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] - lp-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - ls-usb: [ i686-linux, x86_64-linux, x86_64-darwin ] - lscabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ] - lsp-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ] - ltk: [ i686-linux, x86_64-linux, x86_64-darwin ] - lua-bc: [ i686-linux, x86_64-linux, x86_64-darwin ] - luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ] - luautils: [ i686-linux, x86_64-linux, x86_64-darwin ] - lucid-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] - lucienne: [ i686-linux, x86_64-linux, x86_64-darwin ] - Lucu: [ i686-linux, x86_64-linux, x86_64-darwin ] - lui: [ i686-linux, x86_64-linux, x86_64-darwin ] - luis-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - luka: [ i686-linux, x86_64-linux, x86_64-darwin ] - luminance-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] - luminance: [ i686-linux, x86_64-linux, x86_64-darwin ] - lushtags: [ i686-linux, x86_64-linux, x86_64-darwin ] - luthor: [ i686-linux, x86_64-linux, x86_64-darwin ] - lvish: [ i686-linux, x86_64-linux, x86_64-darwin ] - lvmlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - lxc: [ i686-linux, x86_64-linux, x86_64-darwin ] - lxd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - lye: [ i686-linux, x86_64-linux, x86_64-darwin ] - Lykah: [ i686-linux, x86_64-linux, x86_64-darwin ] - lz4-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - lzma-enumerator: [ 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-process: [ i686-linux, x86_64-linux, x86_64-darwin ] - machines-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - maclight: [ i686-linux, x86_64-linux, x86_64-darwin ] - macos-corelibs: [ i686-linux, x86_64-linux, x86_64-darwin ] - macosx-make-standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] - madlang: [ i686-linux, x86_64-linux, x86_64-darwin ] - mage: [ i686-linux, x86_64-linux, x86_64-darwin ] - magic-wormhole: [ i686-linux, x86_64-linux, x86_64-darwin ] - magicbane: [ i686-linux, x86_64-linux, x86_64-darwin ] - MagicHaskeller: [ i686-linux, x86_64-linux, x86_64-darwin ] - magico: [ i686-linux, x86_64-linux, x86_64-darwin ] - magma: [ i686-linux, x86_64-linux, x86_64-darwin ] - mahoro: [ i686-linux, x86_64-linux, x86_64-darwin ] - maid: [ i686-linux, x86_64-linux, x86_64-darwin ] - mailbox-count: [ i686-linux, x86_64-linux, x86_64-darwin ] - mailchimp-subscribe: [ i686-linux, x86_64-linux, x86_64-darwin ] - mailchimp: [ i686-linux, x86_64-linux, x86_64-darwin ] - MailchimpSimple: [ i686-linux, x86_64-linux, x86_64-darwin ] - mailgun: [ i686-linux, x86_64-linux, x86_64-darwin ] - majordomo: [ i686-linux, x86_64-linux, x86_64-darwin ] - majority: [ i686-linux, x86_64-linux, x86_64-darwin ] - make-hard-links: [ i686-linux, x86_64-linux, x86_64-darwin ] - make-monofoldable-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] - make-package: [ i686-linux, x86_64-linux, x86_64-darwin ] - makedo: [ i686-linux, x86_64-linux, x86_64-darwin ] - makefile: [ i686-linux, x86_64-linux, x86_64-darwin ] - mallard: [ i686-linux, x86_64-linux, x86_64-darwin ] - manatee-anything: [ i686-linux, x86_64-linux, x86_64-darwin ] - manatee-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - manatee-curl: [ i686-linux, x86_64-linux, x86_64-darwin ] - manatee-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] - manatee-filemanager: [ i686-linux, x86_64-linux, x86_64-darwin ] - manatee-imageviewer: [ i686-linux, x86_64-linux, x86_64-darwin ] - manatee-ircclient: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-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 ] - manatee: [ i686-linux, x86_64-linux, x86_64-darwin ] - mandrill: [ i686-linux, x86_64-linux, x86_64-darwin ] - mandulia: [ i686-linux, x86_64-linux, x86_64-darwin ] - mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] - manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - manifolds-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] - map-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] - map-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - Mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] - mappy: [ i686-linux, x86_64-linux, x86_64-darwin ] - marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] - markdown-kate: [ i686-linux, x86_64-linux, x86_64-darwin ] - markdown-pap: [ i686-linux, x86_64-linux, x86_64-darwin ] - markdown2svg: [ i686-linux, x86_64-linux, x86_64-darwin ] - marked-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] - markov-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] - markup: [ i686-linux, x86_64-linux, x86_64-darwin ] - marmalade-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] - marquise: [ i686-linux, x86_64-linux, x86_64-darwin ] - mars: [ i686-linux, x86_64-linux, x86_64-darwin ] - marvin-interpolate: [ i686-linux, x86_64-linux, x86_64-darwin ] - marvin: [ i686-linux, x86_64-linux, x86_64-darwin ] - marxup: [ i686-linux, x86_64-linux, x86_64-darwin ] - masakazu-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - mathflow: [ i686-linux, x86_64-linux, x86_64-darwin ] - mathlink: [ i686-linux, x86_64-linux, x86_64-darwin ] - matplotlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - matrix-as-xyz: [ i686-linux, x86_64-linux, x86_64-darwin ] - matsuri: [ i686-linux, x86_64-linux, x86_64-darwin ] - matterhorn: [ i686-linux, x86_64-linux, x86_64-darwin ] - maude: [ i686-linux, x86_64-linux, x86_64-darwin ] - maxent-learner-hw-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] - maxent-learner-hw: [ i686-linux, x86_64-linux, x86_64-darwin ] - maxent: [ i686-linux, x86_64-linux, x86_64-darwin ] - maxsharing: [ i686-linux, x86_64-linux, x86_64-darwin ] - maybench: [ i686-linux, x86_64-linux, x86_64-darwin ] - MaybeT-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - MaybeT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - MaybeT: [ i686-linux, x86_64-linux, x86_64-darwin ] - MazesOfMonad: [ i686-linux, x86_64-linux, x86_64-darwin ] - MBot: [ i686-linux, x86_64-linux, x86_64-darwin ] - mbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - MC-Fold-DP: [ i686-linux, x86_64-linux, x86_64-darwin ] - mcl: [ i686-linux, x86_64-linux, x86_64-darwin ] - mcm: [ i686-linux, x86_64-linux, x86_64-darwin ] - mcmaster-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - mcmc-samplers: [ i686-linux, x86_64-linux, x86_64-darwin ] - mcmc-synthesis: [ i686-linux, x86_64-linux, x86_64-darwin ] - mcpi: [ i686-linux, x86_64-linux, x86_64-darwin ] - mdapi: [ i686-linux, x86_64-linux, x86_64-darwin ] - mdcat: [ i686-linux, x86_64-linux, x86_64-darwin ] - mDNSResponder-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - mdp: [ i686-linux, x86_64-linux, x86_64-darwin ] - mealstrom: [ i686-linux, x86_64-linux, x86_64-darwin ] - MeanShift: [ i686-linux, x86_64-linux, x86_64-darwin ] - Measure: [ i686-linux, x86_64-linux, x86_64-darwin ] - mecab: [ i686-linux, x86_64-linux, x86_64-darwin ] - mech: [ i686-linux, x86_64-linux, x86_64-darwin ] - Mecha: [ i686-linux, x86_64-linux, x86_64-darwin ] - Mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] - mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] - med-module: [ i686-linux, x86_64-linux, x86_64-darwin ] - mediabus-fdk-aac: [ i686-linux, x86_64-linux, x86_64-darwin ] - mediabus-rtp: [ i686-linux, x86_64-linux, x86_64-darwin ] - mediabus: [ i686-linux, x86_64-linux, x86_64-darwin ] - median-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - mediawiki2latex: [ i686-linux, x86_64-linux, x86_64-darwin ] - mediawiki: [ i686-linux, x86_64-linux, x86_64-darwin ] - medium-sdk-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - melody: [ i686-linux, x86_64-linux, x86_64-darwin ] - memcache-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - memcache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - memcached-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - meminfo: [ i686-linux, x86_64-linux, x86_64-darwin ] - memis: [ i686-linux, x86_64-linux, x86_64-darwin ] - memo-ptr: [ i686-linux, x86_64-linux, x86_64-darwin ] - memoization-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - memorable-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] - memorypool: [ i686-linux, x86_64-linux, x86_64-darwin ] - menoh: [ i686-linux, x86_64-linux, x86_64-darwin ] - mercury-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ] - messagepack-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - messagepack: [ i686-linux, x86_64-linux, x86_64-darwin ] - messente: [ i686-linux, x86_64-linux, x86_64-darwin ] - meta-misc: [ i686-linux, x86_64-linux, x86_64-darwin ] - meta-par-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - meta-par: [ i686-linux, x86_64-linux, x86_64-darwin ] - metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] - MetaHDBC: [ i686-linux, x86_64-linux, x86_64-darwin ] - MetaObject: [ i686-linux, x86_64-linux, x86_64-darwin ] - metaplug: [ i686-linux, x86_64-linux, x86_64-darwin ] - metar-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - metar: [ i686-linux, x86_64-linux, x86_64-darwin ] - metric: [ i686-linux, x86_64-linux, x86_64-darwin ] - Metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] - metricsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - metronome: [ i686-linux, x86_64-linux, x86_64-darwin ] - mezzo: [ i686-linux, x86_64-linux, x86_64-darwin ] - mezzolens: [ i686-linux, x86_64-linux, x86_64-darwin ] - MFlow: [ 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 ] - mi: [ i686-linux, x86_64-linux, x86_64-darwin ] - Michelangelo: [ i686-linux, x86_64-linux, x86_64-darwin ] - miconix-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - micro-recursion-schemes: [ i686-linux, x86_64-linux, x86_64-darwin ] - microaeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - microformats2-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - microformats2-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - microgroove: [ i686-linux, x86_64-linux, x86_64-darwin ] - microlens-each: [ i686-linux, x86_64-linux, x86_64-darwin ] - micrologger: [ i686-linux, x86_64-linux, x86_64-darwin ] - microsoft-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] - MicrosoftTranslator: [ i686-linux, x86_64-linux, x86_64-darwin ] - mida: [ i686-linux, x86_64-linux, x86_64-darwin ] - midi-music-box: [ i686-linux, x86_64-linux, x86_64-darwin ] - midi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - midimory: [ i686-linux, x86_64-linux, x86_64-darwin ] - midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] - mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ] - mighty-metropolis: [ i686-linux, x86_64-linux, x86_64-darwin ] - mikmod: [ i686-linux, x86_64-linux, x86_64-darwin ] - mikrokosmos: [ i686-linux, x86_64-linux, x86_64-darwin ] - miku: [ i686-linux, x86_64-linux, x86_64-darwin ] - milena: [ i686-linux, x86_64-linux, x86_64-darwin ] - mime-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] - minecraft-data: [ i686-linux, x86_64-linux, x86_64-darwin ] - minesweeper: [ i686-linux, x86_64-linux, x86_64-darwin ] - miniforth: [ i686-linux, x86_64-linux, x86_64-darwin ] - minilens: [ i686-linux, x86_64-linux, x86_64-darwin ] - minimung: [ i686-linux, x86_64-linux, x86_64-darwin ] - minio-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - minions: [ i686-linux, x86_64-linux, x86_64-darwin ] - minioperational: [ i686-linux, x86_64-linux, x86_64-darwin ] - miniplex: [ i686-linux, x86_64-linux, x86_64-darwin ] - minirotate: [ i686-linux, x86_64-linux, x86_64-darwin ] - ministg: [ i686-linux, x86_64-linux, x86_64-darwin ] - minst-idx: [ i686-linux, x86_64-linux, x86_64-darwin ] - mios: [ i686-linux, x86_64-linux, x86_64-darwin ] - mirror-tweet: [ i686-linux, x86_64-linux, x86_64-darwin ] - miss-porcelain: [ i686-linux, x86_64-linux, x86_64-darwin ] - miss: [ i686-linux, x86_64-linux, x86_64-darwin ] - missing-py2: [ i686-linux, x86_64-linux, x86_64-darwin ] - MissingK: [ i686-linux, x86_64-linux, x86_64-darwin ] - MissingPy: [ i686-linux, x86_64-linux, x86_64-darwin ] - mixed-strategies: [ i686-linux, x86_64-linux, x86_64-darwin ] - mixpanel-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ] - mkcabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ] - mlist: [ i686-linux, x86_64-linux, x86_64-darwin ] - mltool: [ i686-linux, x86_64-linux, x86_64-darwin ] - mmtf: [ i686-linux, x86_64-linux, x86_64-darwin ] - mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - moan: [ i686-linux, x86_64-linux, x86_64-darwin ] - Mobile-Legends-Hack-Cheats: [ i686-linux, x86_64-linux, x86_64-darwin ] - model: [ 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 ] - modular-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - modular: [ i686-linux, x86_64-linux, x86_64-darwin ] - modularity: [ i686-linux, x86_64-linux, x86_64-darwin ] - module-management: [ i686-linux, x86_64-linux, x86_64-darwin ] - modulespection: [ i686-linux, x86_64-linux, x86_64-darwin ] - modulo: [ i686-linux, x86_64-linux, x86_64-darwin ] - Moe: [ i686-linux, x86_64-linux, x86_64-darwin ] - moe: [ i686-linux, x86_64-linux, x86_64-darwin ] - MoeDict: [ i686-linux, x86_64-linux, x86_64-darwin ] - mohws: [ i686-linux, x86_64-linux, x86_64-darwin ] - mole: [ i686-linux, x86_64-linux, x86_64-darwin ] - mollie-api-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-atom-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-dijkstra: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-levels: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-lgbt: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-lrs: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-mersenne-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-open: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-parallel-progressbar: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-ran: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-recorder: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-resumption: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-state: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-statevar: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-ste: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-stlike-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-stlike-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-supply: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-timing: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-tx: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-unify: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-var: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-wrap: [ i686-linux, x86_64-linux, x86_64-darwin ] - monadacme: [ i686-linux, x86_64-linux, x86_64-darwin ] - MonadCatchIO-mtl-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - MonadCompose: [ i686-linux, x86_64-linux, x86_64-darwin ] - monadiccp-gecode: [ i686-linux, x86_64-linux, x86_64-darwin ] - monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] - Monadius: [ i686-linux, x86_64-linux, x86_64-darwin ] - MonadLab: [ i686-linux, x86_64-linux, x86_64-darwin ] - monadLib-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] - monadloc-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] - monadlog: [ i686-linux, x86_64-linux, x86_64-darwin ] - monadplus: [ i686-linux, x86_64-linux, x86_64-darwin ] - monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] - MonadStack: [ i686-linux, x86_64-linux, x86_64-darwin ] - monarch: [ i686-linux, x86_64-linux, x86_64-darwin ] - Monaris: [ i686-linux, x86_64-linux, x86_64-darwin ] - Monatron-IO: [ i686-linux, x86_64-linux, x86_64-darwin ] - Monatron: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] - mongrel2-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] - monitor: [ i686-linux, x86_64-linux, x86_64-darwin ] - monky: [ i686-linux, x86_64-linux, x86_64-darwin ] - mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] - Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] - monoid-absorbing: [ i686-linux, x86_64-linux, x86_64-darwin ] - monoid-owns: [ i686-linux, x86_64-linux, x86_64-darwin ] - monoid-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] - monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ] - monoids: [ i686-linux, x86_64-linux, x86_64-darwin ] - monopati: [ i686-linux, x86_64-linux, x86_64-darwin ] - monte-carlo: [ i686-linux, x86_64-linux, x86_64-darwin ] - monzo: [ i686-linux, x86_64-linux, x86_64-darwin ] - moo: [ i686-linux, x86_64-linux, x86_64-darwin ] - moonshine: [ i686-linux, x86_64-linux, x86_64-darwin ] - more-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - morfette: [ i686-linux, x86_64-linux, x86_64-darwin ] - morfeusz: [ i686-linux, x86_64-linux, x86_64-darwin ] - morph: [ i686-linux, x86_64-linux, x86_64-darwin ] - morphisms-functors-inventory: [ i686-linux, x86_64-linux, x86_64-darwin ] - morphisms-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] - morphisms-objects: [ i686-linux, x86_64-linux, x86_64-darwin ] - morte: [ i686-linux, x86_64-linux, x86_64-darwin ] - mosaico-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - moto-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - moto: [ i686-linux, x86_64-linux, x86_64-darwin ] - mount: [ i686-linux, x86_64-linux, x86_64-darwin ] - movie-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - mp: [ i686-linux, x86_64-linux, x86_64-darwin ] - mpdmate: [ i686-linux, x86_64-linux, x86_64-darwin ] - mpi-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - mpppc: [ i686-linux, x86_64-linux, x86_64-darwin ] - mpretty: [ i686-linux, x86_64-linux, x86_64-darwin ] - mpris: [ i686-linux, x86_64-linux, x86_64-darwin ] - mprover: [ i686-linux, x86_64-linux, x86_64-darwin ] - mps: [ i686-linux, x86_64-linux, x86_64-darwin ] - mpvguihs: [ i686-linux, x86_64-linux, x86_64-darwin ] - mqtt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - mqtt: [ i686-linux, x86_64-linux, x86_64-darwin ] - mrifk: [ i686-linux, x86_64-linux, x86_64-darwin ] - mrm: [ i686-linux, x86_64-linux, x86_64-darwin ] - ms: [ i686-linux, x86_64-linux, x86_64-darwin ] - msgpack-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - msgpack-idl: [ i686-linux, x86_64-linux, x86_64-darwin ] - msgpack-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - msgpack: [ i686-linux, x86_64-linux, x86_64-darwin ] - msh: [ i686-linux, x86_64-linux, x86_64-darwin ] - msi-kb-backlit: [ i686-linux, x86_64-linux, x86_64-darwin ] - MSQueue: [ i686-linux, x86_64-linux, x86_64-darwin ] - MTGBuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] - mtgoxapi: [ i686-linux, x86_64-linux, x86_64-darwin ] - mtl-evil-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - mtl-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - mtl-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - mtlx: [ i686-linux, x86_64-linux, x86_64-darwin ] - mtp: [ i686-linux, x86_64-linux, x86_64-darwin ] - MuCheck-Hspec: [ i686-linux, x86_64-linux, x86_64-darwin ] - MuCheck-HUnit: [ i686-linux, x86_64-linux, x86_64-darwin ] - MuCheck-QuickCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - MuCheck-SmallCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - MuCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - mud: [ i686-linux, x86_64-linux, x86_64-darwin ] - mulang: [ i686-linux, x86_64-linux, x86_64-darwin ] - multext-east-msd: [ i686-linux, x86_64-linux, x86_64-darwin ] - multi-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - multi-instance: [ i686-linux, x86_64-linux, x86_64-darwin ] - multiaddr: [ i686-linux, x86_64-linux, x86_64-darwin ] - multiarg: [ i686-linux, x86_64-linux, x86_64-darwin ] - multifile: [ i686-linux, x86_64-linux, x86_64-darwin ] - multifocal: [ i686-linux, x86_64-linux, x86_64-darwin ] - multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] - multilinear-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - multilinear: [ i686-linux, x86_64-linux, x86_64-darwin ] - multipass: [ i686-linux, x86_64-linux, x86_64-darwin ] - multipath: [ i686-linux, x86_64-linux, x86_64-darwin ] - multiplate-simplified: [ i686-linux, x86_64-linux, x86_64-darwin ] - multirec-alt-deriver: [ i686-linux, x86_64-linux, x86_64-darwin ] - multirec-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - multiset-comb: [ i686-linux, x86_64-linux, x86_64-darwin ] - multisetrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] - multistate: [ i686-linux, x86_64-linux, x86_64-darwin ] - multivariant: [ i686-linux, x86_64-linux, x86_64-darwin ] - Munkres-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - muon: [ i686-linux, x86_64-linux, x86_64-darwin ] - murder: [ i686-linux, x86_64-linux, x86_64-darwin ] - murmur: [ i686-linux, x86_64-linux, x86_64-darwin ] - murmurhash3: [ i686-linux, x86_64-linux, x86_64-darwin ] - mushu: [ i686-linux, x86_64-linux, x86_64-darwin ] - music-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] - music-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] - music-pitch: [ i686-linux, x86_64-linux, x86_64-darwin ] - music-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] - music-score: [ i686-linux, x86_64-linux, x86_64-darwin ] - music-sibelius: [ i686-linux, x86_64-linux, x86_64-darwin ] - music-suite: [ i686-linux, x86_64-linux, x86_64-darwin ] - music-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - musicbrainz-email: [ i686-linux, x86_64-linux, x86_64-darwin ] - musicxml2: [ i686-linux, x86_64-linux, x86_64-darwin ] - musicxml: [ i686-linux, x86_64-linux, x86_64-darwin ] - mustache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - mutable-iter: [ i686-linux, x86_64-linux, x86_64-darwin ] - MutationOrder: [ i686-linux, x86_64-linux, x86_64-darwin ] - mute-unmute: [ i686-linux, x86_64-linux, x86_64-darwin ] - mvar-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] - mvc-updates: [ i686-linux, x86_64-linux, x86_64-darwin ] - mvc: [ i686-linux, x86_64-linux, x86_64-darwin ] - mvclient: [ i686-linux, x86_64-linux, x86_64-darwin ] - mwc-random-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - mxnet-dataiter: [ i686-linux, x86_64-linux, x86_64-darwin ] - mxnet-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - mxnet-nn: [ i686-linux, x86_64-linux, x86_64-darwin ] - mxnet-nnvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - mxnet: [ i686-linux, x86_64-linux, x86_64-darwin ] - my-package-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] - my-test-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] - myanimelist-export: [ i686-linux, x86_64-linux, x86_64-darwin ] - myo: [ i686-linux, x86_64-linux, x86_64-darwin ] - MyPrimes: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysnapsession-example: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysnapsession: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysql-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysql-haskell-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] - mystem: [ i686-linux, x86_64-linux, x86_64-darwin ] - myTestlll: [ i686-linux, x86_64-linux, x86_64-darwin ] - mywatch: [ i686-linux, x86_64-linux, x86_64-darwin ] - mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] - n-ary-functor: [ i686-linux, x86_64-linux, x86_64-darwin ] - n-tuple: [ i686-linux, x86_64-linux, x86_64-darwin ] - nagios-plugin-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] - nakadi-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - named-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] - namelist: [ i686-linux, x86_64-linux, x86_64-darwin ] - namespace: [ i686-linux, x86_64-linux, x86_64-darwin ] - nano-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] - nano-md5: [ i686-linux, x86_64-linux, x86_64-darwin ] - nanocurses: [ i686-linux, x86_64-linux, x86_64-darwin ] - nanomsg-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - nanomsg: [ i686-linux, x86_64-linux, x86_64-darwin ] - nanoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - NanoProlog: [ i686-linux, x86_64-linux, x86_64-darwin ] - nanovg-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - nanovg: [ i686-linux, x86_64-linux, x86_64-darwin ] - nanq: [ i686-linux, x86_64-linux, x86_64-darwin ] - naqsha: [ i686-linux, x86_64-linux, x86_64-darwin ] - narc: [ i686-linux, x86_64-linux, x86_64-darwin ] - nat-sized-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] - nationstates: [ i686-linux, x86_64-linux, x86_64-darwin ] - natural-number: [ i686-linux, x86_64-linux, x86_64-darwin ] - natural: [ i686-linux, x86_64-linux, x86_64-darwin ] - naver-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] - nc-indicators: [ i686-linux, x86_64-linux, x86_64-darwin ] - NearContextAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] - neat: [ i686-linux, x86_64-linux, x86_64-darwin ] - needle: [ i686-linux, x86_64-linux, x86_64-darwin ] - neet: [ i686-linux, x86_64-linux, x86_64-darwin ] - nehe-tuts: [ i686-linux, x86_64-linux, x86_64-darwin ] - neither: [ i686-linux, x86_64-linux, x86_64-darwin ] - neko-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - neko-obfs: [ i686-linux, x86_64-linux, x86_64-darwin ] - Neks: [ i686-linux, x86_64-linux, x86_64-darwin ] - nemesis-titan: [ i686-linux, x86_64-linux, x86_64-darwin ] - nerf: [ i686-linux, x86_64-linux, x86_64-darwin ] - nero-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] - nero-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] - nero: [ i686-linux, x86_64-linux, x86_64-darwin ] - nest: [ i686-linux, x86_64-linux, x86_64-darwin ] - nested-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] - nested-sequence: [ i686-linux, x86_64-linux, x86_64-darwin ] - NestedFunctor: [ i686-linux, x86_64-linux, x86_64-darwin ] - nestedmap: [ i686-linux, x86_64-linux, x86_64-darwin ] - net-spider: [ i686-linux, x86_64-linux, x86_64-darwin ] - netclock: [ i686-linux, x86_64-linux, x86_64-darwin ] - netcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - netease-fm: [ i686-linux, x86_64-linux, x86_64-darwin ] - netlines: [ i686-linux, x86_64-linux, x86_64-darwin ] - netrc: [ i686-linux, x86_64-linux, x86_64-darwin ] - netrium: [ i686-linux, x86_64-linux, x86_64-darwin ] - NetSNMP: [ i686-linux, x86_64-linux, x86_64-darwin ] - netspec: [ i686-linux, x86_64-linux, x86_64-darwin ] - netstring-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - nettle-frp: [ 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-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 ] - network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-api-support: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-bsd: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-connection: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-hans: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-interfacerequest: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-messagepack-rpc-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-minihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-msgpack-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-netpacket: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-protocol-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-rpca: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-service: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-simple-sockaddr: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-topic-models: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-transport-amqp: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-transport-inmemory: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-transport-tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-transport-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-transport-zeromq: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-voicetext: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] - networked-game: [ i686-linux, x86_64-linux, x86_64-darwin ] - neural-network-blashs: [ i686-linux, x86_64-linux, x86_64-darwin ] - neural-network-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] - neural: [ i686-linux, x86_64-linux, x86_64-darwin ] - newports: [ i686-linux, x86_64-linux, x86_64-darwin ] - newt: [ i686-linux, x86_64-linux, x86_64-darwin ] - newtype-deriving: [ i686-linux, x86_64-linux, x86_64-darwin ] - newtype-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - next-ref: [ i686-linux, x86_64-linux, x86_64-darwin ] - nextstep-plist: [ i686-linux, x86_64-linux, x86_64-darwin ] - nfc: [ i686-linux, x86_64-linux, x86_64-darwin ] - ngrams-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] - NGrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - niagra: [ i686-linux, x86_64-linux, x86_64-darwin ] - nibblestring: [ i686-linux, x86_64-linux, x86_64-darwin ] - nice-html: [ i686-linux, x86_64-linux, x86_64-darwin ] - nicovideo-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] - nikepub: [ i686-linux, x86_64-linux, x86_64-darwin ] - nimber: [ i686-linux, x86_64-linux, x86_64-darwin ] - Ninjas: [ i686-linux, x86_64-linux, x86_64-darwin ] - nirum: [ 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 ] - nixpkgs-update: [ i686-linux, x86_64-linux, x86_64-darwin ] - nkjp: [ i686-linux, x86_64-linux, x86_64-darwin ] - nlp-scores-scripts: [ i686-linux, x86_64-linux, x86_64-darwin ] - nlp-scores: [ i686-linux, x86_64-linux, x86_64-darwin ] - nm: [ i686-linux, x86_64-linux, x86_64-darwin ] - NMap: [ i686-linux, x86_64-linux, x86_64-darwin ] - nntp: [ i686-linux, x86_64-linux, x86_64-darwin ] - no-role-annots: [ i686-linux, x86_64-linux, x86_64-darwin ] - noether: [ i686-linux, x86_64-linux, x86_64-darwin ] - nofib-analyse: [ i686-linux, x86_64-linux, x86_64-darwin ] - nofib-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] - noise: [ i686-linux, x86_64-linux, x86_64-darwin ] - Nomyx-Core: [ i686-linux, x86_64-linux, x86_64-darwin ] - Nomyx-Language: [ i686-linux, x86_64-linux, x86_64-darwin ] - Nomyx-Rules: [ i686-linux, x86_64-linux, x86_64-darwin ] - Nomyx-Web: [ i686-linux, x86_64-linux, x86_64-darwin ] - Nomyx: [ i686-linux, x86_64-linux, x86_64-darwin ] - non-empty-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] - nonempty-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - NonEmpty: [ i686-linux, x86_64-linux, x86_64-darwin ] - NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ] - nonlinear-optimization-ad: [ i686-linux, x86_64-linux, x86_64-darwin ] - nonlinear-optimization: [ i686-linux, x86_64-linux, x86_64-darwin ] - normalization-insensitive: [ i686-linux, x86_64-linux, x86_64-darwin ] - NoSlow: [ i686-linux, x86_64-linux, x86_64-darwin ] - not-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - notcpp: [ i686-linux, x86_64-linux, x86_64-darwin ] - notmuch-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - notmuch-web: [ i686-linux, x86_64-linux, x86_64-darwin ] - NoTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] - np-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - np-linear: [ i686-linux, x86_64-linux, x86_64-darwin ] - nptools: [ i686-linux, x86_64-linux, x86_64-darwin ] - ntrip-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - NTRU: [ i686-linux, x86_64-linux, x86_64-darwin ] - null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - nullary: [ i686-linux, x86_64-linux, x86_64-darwin ] - nullpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - numbered-semigroups: [ i686-linux, x86_64-linux, x86_64-darwin ] - NumberSieves: [ i686-linux, x86_64-linux, x86_64-darwin ] - NumberTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] - numerals-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - numerals: [ i686-linux, x86_64-linux, x86_64-darwin ] - numeric-ode: [ i686-linux, x86_64-linux, x86_64-darwin ] - numeric-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - numeric-ranges: [ i686-linux, x86_64-linux, x86_64-darwin ] - numerical: [ i686-linux, x86_64-linux, x86_64-darwin ] - numhask-array: [ i686-linux, x86_64-linux, x86_64-darwin ] - numhask-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] - numhask-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - numhask-range: [ i686-linux, x86_64-linux, x86_64-darwin ] - numhask-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - numhask: [ i686-linux, x86_64-linux, x86_64-darwin ] - Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ] - Nutri: [ i686-linux, x86_64-linux, x86_64-darwin ] - nvim-hs-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] - nvim-hs-ghcid: [ i686-linux, x86_64-linux, x86_64-darwin ] - nvim-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - NXT: [ i686-linux, x86_64-linux, x86_64-darwin ] - NXTDSL: [ i686-linux, x86_64-linux, x86_64-darwin ] - nylas: [ i686-linux, x86_64-linux, x86_64-darwin ] - nymphaea: [ i686-linux, x86_64-linux, x86_64-darwin ] - o-clock: [ i686-linux, x86_64-linux, x86_64-darwin ] - oanda-rest-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - oasis-xrd: [ i686-linux, x86_64-linux, x86_64-darwin ] - oauth2-jwt-bearer: [ i686-linux, x86_64-linux, x86_64-darwin ] - oauthenticated: [ i686-linux, x86_64-linux, x86_64-darwin ] - obd: [ i686-linux, x86_64-linux, x86_64-darwin ] - obdd: [ i686-linux, x86_64-linux, x86_64-darwin ] - oberon0: [ i686-linux, x86_64-linux, x86_64-darwin ] - obj: [ 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 ] - objective: [ i686-linux, x86_64-linux, x86_64-darwin ] - ocaml-export: [ i686-linux, x86_64-linux, x86_64-darwin ] - octane: [ i686-linux, x86_64-linux, x86_64-darwin ] - octohat: [ i686-linux, x86_64-linux, x86_64-darwin ] - octopus: [ i686-linux, x86_64-linux, x86_64-darwin ] - Octree: [ i686-linux, x86_64-linux, x86_64-darwin ] - oculus: [ i686-linux, x86_64-linux, x86_64-darwin ] - odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - OddWord: [ i686-linux, x86_64-linux, x86_64-darwin ] - oden-go-packages: [ i686-linux, x86_64-linux, x86_64-darwin ] - oeis2: [ i686-linux, x86_64-linux, x86_64-darwin ] - off-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] - ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] - ohloh-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - oi: [ i686-linux, x86_64-linux, x86_64-darwin ] - oidc-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - ois-input-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] - olwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] - om-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] - omaketex: [ i686-linux, x86_64-linux, x86_64-darwin ] - ombra: [ i686-linux, x86_64-linux, x86_64-darwin ] - Omega: [ i686-linux, x86_64-linux, x86_64-darwin ] - omega: [ i686-linux, x86_64-linux, x86_64-darwin ] - omnifmt: [ i686-linux, x86_64-linux, x86_64-darwin ] - on-a-horse: [ i686-linux, x86_64-linux, x86_64-darwin ] - onama: [ i686-linux, x86_64-linux, x86_64-darwin ] - oneormore: [ i686-linux, x86_64-linux, x86_64-darwin ] - online: [ i686-linux, x86_64-linux, x86_64-darwin ] - onpartitions: [ i686-linux, x86_64-linux, x86_64-darwin ] - OnRmt: [ i686-linux, x86_64-linux, x86_64-darwin ] - onu-course: [ i686-linux, x86_64-linux, x86_64-darwin ] - opaleye-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] - opaleye-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - opaleye-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-signals: [ i686-linux, x86_64-linux, x86_64-darwin ] - open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenAFP: [ i686-linux, x86_64-linux, x86_64-darwin ] - openapi-petstore: [ i686-linux, x86_64-linux, x86_64-darwin ] - opench-meteo: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenCLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenCLWrappers: [ i686-linux, x86_64-linux, x86_64-darwin ] - opencv-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] - opendatatable: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenGLCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - opengles: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenSCAD: [ i686-linux, x86_64-linux, x86_64-darwin ] - opensoundcontrol-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] - openssh-github-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] - opentheory-char: [ i686-linux, x86_64-linux, x86_64-darwin ] - opentok: [ i686-linux, x86_64-linux, x86_64-darwin ] - opentype: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenVG: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] - openweathermap: [ i686-linux, x86_64-linux, x86_64-darwin ] - Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] - operational-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - opml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - optima: [ i686-linux, x86_64-linux, x86_64-darwin ] - optimal-blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] - optimization: [ i686-linux, x86_64-linux, x86_64-darwin ] - optimusprime: [ i686-linux, x86_64-linux, x86_64-darwin ] - optional: [ i686-linux, x86_64-linux, x86_64-darwin ] - options-time: [ i686-linux, x86_64-linux, x86_64-darwin ] - optparse-applicative-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - orc: [ i686-linux, x86_64-linux, x86_64-darwin ] - orchestrate: [ i686-linux, x86_64-linux, x86_64-darwin ] - OrchestrateDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - orchid-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] - orchid: [ i686-linux, x86_64-linux, x86_64-darwin ] - order-maintenance: [ i686-linux, x86_64-linux, x86_64-darwin ] - order-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] - orders: [ i686-linux, x86_64-linux, x86_64-darwin ] - Ordinary: [ i686-linux, x86_64-linux, x86_64-darwin ] - ordrea: [ i686-linux, x86_64-linux, x86_64-darwin ] - organize-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] - orgmode-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] - orgmode: [ 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 ] - osdkeys: [ i686-linux, x86_64-linux, x86_64-darwin ] - Oslo-Vectize: [ i686-linux, x86_64-linux, x86_64-darwin ] - osm-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - osm-download: [ i686-linux, x86_64-linux, x86_64-darwin ] - OSM: [ i686-linux, x86_64-linux, x86_64-darwin ] - oso2pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] - ot: [ i686-linux, x86_64-linux, x86_64-darwin ] - otp-authenticator: [ i686-linux, x86_64-linux, x86_64-darwin ] - OTP: [ i686-linux, x86_64-linux, x86_64-darwin ] - ottparse-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] - overloaded-records: [ i686-linux, x86_64-linux, x86_64-darwin ] - overture: [ i686-linux, x86_64-linux, x86_64-darwin ] - pack: [ i686-linux, x86_64-linux, x86_64-darwin ] - package-description-remote: [ i686-linux, x86_64-linux, x86_64-darwin ] - package-o-tron: [ i686-linux, x86_64-linux, x86_64-darwin ] - package-vt: [ i686-linux, x86_64-linux, x86_64-darwin ] - packdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] - packed-dawg: [ i686-linux, x86_64-linux, x86_64-darwin ] - packed-multikey-map: [ i686-linux, x86_64-linux, x86_64-darwin ] - packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - pads-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - pagarme: [ i686-linux, x86_64-linux, x86_64-darwin ] - PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ] - pagure-hook-receiver: [ i686-linux, x86_64-linux, x86_64-darwin ] - Paillier: [ i686-linux, x86_64-linux, x86_64-darwin ] - palette: [ i686-linux, x86_64-linux, x86_64-darwin ] - pam: [ i686-linux, x86_64-linux, x86_64-darwin ] - panda: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-citeproc: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-crossref: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-csv2table: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-filter-graphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-include-code: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-include: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-japanese-filters: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-plantuml-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-sidenote: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-stylefrommeta: [ i686-linux, x86_64-linux, x86_64-darwin ] - pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] - PandocAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] - pang-a-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] - pango: [ i686-linux, x86_64-linux, x86_64-darwin ] - pangraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - panpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - pansite: [ i686-linux, x86_64-linux, x86_64-darwin ] - papa-export: [ i686-linux, x86_64-linux, x86_64-darwin ] - papa-implement: [ i686-linux, x86_64-linux, x86_64-darwin ] - papa-include: [ i686-linux, x86_64-linux, x86_64-darwin ] - papa-prelude-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - papa-prelude-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - papa-prelude-semigroupoids: [ i686-linux, x86_64-linux, x86_64-darwin ] - papa-prelude-semigroups: [ i686-linux, x86_64-linux, x86_64-darwin ] - papa-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - paphragen: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-Arrows-Eden: [ i686-linux, x86_64-linux, x86_64-darwin ] - parallel-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] - parameterized-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - parameterized: [ i686-linux, x86_64-linux, x86_64-darwin ] - paramtree: [ i686-linux, x86_64-linux, x86_64-darwin ] - paranoia: [ i686-linux, x86_64-linux, x86_64-darwin ] - parco-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - parco: [ i686-linux, x86_64-linux, x86_64-darwin ] - parconc-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - pareto: [ i686-linux, x86_64-linux, x86_64-darwin ] - Parry: [ i686-linux, x86_64-linux, x86_64-darwin ] - parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] - parsec-free: [ i686-linux, x86_64-linux, x86_64-darwin ] - parsec-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] - parsec-pratt: [ i686-linux, x86_64-linux, x86_64-darwin ] - parseerror-eq: [ i686-linux, x86_64-linux, x86_64-darwin ] - parsely: [ i686-linux, x86_64-linux, x86_64-darwin ] - parser-helper: [ i686-linux, x86_64-linux, x86_64-darwin ] - parser241: [ i686-linux, x86_64-linux, x86_64-darwin ] - parsergen: [ i686-linux, x86_64-linux, x86_64-darwin ] - parsestar: [ i686-linux, x86_64-linux, x86_64-darwin ] - parsix: [ i686-linux, x86_64-linux, x86_64-darwin ] - partage: [ i686-linux, x86_64-linux, x86_64-darwin ] - partial-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - partial-order: [ i686-linux, x86_64-linux, x86_64-darwin ] - partly: [ i686-linux, x86_64-linux, x86_64-darwin ] - passage: [ i686-linux, x86_64-linux, x86_64-darwin ] - PasswordGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - passwords: [ i686-linux, x86_64-linux, x86_64-darwin ] - pasta: [ i686-linux, x86_64-linux, x86_64-darwin ] - pastis: [ i686-linux, x86_64-linux, x86_64-darwin ] - pasty: [ i686-linux, x86_64-linux, x86_64-darwin ] - patat: [ i686-linux, x86_64-linux, x86_64-darwin ] - patches-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - Pathfinder: [ i686-linux, x86_64-linux, x86_64-darwin ] - pathfindingcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - PathTree: [ i686-linux, x86_64-linux, x86_64-darwin ] - patronscraper: [ i686-linux, x86_64-linux, x86_64-darwin ] - patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] - paypal-adaptive-hoops: [ i686-linux, x86_64-linux, x86_64-darwin ] - paypal-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - paypal-rest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - pb-next: [ i686-linux, x86_64-linux, x86_64-darwin ] - pb: [ i686-linux, x86_64-linux, x86_64-darwin ] - pbc4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - PBKDF2: [ i686-linux, x86_64-linux, x86_64-darwin ] - pcap-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - pcd-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] - pcf: [ i686-linux, x86_64-linux, x86_64-darwin ] - PCLT-DB: [ i686-linux, x86_64-linux, x86_64-darwin ] - PCLT: [ i686-linux, x86_64-linux, x86_64-darwin ] - pcre-light-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - pdf-slave-template: [ i686-linux, x86_64-linux, x86_64-darwin ] - pdf-slave: [ i686-linux, x86_64-linux, x86_64-darwin ] - pdf-toolbox-content: [ i686-linux, x86_64-linux, x86_64-darwin ] - pdf-toolbox-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - pdf-toolbox-document: [ i686-linux, x86_64-linux, x86_64-darwin ] - pdf-toolbox-viewer: [ 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 ] - PeanoWitnesses: [ i686-linux, x86_64-linux, x86_64-darwin ] - pec: [ i686-linux, x86_64-linux, x86_64-darwin ] - pedestrian-dag: [ i686-linux, x86_64-linux, x86_64-darwin ] - peg: [ i686-linux, x86_64-linux, x86_64-darwin ] - peggy: [ i686-linux, x86_64-linux, x86_64-darwin ] - pell: [ i686-linux, x86_64-linux, x86_64-darwin ] - pencil: [ i686-linux, x86_64-linux, x86_64-darwin ] - penny-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] - penny-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - penny: [ 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 ] - peregrin: [ i686-linux, x86_64-linux, x86_64-darwin ] - perf-analysis: [ i686-linux, x86_64-linux, x86_64-darwin ] - perf: [ i686-linux, x86_64-linux, x86_64-darwin ] - PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ] - perfecthash: [ i686-linux, x86_64-linux, x86_64-darwin ] - perhaps: [ i686-linux, x86_64-linux, x86_64-darwin ] - periodic: [ i686-linux, x86_64-linux, x86_64-darwin ] - perm: [ i686-linux, x86_64-linux, x86_64-darwin ] - permutations: [ i686-linux, x86_64-linux, x86_64-darwin ] - permute: [ i686-linux, x86_64-linux, x86_64-darwin ] - PermuteEffects: [ i686-linux, x86_64-linux, x86_64-darwin ] - persist2er: [ i686-linux, x86_64-linux, x86_64-darwin ] - Persistence: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-database-url: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-equivalence: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-hssqlppp: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-map: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-ratelimit: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-refs: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-relational-record: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-template-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] - persona-idp: [ i686-linux, x86_64-linux, x86_64-darwin ] - persona: [ i686-linux, x86_64-linux, x86_64-darwin ] - pesca: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - pg-harness-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - pg-harness: [ i686-linux, x86_64-linux, x86_64-darwin ] - pg-recorder: [ i686-linux, x86_64-linux, x86_64-darwin ] - pg-store: [ i686-linux, x86_64-linux, x86_64-darwin ] - pg-transact: [ i686-linux, x86_64-linux, x86_64-darwin ] - pgdl: [ i686-linux, x86_64-linux, x86_64-darwin ] - pgsql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - pgstream: [ i686-linux, x86_64-linux, x86_64-darwin ] - phasechange: [ i686-linux, x86_64-linux, x86_64-darwin ] - phoityne: [ i686-linux, x86_64-linux, x86_64-darwin ] - phone-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] - phone-push: [ i686-linux, x86_64-linux, x86_64-darwin ] - phooey: [ i686-linux, x86_64-linux, x86_64-darwin ] - photoname: [ i686-linux, x86_64-linux, x86_64-darwin ] - phraskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - Phsu: [ i686-linux, x86_64-linux, x86_64-darwin ] - phybin: [ i686-linux, x86_64-linux, x86_64-darwin ] - pi-calculus: [ i686-linux, x86_64-linux, x86_64-darwin ] - pi-forall: [ i686-linux, x86_64-linux, x86_64-darwin ] - pi-hoole: [ i686-linux, x86_64-linux, x86_64-darwin ] - pia-forward: [ i686-linux, x86_64-linux, x86_64-darwin ] - pianola: [ i686-linux, x86_64-linux, x86_64-darwin ] - picedit: [ i686-linux, x86_64-linux, x86_64-darwin ] - picologic: [ i686-linux, x86_64-linux, x86_64-darwin ] - picoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] - pictikz: [ i686-linux, x86_64-linux, x86_64-darwin ] - pidfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - pier-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - pier: [ i686-linux, x86_64-linux, x86_64-darwin ] - piet: [ i686-linux, x86_64-linux, x86_64-darwin ] - pig: [ i686-linux, x86_64-linux, x86_64-darwin ] - pinch: [ i686-linux, x86_64-linux, x86_64-darwin ] - pinchot: [ i686-linux, x86_64-linux, x86_64-darwin ] - ping: [ i686-linux, x86_64-linux, x86_64-darwin ] - pinpon: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipe-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-async: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-attoparsec-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-courier: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-files: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-fluid: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-illumina: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-key-value-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-p2p-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-p2p: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-protolude: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-rt: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-shell: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-sqlite-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-transduce: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-zeromq4: [ i686-linux, x86_64-linux, x86_64-darwin ] - pisigma: [ i686-linux, x86_64-linux, x86_64-darwin ] - Piso: [ i686-linux, x86_64-linux, x86_64-darwin ] - pit: [ i686-linux, x86_64-linux, x86_64-darwin ] - pitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ] - pivotal-tracker: [ i686-linux, x86_64-linux, x86_64-darwin ] - pixelated-avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] - pkcs10: [ i686-linux, x86_64-linux, x86_64-darwin ] - pkcs7: [ i686-linux, x86_64-linux, x86_64-darwin ] - pkggraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - plailude: [ i686-linux, x86_64-linux, x86_64-darwin ] - plan-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] - plan-b: [ i686-linux, x86_64-linux, x86_64-darwin ] - planar-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] - planb-token-introspection: [ i686-linux, x86_64-linux, x86_64-darwin ] - planet-mitchell-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - planet-mitchell: [ i686-linux, x86_64-linux, x86_64-darwin ] - plankton: [ i686-linux, x86_64-linux, x86_64-darwin ] - plat: [ i686-linux, x86_64-linux, x86_64-darwin ] - platinum-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] - PlayingCards: [ i686-linux, x86_64-linux, x86_64-darwin ] - plist-buddy: [ i686-linux, x86_64-linux, x86_64-darwin ] - plocketed: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - Plot-ho-matic: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-light-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot: [ i686-linux, x86_64-linux, x86_64-darwin ] - plots: [ i686-linux, x86_64-linux, x86_64-darwin ] - PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] - plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] - plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] - plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] - plur: [ i686-linux, x86_64-linux, x86_64-darwin ] - plural: [ i686-linux, x86_64-linux, x86_64-darwin ] - png-file: [ i686-linux, x86_64-linux, x86_64-darwin ] - pngload-fixed: [ i686-linux, x86_64-linux, x86_64-darwin ] - pngload: [ i686-linux, x86_64-linux, x86_64-darwin ] - pocket-dns: [ i686-linux, x86_64-linux, x86_64-darwin ] - pocket: [ i686-linux, x86_64-linux, x86_64-darwin ] - point-octree: [ i686-linux, x86_64-linux, x86_64-darwin ] - pointfree-fancy: [ i686-linux, x86_64-linux, x86_64-darwin ] - pointful: [ i686-linux, x86_64-linux, x86_64-darwin ] - pointless-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] - pointless-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] - pokemon-go-protobuf-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - poker-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] - pokitdok: [ i686-linux, x86_64-linux, x86_64-darwin ] - polar-configfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - polar-shader: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-control: [ i686-linux, x86_64-linux, x86_64-darwin ] - polydata-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - polydata: [ i686-linux, x86_64-linux, x86_64-darwin ] - polynomial: [ i686-linux, x86_64-linux, x86_64-darwin ] - polyseq: [ i686-linux, x86_64-linux, x86_64-darwin ] - polysoup: [ i686-linux, x86_64-linux, x86_64-darwin ] - polytypeable-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - polytypeable: [ i686-linux, x86_64-linux, x86_64-darwin ] - pomaps: [ i686-linux, x86_64-linux, x86_64-darwin ] - pomodoro: [ i686-linux, x86_64-linux, x86_64-darwin ] - pomohoro: [ i686-linux, x86_64-linux, x86_64-darwin ] - ponder: [ i686-linux, x86_64-linux, x86_64-darwin ] - pong-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - pontarius-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] - pool-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - pool: [ i686-linux, x86_64-linux, x86_64-darwin ] - popenhs: [ i686-linux, x86_64-linux, x86_64-darwin ] - poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] - portager: [ i686-linux, x86_64-linux, x86_64-darwin ] - porte: [ i686-linux, x86_64-linux, x86_64-darwin ] - porter: [ i686-linux, x86_64-linux, x86_64-darwin ] - PortFusion: [ i686-linux, x86_64-linux, x86_64-darwin ] - ports: [ i686-linux, x86_64-linux, x86_64-darwin ] - posix-acl: [ i686-linux, x86_64-linux, x86_64-darwin ] - posix-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - posix-pty: [ i686-linux, x86_64-linux, x86_64-darwin ] - posix-realtime: [ i686-linux, x86_64-linux, x86_64-darwin ] - posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] - postcodes: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgres-embedded: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgres-tmp: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgres-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-copy-escape: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-lo-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-named: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-query: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-simple-bind: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-simple-opts: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-simple-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-simple-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-simple-url: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-typed-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgrest-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgrest: [ i686-linux, x86_64-linux, x86_64-darwin ] - postie: [ i686-linux, x86_64-linux, x86_64-darwin ] - postmark-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] - potato-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] - potoki-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] - potoki-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - potoki-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - potoki-hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] - potoki-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - potoki: [ i686-linux, x86_64-linux, x86_64-darwin ] - powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - powerqueue-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] - powerqueue-levelmem: [ i686-linux, x86_64-linux, x86_64-darwin ] - powerqueue-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ] - powerqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] - PPrinter: [ i686-linux, x86_64-linux, x86_64-darwin ] - pqc: [ i686-linux, x86_64-linux, x86_64-darwin ] - pqueue-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - practice-room: [ i686-linux, x86_64-linux, x86_64-darwin ] - praglude: [ i686-linux, x86_64-linux, x86_64-darwin ] - pragmatic-show: [ i686-linux, x86_64-linux, x86_64-darwin ] - precursor: [ i686-linux, x86_64-linux, x86_64-darwin ] - pred-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] - predicate-class: [ i686-linux, x86_64-linux, x86_64-darwin ] - prednote-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - prednote: [ i686-linux, x86_64-linux, x86_64-darwin ] - prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - presburger: [ 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-ncols: [ i686-linux, x86_64-linux, x86_64-darwin ] - pretty-relative-time: [ i686-linux, x86_64-linux, x86_64-darwin ] - prettyprinter-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] - preview: [ i686-linux, x86_64-linux, x86_64-darwin ] - prim-array: [ i686-linux, x86_64-linux, x86_64-darwin ] - prim-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - primes-type: [ i686-linux, x86_64-linux, x86_64-darwin ] - primesieve: [ i686-linux, x86_64-linux, x86_64-darwin ] - primitive-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - primitive-indexed: [ i686-linux, x86_64-linux, x86_64-darwin ] - primitive-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] - primitive-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] - PrimitiveArray-Pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] - primula-board: [ i686-linux, x86_64-linux, x86_64-darwin ] - primula-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] - pringletons: [ i686-linux, x86_64-linux, x86_64-darwin ] - print-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] - printcess: [ i686-linux, x86_64-linux, x86_64-darwin ] - Printf-TH: [ i686-linux, x86_64-linux, x86_64-darwin ] - priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] - priority-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] - PriorityChansConverger: [ i686-linux, x86_64-linux, x86_64-darwin ] - ProbabilityMonads: [ i686-linux, x86_64-linux, x86_64-darwin ] - proc: [ i686-linux, x86_64-linux, x86_64-darwin ] - process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - process-iterio: [ i686-linux, x86_64-linux, x86_64-darwin ] - process-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] - process-listlike: [ i686-linux, x86_64-linux, x86_64-darwin ] - process-progress: [ i686-linux, x86_64-linux, x86_64-darwin ] - process-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - process-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] - processing: [ i686-linux, x86_64-linux, x86_64-darwin ] - procrastinating-variable: [ i686-linux, x86_64-linux, x86_64-darwin ] - procstat: [ i686-linux, x86_64-linux, x86_64-darwin ] - producer: [ i686-linux, x86_64-linux, x86_64-darwin ] - product: [ i686-linux, x86_64-linux, x86_64-darwin ] - prof2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] - prof2pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] - profiteur: [ i686-linux, x86_64-linux, x86_64-darwin ] - progress-meter: [ i686-linux, x86_64-linux, x86_64-darwin ] - progress: [ i686-linux, x86_64-linux, x86_64-darwin ] - progressbar: [ i686-linux, x86_64-linux, x86_64-darwin ] - progression: [ i686-linux, x86_64-linux, x86_64-darwin ] - progressive: [ i686-linux, x86_64-linux, x86_64-darwin ] - proj4-hs-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] - project-m36: [ i686-linux, x86_64-linux, x86_64-darwin ] - projectile: [ i686-linux, x86_64-linux, x86_64-darwin ] - prolog-graph-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - prolog-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] - prolog: [ i686-linux, x86_64-linux, x86_64-darwin ] - prometheus-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - prometheus: [ i686-linux, x86_64-linux, x86_64-darwin ] - promise: [ i686-linux, x86_64-linux, x86_64-darwin ] - pronounce: [ i686-linux, x86_64-linux, x86_64-darwin ] - proof-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] - propane: [ i686-linux, x86_64-linux, x86_64-darwin ] - propellor: [ i686-linux, x86_64-linux, x86_64-darwin ] - Proper: [ i686-linux, x86_64-linux, x86_64-darwin ] - properties: [ i686-linux, x86_64-linux, x86_64-darwin ] - property-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - proplang: [ i686-linux, x86_64-linux, x86_64-darwin ] - prosper: [ i686-linux, x86_64-linux, x86_64-darwin ] - proteome: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] - proto-lens-descriptors: [ i686-linux, x86_64-linux, x86_64-darwin ] - protobuf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] - protocol-buffers-descriptor-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - protocol-buffers-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - protolude-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] - proton-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - prototype: [ i686-linux, x86_64-linux, x86_64-darwin ] - prove-everywhere-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - proxy-kindness: [ i686-linux, x86_64-linux, x86_64-darwin ] - proxy-mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] - psc-ide: [ i686-linux, x86_64-linux, x86_64-darwin ] - pseudo-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] - PSQueue: [ i686-linux, x86_64-linux, x86_64-darwin ] - pthread: [ i686-linux, x86_64-linux, x86_64-darwin ] - PTQ: [ i686-linux, x86_64-linux, x86_64-darwin ] - ptr: [ i686-linux, x86_64-linux, x86_64-darwin ] - publicsuffix: [ i686-linux, x86_64-linux, x86_64-darwin ] - publicsuffixlistcreate: [ i686-linux, x86_64-linux, x86_64-darwin ] - pubnub: [ i686-linux, x86_64-linux, x86_64-darwin ] - pubsub: [ i686-linux, x86_64-linux, x86_64-darwin ] - puffytools: [ i686-linux, x86_64-linux, x86_64-darwin ] - pugixml: [ i686-linux, x86_64-linux, x86_64-darwin ] - pugs-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] - pugs-DrIFT: [ i686-linux, x86_64-linux, x86_64-darwin ] - pugs-hsregex: [ i686-linux, x86_64-linux, x86_64-darwin ] - Pugs: [ i686-linux, x86_64-linux, x86_64-darwin ] - PUH-Project: [ i686-linux, x86_64-linux, x86_64-darwin ] - punkt: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - pure-priority-queue-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - pure-priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] - purescript-iso: [ i686-linux, x86_64-linux, x86_64-darwin ] - purescript-tsd-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] - push-notify-ccs: [ i686-linux, x86_64-linux, x86_64-darwin ] - push-notify-general: [ i686-linux, x86_64-linux, x86_64-darwin ] - push-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] - pusher-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 ] - putlenses: [ i686-linux, x86_64-linux, x86_64-darwin ] - puzzle-draw-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] - puzzle-draw: [ i686-linux, x86_64-linux, x86_64-darwin ] - pvd: [ i686-linux, x86_64-linux, x86_64-darwin ] - PyF: [ i686-linux, x86_64-linux, x86_64-darwin ] - pyffi: [ i686-linux, x86_64-linux, x86_64-darwin ] - pyfi: [ i686-linux, x86_64-linux, x86_64-darwin ] - python-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] - q4c12-twofinger: [ i686-linux, x86_64-linux, x86_64-darwin ] - qc-oi-testgenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - qd-vec: [ i686-linux, x86_64-linux, x86_64-darwin ] - qd: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - 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 ] - qtah-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - qtah-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] - qtah-qt5: [ i686-linux, x86_64-linux, x86_64-darwin ] - QuadEdge: [ i686-linux, x86_64-linux, x86_64-darwin ] - quadratic-irrational: [ i686-linux, x86_64-linux, x86_64-darwin ] - QuadTree: [ i686-linux, x86_64-linux, x86_64-darwin ] - quantfin: [ i686-linux, x86_64-linux, x86_64-darwin ] - quantum-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ] - quantum-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - qudb: [ i686-linux, x86_64-linux, x86_64-darwin ] - Quelea: [ i686-linux, x86_64-linux, x86_64-darwin ] - quenya-verb: [ i686-linux, x86_64-linux, x86_64-darwin ] - queryparser-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] - queryparser-hive: [ i686-linux, x86_64-linux, x86_64-darwin ] - queryparser-presto: [ i686-linux, x86_64-linux, x86_64-darwin ] - queryparser-vertica: [ i686-linux, x86_64-linux, x86_64-darwin ] - queryparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - questioner: [ i686-linux, x86_64-linux, x86_64-darwin ] - queuelike: [ i686-linux, x86_64-linux, x86_64-darwin ] - quick-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] - QuickAnnotate: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickbooks: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-arbitrary-template: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-poly: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-property-comb: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-property-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-state-machine-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-state-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-string-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] - QuickCheckVariant: [ i686-linux, x86_64-linux, x86_64-darwin ] - QuickPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickpull: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickset: [ i686-linux, x86_64-linux, x86_64-darwin ] - Quickson: [ i686-linux, x86_64-linux, x86_64-darwin ] - quicktest: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickwebapp: [ i686-linux, x86_64-linux, x86_64-darwin ] - quipper-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - quipper-rendering: [ i686-linux, x86_64-linux, x86_64-darwin ] - quipper: [ i686-linux, x86_64-linux, x86_64-darwin ] - quiver-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - quiver-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - quiver-groups: [ i686-linux, x86_64-linux, x86_64-darwin ] - quiver-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - quiver-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - quiver-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] - quiver-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] - quoridor-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - qux: [ i686-linux, x86_64-linux, x86_64-darwin ] - R-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - raaz: [ i686-linux, x86_64-linux, x86_64-darwin ] - rad: [ i686-linux, x86_64-linux, x86_64-darwin ] - radian: [ i686-linux, x86_64-linux, x86_64-darwin ] - radium-formula-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - radium: [ i686-linux, x86_64-linux, x86_64-darwin ] - radix: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - rakuten: [ i686-linux, x86_64-linux, x86_64-darwin ] - rallod: [ i686-linux, x86_64-linux, x86_64-darwin ] - raml: [ i686-linux, x86_64-linux, x86_64-darwin ] - rand-vars: [ i686-linux, x86_64-linux, x86_64-darwin ] - randfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - rando: [ i686-linux, x86_64-linux, x86_64-darwin ] - random-access-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - random-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] - random-eff: [ i686-linux, x86_64-linux, x86_64-darwin ] - random-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] - random-fu-multivariate: [ 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 ] - RandomDotOrg: [ i686-linux, x86_64-linux, x86_64-darwin ] - range-set-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - range-space: [ i686-linux, x86_64-linux, x86_64-darwin ] - Range: [ i686-linux, x86_64-linux, x86_64-darwin ] - Ranged-sets: [ i686-linux, x86_64-linux, x86_64-darwin ] - rangemin: [ i686-linux, x86_64-linux, x86_64-darwin ] - rank1dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] - rank2classes: [ i686-linux, x86_64-linux, x86_64-darwin ] - Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] - rapid-term: [ i686-linux, x86_64-linux, x86_64-darwin ] - rapid: [ i686-linux, x86_64-linux, x86_64-darwin ] - rasa-example-config: [ i686-linux, x86_64-linux, x86_64-darwin ] - rasa-ext-bufs: [ i686-linux, x86_64-linux, x86_64-darwin ] - rasa-ext-cmd: [ i686-linux, x86_64-linux, x86_64-darwin ] - rasa-ext-cursors: [ i686-linux, x86_64-linux, x86_64-darwin ] - rasa-ext-files: [ i686-linux, x86_64-linux, x86_64-darwin ] - rasa-ext-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] - rasa-ext-slate: [ i686-linux, x86_64-linux, x86_64-darwin ] - rasa-ext-status-bar: [ i686-linux, x86_64-linux, x86_64-darwin ] - rasa-ext-style: [ i686-linux, x86_64-linux, x86_64-darwin ] - rasa-ext-views: [ i686-linux, x86_64-linux, x86_64-darwin ] - rasa-ext-vim: [ i686-linux, x86_64-linux, x86_64-darwin ] - rasa: [ i686-linux, x86_64-linux, x86_64-darwin ] - rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] - Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] - rattletrap: [ i686-linux, x86_64-linux, x86_64-darwin ] - raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] - raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] - rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] - raz: [ i686-linux, x86_64-linux, x86_64-darwin ] - razom-text-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - rbr: [ i686-linux, x86_64-linux, x86_64-darwin ] - rc: [ i686-linux, x86_64-linux, x86_64-darwin ] - rcu: [ i686-linux, x86_64-linux, x86_64-darwin ] - rdf4h: [ i686-linux, x86_64-linux, x86_64-darwin ] - rdf: [ i686-linux, x86_64-linux, x86_64-darwin ] - rdioh: [ i686-linux, x86_64-linux, x86_64-darwin ] - react-flux-servant: [ i686-linux, x86_64-linux, x86_64-darwin ] - react-flux: [ i686-linux, x86_64-linux, x86_64-darwin ] - react-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - react-tutorial-haskell-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - reaction-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-bacon: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-balsa: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-banana-automation: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-banana-bunch: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-banana-gi-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-banana-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-banana-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-banana-threepenny: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-banana-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-fieldtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-jack: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-midyim: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive-thread: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactor: [ i686-linux, x86_64-linux, x86_64-darwin ] - read-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - readline-statevar: [ i686-linux, x86_64-linux, x86_64-darwin ] - readme-lhs: [ i686-linux, x86_64-linux, x86_64-darwin ] - readpyc: [ i686-linux, x86_64-linux, x86_64-darwin ] - readshp: [ i686-linux, x86_64-linux, x86_64-darwin ] - really-simple-xml-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - reasonable-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - record-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - record-encode: [ i686-linux, x86_64-linux, x86_64-darwin ] - record-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] - record-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] - record-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - record: [ i686-linux, x86_64-linux, x86_64-darwin ] - records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - records: [ i686-linux, x86_64-linux, x86_64-darwin ] - recursive-line-count: [ i686-linux, x86_64-linux, x86_64-darwin ] - recursors: [ i686-linux, x86_64-linux, x86_64-darwin ] - reddit: [ i686-linux, x86_64-linux, x86_64-darwin ] - redis-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - redis: [ i686-linux, x86_64-linux, x86_64-darwin ] - redland: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - reenact: [ i686-linux, x86_64-linux, x86_64-darwin ] - ref-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] - ref-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - ref-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - ref: [ i686-linux, x86_64-linux, x86_64-darwin ] - Ref: [ i686-linux, x86_64-linux, x86_64-darwin ] - refcount: [ i686-linux, x86_64-linux, x86_64-darwin ] - Referees: [ i686-linux, x86_64-linux, x86_64-darwin ] - refh: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflection-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflex-animation: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflex-gloss-scene: [ i686-linux, x86_64-linux, x86_64-darwin ] - reflex-gloss: [ 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 ] - reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] - reformat: [ i686-linux, x86_64-linux, x86_64-darwin ] - refresht: [ i686-linux, x86_64-linux, x86_64-darwin ] - refurb: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-pderiv: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-tdfa-pipes: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-tdfa-quasiquoter: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-tdfa-rc: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-xmlschema: [ i686-linux, x86_64-linux, x86_64-darwin ] - regexp-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] - regexpr-symbolic: [ i686-linux, x86_64-linux, x86_64-darwin ] - regexqq: [ i686-linux, x86_64-linux, x86_64-darwin ] - regional-pointers: [ i686-linux, x86_64-linux, x86_64-darwin ] - regions-monadsfd: [ i686-linux, x86_64-linux, x86_64-darwin ] - regions-monadstf: [ i686-linux, x86_64-linux, x86_64-darwin ] - regions-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - regions: [ i686-linux, x86_64-linux, x86_64-darwin ] - register-machine-typelevel: [ i686-linux, x86_64-linux, x86_64-darwin ] - regress: [ i686-linux, x86_64-linux, x86_64-darwin ] - regular-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - regular-web: [ i686-linux, x86_64-linux, x86_64-darwin ] - regular-xmlpickler: [ i686-linux, x86_64-linux, x86_64-darwin ] - regular: [ i686-linux, x86_64-linux, x86_64-darwin ] - reheat: [ i686-linux, x86_64-linux, x86_64-darwin ] - rei: [ i686-linux, x86_64-linux, x86_64-darwin ] - reified-records: [ i686-linux, x86_64-linux, x86_64-darwin ] - reify: [ i686-linux, x86_64-linux, x86_64-darwin ] - relacion: [ i686-linux, x86_64-linux, x86_64-darwin ] - relapse: [ i686-linux, x86_64-linux, x86_64-darwin ] - relation: [ i686-linux, x86_64-linux, x86_64-darwin ] - relational-postgresql8: [ i686-linux, x86_64-linux, x86_64-darwin ] - relative-date: [ i686-linux, x86_64-linux, x86_64-darwin ] - reload: [ i686-linux, x86_64-linux, x86_64-darwin ] - remark: [ i686-linux, x86_64-linux, x86_64-darwin ] - remarks: [ i686-linux, x86_64-linux, x86_64-darwin ] - remote-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] - remote-json-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - remote-json-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - remote-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - remote-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - remote: [ i686-linux, x86_64-linux, x86_64-darwin ] - remotion: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] - repa-flow: [ 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-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - repa-v4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] - repl: [ i686-linux, x86_64-linux, x86_64-darwin ] - RepLib: [ i686-linux, x86_64-linux, x86_64-darwin ] - replicant: [ i686-linux, x86_64-linux, x86_64-darwin ] - ReplicateEffects: [ i686-linux, x86_64-linux, x86_64-darwin ] - repo-based-blog: [ i686-linux, x86_64-linux, x86_64-darwin ] - repr: [ i686-linux, x86_64-linux, x86_64-darwin ] - representable-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] - representable-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] - reprinter: [ i686-linux, x86_64-linux, x86_64-darwin ] - reproject: [ i686-linux, x86_64-linux, x86_64-darwin ] - req-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - reqcatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] - request-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - require: [ i686-linux, x86_64-linux, x86_64-darwin ] - reserve: [ i686-linux, x86_64-linux, x86_64-darwin ] - reservoir: [ i686-linux, x86_64-linux, x86_64-darwin ] - resistor-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] - resolve-trivial-conflicts: [ i686-linux, x86_64-linux, x86_64-darwin ] - resolve: [ i686-linux, x86_64-linux, x86_64-darwin ] - resource-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - resource-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] - resource-pool-catchio: [ i686-linux, x86_64-linux, x86_64-darwin ] - resource-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - respond: [ i686-linux, x86_64-linux, x86_64-darwin ] - rest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - rest-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - rest-example: [ i686-linux, x86_64-linux, x86_64-darwin ] - rest-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - rest-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] - rest-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - rest-stringmap: [ i686-linux, x86_64-linux, x86_64-darwin ] - rest-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - rest-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] - restful-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - restricted-workers: [ i686-linux, x86_64-linux, x86_64-darwin ] - restyle: [ i686-linux, x86_64-linux, x86_64-darwin ] - rethinkdb-client-driver: [ i686-linux, x86_64-linux, x86_64-darwin ] - rethinkdb-model: [ i686-linux, x86_64-linux, x86_64-darwin ] - rethinkdb-wereHamster: [ i686-linux, x86_64-linux, x86_64-darwin ] - rethinkdb: [ i686-linux, x86_64-linux, x86_64-darwin ] - retryer: [ i686-linux, x86_64-linux, x86_64-darwin ] - reverse-geocoding: [ i686-linux, x86_64-linux, x86_64-darwin ] - reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] - ReviewBoard: [ i686-linux, x86_64-linux, x86_64-darwin ] - rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] - rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] - rezoom: [ i686-linux, x86_64-linux, x86_64-darwin ] - rfc-env: [ i686-linux, x86_64-linux, x86_64-darwin ] - rfc-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - rfc-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - rfc-psql: [ i686-linux, x86_64-linux, x86_64-darwin ] - rfc-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] - rfc-servant: [ i686-linux, x86_64-linux, x86_64-darwin ] - rfc: [ i686-linux, x86_64-linux, x86_64-darwin ] - rhine-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] - rhine: [ i686-linux, x86_64-linux, x86_64-darwin ] - rhythm-game-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] - ribosome: [ i686-linux, x86_64-linux, x86_64-darwin ] - RichConditional: [ i686-linux, x86_64-linux, x86_64-darwin ] - ridley-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - ridley: [ i686-linux, x86_64-linux, x86_64-darwin ] - riemann: [ i686-linux, x86_64-linux, x86_64-darwin ] - riff: [ i686-linux, x86_64-linux, x86_64-darwin ] - ring-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] - riot: [ i686-linux, x86_64-linux, x86_64-darwin ] - risc386: [ i686-linux, x86_64-linux, x86_64-darwin ] - riscv-isa: [ i686-linux, x86_64-linux, x86_64-darwin ] - rivers: [ i686-linux, x86_64-linux, x86_64-darwin ] - rivet-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] - rivet-simple-deploy: [ i686-linux, x86_64-linux, x86_64-darwin ] - rivet: [ i686-linux, x86_64-linux, x86_64-darwin ] - RJson: [ i686-linux, x86_64-linux, x86_64-darwin ] - rl-satton: [ i686-linux, x86_64-linux, x86_64-darwin ] - Rlang-QQ: [ i686-linux, x86_64-linux, x86_64-darwin ] - rlglue: [ i686-linux, x86_64-linux, x86_64-darwin ] - rlwe-challenges: [ i686-linux, x86_64-linux, x86_64-darwin ] - rmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] - RMP: [ i686-linux, x86_64-linux, x86_64-darwin ] - RNAdesign: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - rob: [ i686-linux, x86_64-linux, x86_64-darwin ] - robin: [ i686-linux, x86_64-linux, x86_64-darwin ] - robots-txt: [ i686-linux, x86_64-linux, x86_64-darwin ] - roc-cluster-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] - roc-cluster: [ i686-linux, x86_64-linux, x86_64-darwin ] - roku-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - rollbar-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - roller: [ i686-linux, x86_64-linux, x86_64-darwin ] - RollingDirectory: [ i686-linux, x86_64-linux, x86_64-darwin ] - ron: [ i686-linux, x86_64-linux, x86_64-darwin ] - rope: [ i686-linux, x86_64-linux, x86_64-darwin ] - rose-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] - rose-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] - roshask: [ i686-linux, x86_64-linux, x86_64-darwin ] - rosmsg-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] - rosmsg: [ i686-linux, x86_64-linux, x86_64-darwin ] - rosso: [ i686-linux, x86_64-linux, x86_64-darwin ] - rounded: [ i686-linux, x86_64-linux, x86_64-darwin ] - rounding: [ i686-linux, x86_64-linux, x86_64-darwin ] - roundtrip-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - roundtrip-string: [ i686-linux, x86_64-linux, x86_64-darwin ] - roundtrip-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] - roundtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] - route-planning: [ i686-linux, x86_64-linux, x86_64-darwin ] - rowrecord: [ i686-linux, x86_64-linux, x86_64-darwin ] - rpc-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] - rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - rpf: [ i686-linux, x86_64-linux, x86_64-darwin ] - rpm: [ i686-linux, x86_64-linux, x86_64-darwin ] - rsagl-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] - rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] - rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] - rspp: [ i686-linux, x86_64-linux, x86_64-darwin ] - rss-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] - rtnetlink: [ i686-linux, x86_64-linux, x86_64-darwin ] - rtorrent-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - rts-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] - ruby-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] - ruby-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - ruin: [ i686-linux, x86_64-linux, x86_64-darwin ] - ruler-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - ruler: [ i686-linux, x86_64-linux, x86_64-darwin ] - rungekutta: [ i686-linux, x86_64-linux, x86_64-darwin ] - runmany: [ i686-linux, x86_64-linux, x86_64-darwin ] - runtime-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] - rws: [ i686-linux, x86_64-linux, x86_64-darwin ] - RxHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - s-expression: [ 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 ] - safe-buffer-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - safe-failure-cme: [ 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 ] - safe-lazy-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - safe-length: [ i686-linux, x86_64-linux, x86_64-darwin ] - safe-money-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - safe-money-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] - safe-money-serialise: [ i686-linux, x86_64-linux, x86_64-darwin ] - safe-money-store: [ i686-linux, x86_64-linux, x86_64-darwin ] - safe-money-xmlbf: [ i686-linux, x86_64-linux, x86_64-darwin ] - safe-money: [ i686-linux, x86_64-linux, x86_64-darwin ] - safe-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] - safe-printf: [ i686-linux, x86_64-linux, x86_64-darwin ] - safecopy-store: [ i686-linux, x86_64-linux, x86_64-darwin ] - safeint: [ i686-linux, x86_64-linux, x86_64-darwin ] - safepath: [ i686-linux, x86_64-linux, x86_64-darwin ] - safer-file-handles-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] - safer-file-handles-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - safer-file-handles: [ i686-linux, x86_64-linux, x86_64-darwin ] - saferoute: [ i686-linux, x86_64-linux, x86_64-darwin ] - sai-shape-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] - sajson: [ i686-linux, x86_64-linux, x86_64-darwin ] - Salsa: [ i686-linux, x86_64-linux, x86_64-darwin ] - saltine-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - salvia-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] - salvia-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - salvia-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] - salvia-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] - salvia-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] - salvia: [ i686-linux, x86_64-linux, x86_64-darwin ] - samtools-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - samtools-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - samtools-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] - samtools: [ i686-linux, x86_64-linux, x86_64-darwin ] - sandlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - sarasvati: [ i686-linux, x86_64-linux, x86_64-darwin ] - sarsi: [ i686-linux, x86_64-linux, x86_64-darwin ] - sasl: [ i686-linux, x86_64-linux, x86_64-darwin ] - sat-micro-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - sat: [ i686-linux, x86_64-linux, x86_64-darwin ] - satchmo-backends: [ i686-linux, x86_64-linux, x86_64-darwin ] - satchmo-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - satchmo-funsat: [ i686-linux, x86_64-linux, x86_64-darwin ] - satchmo-minisat: [ i686-linux, x86_64-linux, x86_64-darwin ] - satchmo-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] - satchmo: [ i686-linux, x86_64-linux, x86_64-darwin ] - savage: [ i686-linux, x86_64-linux, x86_64-darwin ] - sax: [ i686-linux, x86_64-linux, x86_64-darwin ] - SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] - sbvPlugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - sc3-rdu: [ i686-linux, x86_64-linux, x86_64-darwin ] - scalable-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] - SCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ] - scalendar: [ i686-linux, x86_64-linux, x86_64-darwin ] - scalp-webhooks: [ i686-linux, x86_64-linux, x86_64-darwin ] - scan-vector-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] - scat: [ i686-linux, x86_64-linux, x86_64-darwin ] - scc: [ i686-linux, x86_64-linux, x86_64-darwin ] - scenegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] - schedule-planner: [ i686-linux, x86_64-linux, x86_64-darwin ] - schedyield: [ i686-linux, x86_64-linux, x86_64-darwin ] - schematic: [ i686-linux, x86_64-linux, x86_64-darwin ] - scholdoc-citeproc: [ i686-linux, x86_64-linux, x86_64-darwin ] - scholdoc-texmath: [ i686-linux, x86_64-linux, x86_64-darwin ] - scholdoc-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - scholdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - science-constants-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] - scion-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] - scion: [ i686-linux, x86_64-linux, x86_64-darwin ] - scons2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] - scope-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - scope: [ i686-linux, x86_64-linux, x86_64-darwin ] - scottish: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty-binding-play: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty-blaze: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty-cookie: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty-format: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty-hastache: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty-params-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty-path-normalizer: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty-resource: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty-session: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty-view: [ i686-linux, x86_64-linux, x86_64-darwin ] - scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] - scp-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - scrabble-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] - scrape-changes: [ i686-linux, x86_64-linux, x86_64-darwin ] - ScratchFs: [ i686-linux, x86_64-linux, x86_64-darwin ] - script-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - SCRIPTWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] - scrobble: [ i686-linux, x86_64-linux, x86_64-darwin ] - Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ] - scythe: [ i686-linux, x86_64-linux, x86_64-darwin ] - scyther-proof: [ i686-linux, x86_64-linux, x86_64-darwin ] - sde-solver: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdl2-cairo-image: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdl2-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdl2-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] - seakale-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - seakale-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - seakale: [ i686-linux, x86_64-linux, x86_64-darwin ] - search-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] - sec: [ i686-linux, x86_64-linux, x86_64-darwin ] - secdh: [ i686-linux, x86_64-linux, x86_64-darwin ] - seclib: [ i686-linux, x86_64-linux, x86_64-darwin ] - second-transfer: [ i686-linux, x86_64-linux, x86_64-darwin ] - secp256k1: [ i686-linux, x86_64-linux, x86_64-darwin ] - secret-santa: [ i686-linux, x86_64-linux, x86_64-darwin ] - secret-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] - secrm: [ i686-linux, x86_64-linux, x86_64-darwin ] - sednaDBXML: [ i686-linux, x86_64-linux, x86_64-darwin ] - selectors: [ i686-linux, x86_64-linux, x86_64-darwin ] - SelectSequencesFromMSA: [ i686-linux, x86_64-linux, x86_64-darwin ] - selenium-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - selenium: [ i686-linux, x86_64-linux, x86_64-darwin ] - self-extract: [ i686-linux, x86_64-linux, x86_64-darwin ] - selinux: [ i686-linux, x86_64-linux, x86_64-darwin ] - Semantique: [ i686-linux, x86_64-linux, x86_64-darwin ] - semdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - semi-iso: [ i686-linux, x86_64-linux, x86_64-darwin ] - semibounded-lattices: [ i686-linux, x86_64-linux, x86_64-darwin ] - Semigroup: [ i686-linux, x86_64-linux, x86_64-darwin ] - semigroupoids-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - semigroups-actions: [ i686-linux, x86_64-linux, x86_64-darwin ] - semilattices: [ i686-linux, x86_64-linux, x86_64-darwin ] - semiring-num: [ i686-linux, x86_64-linux, x86_64-darwin ] - semiring: [ i686-linux, x86_64-linux, x86_64-darwin ] - semver-range: [ i686-linux, x86_64-linux, x86_64-darwin ] - sendgrid-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - sendgrid-v3: [ i686-linux, x86_64-linux, x86_64-darwin ] - sensei: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - seqaid: [ i686-linux, x86_64-linux, x86_64-darwin ] - SeqAlign: [ i686-linux, x86_64-linux, x86_64-darwin ] - seqid-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - seqid: [ i686-linux, x86_64-linux, x86_64-darwin ] - seqloc-datafiles: [ i686-linux, x86_64-linux, x86_64-darwin ] - seqloc: [ i686-linux, x86_64-linux, x86_64-darwin ] - sequent-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - sequor: [ i686-linux, x86_64-linux, x86_64-darwin ] - serialize-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - serokell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - serpentine: [ i686-linux, x86_64-linux, x86_64-darwin ] - serv-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] - serv: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-aeson-specs: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-cookie: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-token-acid: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-token-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-token-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-token-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-token-rocksdb: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-auth-token: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-checked-exceptions-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-checked-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-client-namedargs: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-db: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-dhall: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-generate: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-github-webhook: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-github: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-haxl-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-hmac-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-http2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-iCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-jquery: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-matrix-param: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-multipart: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-namedargs: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-pipes: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-proto-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-pushbullet-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-py: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-rawm: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-router: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-server-namedargs: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-streaming-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-streaming-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-streaming-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-subscriber: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-swagger-ui-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-swagger-ui-jensoleg: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-swagger-ui-redoc: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-swagger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-zeppelin-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-zeppelin-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-zeppelin-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-zeppelin: [ i686-linux, x86_64-linux, x86_64-darwin ] - server-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] - serverless-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - serversession-frontend-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - serversession-frontend-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] - services: [ i686-linux, x86_64-linux, x86_64-darwin ] - ses-html-snaplet: [ i686-linux, x86_64-linux, x86_64-darwin ] - SessionLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] - sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] - sessiontypes-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] - sessiontypes: [ i686-linux, x86_64-linux, x86_64-darwin ] - set-cover: [ i686-linux, x86_64-linux, x86_64-darwin ] - set-of: [ i686-linux, x86_64-linux, x86_64-darwin ] - set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] - setdown: [ i686-linux, x86_64-linux, x86_64-darwin ] - setgame: [ i686-linux, x86_64-linux, x86_64-darwin ] - setoid: [ i686-linux, x86_64-linux, x86_64-darwin ] - sets: [ i686-linux, x86_64-linux, x86_64-darwin ] - setters: [ i686-linux, x86_64-linux, x86_64-darwin ] - sexp-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] - sexp: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - sfnt2woff: [ i686-linux, x86_64-linux, x86_64-darwin ] - SFont: [ i686-linux, x86_64-linux, x86_64-darwin ] - SG: [ i686-linux, x86_64-linux, x86_64-darwin ] - sgd: [ i686-linux, x86_64-linux, x86_64-darwin ] - SGdemo: [ i686-linux, x86_64-linux, x86_64-darwin ] - sgf: [ i686-linux, x86_64-linux, x86_64-darwin ] - SGplus: [ i686-linux, x86_64-linux, x86_64-darwin ] - sgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] - sh2md: [ i686-linux, x86_64-linux, x86_64-darwin ] - sha-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - shade: [ i686-linux, x86_64-linux, x86_64-darwin ] - shadower: [ i686-linux, x86_64-linux, x86_64-darwin ] - shake-cabal-build: [ i686-linux, x86_64-linux, x86_64-darwin ] - shake-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - shake-minify: [ i686-linux, x86_64-linux, x86_64-darwin ] - shake-pack: [ i686-linux, x86_64-linux, x86_64-darwin ] - shake-path: [ i686-linux, x86_64-linux, x86_64-darwin ] - shake-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] - shaker: [ i686-linux, x86_64-linux, x86_64-darwin ] - shakespeare-babel: [ i686-linux, x86_64-linux, x86_64-darwin ] - shakespeare-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] - shapely-data: [ i686-linux, x86_64-linux, x86_64-darwin ] - shared-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] - shared-fields: [ i686-linux, x86_64-linux, x86_64-darwin ] - she: [ i686-linux, x86_64-linux, x86_64-darwin ] - shelduck: [ i686-linux, x86_64-linux, x86_64-darwin ] - shell-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - Shellac-compatline: [ i686-linux, x86_64-linux, x86_64-darwin ] - Shellac-editline: [ i686-linux, x86_64-linux, x86_64-darwin ] - Shellac-haskeline: [ i686-linux, x86_64-linux, x86_64-darwin ] - Shellac-readline: [ i686-linux, x86_64-linux, x86_64-darwin ] - Shellac: [ 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 ] - shellwords: [ i686-linux, x86_64-linux, x86_64-darwin ] - shh: [ i686-linux, x86_64-linux, x86_64-darwin ] - shimmer: [ i686-linux, x86_64-linux, x86_64-darwin ] - shivers-cfg: [ i686-linux, x86_64-linux, x86_64-darwin ] - shoap: [ i686-linux, x86_64-linux, x86_64-darwin ] - shopify: [ i686-linux, x86_64-linux, x86_64-darwin ] - shorten-strings: [ i686-linux, x86_64-linux, x86_64-darwin ] - ShortestPathProblems: [ i686-linux, x86_64-linux, x86_64-darwin ] - showdown: [ i686-linux, x86_64-linux, x86_64-darwin ] - shpider: [ i686-linux, x86_64-linux, x86_64-darwin ] - shuffle: [ i686-linux, x86_64-linux, x86_64-darwin ] - si-clock: [ i686-linux, x86_64-linux, x86_64-darwin ] - sibe: [ i686-linux, x86_64-linux, x86_64-darwin ] - sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - sifflet: [ i686-linux, x86_64-linux, x86_64-darwin ] - sigma-ij: [ i686-linux, x86_64-linux, x86_64-darwin ] - sign: [ i686-linux, x86_64-linux, x86_64-darwin ] - signals: [ i686-linux, x86_64-linux, x86_64-darwin ] - signed-multiset: [ i686-linux, x86_64-linux, x86_64-darwin ] - silvi: [ i686-linux, x86_64-linux, x86_64-darwin ] - simd: [ i686-linux, x86_64-linux, x86_64-darwin ] - simgi: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-actors: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-affine-space: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-bluetooth: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-c-value: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-download: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-firewire: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-genetic-algorithm: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-index: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-log-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-money: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-neural-networks: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-pascal: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-rope: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-session: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-tabular: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-tar: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-vec3: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - simpleargs: [ i686-linux, x86_64-linux, x86_64-darwin ] - simpleconfig: [ i686-linux, x86_64-linux, x86_64-darwin ] - SimpleGL: [ i686-linux, x86_64-linux, x86_64-darwin ] - simpleirc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - simpleirc: [ i686-linux, x86_64-linux, x86_64-darwin ] - SimpleLog: [ i686-linux, x86_64-linux, x86_64-darwin ] - simplenote: [ i686-linux, x86_64-linux, x86_64-darwin ] - simpleprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - SimpleServer: [ i686-linux, x86_64-linux, x86_64-darwin ] - simplest-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - simseq: [ i686-linux, x86_64-linux, x86_64-darwin ] - singleton-dict: [ i686-linux, x86_64-linux, x86_64-darwin ] - singleton-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] - singnal: [ i686-linux, x86_64-linux, x86_64-darwin ] - sink: [ i686-linux, x86_64-linux, x86_64-darwin ] - siphon: [ i686-linux, x86_64-linux, x86_64-darwin ] - siren-json: [ 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 ] - sixfiguregroup: [ i686-linux, x86_64-linux, x86_64-darwin ] - sized-grid: [ i686-linux, x86_64-linux, x86_64-darwin ] - sized-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - sized: [ i686-linux, x86_64-linux, x86_64-darwin ] - sizes: [ i686-linux, x86_64-linux, x86_64-darwin ] - sjsp: [ i686-linux, x86_64-linux, x86_64-darwin ] - skeletal-set: [ i686-linux, x86_64-linux, x86_64-darwin ] - skeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] - skeletons: [ i686-linux, x86_64-linux, x86_64-darwin ] - skell: [ i686-linux, x86_64-linux, x86_64-darwin ] - skemmtun: [ i686-linux, x86_64-linux, x86_64-darwin ] - skews: [ i686-linux, x86_64-linux, x86_64-darwin ] - skulk: [ i686-linux, x86_64-linux, x86_64-darwin ] - skylark-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - skype4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - slack-web: [ i686-linux, x86_64-linux, x86_64-darwin ] - slack: [ i686-linux, x86_64-linux, x86_64-darwin ] - slick: [ i686-linux, x86_64-linux, x86_64-darwin ] - slidemews: [ i686-linux, x86_64-linux, x86_64-darwin ] - Slides: [ i686-linux, x86_64-linux, x86_64-darwin ] - slim: [ i686-linux, x86_64-linux, x86_64-darwin ] - sloane: [ i686-linux, x86_64-linux, x86_64-darwin ] - slope-field: [ i686-linux, x86_64-linux, x86_64-darwin ] - slot-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] - sloth: [ i686-linux, x86_64-linux, x86_64-darwin ] - slug: [ i686-linux, x86_64-linux, x86_64-darwin ] - smallarray: [ i686-linux, x86_64-linux, x86_64-darwin ] - smallcaps: [ i686-linux, x86_64-linux, x86_64-darwin ] - smallcheck-laws: [ i686-linux, x86_64-linux, x86_64-darwin ] - smallcheck-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - smallcheck-series: [ i686-linux, x86_64-linux, x86_64-darwin ] - smallpt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - smallstring: [ i686-linux, x86_64-linux, x86_64-darwin ] - smartcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - smartconstructor: [ i686-linux, x86_64-linux, x86_64-darwin ] - smartGroup: [ i686-linux, x86_64-linux, x86_64-darwin ] - smartword: [ i686-linux, x86_64-linux, x86_64-darwin ] - smcdel: [ i686-linux, x86_64-linux, x86_64-darwin ] - sme: [ i686-linux, x86_64-linux, x86_64-darwin ] - smerdyakov: [ i686-linux, x86_64-linux, x86_64-darwin ] - smiles: [ i686-linux, x86_64-linux, x86_64-darwin ] - Smooth: [ i686-linux, x86_64-linux, x86_64-darwin ] - smsaero: [ i686-linux, x86_64-linux, x86_64-darwin ] - smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - smtlib2-debug: [ i686-linux, x86_64-linux, x86_64-darwin ] - smtlib2-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - smtlib2-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - SmtLib: [ i686-linux, x86_64-linux, x86_64-darwin ] - smtp-mail-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] - SMTPClient: [ i686-linux, x86_64-linux, x86_64-darwin ] - smtps-gmail: [ i686-linux, x86_64-linux, x86_64-darwin ] - smuggler: [ i686-linux, x86_64-linux, x86_64-darwin ] - snake-game: [ i686-linux, x86_64-linux, x86_64-darwin ] - snake: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-auth-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-blaze-clay: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-configuration-utilities: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-error-collector: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-language: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-web-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-acid-state: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-actionlog: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-amqp: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-auth-acid: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-coffee: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-css-min: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-customauth: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-environments: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-ghcjs: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-haxl: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-hslogger: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-influxdb: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-mandrill: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-mongodb-minimalistic: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-mysql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-oauth: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-postgresql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-recaptcha: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-redson: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-riak: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-scoped-session: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-sedna: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-ses-html: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-sqlite-simple-jwt-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-sqlite-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-typed-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-wordpress: [ i686-linux, x86_64-linux, x86_64-darwin ] - snappy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - snappy-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] - sndfile-enumerators: [ i686-linux, x86_64-linux, x86_64-darwin ] - sneakyterm: [ i686-linux, x86_64-linux, x86_64-darwin ] - SNet: [ i686-linux, x86_64-linux, x86_64-darwin ] - snipcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - snm: [ i686-linux, x86_64-linux, x86_64-darwin ] - snmp: [ i686-linux, x86_64-linux, x86_64-darwin ] - snorkels: [ i686-linux, x86_64-linux, x86_64-darwin ] - snow-white: [ i686-linux, x86_64-linux, x86_64-darwin ] - snowflake-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - snowflake-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - snowtify: [ i686-linux, x86_64-linux, x86_64-darwin ] - Snusmumrik: [ i686-linux, x86_64-linux, x86_64-darwin ] - soap-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] - SoccerFun: [ i686-linux, x86_64-linux, x86_64-darwin ] - SoccerFunGL: [ i686-linux, x86_64-linux, x86_64-darwin ] - socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ] - socket-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] - socketed: [ i686-linux, x86_64-linux, x86_64-darwin ] - socketio: [ i686-linux, x86_64-linux, x86_64-darwin ] - sockets: [ i686-linux, x86_64-linux, x86_64-darwin ] - socketson: [ i686-linux, x86_64-linux, x86_64-darwin ] - sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] - soegtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - softfloat-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - solga-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] - solga: [ i686-linux, x86_64-linux, x86_64-darwin ] - solr: [ i686-linux, x86_64-linux, x86_64-darwin ] - sonic-visualiser: [ i686-linux, x86_64-linux, x86_64-darwin ] - Sonnex: [ i686-linux, x86_64-linux, x86_64-darwin ] - SoOSiM: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - spake2: [ i686-linux, x86_64-linux, x86_64-darwin ] - spanout: [ i686-linux, x86_64-linux, x86_64-darwin ] - sparkle: [ i686-linux, x86_64-linux, x86_64-darwin ] - sparrow: [ i686-linux, x86_64-linux, x86_64-darwin ] - sparse-lin-alg: [ i686-linux, x86_64-linux, x86_64-darwin ] - sparse: [ i686-linux, x86_64-linux, x86_64-darwin ] - sparsebit: [ i686-linux, x86_64-linux, x86_64-darwin ] - sparsecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - sparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - spata: [ i686-linux, x86_64-linux, x86_64-darwin ] - spatial-rotations: [ i686-linux, x86_64-linux, x86_64-darwin ] - special-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] - special-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] - specialize-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - species: [ i686-linux, x86_64-linux, x86_64-darwin ] - spectral-clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] - speculation-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - speculation: [ i686-linux, x86_64-linux, x86_64-darwin ] - speechmatics: [ i686-linux, x86_64-linux, x86_64-darwin ] - speedy-slice: [ i686-linux, x86_64-linux, x86_64-darwin ] - spelling-suggest: [ i686-linux, x86_64-linux, x86_64-darwin ] - sphero: [ i686-linux, x86_64-linux, x86_64-darwin ] - sphinx-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - sphinxesc: [ i686-linux, x86_64-linux, x86_64-darwin ] - spice: [ i686-linux, x86_64-linux, x86_64-darwin ] - SpinCounter: [ i686-linux, x86_64-linux, x86_64-darwin ] - spir-v: [ i686-linux, x86_64-linux, x86_64-darwin ] - splay: [ 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 ] - splitter: [ i686-linux, x86_64-linux, x86_64-darwin ] - splot: [ i686-linux, x86_64-linux, x86_64-darwin ] - Spock-api-ghcjs: [ i686-linux, x86_64-linux, x86_64-darwin ] - Spock-api-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - Spock-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] - Spock-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - Spock-digestive: [ i686-linux, x86_64-linux, x86_64-darwin ] - Spock-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] - Spock-worker: [ i686-linux, x86_64-linux, x86_64-darwin ] - Spock: [ i686-linux, x86_64-linux, x86_64-darwin ] - spoonutil: [ i686-linux, x86_64-linux, x86_64-darwin ] - spoty: [ i686-linux, x86_64-linux, x86_64-darwin ] - Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ] - sprinkles: [ i686-linux, x86_64-linux, x86_64-darwin ] - spritz: [ i686-linux, x86_64-linux, x86_64-darwin ] - sproxy-web: [ i686-linux, x86_64-linux, x86_64-darwin ] - spsa: [ i686-linux, x86_64-linux, x86_64-darwin ] - spy: [ i686-linux, x86_64-linux, x86_64-darwin ] - sql-simple-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - sql-simple-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] - sql-simple-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - sql-simple-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - sql-simple: [ 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 ] - 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 ] - squeal-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - srcinst: [ i686-linux, x86_64-linux, x86_64-darwin ] - sscan: [ i686-linux, x86_64-linux, x86_64-darwin ] - sscgi: [ i686-linux, x86_64-linux, x86_64-darwin ] - ssh-tunnel: [ i686-linux, x86_64-linux, x86_64-darwin ] - ssh: [ i686-linux, x86_64-linux, x86_64-darwin ] - sshd-lint: [ i686-linux, x86_64-linux, x86_64-darwin ] - sssp: [ i686-linux, x86_64-linux, x86_64-darwin ] - sstable: [ i686-linux, x86_64-linux, x86_64-darwin ] - SSTG: [ i686-linux, x86_64-linux, x86_64-darwin ] - stable-heap: [ i686-linux, x86_64-linux, x86_64-darwin ] - stable-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] - stable-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 ] - stack-bump: [ i686-linux, x86_64-linux, x86_64-darwin ] - stack-hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] - stack-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - stack-network: [ i686-linux, x86_64-linux, x86_64-darwin ] - stack-prism: [ i686-linux, x86_64-linux, x86_64-darwin ] - stack-run-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] - stack-run: [ i686-linux, x86_64-linux, x86_64-darwin ] - stack-type: [ i686-linux, x86_64-linux, x86_64-darwin ] - stack2cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage-build-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage-curator: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage-metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage-to-hackage: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage: [ 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 ] - stash: [ i686-linux, x86_64-linux, x86_64-darwin ] - Stasis: [ i686-linux, x86_64-linux, x86_64-darwin ] - state-bag: [ i686-linux, x86_64-linux, x86_64-darwin ] - state-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] - state-record: [ i686-linux, x86_64-linux, x86_64-darwin ] - state: [ i686-linux, x86_64-linux, x86_64-darwin ] - stateful-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - stateWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] - static-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - static-closure: [ i686-linux, x86_64-linux, x86_64-darwin ] - static-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] - static-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - statistics-dirichlet: [ i686-linux, x86_64-linux, x86_64-darwin ] - statistics-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] - statistics-hypergeometric-genvar: [ i686-linux, x86_64-linux, x86_64-darwin ] - stats: [ i686-linux, x86_64-linux, x86_64-darwin ] - statsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - statsd: [ i686-linux, x86_64-linux, x86_64-darwin ] - statsdi: [ i686-linux, x86_64-linux, x86_64-darwin ] - status-notifier-item: [ i686-linux, x86_64-linux, x86_64-darwin ] - staversion: [ i686-linux, x86_64-linux, x86_64-darwin ] - stb-image-redux: [ i686-linux, x86_64-linux, x86_64-darwin ] - stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ] - stdata: [ i686-linux, x86_64-linux, x86_64-darwin ] - stdf: [ i686-linux, x86_64-linux, x86_64-darwin ] - steambrowser: [ i686-linux, x86_64-linux, x86_64-darwin ] - stego-uuid: [ i686-linux, x86_64-linux, x86_64-darwin ] - stemmer-german: [ i686-linux, x86_64-linux, x86_64-darwin ] - stemmer: [ i686-linux, x86_64-linux, x86_64-darwin ] - stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] - stgi: [ i686-linux, x86_64-linux, x86_64-darwin ] - STL: [ i686-linux, x86_64-linux, x86_64-darwin ] - stm-chunked-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] - stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] - stm-io-hooks: [ i686-linux, x86_64-linux, x86_64-darwin ] - stm-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] - stm-promise: [ i686-linux, x86_64-linux, x86_64-darwin ] - stm-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] - stm-supply: [ i686-linux, x86_64-linux, x86_64-darwin ] - stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] - stochastic: [ i686-linux, x86_64-linux, x86_64-darwin ] - StockholmAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] - Stomp: [ i686-linux, x86_64-linux, x86_64-darwin ] - storable-static-array: [ i686-linux, x86_64-linux, x86_64-darwin ] - storable: [ i686-linux, x86_64-linux, x86_64-darwin ] - storablevector-streamfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] - stp: [ i686-linux, x86_64-linux, x86_64-darwin ] - str: [ i686-linux, x86_64-linux, x86_64-darwin ] - Strafunski-ATermLib: [ i686-linux, x86_64-linux, x86_64-darwin ] - Strafunski-Sdf2Haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - StrappedTemplates: [ i686-linux, x86_64-linux, x86_64-darwin ] - stratum-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] - stratux-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - stratux-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - stratux-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] - stratux: [ i686-linux, x86_64-linux, x86_64-darwin ] - stream-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] - stream-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - streamdeck: [ i686-linux, x86_64-linux, x86_64-darwin ] - streamed: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-cassava: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-osm: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-png: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-postgresql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-process: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] - streaming-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - strelka: [ i686-linux, x86_64-linux, x86_64-darwin ] - strict-data: [ i686-linux, x86_64-linux, x86_64-darwin ] - StrictBench: [ i686-linux, x86_64-linux, x86_64-darwin ] - StrictCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - strictly: [ i686-linux, x86_64-linux, x86_64-darwin ] - string-isos: [ i686-linux, x86_64-linux, x86_64-darwin ] - string-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - string-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] - stringlike: [ i686-linux, x86_64-linux, x86_64-darwin ] - stringtable-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] - stripe-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - stripe-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - stripe-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] - stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] - structural-induction: [ i686-linux, x86_64-linux, x86_64-darwin ] - structural-traversal: [ i686-linux, x86_64-linux, x86_64-darwin ] - structured-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] - structures: [ i686-linux, x86_64-linux, x86_64-darwin ] - stt: [ i686-linux, x86_64-linux, x86_64-darwin ] - stunts: [ i686-linux, x86_64-linux, x86_64-darwin ] - stutter: [ i686-linux, x86_64-linux, x86_64-darwin ] - stylized: [ i686-linux, x86_64-linux, x86_64-darwin ] - sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ] - subhask: [ i686-linux, x86_64-linux, x86_64-darwin ] - subleq-toolchain: [ i686-linux, x86_64-linux, x86_64-darwin ] - submark: [ i686-linux, x86_64-linux, x86_64-darwin ] - subsample: [ i686-linux, x86_64-linux, x86_64-darwin ] - substring-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - subwordgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - successors: [ i686-linux, x86_64-linux, x86_64-darwin ] - suffix-array: [ i686-linux, x86_64-linux, x86_64-darwin ] - suffixarray: [ i686-linux, x86_64-linux, x86_64-darwin ] - SuffixStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] - suitable: [ i686-linux, x86_64-linux, x86_64-darwin ] - summoner: [ i686-linux, x86_64-linux, x86_64-darwin ] - sump: [ i686-linux, x86_64-linux, x86_64-darwin ] - sunlight: [ i686-linux, x86_64-linux, x86_64-darwin ] - sunroof-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] - sunroof-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - sunroof-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - super-user-spark: [ i686-linux, x86_64-linux, x86_64-darwin ] - superbubbles: [ i686-linux, x86_64-linux, x86_64-darwin ] - superbuffer: [ i686-linux, x86_64-linux, x86_64-darwin ] - supercollider-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] - supercollider-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] - superconstraints: [ i686-linux, x86_64-linux, x86_64-darwin ] - superevent: [ i686-linux, x86_64-linux, x86_64-darwin ] - supermonad: [ i686-linux, x86_64-linux, x86_64-darwin ] - supero: [ i686-linux, x86_64-linux, x86_64-darwin ] - supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] - supplemented: [ i686-linux, x86_64-linux, x86_64-darwin ] - surjective: [ i686-linux, x86_64-linux, x86_64-darwin ] - sv-svfactor: [ i686-linux, x86_64-linux, x86_64-darwin ] - sv: [ i686-linux, x86_64-linux, x86_64-darwin ] - SVD2HS: [ i686-linux, x86_64-linux, x86_64-darwin ] - svfactor: [ i686-linux, x86_64-linux, x86_64-darwin ] - svg-builder-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ] - svg2q: [ i686-linux, x86_64-linux, x86_64-darwin ] - svgcairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - svgutils: [ i686-linux, x86_64-linux, x86_64-darwin ] - svm-light-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - svndump: [ i686-linux, x86_64-linux, x86_64-darwin ] - swagger-petstore: [ i686-linux, x86_64-linux, x86_64-darwin ] - swagger-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - swagger2: [ i686-linux, x86_64-linux, x86_64-darwin ] - swapper: [ i686-linux, x86_64-linux, x86_64-darwin ] - swearjure: [ i686-linux, x86_64-linux, x86_64-darwin ] - swf: [ i686-linux, x86_64-linux, x86_64-darwin ] - swift-lda: [ i686-linux, x86_64-linux, x86_64-darwin ] - syb-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - syb-with-class-instances-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - SybWidget: [ i686-linux, x86_64-linux, x86_64-darwin ] - syfco: [ i686-linux, x86_64-linux, x86_64-darwin ] - sylvia: [ i686-linux, x86_64-linux, x86_64-darwin ] - sym-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] - sym: [ i686-linux, x86_64-linux, x86_64-darwin ] - symantic-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - symantic-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] - symantic-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - symantic: [ i686-linux, x86_64-linux, x86_64-darwin ] - symengine-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - symengine: [ i686-linux, x86_64-linux, x86_64-darwin ] - symmetric-properties: [ i686-linux, x86_64-linux, x86_64-darwin ] - sync-mht: [ i686-linux, x86_64-linux, x86_64-darwin ] - sync: [ 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-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - syntax-example: [ 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 ] - syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - SyntaxMacros: [ i686-linux, x86_64-linux, x86_64-darwin ] - syntaxnet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] - sys-process: [ i686-linux, x86_64-linux, x86_64-darwin ] - Sysmon: [ i686-linux, x86_64-linux, x86_64-darwin ] - system-canonicalpath: [ i686-linux, x86_64-linux, x86_64-darwin ] - system-command: [ i686-linux, x86_64-linux, x86_64-darwin ] - system-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - system-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] - system-linux-proc: [ i686-linux, x86_64-linux, x86_64-darwin ] - system-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - systemstats: [ i686-linux, x86_64-linux, x86_64-darwin ] - t-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] - t3-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - t3-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - ta: [ i686-linux, x86_64-linux, x86_64-darwin ] - table-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] - table-tennis: [ i686-linux, x86_64-linux, x86_64-darwin ] - table: [ i686-linux, x86_64-linux, x86_64-darwin ] - tableaux: [ i686-linux, x86_64-linux, x86_64-darwin ] - Tables: [ i686-linux, x86_64-linux, x86_64-darwin ] - tables: [ i686-linux, x86_64-linux, x86_64-darwin ] - tablestorage: [ i686-linux, x86_64-linux, x86_64-darwin ] - Tablify: [ i686-linux, x86_64-linux, x86_64-darwin ] - tabloid: [ i686-linux, x86_64-linux, x86_64-darwin ] - tabs: [ i686-linux, x86_64-linux, x86_64-darwin ] - taffybar: [ i686-linux, x86_64-linux, x86_64-darwin ] - tag-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] - tag-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - tagged-exception-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - tagged-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - tagged-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - tagged-timers: [ i686-linux, x86_64-linux, x86_64-darwin ] - taglib-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - tagsoup-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] - tagsoup-megaparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - tagsoup-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - tagsoup-selection: [ i686-linux, x86_64-linux, x86_64-darwin ] - tai64: [ i686-linux, x86_64-linux, x86_64-darwin ] - tai: [ i686-linux, x86_64-linux, x86_64-darwin ] - takahashi: [ i686-linux, x86_64-linux, x86_64-darwin ] - takusen-oracle: [ i686-linux, x86_64-linux, x86_64-darwin ] - Takusen: [ i686-linux, x86_64-linux, x86_64-darwin ] - tal: [ i686-linux, x86_64-linux, x86_64-darwin ] - tamarin-prover-term: [ i686-linux, x86_64-linux, x86_64-darwin ] - tamarin-prover-theory: [ i686-linux, x86_64-linux, x86_64-darwin ] - tamarin-prover-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - tamarin-prover: [ i686-linux, x86_64-linux, x86_64-darwin ] - tamper: [ i686-linux, x86_64-linux, x86_64-darwin ] - Tape: [ i686-linux, x86_64-linux, x86_64-darwin ] - target: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-fail-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-hedgehog-coverage: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-integrate: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-jenkins-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-laws: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-tap: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-travis: [ i686-linux, x86_64-linux, x86_64-darwin ] - TaxonomyTools: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - tcache-AWS: [ 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-streams-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] - tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] - tdd-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - tdigest-Chart: [ i686-linux, x86_64-linux, x86_64-darwin ] - tdigest: [ i686-linux, x86_64-linux, x86_64-darwin ] - TeaHS: [ i686-linux, x86_64-linux, x86_64-darwin ] - teams: [ i686-linux, x86_64-linux, x86_64-darwin ] - teardown: [ i686-linux, x86_64-linux, x86_64-darwin ] - teeth: [ i686-linux, x86_64-linux, x86_64-darwin ] - telegram-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - telegram-bot-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] - telegram: [ i686-linux, x86_64-linux, x86_64-darwin ] - teleport: [ i686-linux, x86_64-linux, x86_64-darwin ] - teleshell: [ i686-linux, x86_64-linux, x86_64-darwin ] - tellbot: [ i686-linux, x86_64-linux, x86_64-darwin ] - template-default: [ i686-linux, x86_64-linux, x86_64-darwin ] - template-haskell-compat-v0208: [ i686-linux, x86_64-linux, x86_64-darwin ] - template-haskell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - template-hsml: [ i686-linux, x86_64-linux, x86_64-darwin ] - template-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] - templateify: [ i686-linux, x86_64-linux, x86_64-darwin ] - templatepg: [ i686-linux, x86_64-linux, x86_64-darwin ] - tempodb: [ i686-linux, x86_64-linux, x86_64-darwin ] - temporal-csound: [ i686-linux, x86_64-linux, x86_64-darwin ] - temporary-resourcet: [ i686-linux, x86_64-linux, x86_64-darwin ] - tempus: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-core-ops: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-opgen: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-ops: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-proto: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow: [ i686-linux, x86_64-linux, x86_64-darwin ] - termbox-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] - termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] - termcolor: [ i686-linux, x86_64-linux, x86_64-darwin ] - terminal-punch: [ i686-linux, x86_64-linux, x86_64-darwin ] - terminal-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - termination-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] - termonad: [ i686-linux, x86_64-linux, x86_64-darwin ] - termplot: [ i686-linux, x86_64-linux, x86_64-darwin ] - terntup: [ i686-linux, x86_64-linux, x86_64-darwin ] - terrahs: [ i686-linux, x86_64-linux, x86_64-darwin ] - tersmu: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-fixture: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-framework-doctest: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-framework-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-framework-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-framework-skip: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-framework-testing-feat: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-pkg: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-sandbox-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-sandbox-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] - test-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - testbench: [ i686-linux, x86_64-linux, x86_64-darwin ] - testCom: [ i686-linux, x86_64-linux, x86_64-darwin ] - TestExplode: [ i686-linux, x86_64-linux, x86_64-darwin ] - testloop: [ i686-linux, x86_64-linux, x86_64-darwin ] - testpack: [ i686-linux, x86_64-linux, x86_64-darwin ] - testpattern: [ i686-linux, x86_64-linux, x86_64-darwin ] - testrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] - TeX-my-math: [ i686-linux, x86_64-linux, x86_64-darwin ] - tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ] - texbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-all: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-and-plots: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-locale-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-markup: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-normal: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-position: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-register-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-time: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-utf8: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-xml-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-zipper-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - textmatetags: [ i686-linux, x86_64-linux, x86_64-darwin ] - textocat-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - textual: [ i686-linux, x86_64-linux, x86_64-darwin ] - tfp-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - tftp: [ i686-linux, x86_64-linux, x86_64-darwin ] - tga: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-build: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-context: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-dict-discovery: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-fold: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-format: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-instance-reification: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-kinds-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-nowq: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-sccs: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-to-exp: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] - th-typegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - thank-you-stars: [ i686-linux, x86_64-linux, x86_64-darwin ] - themoviedb: [ i686-linux, x86_64-linux, x86_64-darwin ] - thentos-cookie-session: [ i686-linux, x86_64-linux, x86_64-darwin ] - Theora: [ i686-linux, x86_64-linux, x86_64-darwin ] - theoremquest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - theoremquest: [ i686-linux, x86_64-linux, x86_64-darwin ] - these-skinny: [ i686-linux, x86_64-linux, x86_64-darwin ] - these: [ i686-linux, x86_64-linux, x86_64-darwin ] - thih: [ i686-linux, x86_64-linux, x86_64-darwin ] - thimk: [ i686-linux, x86_64-linux, x86_64-darwin ] - Thingie: [ i686-linux, x86_64-linux, x86_64-darwin ] - thorn: [ i686-linux, x86_64-linux, x86_64-darwin ] - threadmanager: [ i686-linux, x86_64-linux, x86_64-darwin ] - threads-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] - threadscope: [ i686-linux, x86_64-linux, x86_64-darwin ] - threepenny-gui-contextmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] - threepenny-gui-flexbox: [ i686-linux, x86_64-linux, x86_64-darwin ] - thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] - throttled-io-loop: [ i686-linux, x86_64-linux, x86_64-darwin ] - through-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - thumbnail-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] - tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] - tickle: [ i686-linux, x86_64-linux, x86_64-darwin ] - tictactoe3d: [ i686-linux, x86_64-linux, x86_64-darwin ] - TicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] - tidal-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] - tidal-serial: [ i686-linux, x86_64-linux, x86_64-darwin ] - tidal-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] - tie-knot: [ i686-linux, x86_64-linux, x86_64-darwin ] - tiempo: [ i686-linux, x86_64-linux, x86_64-darwin ] - tiger: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - time-extras: [ 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 ] - time-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-series-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-series: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-w3c: [ i686-linux, x86_64-linux, x86_64-darwin ] - time-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] - timecalc: [ i686-linux, x86_64-linux, x86_64-darwin ] - timemap: [ i686-linux, x86_64-linux, x86_64-darwin ] - timeout-with-results: [ 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 ] - 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 ] - timers-tick: [ i686-linux, x86_64-linux, x86_64-darwin ] - timeseries: [ i686-linux, x86_64-linux, x86_64-darwin ] - timespan: [ i686-linux, x86_64-linux, x86_64-darwin ] - timezone-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] - tintin: [ i686-linux, x86_64-linux, x86_64-darwin ] - tiny-scheduler: [ i686-linux, x86_64-linux, x86_64-darwin ] - TinyLaunchbury: [ i686-linux, x86_64-linux, x86_64-darwin ] - tinyMesh: [ i686-linux, x86_64-linux, x86_64-darwin ] - tinytemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] - TinyURL: [ i686-linux, x86_64-linux, x86_64-darwin ] - tinyXml: [ i686-linux, x86_64-linux, x86_64-darwin ] - tip-haskell-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] - tip-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - titan: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - tls-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - tn: [ i686-linux, x86_64-linux, x86_64-darwin ] - to-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - to-string-class: [ i686-linux, x86_64-linux, x86_64-darwin ] - to-string-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - toboggan: [ i686-linux, x86_64-linux, x86_64-darwin ] - todo: [ i686-linux, x86_64-linux, x86_64-darwin ] - todos: [ i686-linux, x86_64-linux, x86_64-darwin ] - tofromxml: [ i686-linux, x86_64-linux, x86_64-darwin ] - toilet: [ i686-linux, x86_64-linux, x86_64-darwin ] - tokenify: [ i686-linux, x86_64-linux, x86_64-darwin ] - tokenizer-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - tokstyle: [ i686-linux, x86_64-linux, x86_64-darwin ] - toktok: [ i686-linux, x86_64-linux, x86_64-darwin ] - tokyocabinet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - tokyotyrant-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - tomato-rubato-openal: [ i686-linux, x86_64-linux, x86_64-darwin ] - toml: [ i686-linux, x86_64-linux, x86_64-darwin ] - tomland: [ i686-linux, x86_64-linux, x86_64-darwin ] - tonatona-google-server-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - too-many-cells: [ i686-linux, x86_64-linux, x86_64-darwin ] - toodles: [ i686-linux, x86_64-linux, x86_64-darwin ] - Top: [ i686-linux, x86_64-linux, x86_64-darwin ] - top: [ i686-linux, x86_64-linux, x86_64-darwin ] - topkata: [ i686-linux, x86_64-linux, x86_64-darwin ] - torch: [ i686-linux, x86_64-linux, x86_64-darwin ] - TORCS: [ i686-linux, x86_64-linux, x86_64-darwin ] - total-map: [ 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 ] - toxcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - toxiproxy-haskell: [ 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 ] - tpdb: [ i686-linux, x86_64-linux, x86_64-darwin ] - trace-call: [ i686-linux, x86_64-linux, x86_64-darwin ] - trace-function-call: [ i686-linux, x86_64-linux, x86_64-darwin ] - trace: [ i686-linux, x86_64-linux, x86_64-darwin ] - traced: [ i686-linux, x86_64-linux, x86_64-darwin ] - tracetree: [ i686-linux, x86_64-linux, x86_64-darwin ] - tracker: [ i686-linux, x86_64-linux, x86_64-darwin ] - trackit: [ i686-linux, x86_64-linux, x86_64-darwin ] - traction: [ i686-linux, x86_64-linux, x86_64-darwin ] - tracy: [ i686-linux, x86_64-linux, x86_64-darwin ] - traildb: [ i686-linux, x86_64-linux, x86_64-darwin ] - trajectory: [ i686-linux, x86_64-linux, x86_64-darwin ] - transactional-events: [ i686-linux, x86_64-linux, x86_64-darwin ] - transf: [ i686-linux, x86_64-linux, x86_64-darwin ] - transfer-db: [ i686-linux, x86_64-linux, x86_64-darwin ] - transformations: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-runnable: [ i686-linux, x86_64-linux, x86_64-darwin ] - TransformersStepByStep: [ i686-linux, x86_64-linux, x86_64-darwin ] - transient-universe-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] - transient-universe: [ i686-linux, x86_64-linux, x86_64-darwin ] - transient: [ i686-linux, x86_64-linux, x86_64-darwin ] - translatable-intset: [ i686-linux, x86_64-linux, x86_64-darwin ] - translate-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - translate: [ i686-linux, x86_64-linux, x86_64-darwin ] - trasa-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - trasa-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - trasa: [ i686-linux, x86_64-linux, x86_64-darwin ] - travis-meta-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ] - travis: [ i686-linux, x86_64-linux, x86_64-darwin ] - trawl: [ i686-linux, x86_64-linux, x86_64-darwin ] - traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ] - tree-traversals: [ i686-linux, x86_64-linux, x86_64-darwin ] - TreeCounter: [ i686-linux, x86_64-linux, x86_64-darwin ] - treemap-html-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - treemap-html: [ i686-linux, x86_64-linux, x86_64-darwin ] - TreeStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] - Treiber: [ i686-linux, x86_64-linux, x86_64-darwin ] - tremulous-query: [ i686-linux, x86_64-linux, x86_64-darwin ] - TrendGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - trhsx: [ i686-linux, x86_64-linux, x86_64-darwin ] - triangulation: [ i686-linux, x86_64-linux, x86_64-darwin ] - trie-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - TrieMap: [ i686-linux, x86_64-linux, x86_64-darwin ] - tries: [ i686-linux, x86_64-linux, x86_64-darwin ] - trigger: [ i686-linux, x86_64-linux, x86_64-darwin ] - trimpolya: [ i686-linux, x86_64-linux, x86_64-darwin ] - triplesec: [ i686-linux, x86_64-linux, x86_64-darwin ] - tripLL: [ i686-linux, x86_64-linux, x86_64-darwin ] - trivia: [ i686-linux, x86_64-linux, x86_64-darwin ] - tropical: [ i686-linux, x86_64-linux, x86_64-darwin ] - trurl: [ i686-linux, x86_64-linux, x86_64-darwin ] - tsession-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] - tsession: [ i686-linux, x86_64-linux, x86_64-darwin ] - tskiplist: [ i686-linux, x86_64-linux, x86_64-darwin ] - tsp-viz: [ i686-linux, x86_64-linux, x86_64-darwin ] - tsparse: [ i686-linux, x86_64-linux, x86_64-darwin ] - tsuntsun: [ i686-linux, x86_64-linux, x86_64-darwin ] - tsvsql: [ i686-linux, x86_64-linux, x86_64-darwin ] - ttask: [ i686-linux, x86_64-linux, x86_64-darwin ] - ttn-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - tttool: [ i686-linux, x86_64-linux, x86_64-darwin ] - tuntap: [ i686-linux, x86_64-linux, x86_64-darwin ] - tup-functor: [ i686-linux, x86_64-linux, x86_64-darwin ] - tuple-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - tuple-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] - tuple-morph: [ i686-linux, x86_64-linux, x86_64-darwin ] - tuple-ops: [ i686-linux, x86_64-linux, x86_64-darwin ] - tupleinstances: [ i686-linux, x86_64-linux, x86_64-darwin ] - turing-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] - turingMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] - turtle-options: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - twentefp-rosetree: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - twine: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-feed: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-types-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] - tx: [ i686-linux, x86_64-linux, x86_64-darwin ] - txt: [ i686-linux, x86_64-linux, x86_64-darwin ] - txtblk: [ i686-linux, x86_64-linux, x86_64-darwin ] - TYB: [ i686-linux, x86_64-linux, x86_64-darwin ] - tyfam-witnesses: [ i686-linux, x86_64-linux, x86_64-darwin ] - typalyze: [ 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 ] - type-combinators-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-combinators-singletons: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-digits: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-eq: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-indexed-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-int: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-level-bst: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-level-natural-number-induction: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-level-natural-number-operations: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-natural: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-ord-spine-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-ord: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-settheory: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-spine: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-structure: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ] - typed-admin: [ i686-linux, x86_64-linux, x86_64-darwin ] - typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ] - typed-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ] - typedflow: [ i686-linux, x86_64-linux, x86_64-darwin ] - typedquery: [ i686-linux, x86_64-linux, x86_64-darwin ] - typehash: [ i686-linux, x86_64-linux, x86_64-darwin ] - TypeIlluminator: [ i686-linux, x86_64-linux, x86_64-darwin ] - typelevel-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] - TypeNat: [ i686-linux, x86_64-linux, x86_64-darwin ] - typeparams: [ i686-linux, x86_64-linux, x86_64-darwin ] - types-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] - typesafe-precure: [ i686-linux, x86_64-linux, x86_64-darwin ] - typescript-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] - typograffiti: [ i686-linux, x86_64-linux, x86_64-darwin ] - typography-geometry: [ i686-linux, x86_64-linux, x86_64-darwin ] - tyro: [ i686-linux, x86_64-linux, x86_64-darwin ] - u2f: [ i686-linux, x86_64-linux, x86_64-darwin ] - uber: [ i686-linux, x86_64-linux, x86_64-darwin ] - uberlast: [ i686-linux, x86_64-linux, x86_64-darwin ] - uconv: [ i686-linux, x86_64-linux, x86_64-darwin ] - udev: [ i686-linux, x86_64-linux, x86_64-darwin ] - udp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - uhc-light: [ i686-linux, x86_64-linux, x86_64-darwin ] - uhc-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - uhexdump: [ i686-linux, x86_64-linux, x86_64-darwin ] - ui-command: [ i686-linux, x86_64-linux, x86_64-darwin ] - UMM: [ i686-linux, x86_64-linux, x86_64-darwin ] - unagi-bloomfilter: [ i686-linux, x86_64-linux, x86_64-darwin ] - unagi-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - unamb-custom: [ i686-linux, x86_64-linux, x86_64-darwin ] - unbound: [ i686-linux, x86_64-linux, x86_64-darwin ] - unbounded-delays-units: [ i686-linux, x86_64-linux, x86_64-darwin ] - unboxed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - unbreak: [ i686-linux, x86_64-linux, x86_64-darwin ] - uni-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] - uni-uDrawGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - unicode-normalization: [ i686-linux, x86_64-linux, x86_64-darwin ] - unicode-show: [ i686-linux, x86_64-linux, x86_64-darwin ] - unicode-symbols: [ i686-linux, x86_64-linux, x86_64-darwin ] - uniform-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - union-map: [ i686-linux, x86_64-linux, x86_64-darwin ] - unique-logic-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] - Unique: [ i686-linux, x86_64-linux, x86_64-darwin ] - uniqueid: [ i686-linux, x86_64-linux, x86_64-darwin ] - uniquely-represented-sets: [ i686-linux, x86_64-linux, x86_64-darwin ] - units-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - units-defs: [ i686-linux, x86_64-linux, x86_64-darwin ] - units: [ i686-linux, x86_64-linux, x86_64-darwin ] - unittyped: [ i686-linux, x86_64-linux, x86_64-darwin ] - unity-testresult-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - unitym-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] - universe-instances-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] - universe-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - universe: [ i686-linux, x86_64-linux, x86_64-darwin ] - universum: [ i686-linux, x86_64-linux, x86_64-darwin ] - unix-fcntl: [ i686-linux, x86_64-linux, x86_64-darwin ] - unix-handle: [ i686-linux, x86_64-linux, x86_64-darwin ] - unix-process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - unm-hip: [ i686-linux, x86_64-linux, x86_64-darwin ] - unordered-containers-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] - unordered-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] - unordered-intmap: [ i686-linux, x86_64-linux, x86_64-darwin ] - unpack-funcs: [ i686-linux, x86_64-linux, x86_64-darwin ] - unpacked-either: [ i686-linux, x86_64-linux, x86_64-darwin ] - unpacked-maybe-numeric: [ i686-linux, x86_64-linux, x86_64-darwin ] - unpacked-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] - unpacked-these: [ i686-linux, x86_64-linux, x86_64-darwin ] - unpacked-validation: [ i686-linux, x86_64-linux, x86_64-darwin ] - unroll-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - unsafely: [ i686-linux, x86_64-linux, x86_64-darwin ] - unscramble: [ i686-linux, x86_64-linux, x86_64-darwin ] - unsequential: [ i686-linux, x86_64-linux, x86_64-darwin ] - unused: [ i686-linux, x86_64-linux, x86_64-darwin ] - uom-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - up: [ i686-linux, x86_64-linux, x86_64-darwin ] - update-nix-fetchgit: [ i686-linux, x86_64-linux, x86_64-darwin ] - Updater: [ i686-linux, x86_64-linux, x86_64-darwin ] - uploadcare: [ i686-linux, x86_64-linux, x86_64-darwin ] - upskirt: [ i686-linux, x86_64-linux, x86_64-darwin ] - ureader: [ i686-linux, x86_64-linux, x86_64-darwin ] - urembed: [ i686-linux, x86_64-linux, x86_64-darwin ] - uri-bytestring-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - uri-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] - uri-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - uri-enumerator-file: [ i686-linux, x86_64-linux, x86_64-darwin ] - uri-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - uri-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] - uri-template: [ i686-linux, x86_64-linux, x86_64-darwin ] - uri: [ i686-linux, x86_64-linux, x86_64-darwin ] - url-decoders: [ i686-linux, x86_64-linux, x86_64-darwin ] - url-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] - URLb: [ i686-linux, x86_64-linux, x86_64-darwin ] - urlcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - urldecode: [ i686-linux, x86_64-linux, x86_64-darwin ] - urldisp-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] - UrlDisp: [ i686-linux, x86_64-linux, x86_64-darwin ] - urlencoded: [ i686-linux, x86_64-linux, x86_64-darwin ] - urlpath: [ i686-linux, x86_64-linux, x86_64-darwin ] - URLT: [ i686-linux, x86_64-linux, x86_64-darwin ] - urn-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - urn: [ i686-linux, x86_64-linux, x86_64-darwin ] - urxml: [ i686-linux, x86_64-linux, x86_64-darwin ] - usb-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - usb-hid: [ i686-linux, x86_64-linux, x86_64-darwin ] - usb-id-database: [ i686-linux, x86_64-linux, x86_64-darwin ] - usb-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] - usb-safe: [ i686-linux, x86_64-linux, x86_64-darwin ] - users-mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - users-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] - utc: [ i686-linux, x86_64-linux, x86_64-darwin ] - utf8-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] - utf8-validator: [ i686-linux, x86_64-linux, x86_64-darwin ] - UTFTConverter: [ i686-linux, x86_64-linux, x86_64-darwin ] - util-exception: [ i686-linux, x86_64-linux, x86_64-darwin ] - util-primitive-control: [ i686-linux, x86_64-linux, x86_64-darwin ] - util-primitive: [ i686-linux, x86_64-linux, x86_64-darwin ] - uu-cco-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - uu-cco-hut-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] - uu-cco-uu-parsinglib: [ i686-linux, x86_64-linux, x86_64-darwin ] - uu-cco: [ i686-linux, x86_64-linux, x86_64-darwin ] - uuagc-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] - uuagc-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - uuagc-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - uuagc: [ i686-linux, x86_64-linux, x86_64-darwin ] - uuid-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] - uulib: [ i686-linux, x86_64-linux, x86_64-darwin ] - uvector-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] - uvector: [ i686-linux, x86_64-linux, x86_64-darwin ] - uxadt: [ i686-linux, x86_64-linux, x86_64-darwin ] - v4l2-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - v4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] - vabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - vacuum-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] - vacuum-graphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] - vacuum-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] - vacuum-ubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - vacuum: [ i686-linux, x86_64-linux, x86_64-darwin ] - vado: [ i686-linux, x86_64-linux, x86_64-darwin ] - valid-names: [ i686-linux, x86_64-linux, x86_64-darwin ] - validate-input: [ i686-linux, x86_64-linux, x86_64-darwin ] - validated-literals: [ i686-linux, x86_64-linux, x86_64-darwin ] - validated-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - Validation: [ i686-linux, x86_64-linux, x86_64-darwin ] - validations: [ i686-linux, x86_64-linux, x86_64-darwin ] - validity-path: [ i686-linux, x86_64-linux, x86_64-darwin ] - vampire: [ i686-linux, x86_64-linux, x86_64-darwin ] - var: [ i686-linux, x86_64-linux, x86_64-darwin ] - varan: [ i686-linux, x86_64-linux, x86_64-darwin ] - variable-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] - variables: [ i686-linux, x86_64-linux, x86_64-darwin ] - variation: [ i686-linux, x86_64-linux, x86_64-darwin ] - vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - vault-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] - vault-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] - vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] - vaultenv: [ i686-linux, x86_64-linux, x86_64-darwin ] - vaultenv: [ i686-linux, x86_64-linux, x86_64-darwin ] - vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] - vcatt: [ i686-linux, x86_64-linux, x86_64-darwin ] - vcf: [ i686-linux, x86_64-linux, x86_64-darwin ] - vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] - vcswrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] - Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] - Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] - Vec-Transform: [ i686-linux, x86_64-linux, x86_64-darwin ] - vec: [ i686-linux, x86_64-linux, x86_64-darwin ] - vect-floating-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - vect-floating: [ i686-linux, x86_64-linux, x86_64-darwin ] - vect-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] - vector-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] - vector-clock: [ i686-linux, x86_64-linux, x86_64-darwin ] - vector-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - vector-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - vector-functorlazy: [ i686-linux, x86_64-linux, x86_64-darwin ] - vector-heterogenous: [ i686-linux, x86_64-linux, x86_64-darwin ] - vector-instances-collections: [ i686-linux, x86_64-linux, x86_64-darwin ] - vector-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - vector-read-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - vector-space-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] - vector-space-points: [ i686-linux, x86_64-linux, x86_64-darwin ] - vector-static: [ i686-linux, x86_64-linux, x86_64-darwin ] - vectortiles: [ i686-linux, x86_64-linux, x86_64-darwin ] - Verba: [ i686-linux, x86_64-linux, x86_64-darwin ] - verbalexpressions: [ i686-linux, x86_64-linux, x86_64-darwin ] - verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - verdict: [ i686-linux, x86_64-linux, x86_64-darwin ] - verifiable-expressions: [ i686-linux, x86_64-linux, x86_64-darwin ] - verify: [ i686-linux, x86_64-linux, x86_64-darwin ] - verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] - versioning-servant: [ i686-linux, x86_64-linux, x86_64-darwin ] - versioning: [ i686-linux, x86_64-linux, x86_64-darwin ] - vfr-waypoints: [ i686-linux, x86_64-linux, x86_64-darwin ] - vgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] - vhd: [ i686-linux, x86_64-linux, x86_64-darwin ] - vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] - vicinity: [ i686-linux, x86_64-linux, x86_64-darwin ] - ViennaRNA-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - viewprof: [ i686-linux, x86_64-linux, x86_64-darwin ] - views: [ i686-linux, x86_64-linux, x86_64-darwin ] - vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] - Villefort: [ i686-linux, x86_64-linux, x86_64-darwin ] - vimeta: [ i686-linux, x86_64-linux, x86_64-darwin ] - vimus: [ i686-linux, x86_64-linux, x86_64-darwin ] - vintage-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] - vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - vinyl-operational: [ i686-linux, x86_64-linux, x86_64-darwin ] - vinyl-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] - vinyl-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - vinyl-vectors: [ i686-linux, x86_64-linux, x86_64-darwin ] - virthualenv: [ i686-linux, x86_64-linux, x86_64-darwin ] - visibility: [ i686-linux, x86_64-linux, x86_64-darwin ] - vision: [ i686-linux, x86_64-linux, x86_64-darwin ] - visual-graphrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] - visual-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] - visualize-cbn: [ i686-linux, x86_64-linux, x86_64-darwin ] - vivid-supercollider: [ i686-linux, x86_64-linux, x86_64-darwin ] - vivid: [ i686-linux, x86_64-linux, x86_64-darwin ] - vk-aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] - VKHS: [ i686-linux, x86_64-linux, x86_64-darwin ] - voicebase: [ i686-linux, x86_64-linux, x86_64-darwin ] - vorbiscomment: [ i686-linux, x86_64-linux, x86_64-darwin ] - vowpal-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - voyeur: [ i686-linux, x86_64-linux, x86_64-darwin ] - vpq: [ i686-linux, x86_64-linux, x86_64-darwin ] - vrpn: [ i686-linux, x86_64-linux, x86_64-darwin ] - vte: [ i686-linux, x86_64-linux, x86_64-darwin ] - vtegtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] - vty-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - vty-menu: [ i686-linux, x86_64-linux, x86_64-darwin ] - vty-ui-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - vty-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] - vulkan-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - vulkan: [ i686-linux, x86_64-linux, x86_64-darwin ] - waargonaut: [ i686-linux, x86_64-linux, x86_64-darwin ] - wacom-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] - waddle: [ i686-linux, x86_64-linux, x86_64-darwin ] - wahsp: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-git-http: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-handler-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-handler-scgi: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-handler-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-handler-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-hmac-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-logger-buffered: [ 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, x86_64-linux, x86_64-darwin ] - wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-consul: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-content-type: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-delegate: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-etag: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-headers: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-hmac-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-rollbar: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-route: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-middleware-static-caching: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-request-spec: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-responsible: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-routing: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-secure-cookies: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-session-alt: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-session-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-session-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-static-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-throttler: [ i686-linux, x86_64-linux, x86_64-darwin ] - waitfree: [ i686-linux, x86_64-linux, x86_64-darwin ] - waitra: [ i686-linux, x86_64-linux, x86_64-darwin ] - waldo: [ i686-linux, x86_64-linux, x86_64-darwin ] - wallpaper: [ i686-linux, x86_64-linux, x86_64-darwin ] - warp-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] - warp-static: [ i686-linux, x86_64-linux, x86_64-darwin ] - WashNGo: [ i686-linux, x86_64-linux, x86_64-darwin ] - wasm: [ i686-linux, x86_64-linux, x86_64-darwin ] - watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] - watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] - wavefront-obj: [ i686-linux, x86_64-linux, x86_64-darwin ] - WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ] - wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] - wavy: [ i686-linux, x86_64-linux, x86_64-darwin ] - weak-bag: [ i686-linux, x86_64-linux, x86_64-darwin ] - weather-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-css: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-fpco: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-inv-route: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-output: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-page: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-push: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-routes-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-routes-regular: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-routes-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] - web-routing: [ 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 ] - WebBits: [ 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-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] - webcrank: [ i686-linux, x86_64-linux, x86_64-darwin ] - webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] - webdriver-w3c: [ i686-linux, x86_64-linux, x86_64-darwin ] - WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] - webfinger-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - webify: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkit2gtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - webpage: [ i686-linux, x86_64-linux, x86_64-darwin ] - Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] - webserver: [ i686-linux, x86_64-linux, x86_64-darwin ] - websockets-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - webwire: [ i686-linux, x86_64-linux, x86_64-darwin ] - weighted-regexp: [ i686-linux, x86_64-linux, x86_64-darwin ] - weighted: [ i686-linux, x86_64-linux, x86_64-darwin ] - welshy: [ i686-linux, x86_64-linux, x86_64-darwin ] - werewolf-slack: [ i686-linux, x86_64-linux, x86_64-darwin ] - werewolf: [ i686-linux, x86_64-linux, x86_64-darwin ] - wheb-mongo: [ i686-linux, x86_64-linux, x86_64-darwin ] - wheb-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] - wheb-strapped: [ i686-linux, x86_64-linux, x86_64-darwin ] - Wheb: [ i686-linux, x86_64-linux, x86_64-darwin ] - while-lang-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - whim: [ i686-linux, x86_64-linux, x86_64-darwin ] - whiskers: [ i686-linux, x86_64-linux, x86_64-darwin ] - whitespace: [ i686-linux, x86_64-linux, x86_64-darwin ] - why3: [ i686-linux, x86_64-linux, x86_64-darwin ] - WikimediaParser: [ i686-linux, x86_64-linux, x86_64-darwin ] - wikipedia4epub: [ i686-linux, x86_64-linux, x86_64-darwin ] - wild-bind-indicator: [ i686-linux, x86_64-linux, x86_64-darwin ] - wild-bind-task-x11: [ i686-linux, x86_64-linux, x86_64-darwin ] - windns: [ i686-linux, x86_64-linux, x86_64-darwin ] - windowslive: [ i686-linux, x86_64-linux, x86_64-darwin ] - winerror: [ i686-linux, x86_64-linux, x86_64-darwin ] - winio: [ i686-linux, x86_64-linux, x86_64-darwin ] - Wired: [ i686-linux, x86_64-linux, x86_64-darwin ] - wires: [ i686-linux, x86_64-linux, x86_64-darwin ] - wiring: [ i686-linux, x86_64-linux, x86_64-darwin ] - withdependencies: [ i686-linux, x86_64-linux, x86_64-darwin ] - wkt: [ i686-linux, x86_64-linux, x86_64-darwin ] - wl-pprint-ansiterm: [ i686-linux, x86_64-linux, x86_64-darwin ] - wl-pprint-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - wl-pprint-terminfo: [ i686-linux, x86_64-linux, x86_64-darwin ] - WL500gPControl: [ i686-linux, x86_64-linux, x86_64-darwin ] - WL500gPLib: [ i686-linux, x86_64-linux, x86_64-darwin ] - wlc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - WMSigner: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - word2vec-model: [ i686-linux, x86_64-linux, x86_64-darwin ] - WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] - wordchoice: [ i686-linux, x86_64-linux, x86_64-darwin ] - WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] - WordNet: [ i686-linux, x86_64-linux, x86_64-darwin ] - wordpass: [ i686-linux, x86_64-linux, x86_64-darwin ] - wordsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] - work-time: [ i686-linux, x86_64-linux, x86_64-darwin ] - workdays: [ i686-linux, x86_64-linux, x86_64-darwin ] - workflow-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] - workflow-osx: [ i686-linux, x86_64-linux, x86_64-darwin ] - workflow-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] - workflow-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - workflow-windows: [ i686-linux, x86_64-linux, x86_64-darwin ] - Workflow: [ i686-linux, x86_64-linux, x86_64-darwin ] - wp-archivebot: [ i686-linux, x86_64-linux, x86_64-darwin ] - wraxml: [ i686-linux, x86_64-linux, x86_64-darwin ] - wrecker-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] - wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] - wreq-sb: [ i686-linux, x86_64-linux, x86_64-darwin ] - wright: [ i686-linux, x86_64-linux, x86_64-darwin ] - ws: [ i686-linux, x86_64-linux, x86_64-darwin ] - wsdl: [ i686-linux, x86_64-linux, x86_64-darwin ] - wsedit: [ i686-linux, x86_64-linux, x86_64-darwin ] - wss-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - wtk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - wtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - wumpus-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] - wumpus-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - wumpus-drawing: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - 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 ] - 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 ] - x-dsp: [ i686-linux, x86_64-linux, x86_64-darwin ] - X11-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - x86-64bit: [ i686-linux, x86_64-linux, x86_64-darwin ] - xattr: [ i686-linux, x86_64-linux, x86_64-darwin ] - xcb-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - xdot: [ i686-linux, x86_64-linux, x86_64-darwin ] - Xec: [ i686-linux, x86_64-linux, x86_64-darwin ] - xfconf: [ i686-linux, x86_64-linux, x86_64-darwin ] - xformat: [ i686-linux, x86_64-linux, x86_64-darwin ] - xhaskell-library: [ i686-linux, x86_64-linux, x86_64-darwin ] - xhb-atom-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] - xhb-ewmh: [ i686-linux, x86_64-linux, x86_64-darwin ] - xhb: [ i686-linux, x86_64-linux, x86_64-darwin ] - xilinx-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] - xine: [ i686-linux, x86_64-linux, x86_64-darwin ] - xing-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - xkbcommon: [ i686-linux, x86_64-linux, x86_64-darwin ] - xkcd: [ i686-linux, x86_64-linux, x86_64-darwin ] - xleb: [ 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 ] - xml-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml-conduit-decode: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml-enumerator-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml-html-conduit-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-query: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml-tydom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml-tydom-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml2json: [ i686-linux, x86_64-linux, x86_64-darwin ] - xml2x: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmlbf-xeno: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmlbf-xmlhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] - XmlHtmlWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] - XMLParser: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmltv: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmms2-client-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmms2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - XMMS: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-contrib-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-contrib-gpl: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-screenshot: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-vanessa: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-windownames: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - XMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] - Xorshift128Plus: [ i686-linux, x86_64-linux, x86_64-darwin ] - xournal-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] - xournal-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] - xournal-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - xournal-render: [ i686-linux, x86_64-linux, x86_64-darwin ] - xournal-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - xsact: [ i686-linux, x86_64-linux, x86_64-darwin ] - XSaiga: [ i686-linux, x86_64-linux, x86_64-darwin ] - xsd: [ i686-linux, x86_64-linux, x86_64-darwin ] - xslt: [ i686-linux, x86_64-linux, x86_64-darwin ] - xtc: [ 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 ] - yackage: [ i686-linux, x86_64-linux, x86_64-darwin ] - YACPong: [ i686-linux, x86_64-linux, x86_64-darwin ] - yahoo-finance-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - yahoo-finance-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - yahoo-web-search: [ i686-linux, x86_64-linux, x86_64-darwin ] - yajl-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] - yajl: [ i686-linux, x86_64-linux, x86_64-darwin ] - yak: [ i686-linux, x86_64-linux, x86_64-darwin ] - yam-datasource: [ i686-linux, x86_64-linux, x86_64-darwin ] - yam-job: [ i686-linux, x86_64-linux, x86_64-darwin ] - yam-servant: [ i686-linux, x86_64-linux, x86_64-darwin ] - yam-transaction-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - yam-web: [ i686-linux, x86_64-linux, x86_64-darwin ] - yam: [ i686-linux, x86_64-linux, x86_64-darwin ] - yaml-pretty-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - yaml-rpc-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] - yaml-rpc-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - yaml-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - yaml2owl: [ i686-linux, x86_64-linux, x86_64-darwin ] - yampa-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - yampa-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] - yampa-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] - yampa-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] - yampa-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] - yampa-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - yampa2048: [ i686-linux, x86_64-linux, x86_64-darwin ] - Yampa: [ i686-linux, x86_64-linux, x86_64-darwin ] - YampaSynth: [ i686-linux, x86_64-linux, x86_64-darwin ] - yandex-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] - yaop: [ i686-linux, x86_64-linux, x86_64-darwin ] - yap: [ i686-linux, x86_64-linux, x86_64-darwin ] - yarn-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] - yarr-image-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - yarr: [ i686-linux, x86_64-linux, x86_64-darwin ] - yate: [ i686-linux, x86_64-linux, x86_64-darwin ] - yavie: [ i686-linux, x86_64-linux, x86_64-darwin ] - yaya-unsafe: [ i686-linux, x86_64-linux, x86_64-darwin ] - yaya: [ i686-linux, x86_64-linux, x86_64-darwin ] - ycextra: [ i686-linux, x86_64-linux, x86_64-darwin ] - yeller: [ i686-linux, x86_64-linux, x86_64-darwin ] - yeshql-postgresql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-angular-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-angular: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-articles: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-account-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-account: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-bcrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-bcryptdb: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-deskcom: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-fb: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-hmac-keccak: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-kerberos: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-ldap-mediocre: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-ldap-native: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-nopassword: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-zendesk: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-content-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-crud-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-crud: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-datatables: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-fast-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-form-richtext: [ 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-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-markdown: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-media-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-paginate: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-pagination: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-paypal-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-pnotify: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-raml-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-raml-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-raml-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-raml: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-recaptcha: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-routes-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-routes-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-rst: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-session-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-static-angular: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-test-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] - YFrob: [ i686-linux, x86_64-linux, x86_64-darwin ] - yggdrasil: [ i686-linux, x86_64-linux, x86_64-darwin ] - yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-dynamic-configuration: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-frontend-pango: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-frontend-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-fuzzy-open: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-ireader: [ 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-snippet: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-solarized: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-spolsky: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi: [ i686-linux, x86_64-linux, x86_64-darwin ] - yices: [ i686-linux, x86_64-linux, x86_64-darwin ] - yjftp-libs: [ i686-linux, x86_64-linux, x86_64-darwin ] - yjftp: [ i686-linux, x86_64-linux, x86_64-darwin ] - yoda: [ i686-linux, x86_64-linux, x86_64-darwin ] - Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] - Yogurt: [ i686-linux, x86_64-linux, x86_64-darwin ] - yoko: [ i686-linux, x86_64-linux, x86_64-darwin ] - york-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] - yql: [ i686-linux, x86_64-linux, x86_64-darwin ] - yst: [ i686-linux, x86_64-linux, x86_64-darwin ] - yu-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - yu-launch: [ i686-linux, x86_64-linux, x86_64-darwin ] - yu-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] - yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ] - yx: [ i686-linux, x86_64-linux, x86_64-darwin ] - yxdb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - z3-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] - z85: [ i686-linux, x86_64-linux, x86_64-darwin ] - zabt: [ i686-linux, x86_64-linux, x86_64-darwin ] - zampolit: [ i686-linux, x86_64-linux, x86_64-darwin ] - zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ] - ZEBEDDE: [ i686-linux, x86_64-linux, x86_64-darwin ] - zendesk-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - zeno: [ i686-linux, x86_64-linux, x86_64-darwin ] - zephyr: [ i686-linux, x86_64-linux, x86_64-darwin ] - zeromq-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - zeromq3-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - zeromq3-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - zeromq4-clone-pattern: [ i686-linux, x86_64-linux, x86_64-darwin ] - zeromq4-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - zeromq4-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - zeromq4-patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] - zeromq4-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - zeroth: [ i686-linux, x86_64-linux, x86_64-darwin ] - ZFS: [ i686-linux, x86_64-linux, x86_64-darwin ] - zifter-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - zifter-git: [ i686-linux, x86_64-linux, x86_64-darwin ] - zifter-google-java-format: [ i686-linux, x86_64-linux, x86_64-darwin ] - zifter-hindent: [ i686-linux, x86_64-linux, x86_64-darwin ] - zifter-hlint: [ i686-linux, x86_64-linux, x86_64-darwin ] - zifter-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] - zifter: [ i686-linux, x86_64-linux, x86_64-darwin ] - zigbee-znet25: [ i686-linux, x86_64-linux, x86_64-darwin ] - zip-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - zipedit: [ i686-linux, x86_64-linux, x86_64-darwin ] - zipkin: [ i686-linux, x86_64-linux, x86_64-darwin ] - ziptastic-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - ziptastic-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - zlib-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] - zm: [ i686-linux, x86_64-linux, x86_64-darwin ] - ZMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] - zmcat: [ i686-linux, x86_64-linux, x86_64-darwin ] - zmidi-score: [ i686-linux, x86_64-linux, x86_64-darwin ] - zoneinfo: [ i686-linux, x86_64-linux, x86_64-darwin ] - zoom-cache-pcm: [ i686-linux, x86_64-linux, x86_64-darwin ] - zoom-cache-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - zoom-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] - zoom-refs: [ i686-linux, x86_64-linux, x86_64-darwin ] - zoom: [ i686-linux, x86_64-linux, x86_64-darwin ] - zre: [ i686-linux, x86_64-linux, x86_64-darwin ] - zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] - zstd: [ i686-linux, x86_64-linux, x86_64-darwin ] - zsyntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - ztar: [ i686-linux, x86_64-linux, x86_64-darwin ] - zuramaru: [ i686-linux, x86_64-linux, x86_64-darwin ] - Zwaluw: [ i686-linux, x86_64-linux, x86_64-darwin ] - zxcvbn-c: [ i686-linux, x86_64-linux, x86_64-darwin ] +broken-packages: + # these packages don't compile + - 3dmodels + - 4Blocks + - a50 + - AAI + - abcBridge + - abcnotation + - abeson + - abnf + - AbortT-monadstf + - AbortT-mtl + - AbortT-transformers + - abstract-par-accelerate + - abt + - AC-BuildPlatform + - AC-EasyRaster-GTK + - AC-HalfInteger + - ac-machine + - ac-machine-conduit + - AC-MiniTest + - AC-Terminal + - AC-VanillaArray + - AC-Vector + - AC-Vector-Fancy + - accelerate + - accelerate-arithmetic + - accelerate-fftw + - accelerate-fourier + - accelerate-io + - accelerate-llvm + - accelerate-llvm-native + - accelerate-random + - accelerate-typelits + - accelerate-utility + - accentuateus + - access-time + - access-token-provider + - acid-state-dist + - acid-state-tls + - ACME + - acme-all-monad + - acme-comonad + - acme-flipping-tables + - acme-hq9plus + - acme-http + - acme-inator + - acme-kitchen-sink + - acme-left-pad + - acme-miscorder + - acme-mutable-package + - acme-now + - acme-numbersystem + - acme-operators + - acme-php + - acme-schoenfinkel + - acme-strfry + - acme-stringly-typed + - acme-zalgo + - acme-zero + - ActionKid + - activehs + - activehs-base + - activitypub + - activitystreams-aeson + - actor + - Adaptive + - Adaptive-Blaisorblade + - adaptive-containers + - adaptive-tuple + - adb + - adhoc-network + - adict + - adobe-swatch-exchange + - adp-multi + - adp-multi-monadiccp + - ADPfusion + - ADPfusionForest + - ADPfusionSet + - adtrees + - Advgame + - AERN-Basics + - AERN-Net + - AERN-Real + - AERN-Real-Double + - AERN-Real-Interval + - AERN-RnToRm + - AERN-RnToRm-Plot + - aern2-mp + - aern2-real + - aeson-applicative + - aeson-decode + - aeson-diff-generic + - aeson-extra + - aeson-flowtyped + - aeson-injector + - aeson-native + - aeson-prefix + - aeson-schema + - aeson-smart + - aeson-streams + - aeson-t + - aeson-tiled + - aeson-typescript + - affine-invariant-ensemble-mcmc + - afv + - ag-pictgen + - Agata + - agda-server + - agda-snippets + - agda-snippets-hakyll + - agentx + - AGI + - AhoCorasick + - aig + - aip + - air-th + - airbrake + - airship + - airtable-api + - aivika-distributed + - aivika-experiment-cairo + - aivika-experiment-chart + - aivika-experiment-diagrams + - ajhc + - AlanDeniseEricLauren + - alerta + - alex-meta + - alex-prelude + - alfred + - alga + - algebra + - algebra-sql + - algebraic + - algebraic-prelude + - algo-s + - algolia + - AlgoRhythm + - AlgorithmW + - align-text + - AlignmentAlgorithms + - alms + - alpha + - alphachar + - alsa + - alsa-gui + - alsa-midi + - alsa-pcm-tests + - alsa-seq-tests + - altcomposition + - alternative-extra + - alternative-io + - alto + - alure + - amazon-emailer + - amazon-emailer-client-snap + - amazon-products + - amazonka-s3-streaming + - amby + - AMI + - ampersand + - amqp-conduit + - analyze + - analyze-client + - anansi-pandoc + - anatomy + - android + - android-activity + - android-lint-summary + - AndroidViewHierarchyImporter + - angel + - angle + - Animas + - animascii + - animate + - animate-example + - animate-frames + - animate-preview + - animate-sdl2 + - annah + - Annotations + - anonymous-sums + - anonymous-sums-tests + - ansi-terminal-game + - antagonist + - antfarm + - anticiv + - antigate + - antimirov + - antiope-contract + - antiope-messages + - antiope-s3 + - antiope-sqs + - antisplice + - antlr-haskell + - antlrc + - anydbm + - aosd + - apart + - apelsin + - api-builder + - api-tools + - apiary + - apiary-authenticate + - apiary-clientsession + - apiary-cookie + - apiary-eventsource + - apiary-helics + - apiary-http-client + - apiary-logger + - apiary-memcached + - apiary-mongoDB + - apiary-persistent + - apiary-purescript + - apiary-redis + - apiary-session + - apiary-websockets + - apis + - apns-http2 + - apotiki + - app-lens + - appc + - ApplePush + - AppleScript + - applicative-fail + - applicative-parsec + - applicative-quoters + - applicative-splice + - ApproxFun-hs + - arb-fft + - arbb-vm + - arbor-monad-metric + - arbor-monad-metric-datadog + - arbor-postgres + - arbtt + - archiver + - archlinux + - archlinux-web + - archnews + - arena + - arff + - arghwxhaskell + - argon + - argon2 + - argparser + - arguedit + - ariadne + - arion + - arith-encode + - armada + - armor + - arpa + - arpack + - array-forth + - array-primops + - ArrayRef + - arrow-improve + - arrow-list + - arrowapply-utils + - arrowp + - arrowp-qq + - ArrowVHDL + - artery + - artifact + - ascii-flatten + - ascii-vector-avc + - ascii85-conduit + - asic + - asif + - asil + - asn + - asn1-codec + - AspectAG + - assert + - assertions + - asset-map + - assimp + - ast-monad + - ast-monad-json + - astrds + - astview + - async-combinators + - async-dejafu + - async-manager + - async-pool + - async-timer + - asynchronous-exceptions + - aterm + - aterm-utils + - atlassian-connect-core + - atmos-dimensional-tf + - atndapi + - atom-conduit + - atom-msp430 + - atomic-modify + - atomic-primops-foreign + - atomic-primops-vector + - atomo + - ats-format + - ats-setup + - ats-storable + - attic-schedule + - AttoBencode + - AttoJson + - attoparsec-data + - attoparsec-enumerator + - attoparsec-ip + - attoparsec-iteratee + - attoparsec-text + - attoparsec-text-enumerator + - attoparsec-time + - attoparsec-trans + - attoparsec-uri + - attoparsec-varword + - attosplit + - Attrac + - atuin + - audiovisual + - augeas + - augur + - aur + - aur-api + - aura + - Aurochs + - authenticate-ldap + - authoring + - AutoForms + - autom + - automata + - autonix-deps + - autonix-deps-kf5 + - avatar-generator + - avers + - avers-api + - avers-api-docs + - avers-server + - avl-static + - AvlTree + - avr-shake + - awesome-prelude + - awesomium + - awesomium-glut + - awesomium-raw + - aws-configuration-tools + - aws-dynamodb-conduit + - aws-dynamodb-streams + - aws-ec2 + - aws-ec2-knownhosts + - aws-elastic-transcoder + - aws-general + - aws-kinesis + - aws-kinesis-client + - aws-kinesis-reshard + - aws-lambda + - aws-mfa-credentials + - aws-performance-tests + - aws-route53 + - aws-sdk + - aws-sdk-text-converter + - aws-sdk-xml-unordered + - aws-sign4 + - aws-simple + - aws-sns + - axiom + - azubi + - azure-service-api + - azure-servicebus + - azurify + - babylon + - backdropper + - backtracking-exceptions + - backward-state + - bag + - Baggins + - bake + - ballast + - bamboo + - bamboo-launcher + - bamboo-plugin-highlight + - bamboo-plugin-photo + - bamboo-theme-blueprint + - bamboo-theme-mini-html5 + - bamse + - bamstats + - Bang + - bank-holiday-usa + - banwords + - barchart + - barcodes-code128 + - barecheck + - Barracuda + - barrie + - barrier + - barrier-monad + - base-compat-migrate + - base-feature-macros + - base-generics + - base-io-access + - base64-bytestring-type + - base64-conduit + - baserock-schema + - BASIC + - baskell + - batch + - batchd + - battlenet + - battlenet-yesod + - battleship-combinatorics + - battleships + - bayes-stack + - BCMtools + - bdcs + - bdcs-api + - beam + - beam-core + - beam-migrate + - beam-newtype-field + - beam-postgres + - beam-sqlite + - beam-th + - beamable + - beautifHOL + - beeminder-api + - Befunge93 + - bein + - belka + - bench-graph + - bench-show + - BenchmarkHistory + - bencodex + - berkeleydb + - BerkeleyDBXML + - BerlekampAlgorithm + - berp + - besout + - bet + - betacode + - betris + - bff + - bgmax + - bgzf + - bhoogle + - bibdb + - bidirectionalization-combined + - bidispec + - bidispec-extras + - bifunctor + - BiGUL + - billboard-parser + - billeksah-forms + - billeksah-main + - billeksah-pane + - billeksah-services + - binary-communicator + - binary-derive + - binary-ext + - binary-file + - binary-indexed-tree + - binary-protocol + - binary-protocol-zmq + - binary-streams + - binary-strict + - binary-typed + - bind-marshal + - binding-gtk + - binding-wx + - bindings-apr + - bindings-apr-util + - bindings-bfd + - bindings-cctools + - bindings-common + - bindings-dc1394 + - bindings-eskit + - bindings-EsounD + - bindings-fann + - bindings-fluidsynth + - bindings-friso + - bindings-gsl + - bindings-gts + - bindings-hamlib + - bindings-hdf5 + - bindings-K8055 + - bindings-libftdi + - bindings-libg15 + - bindings-librrd + - bindings-libstemmer + - bindings-libv4l2 + - bindings-monetdb-mapi + - bindings-mpdecimal + - bindings-portaudio + - bindings-sc3 + - bindings-sipc + - bindings-wlc + - bindynamic + - binembed + - binembed-example + - bins + - bio + - bio-sequence + - bioace + - bioalign + - Biobase + - BiobaseBlast + - BiobaseDotP + - BiobaseEnsembl + - BiobaseFR3D + - BiobaseHTTP + - BiobaseHTTPTools + - BiobaseInfernal + - BiobaseMAF + - BiobaseNewick + - BiobaseTrainingData + - BiobaseTurner + - BiobaseVienna + - BiobaseXNA + - biocore + - biofasta + - biofastq + - biohazard + - bioinformatics-toolkit + - biophd + - biopsl + - biosff + - biostockholm + - birch-beer + - bird + - BirdPP + - bisect-binary + - bit-array + - bit-stream + - bitcoin-hs + - bitcoin-rpc + - Bitly + - bitly-cli + - bitmaps + - bits-conduit + - bitset + - bitspeak + - bitstream + - BitStringRandomMonad + - bittorrent + - bitvec + - bizzlelude + - bizzlelude-js + - bkr + - bla + - blakesum + - blakesum-demo + - blas + - blas-carray + - blas-comfort-array + - blas-ffi + - blas-hs + - BlastHTTP + - blastxml + - blatex + - blaze-builder-enumerator + - blaze-html-contrib + - blaze-html-hexpat + - blaze-html-truncate + - blaze-json + - blaze-textual-native + - blazeT + - ble + - blink1 + - blip + - bliplib + - Blobs + - blockchain + - blockhash + - Blogdown + - blogination + - bloodhound + - bloodhound-amazonka-auth + - bloomfilter-redis + - blosum + - blubber + - blubber-server + - Blueprint + - bluetile + - bluetileutils + - blunk-hask-tests + - blunt + - BNFC-meta + - bno055-haskell + - bogre-banana + - bolt + - boltzmann-brain + - bond + - bond-haskell + - bond-haskell-compiler + - bookkeeper + - bookkeeper-permissions + - Bookshelf + - boolexpr + - boombox + - boomslang + - borel + - boring + - boring-window-switcher + - bot + - bound-extras + - bounded-array + - bowntz + - braid + - brain-bleep + - Bravo + - breakout + - breve + - brians-brain + - brick-dropdownmenu + - bricks + - bricks-internal + - bricks-internal-test + - bricks-parsec + - bricks-rendering + - bricks-syntax + - brillig + - brittany + - broadcast-chan + - broadcast-chan-conduit + - broadcast-chan-pipes + - broadcast-chan-tests + - broccoli + - brok + - broker-haskell + - bronyradiogermany-streaming + - browscap + - bson-generic + - bson-generics + - btree-concurrent + - buchhaltung + - buffer + - buffer-builder-aeson + - BufferedSocket + - buffon + - bugzilla + - build + - buildable + - buildbox-tools + - buildwrapper + - bullet + - bumper + - bunz + - burnt-explorer + - burst-detection + - bus-pirate + - buster + - Buster + - buster-gtk + - buster-network + - butcher + - butter + - butterflies + - bv-sized + - bytable + - bytestring-arbitrary + - bytestring-builder-varword + - bytestring-class + - bytestring-csv + - bytestring-handle + - bytestring-plain + - bytestring-read + - bytestring-rematch + - bytestring-show + - bytestring-time + - bytestring-typenats + - bytestringparser + - bytestringreadp + - c-dsl + - c-io + - c0check + - c0parser + - c2ats + - c2hsc + - cabal-audit + - cabal-bundle-clib + - cabal-cargs + - cabal-constraints + - cabal-db + - cabal-debian + - cabal-dependency-licenses + - cabal-dev + - cabal-dir + - cabal-ghc-dynflags + - cabal-ghci + - cabal-graphdeps + - cabal-helper + - Cabal-ide-backend + - cabal-info + - cabal-install-bundle + - cabal-install-ghc72 + - cabal-install-ghc74 + - cabal-meta + - cabal-mon + - cabal-nirvana + - cabal-progdeps + - cabal-query + - cabal-setup + - cabal-sort + - cabal-src + - cabal-test + - cabal-toolkit + - cabal-upload + - cabal2arch + - cabal2doap + - cabal2ebuild + - cabal2ghci + - cabalgraph + - cabalish + - cabalmdvrpm + - cabalQuery + - cabalrpmdeps + - CabalSearch + - cabalvchk + - cabin + - cabocha + - cached + - caffegraph + - cairo-core + - cake + - cake3 + - cakyrespa + - cal-layout + - cal3d + - cal3d-examples + - cal3d-opengl + - calc + - calculator + - caldims + - caledon + - call + - call-haskell-from-anything + - camfort + - campfire + - canon + - canonical-filepath + - canonical-json + - canteven-http + - canteven-listen-http + - canteven-log + - canteven-parsedate + - cantor + - cao + - cap + - Capabilities + - capability + - capataz + - capnp + - capped-list + - capri + - car-pool + - carbonara + - carboncopy + - carettah + - CarneadesDSL + - CarneadesIntoDung + - carte + - cartel + - Cartesian + - casa-abbreviations-and-acronyms + - casadi-bindings + - casadi-bindings-control + - casadi-bindings-core + - casadi-bindings-internal + - casadi-bindings-ipopt-interface + - casadi-bindings-snopt-interface + - Cascade + - cascading + - cash + - cassandra-cql + - Cassava + - cassava-streams + - cassette + - cassy + - castle + - casui + - catamorphism + - Catana + - catch-fd + - categorical-algebra + - category + - category-extras + - category-traced + - catnplus + - cayley-client + - CBOR + - CC-delcont-alt + - CC-delcont-cxe + - CC-delcont-exc + - CC-delcont-ref + - CC-delcont-ref-tf + - CCA + - cci + - ccnx + - cctools-workqueue + - cedict + - cef + - cef3-raw + - cef3-simple + - ceilometer-common + - cellrenderer-cairo + - celtchar + - cerberus + - cereal-derive + - cereal-enumerator + - cereal-ieee754 + - cereal-io-streams + - cereal-plus + - certificate + - cf + - cfipu + - cflp + - cfopu + - cg + - cgen + - cgi-utils + - cgrep + - chalkboard + - chalkboard-viewer + - charade + - Chart + - Chart-cairo + - Chart-diagrams + - Chart-gtk + - chart-histogram + - Chart-simple + - chart-unit + - chatter + - chatty-text + - chatwork + - cheapskate-terminal + - check-pvp + - Checked + - checked + - checkmate + - chevalier-common + - chiasma + - chitauri + - Chitra + - choose + - choose-exe + - chorale + - chorale-geo + - chp + - chp-mtl + - chp-plus + - chp-spec + - chp-transformers + - chr-core + - chr-lang + - chr-parse + - ChristmasTree + - chromatin + - chronograph + - chu2 + - chunks + - chunky + - cielo + - cil + - cinvoke + - cio + - ciphersaber2 + - circlehs + - citation-resolve + - citeproc-hs + - citeproc-hs-pandoc-filter + - cj-token + - cjk + - clac + - clafer + - claferIG + - claferwiki + - clang-compilation-database + - clang-pure + - clanki + - clarifai + - CLASE + - clash + - clash-ghc + - clash-lib + - clash-multisignal + - clash-prelude + - Clash-Royale-Hack-Cheats + - clash-systemverilog + - clash-verilog + - clash-vhdl + - classify-frog + - ClassLaws + - classy-miso + - classy-parallel + - ClassyPrelude + - clay + - clckwrks + - clckwrks-cli + - clckwrks-dot-com + - clckwrks-plugin-bugs + - clckwrks-plugin-ircbot + - clckwrks-plugin-mailinglist + - clckwrks-plugin-media + - clckwrks-plugin-page + - clckwrks-theme-bootstrap + - clckwrks-theme-clckwrks + - clckwrks-theme-geo-bootstrap + - Clean + - clean-unions + - cless + - clevercss + - clexer + - CLI + - cli-builder + - clif + - clifford + - clifm + - clingo + - clippard + - clipper + - clippings + - clit + - clocked + - clogparse + - clone-all + - closure + - cloud-haskell + - cloud-seeder + - cloudfront-signer + - clr-inline + - clua + - cluss + - ClustalParser + - clustering + - clustertools + - clutterhs + - cmark-sections + - cmath + - cmathml3 + - CMCompare + - cmd-item + - cmdargs-browser + - cmdlib + - cmdtheline + - cmonad + - cmph + - cmt + - cmv + - cnc-spec-compiler + - co-log-sys + - Coadjute + - coalpit + - code-builder + - codec-beam + - codec-libevent + - codec-rpm + - codecov-haskell + - codemonitor + - codepad + - codex + - coin + - coinbase-exchange + - coincident-root-loci + - colada + - colchis + - collada-output + - collada-types + - collapse-duplication + - collapse-util + - collections + - collections-api + - collections-base-instances + - color-counter + - colorless + - colorless-http-client + - colorless-scotty + - colour-accelerate + - colour-space + - coltrane + - columbia + - com + - comark-syntax + - combinat + - combinat-diagrams + - combinator-interactive + - combinatorial-problems + - Combinatorrent + - combobuffer + - comic + - Command + - commander + - Commando + - commodities + - commsec + - commsec-keyexchange + - comonad-extras + - ComonadSheet + - compact-map + - compact-mutable + - compact-socket + - compact-string + - compact-string-fix + - Compactable + - compdata-dags + - competition + - compilation + - complexity + - compose-trans + - composite-aeson + - composite-aeson-refined + - composite-base + - composite-ekg + - composite-opaleye + - composite-swagger + - composition-tree + - compound-types + - compressed + - compstrat + - comptrans + - computational-algebra + - computations + - concraft + - concraft-hr + - concraft-pl + - concrete-haskell + - concrete-haskell-autogen + - concrete-relaxng-parser + - concrete-typerep + - concurrency-benchmarks + - concurrent-buffer + - Concurrent-Cache + - concurrent-machines + - concurrent-state + - Concurrential + - ConcurrentUtils + - Condor + - condor + - condorcet + - conductive-base + - conductive-hsc3 + - conductive-song + - conduit-algorithms + - conduit-audio-lame + - conduit-audio-samplerate + - conduit-find + - conduit-merge + - conduit-network-stream + - conduit-resumablesink + - conduit-throttle + - conduit-tokenize-attoparsec + - conduit-zstd + - conf + - conffmt + - confide + - config-parser + - config-select + - ConfigFileTH + - Configger + - configifier + - Configurable + - configuration + - configurator-ng + - congruence-relation + - conjure + - conkin + - conlogger + - connection-string + - Conscript + - consistent + - console-program + - const-math-ghc-plugin + - constrained-category + - constrained-dynamic + - constrained-monads + - constraint + - constraint-manip + - constraint-reflection + - ConstraintKinds + - constraints-deriving + - constraints-emerge + - constraints-extras + - constructive-algebra + - consul-haskell + - Consumer + - consumers + - containers-benchmark + - containers-unicode-symbols + - ContArrow + - content-store + - context-free-grammar + - context-stack + - ContextAlgebra + - contiguous-fft + - continue + - continuum + - continuum-client + - Contract + - control-event + - control-monad-attempt + - control-monad-exception + - control-monad-exception-monadsfd + - control-monad-exception-monadstf + - control-monad-exception-mtl + - control-monad-failure + - control-monad-failure-mtl + - Control-Monad-MultiPass + - Control-Monad-ST2 + - contstuff-monads-tf + - contstuff-transformers + - convert-annotation + - convertible-ascii + - convertible-text + - copilot + - copilot-c99 + - copilot-cbmc + - copilot-core + - copilot-language + - copilot-libraries + - copilot-sbv + - copilot-theorem + - copr + - COrdering + - core + - core-haskell + - corebot-bliki + - CoreDump + - CoreErlang + - CoreFoundation + - Coroutine + - coroutine-enumerator + - coroutine-iteratee + - coroutine-object + - couch-hs + - couch-simple + - CouchDB + - couchdb-conduit + - couchdb-enumerator + - countable-inflections + - counter + - courier + - court + - coverage + - cparsing + - CPBrainfuck + - cpio-conduit + - cplusplus-th + - cprng-aes-effect + - cpuperf + - cpython + - cql-io + - cql-io-tinylog + - cqrs-core + - cqrs-example + - cqrs-memory + - cqrs-postgresql + - cqrs-sqlite3 + - cqrs-test + - cqrs-testkit + - cr + - crack + - craft + - Craft3e + - craftwerk + - craftwerk-cairo + - craftwerk-gtk + - crawlchain + - craze + - crc + - crc16 + - creatur + - credential-store + - crf-chain1 + - crf-chain1-constrained + - crf-chain2-generic + - crf-chain2-tiers + - critbit + - criterion-plus + - criterion-to-html + - criu-rpc + - criu-rpc-types + - crjdt-haskell + - crocodile + - cron + - cron-compat + - cruncher-types + - crunghc + - crypto-cipher-benchmarks + - crypto-classical + - crypto-conduit + - crypto-multihash + - crypto-random-effect + - crypto-simple + - cryptocompare + - cryptoconditions + - cryptol + - cryptsy-api + - crystalfontz + - cse-ghc-plugin + - csg + - csound-catalog + - CSPM-cspm + - CSPM-FiringRules + - CSPM-Frontend + - CSPM-Interpreter + - CSPM-ToProlog + - cspmchecker + - cspretty + - css + - csv-enumerator + - csv-nptools + - ctemplate + - ctkl + - ctpl + - cube + - cuboid + - cudd + - curl-runnings + - currency-convert + - curry-frontend + - CurryDB + - cursedcsv + - cursor-gen + - curve25519 + - curves + - custom-prelude + - CV + - cyclotomic + - cypher + - d-bus + - d3js + - dag + - DAG-Tournament + - Dangerous + - Dao + - dao + - dapi + - darcs-benchmark + - darcs-beta + - darcs-buildpackage + - darcs-cabalized + - darcs-fastconvert + - darcs-graph + - darcs-monitor + - darcs2dot + - darcsden + - DarcsHelpers + - darcswatch + - darkplaces-demo + - darkplaces-rcon + - darkplaces-rcon-util + - darkplaces-text + - dash-haskell + - data-accessor-monads-fd + - data-accessor-monads-tf + - data-base + - data-basic + - data-category + - data-check + - data-concurrent-queue + - data-construction + - data-cycle + - data-dispersal + - data-easy + - data-emoticons + - data-filepath + - data-fin + - data-fin-simple + - data-flagset + - data-interval + - data-ivar + - data-kiln + - data-layer + - data-lens + - data-lens-fd + - data-lens-ixset + - data-lens-template + - data-map-multikey + - data-named + - data-nat + - data-object + - data-object-json + - data-object-yaml + - data-pprint + - data-quotientref + - data-r-tree + - data-reify-cse + - data-repr + - data-result + - data-rev + - Data-Rope + - data-rope + - data-rtuple + - data-size + - data-spacepart + - data-standards + - data-store + - data-stringmap + - data-structure-inferrer + - data-type + - data-util + - data-variant + - database-study + - datadog + - datadog-tracing + - datafix + - dataflow + - datalog + - datasets + - DataTreeView + - datetime + - datetime-sb + - dawdle + - dawg + - dawg-ord + - dbcleaner + - DBFunctor + - dbjava + - DBlimited + - dbm + - dbmigrations-mysql + - dbmigrations-postgresql + - dbmigrations-sqlite + - DBus + - dbus-client + - dbus-core + - dbus-qq + - dclabel + - dclabel-eci11 + - dcpu16 + - ddate + - ddc-base + - ddc-build + - ddc-code + - ddc-core + - ddc-core-babel + - ddc-core-eval + - ddc-core-flow + - ddc-core-llvm + - ddc-core-salt + - ddc-core-simpl + - ddc-core-tetra + - ddc-driver + - ddc-interface + - ddc-source-tetra + - ddc-tools + - ddc-war + - ddci-core + - dde + - dead-code-detection + - dead-simple-json + - Deadpan-DDP + - debian + - debug-me + - debug-trace-var + - decepticons + - decimal-arithmetic + - DecisionTree + - declarative + - decoder-conduit + - dedukti + - deepcontrol + - deeplearning-hs + - deepseq-bounded + - deepseq-magic + - deepseq-th + - deepzoom + - defargs + - DefendTheKing + - deka + - deka-tests + - delaunay + - delicious + - delimited-text + - delimiter-separated + - delta + - delta-h + - Delta-Lambda + - delude + - demarcate + - denominate + - dense-int-set + - dependent-monoidal-map + - dependent-state + - dependent-sum-aeson-orphans + - depends + - dephd + - deptrack-core + - deptrack-devops + - deptrack-dot + - derangement + - derivation-trees + - derive-enumerable + - derive-gadt + - derive-IG + - derive-monoid + - derive-topdown + - derive-trie + - derp-lib + - descript-lang + - deterministic-game-engine + - detour-via-uom + - deunicode + - devil + - dewdrop + - df1 + - dfinity-radix-tree + - Dflow + - dfsbuild + - dgim + - dgs + - dhall-check + - dhall-nix + - dhall-to-cabal + - dhcp-lease-parser + - di + - di-df1 + - di-handle + - dia-base + - dia-functions + - diagrams-boolean + - diagrams-canvas + - diagrams-graphviz + - diagrams-gtk + - diagrams-hsqml + - diagrams-html5 + - diagrams-pandoc + - diagrams-pdf + - diagrams-qrcode + - diagrams-tikz + - diagrams-wx + - dib + - dice-entropy-conduit + - dice2tex + - dicom + - dictionaries + - dictparser + - diet + - diffcabal + - difference-monoid + - DifferenceLogic + - differential + - DifferentialEvolution + - difftodo + - digestive-bootstrap + - digestive-foundation-lucid + - digestive-functors-heist + - digestive-functors-hsp + - DigitalOcean + - digitalocean-kzs + - dimensional-tf + - DimensionalHash + - dingo-core + - dingo-example + - dingo-widgets + - diophantine + - diplomacy + - diplomacy-server + - direct-binary-files + - direct-fastcgi + - direct-http + - direct-plugins + - direct-rocksdb + - directed-cubical + - dirfiles + - discogs-haskell + - discord-gateway + - discord-haskell + - discord-hs + - discord-rest + - discord-types + - discordian-calendar + - DiscussionSupportSystem + - Dish + - disjoint-containers + - disjoint-set + - disjoint-set-stateful + - diskhash + - disposable + - Dist + - dist-upload + - distance + - DisTract + - distributed-closure + - distributed-fork + - distributed-fork-aws-lambda + - distributed-process + - distributed-process-async + - distributed-process-azure + - distributed-process-client-server + - distributed-process-ekg + - distributed-process-execution + - distributed-process-extras + - distributed-process-fsm + - distributed-process-lifted + - distributed-process-monad-control + - distributed-process-p2p + - distributed-process-platform + - distributed-process-registry + - distributed-process-simplelocalnet + - distributed-process-supervisor + - distributed-process-systest + - distributed-process-task + - distributed-process-tests + - distributed-process-zookeeper + - distributed-static + - distribution + - distribution-plot + - diversity + - dixi + - djembe + - djinn-th + - dmenu + - dmenu-pkill + - dmenu-pmount + - dmenu-search + - DMuCheck + - DnaProteinAlignment + - dnscache + - dnsrbl + - dnssd + - doc-review + - doccheck + - docidx + - docker + - docker-build-cacher + - dockercook + - DocTest + - doctest-discover-configurator + - doctest-driver-gen + - doctest-prop + - docusign-example + - docvim + - doi + - DOM + - dom-lt + - domain-auth + - domplate + - dot-linker + - dotenv + - dotfs + - doublify-toolkit + - download-media-content + - dozenal + - dozens + - DP + - dph-base + - dph-examples + - dph-lifted-base + - dph-lifted-copy + - dph-lifted-vseg + - dph-prim-interface + - dph-prim-par + - dph-prim-seq + - dpkg + - DPM + - dpor + - dragen + - drawille + - drClickOn + - dresdner-verkehrsbetriebe + - DrHylo + - DrIFT + - DrIFT-cabalized + - drifter-postgresql + - drmaa + - dropbox-sdk + - dropsolve + - ds-kanren + - DSA + - DSH + - dsh-sql + - dsmc + - dsmc-tools + - dson + - dson-parsec + - DSTM + - dstring + - dtab + - DTC + - dtd + - dtd-text + - dtw + - dual + - Dung + - duplo + - Dust + - Dust-crypto + - Dust-tools + - Dust-tools-pcap + - dvda + - dvdread + - dvi-processing + - dwarfadt + - dyckword + - dynamic-cabal + - dynamic-graph + - dynamic-object + - dynamic-plot + - dynamic-pp + - DynamicTimeWarp + - dynamodb-simple + - dynobud + - DysFRP + - DysFRP-Cairo + - DysFRP-Craftwerk + - dywapitchtrack + - dzen-utils + - earclipper + - ease + - easy-api + - easyjson + - easyplot + - easytensor + - easytensor-vulkan + - ebeats + - ebnf-bff + - ecma262 + - ecu + - eddie + - edenmodules + - edenskel + - edentv + - edge + - edges + - edit + - edit-lenses + - editable + - editline + - EditTimeReport + - effect-handlers + - effects + - effects-parser + - effin + - egison-quote + - egison-tutorial + - ehaskell + - ehs + - eibd-client-simple + - eigen + - Eight-Ball-Pool-Hack-Cheats + - either-list-functions + - EitherT + - ekg-elastic + - ekg-elasticsearch + - ekg-influxdb + - ekg-log + - ekg-prometheus-adapter + - ekg-push + - ekg-rrd + - elevator + - elision + - elm-websocket + - elsa + - emacs-keys + - email + - email-header + - email-postmark + - email-validator + - emailparse + - embeddock + - embeddock-example + - embroidery + - emd + - emgm + - Emping + - Empty + - empty-monad + - encoding + - encoding-io + - engine-io-growler + - engine-io-snap + - engine-io-wai + - engine-io-yesod + - ENIG + - entangle + - EntrezHTTP + - entwine + - EnumContainers + - enumerate + - enumerate-function + - enumeration + - enumerator + - enumerator-fd + - enumerator-tf + - enumfun + - EnumMap + - enummapmap + - enummapset + - enummapset-th + - env-parser + - envstatus + - epanet-haskell + - epass + - epic + - epoll + - eprocess + - epubname + - Eq + - EqualitySolver + - erd + - erf-native + - eros + - eros-client + - eros-http + - error-context + - error-continuations + - error-list + - error-loc + - error-message + - errors-ext + - ersaconcat + - ersatz + - ersatz-toysat + - ert + - escape-artist + - escoger + - esotericbot + - EsounD + - espial + - ess + - estimators + - EstProgress + - estreps + - Etage + - Etage-Graph + - EtaMOO + - eternal + - Eternal10Seconds + - eternity + - eternity-timestamped + - ether + - Etherbunny + - ethereum-analyzer + - ethereum-analyzer-cli + - ethereum-analyzer-webui + - ethereum-client-haskell + - ethereum-merkle-patricia-db + - eths-rlp + - euphoria + - eurofxref + - Euterpea + - eve + - eve-cli + - event + - event-driven + - event-monad + - eventful-dynamodb + - eventful-postgresql + - eventloop + - EventSocket + - eventsource-geteventstore-store + - eventstore + - every-bit-counts + - exact-cover + - exact-real + - exact-real-positional + - except-exceptions + - exception-hierarchy + - exception-monads-fd + - exchangerates + - execs + - executor + - exference + - exherbo-cabal + - exif + - exinst-deepseq + - exinst-hashable + - exists + - exitcode + - expand + - expat-enumerator + - expiring-containers + - explain + - explicit-constraint-lens + - explicit-determinant + - explicit-iomodes + - explicit-iomodes-bytestring + - explicit-iomodes-text + - explicit-sharing + - explore + - exposed-containers + - expressions + - expressions-z3 + - extcore + - extemp + - extended-categories + - extensible-data + - extensible-effects-concurrent + - Extra + - extract-dependencies + - extractelf + - ez-couch + - f-ree-hack-cheats-free-v-bucks-generator + - Facebook-Password-Hacker-Online-Latest-Version + - faceted + - Facts + - factual-api + - fadno + - fadno-braids + - fadno-xml + - failable-list + - failure-detector + - FailureT + - fake + - fake-type + - faktory + - falling-turnip + - fallingblocks + - family-tree + - fast-arithmetic + - fast-combinatorics + - fast-nats + - fasta + - fastbayes + - fastedit + - fastirc + - fastly + - fastparser + - FastPush + - FastxPipe + - fathead-util + - fault-tree + - fay + - fay-base + - fay-builder + - fay-dom + - fay-geoposition + - fay-hsx + - fay-jquery + - fay-ref + - fay-simplejson + - fay-text + - fay-uri + - fay-websockets + - fb-persistent + - fbmessenger-api + - fca + - fcache + - fcd + - fcg + - fckeditor + - fclabels-monadlib + - FComp + - fdo-trash + - feature-flipper + - feature-flipper-postgres + - fedora-packages + - feed-cli + - feed-collect + - feed-crawl + - feed-gipeda + - feed-translator + - feed2lj + - feed2twitter + - feldspar-compiler + - feldspar-language + - fenfire + - FermatsLastMargin + - fernet + - FerryCore + - festung + - Feval + - ffeed + - ffmpeg-light + - ffmpeg-tutorials + - ffunctor + - fgl-extras-decompositions + - fib + - fibon + - ficketed + - fields + - FieldTrip + - fieldwise + - fig + - file-collection + - file-command-qq + - file-location + - filediff + - FileManip + - FileManipCompat + - fileneglect + - filepath-io-access + - FilePather + - filepather + - Files + - FileSystem + - filesystem-conduit + - filesystem-enumerator + - filesystem-trees + - fillit + - fin + - final-pretty-printer + - Finance-Quote-Yahoo + - Finance-Treasury + - find-clumpiness + - find-conduit + - find-source-files + - fingertree-psqueue + - fingertree-tf + - FiniteMap + - firefly-example + - first-and-last + - firstify + - FirstOrderTheory + - fit + - fitsio + - fix-parser-simple + - fix-symbols-gitit + - fixed-point + - fixed-point-vector + - fixed-point-vector-space + - fixed-precision + - fixed-storable-array + - fixed-vector-binary + - fixed-vector-cborg + - fixed-vector-cereal + - fixed-width + - fixer + - fixfile + - fixhs + - fixie + - fizzbuzz + - fizzbuzz-as-a-service + - flac + - flac-picture + - flamethrower + - flamingra + - flat-maybe + - flexible-time + - flexiwrap + - flexiwrap-smallcheck + - flickr + - Flippi + - flite + - float-binstring + - floating-bits + - floskell + - flow-er + - flow2dot + - flowdock + - flowdock-api + - flowdock-rest + - flower + - flowlocks-framework + - flowsim + - fltkhs-fluid-examples + - fluent-logger + - fluidsynth + - flux-monoid + - FM-SBLEX + - fmark + - FModExRaw + - fn-extra + - foldl-incremental + - foldl-statistics + - folds-common + - follow + - follower + - foma + - font-opengl-basic4x6 + - foo + - for-free + - forbidden-fruit + - fordo + - forecast-io + - foreign-var + - forest-fire + - Forestry + - forger + - ForkableT + - formal + - FormalGrammars + - format + - format-status + - formattable + - forml + - formlets + - formlets-hsp + - formura + - ForSyDe + - forsyde-deep + - forth-hll + - Fortnite-Hack-Cheats-Free-V-Bucks-Generator + - fortran-src + - foscam-directory + - foscam-filename + - foscam-sort + - Foster + - fpco-api + - fpnla-examples + - FPretty + - fptest + - Fractaler + - fractals + - frag + - Frames-beam + - Frames-dsv + - franchise + - Frank + - freddy + - free-concurrent + - free-game + - free-http + - free-operational + - free-theorems + - free-theorems-counterexamples + - free-theorems-seq + - free-theorems-seq-webui + - free-theorems-webui + - free-v-bucks-generator-no-survey + - free-v-bucks-generator-ps4-no-survey + - free-vector-spaces + - freekick2 + - freelude + - freer-converse + - freer-effects + - freer-simple-catching + - freer-simple-http + - freer-simple-profiling + - freer-simple-random + - freer-simple-time + - freesect + - freesound + - freetype-simple + - FreeTypeGL + - freq + - fresh + - friday-devil + - friday-scale-dct + - friendly + - front + - frown + - frp-arduino + - frpnow + - frpnow-gloss + - frpnow-gtk + - frpnow-gtk3 + - frpnow-vty + - fs-events + - fsh-csv + - fsmActions + - fsutils + - fswait + - ftdi + - FTGL-bytestring + - ftp-conduit + - FTPLine + - ftshell + - full-sessions + - full-text-search + - fullstop + - funbot + - funbot-client + - funbot-git-hook + - funcons-lambda-cbv-mp + - function-combine + - function-instances-algebra + - functional-arrow + - functor + - functorm + - funflow + - funflow-nix + - FunGEn + - Fungi + - funion + - funpat + - funsat + - fusion + - futun + - future + - fuzzy-timings + - fwgl + - fwgl-glfw + - fwgl-javascript + - g-npm + - g4ip + - gact + - game-probability + - gameclock + - Gamgine + - gamma + - Ganymede + - garepinoh + - gargoyle + - gargoyle-postgresql + - gas + - gbu + - gc-monitoring-wai + - gcodehs + - gdax + - gdiff-ig + - gdiff-th + - GeBoP + - gedcom + - geek + - geek-server + - gegl + - gelatin + - gelatin-freetype2 + - gelatin-fruity + - gelatin-gl + - gelatin-sdl2 + - gelatin-shaders + - gemstone + - gen-imports + - gen-passwd + - Genbank + - gencheck + - gender + - genders + - Gene-CluEDO + - general-prelude + - GeneralTicTacToe + - generators + - generic-accessors + - generic-aeson + - generic-binary + - generic-church + - generic-enum + - generic-lens-labels + - generic-lucid-scaffold + - generic-maybe + - generic-pretty + - generic-storable + - generic-tree + - generic-xml + - generic-xmlpickler + - genericserialize + - genesis + - genesis-test + - genetics + - GenI + - geni-gui + - geni-util + - geniconvert + - geniplate + - geniserver + - genprog + - GenSmsPdu + - gentlemark + - GenussFold + - geo-resolver + - GeocoderOpenCage + - geodetic + - geodetic-types + - geojson-types + - geolite-csv + - geom2d + - GeomPredicates-SSE + - geos + - Get + - getemx + - getflag + - GGg + - ggtsTC + - ghc-core-smallstep + - ghc-datasize + - ghc-dump-core + - ghc-dump-tree + - ghc-dump-util + - ghc-dup + - ghc-events-analyze + - ghc-events-parallel + - ghc-generic-instances + - ghc-heap-view + - ghc-imported-from + - ghc-instances + - ghc-man-completion + - ghc-mod + - ghc-parmake + - ghc-parser + - ghc-pkg-autofix + - ghc-pkg-lib + - ghc-proofs + - ghc-session + - ghc-simple + - ghc-srcspan-plugin + - ghc-syb + - ghc-syb-utils + - ghc-time-alloc-prof + - ghc-trace-events + - ghc-typelits-presburger + - ghc-usage + - ghc-vis + - ghci-diagrams + - ghci-haskeline + - ghci-history-parser + - ghci-lib + - ghci-ng + - ghcjs-base-stub + - ghcjs-dom-jsffi + - ghcjs-fetch + - ghcjs-hplay + - ghcjs-promise + - ghcjs-xhr + - ghclive + - ght + - gi-cairo-again + - gi-gstpbutils + - gi-gsttag + - gi-gtkosxapplication + - gi-notify + - gi-poppler + - gi-wnck + - giak + - Gifcurry + - ginsu + - gipeda + - gist + - GiST + - git-checklist + - git-config + - git-date + - git-fmt + - git-gpush + - git-jump + - git-monitor + - git-object + - git-repair + - git-sanity + - git-vogue + - gitdo + - github-backup + - github-data + - github-tools + - github-utils + - github-webhook-handler + - github-webhook-handler-snap + - gitignore + - gitlab-api + - gitlib-cross + - gitlib-libgit2 + - gitlib-s3 + - gitlib-test + - gitlib-utils + - gitson + - gitter + - glade + - gladexml-accessor + - glapp + - glazier-pipes + - glazier-react + - glazier-react-examples + - glazier-react-widget + - GLFW-b-demo + - GLFW-OGL + - gli + - glicko + - glider-nlp + - GLMatrix + - glob-posix + - global + - global-config + - global-variables + - glome-hs + - GlomeTrace + - GlomeView + - gloss-accelerate + - gloss-banana + - gloss-devil + - gloss-export + - gloss-game + - gloss-sodium + - glpk-hs + - glue + - glue-common + - glue-core + - glue-ekg + - glue-example + - gmap + - gmndl + - gnome-desktop + - gnomevfs + - gnss-converters + - gnuidn + - goal-core + - goal-geometry + - goal-probability + - goal-simulation + - goatee + - goatee-gtk + - gochan + - gofer-prelude + - gooey + - google-cloud + - google-drive + - google-html5-slide + - google-mail-filters + - google-oauth2 + - google-oauth2-easy + - google-search + - google-translate + - GoogleCodeJam + - GoogleDirections + - googleplus + - googlepolyline + - GoogleSB + - GoogleTranslate + - gopher-proxy + - gopherbot + - gore-and-ash + - gore-and-ash-actor + - gore-and-ash-async + - gore-and-ash-demo + - gore-and-ash-glfw + - gore-and-ash-lambdacube + - gore-and-ash-logging + - gore-and-ash-network + - gore-and-ash-sdl + - gore-and-ash-sync + - GotoT-transformers + - gotta-go-fast + - gpah + - GPipe + - GPipe-Collada + - GPipe-Examples + - GPipe-GLFW + - GPipe-TextureLoad + - gps + - gps2htmlReport + - GPX + - gpx-conduit + - graceful + - graflog + - Grafos + - grakn + - grammar-combinators + - GrammarProducts + - grammatical-parsers + - grapefruit-examples + - grapefruit-frp + - grapefruit-records + - grapefruit-ui + - grapefruit-ui-gtk + - graph-matchings + - graph-rewriting + - graph-rewriting-cl + - graph-rewriting-gl + - graph-rewriting-lambdascope + - graph-rewriting-layout + - graph-rewriting-ski + - graph-rewriting-strategies + - graph-rewriting-trs + - graph-rewriting-ww + - graph-serialize + - graph-utils + - graph-visit + - Graph500 + - graphbuilder + - graphene + - GraphHammer + - GraphHammer-examples + - graphics-drawingcombinators + - graphics-formats-collada + - graphicsFormats + - graphicstools + - graphql-w-persistent + - graphtype + - graql + - grasp + - gray-code + - greencard + - greencard-lib + - greg-client + - gremlin-haskell + - Grempa + - grenade + - grid-proto + - gridbounds + - gridland + - grm + - groot + - gross + - GroteTrap + - groundhog-converters + - group-with + - grouped-list + - growler + - GrowlNotify + - grpc-etcd-client + - gruff + - gruff-examples + - gsc-weighting + - gscholar-rss + - gsl-random + - gsl-random-fu + - gstorable + - GTALib + - gtfs + - gtk-serialized-event + - gtk-toy + - gtk2hs-hello + - gtk2hs-rpn + - Gtk2hsGenerics + - gtk3-mac-integration + - gtkglext + - GtkGLTV + - gtkimageview + - gtkrsync + - gtksourceview2 + - gtksourceview3 + - guarded-rewriting + - guess-combinator + - guid + - GuiHaskell + - GuiTV + - gulcii + - gyah-bin + - h-booru + - h-gpgme + - h-reversi + - h2048 + - h2c + - haar + - habit + - HABQT + - Hach + - hack-contrib + - hack-contrib-press + - hack-frontend-happstack + - hack-handler-cgi + - hack-handler-epoll + - hack-handler-evhttp + - hack-handler-fastcgi + - hack-handler-happstack + - hack-handler-hyena + - hack-handler-kibro + - hack-handler-simpleserver + - hack-middleware-cleanpath + - hack-middleware-clientsession + - hack-middleware-jsonp + - hack2-handler-happstack-server + - hack2-handler-mongrel2-http + - hack2-handler-snap-server + - hack2-handler-warp + - hackage-diff + - hackage-mirror + - hackage-processing + - hackage-proxy + - hackage-repo-tool + - hackage-security-HTTP + - hackage-server + - hackage2hwn + - hackage2twitter + - hackager + - hackernews + - HackMail + - hackmanager + - hactor + - hactors + - haddock + - haddock-api + - haddock-leksah + - haddock-test + - haddocset + - hadolint + - hadoop-formats + - hadoop-rpc + - hadoop-tools + - haggis + - Haggressive + - hahp + - haiji + - hail + - hailgun-send + - hairy + - hakaru + - hakismet + - hakka + - hako + - hakyll-agda + - hakyll-blaze-templates + - hakyll-contrib + - hakyll-contrib-csv + - hakyll-contrib-elm + - hakyll-contrib-hyphenation + - hakyll-contrib-links + - hakyll-convert + - hakyll-filestore + - hakyll-ogmarkup + - hakyll-R + - hakyll-shortcode + - halberd + - halfs + - halipeto + - halive + - hall-symbols + - halma-gui + - halma-telegram-bot + - halves + - HaMinitel + - hampp + - hamsql + - hamtmap + - hamusic + - handa-gdata + - handle-like + - handsy + - Hangman + - hannahci + - hans + - hans-pcap + - haphviz + - hapistrano + - happindicator + - happindicator3 + - happlets + - happlets-lib-gtk + - happraise + - HAppS-Data + - happs-hsp + - happs-hsp-template + - HAppS-IxSet + - HAppS-Server + - HAppS-State + - happs-tutorial + - HAppS-Util + - happstack + - happstack-auth + - happstack-authenticate + - happstack-clientsession + - happstack-contrib + - happstack-data + - happstack-dlg + - happstack-facebook + - happstack-fay + - happstack-fay-ajax + - happstack-foundation + - happstack-hamlet + - happstack-heist + - happstack-helpers + - happstack-hstringtemplate + - happstack-ixset + - happstack-jmacro + - happstack-lite + - happstack-monad-peel + - happstack-plugins + - happstack-server-tls-cryptonite + - happstack-state + - happstack-util + - happstack-yui + - happy-meta + - happybara + - happybara-webkit + - happybara-webkit-server + - HappyTree + - hapstone + - HaPy + - haquery + - haquil + - harchive + - hArduino + - hardware-edsl + - HaRe + - hark + - harmony + - HarmTrace + - haroonga + - haroonga-httpd + - harpy + - harvest-api + - has + - has-th + - HasCacBDD + - hascas + - Haschoo + - HasGP + - hash + - hashable-extras + - hashable-generics + - hashabler + - hashed-storage + - Hashell + - hashflare + - hashring + - hashtables-plus + - hasim + - hask + - hask-home + - haskarrow + - haskbot-core + - haskdeep + - haskeem + - haskeline-class + - haskelisp + - haskell-abci + - haskell-aliyun + - haskell-awk + - haskell-bitmex-client + - haskell-bitmex-rest + - haskell-brainfuck + - haskell-cnc + - haskell-coffee + - haskell-compression + - haskell-conll + - haskell-course-preludes + - haskell-disque + - haskell-docs + - haskell-eigen-util + - haskell-formatter + - haskell-ftp + - haskell-generate + - haskell-go-checkers + - haskell-holes-th + - haskell-in-space + - haskell-kubernetes + - haskell-lsp-client + - haskell-ml + - haskell-mpfr + - haskell-names + - haskell-neo4j-client + - haskell-openflow + - haskell-overridez + - haskell-packages + - haskell-pdf-presenter + - haskell-platform-test + - haskell-player + - haskell-plot + - haskell-postal + - haskell-read-editor + - haskell-reflect + - haskell-rules + - haskell-src-exts-observe + - haskell-src-exts-prisms + - haskell-src-exts-qq + - haskell-src-exts-sc + - haskell-src-meta-mwotton + - haskell-stack-trace-plugin + - haskell-token-utils + - haskell-tools-ast-fromghc + - haskell-tools-ast-gen + - haskell-tools-ast-trf + - haskell-tools-builtin-refactorings + - haskell-tools-cli + - haskell-tools-daemon + - haskell-tools-debug + - haskell-tools-demo + - haskell-tools-experimental-refactorings + - haskell-tools-refactor + - haskell-tools-rewrite + - haskell-tor + - haskell-type-exts + - haskell-typescript + - haskell-tyrant + - haskell-xmpp + - haskell2010 + - haskell98 + - haskell98libraries + - haskelldb + - haskelldb-connect-hdbc + - haskelldb-connect-hdbc-catchio-mtl + - haskelldb-connect-hdbc-catchio-tf + - haskelldb-connect-hdbc-catchio-transformers + - haskelldb-connect-hdbc-lifted + - haskelldb-dynamic + - haskelldb-flat + - haskelldb-hdbc + - haskelldb-hdbc-mysql + - haskelldb-hdbc-odbc + - haskelldb-hdbc-postgresql + - haskelldb-hdbc-sqlite3 + - haskelldb-hsql + - haskelldb-hsql-mysql + - haskelldb-hsql-odbc + - haskelldb-hsql-postgresql + - haskelldb-hsql-sqlite3 + - haskelldb-th + - haskelldb-wx + - HaskellLM + - HaskellNN + - Haskelloids + - haskellscrabble + - haskellscript + - HaskellTorrent + - HaskellTutorials + - haskelzinc + - haskey + - haskey-mtl + - haskgame + - haskheap + - haskhol-core + - haskmon + - haskoin + - haskoin-bitcoind + - haskoin-crypto + - haskoin-node + - haskoin-protocol + - haskoin-script + - haskoin-store + - haskoin-util + - haskoin-wallet + - haskoon + - haskoon-httpspec + - haskoon-salvia + - haskore + - haskore-realtime + - haskore-supercollider + - haskore-synthesizer + - HaskRel + - hasktorch + - hasktorch-ffi-th + - hasktorch-ffi-thc + - hasktorch-indef + - hasktorch-signatures + - hasktorch-signatures-partial + - hasktorch-signatures-support + - hasktorch-zoo + - haskus-web + - haslo + - hasloGUI + - hasparql-client + - hasql-backend + - hasql-class + - hasql-cursor-query + - hasql-generic + - hasql-migration + - hasql-optparse-applicative + - hasql-pool + - hasql-postgres + - hasql-postgres-options + - hasql-simple + - hastache + - hastache-aeson + - haste + - haste-app + - haste-lib + - haste-markup + - haste-prim + - Hate + - hatex-guide + - HaTeX-meta + - HaTeX-qq + - hats + - hatt + - haven + - haverer + - HaVSA + - hawitter + - Hawk + - hax + - haxl-amazonka + - haxl-facebook + - haxparse + - haxr-th + - haxy + - hayland + - Hayoo + - hayoo-cli + - hback + - hbayes + - hbb + - hBDD-CMUBDD + - hBDD-CUDD + - hbeat + - hbf + - hblas + - hblock + - hburg + - HCard + - hcc + - hcg-minus + - hcg-minus-cairo + - hcheat + - hcheckers + - hchesslib + - hcltest + - hcoap + - hcom + - hcoord + - hcron + - hCsound + - hcube + - hdaemonize-buildfix + - hdbc-aeson + - HDBC-mysql + - HDBC-postgresql-hstore + - hdbc-postgresql-hstore + - hdbi + - hdbi-conduit + - hdbi-postgresql + - hdbi-sqlite + - hdbi-tests + - hdf + - hDFA + - hdigest + - hdirect + - hdis86 + - hdiscount + - hdm + - hdo + - hdocs + - hdph + - hdph-closure + - hdr-histogram + - HDRUtils + - headergen + - heap + - heartbeat-streams + - heatitup + - heatitup-complete + - hecc + - heckle + - hedgehog-checkers + - hedgehog-checkers-lens + - hedgehog-gen-json + - Hedi + - hedis-config + - hedis-pile + - hedis-simple + - hedis-tags + - hein + - heist + - heist-aeson + - heist-async + - helics + - helics-wai + - helisp + - helium + - helix + - hell + - hellage + - hellnet + - help-esb + - hemkay + - hemokit + - hen + - henet + - hepevt + - her-lexer + - her-lexer-parsec + - HERA + - herbalizer + - HerbiePlugin + - heredocs + - Hermes + - hermit + - hermit-syb + - herms + - herringbone + - herringbone-embed + - herringbone-wai + - hesh + - hesql + - hetero-dict + - heterogeneous-list-literals + - heterolist + - hetris + - heukarya + - hevm + - hevolisa + - hevolisa-dph + - hexchat + - hexif + - hexmino + - hexml-lens + - hexpat-iteratee + - hexpat-pickle-generic + - hexpr + - hexpress + - hexquote + - hext + - heyefi + - heyting-algebras + - hF2 + - hfann + - hfd + - hfiar + - HFitUI + - hfmt + - hfoil + - hfov + - hfractal + - HFrequencyQueue + - hfusion + - hg-buildpackage + - hgalib + - hgdbmi + - HGE2D + - hgearman + - hgen + - hgeometric + - hgeometry + - hgeos + - hgettext + - hgis + - hgithub + - HGL + - hgom + - hgopher + - HGraphStorage + - hgrep + - hgrev + - hgrib + - hharp + - HHDL + - hi3status + - hiccup + - hichi + - hid-examples + - hieraclus + - hierarchical-clustering + - hierarchical-clustering-diagrams + - hierarchical-exceptions + - hierarchical-spectral-clustering + - hierarchy + - hiernotify + - Hieroglyph + - HiggsSet + - higherorder + - highjson + - highjson-swagger + - highjson-th + - highlight-versions + - highWaterMark + - himg + - himpy + - hindley-milner + - hinduce-classifier + - hinduce-classifier-decisiontree + - hinduce-examples + - hinquire + - hinstaller + - hint-server + - hinter + - hinvaders + - hinze-streams + - hip + - hipbot + - hipchat-hs + - hipe + - hircules + - hirt + - Hish + - hissmetrics + - hist-pl + - hist-pl-dawg + - hist-pl-fusion + - hist-pl-lexicon + - hist-pl-lmf + - hist-pl-types + - historian + - hit-graph + - HJavaScript + - hjcase + - hjs + - HJScript + - hjson-query + - hjsonpointer + - hjsonschema + - HJVM + - hlatex + - hlbfgsb + - hlcm + - HLearn-algebra + - HLearn-approximation + - HLearn-classification + - HLearn-datastructures + - HLearn-distributions + - hledger-chart + - hledger-irr + - hledger-vty + - hlibBladeRF + - hlibev + - hlibfam + - HList + - HListPP + - HLogger + - hlogger + - hlongurl + - hls + - hlwm + - hly + - hmark + - hmarkup + - hmatrix-backprop + - hmatrix-banded + - hmatrix-mmap + - hmatrix-morpheus + - hmatrix-nipals + - hmatrix-sparse + - hmatrix-static + - hmatrix-sundials + - hmatrix-syntax + - hmatrix-tests + - hmeap + - hmeap-utils + - hmenu + - hmep + - hmk + - hmm + - HMM + - hmm-hmatrix + - hmm-lapack + - hMollom + - hmp3 + - Hmpf + - hmt-diagrams + - hmumps + - hnix + - HNM + - hnormalise + - ho-rewriting + - hoauth + - hob + - hobbes + - hobbits + - hocilib + - hocker + - hodatime + - HODE + - hog + - hogg + - hoggl + - hogre + - hogre-examples + - hois + - hol + - hold-em + - hole + - Holumbus-Searchengine + - holy-project + - homeomorphic + - hommage + - homoiconic + - homplexity + - HongoDB + - honi + - hoobuddy + - hood + - hood-off + - hood2 + - hoodie + - hoodle + - hoodle-builder + - hoodle-core + - hoodle-extra + - hoodle-parser + - hoodle-publish + - hoodle-render + - hoodle-types + - hoogle-index + - hooks-dir + - hoopl + - hoovie + - hopencc + - hopencl + - hopfield + - hoppy-docs + - hoppy-generator + - hoppy-runtime + - hoppy-std + - hops + - hoq + - horizon + - horname + - hosc-json + - hosts-server + - hothasktags + - hotswap + - hourglass-fuzzy-parsing + - houseman + - hp2any-core + - hp2any-graph + - hp2any-manager + - hpack-convert + - hpaco + - hpaco-lib + - hpage + - hpapi + - hpaste + - hpasteit + - HPath + - hpc-tracer + - hPDB + - hPDB-examples + - HPDF + - hpdft + - hpg + - HPi + - hplaylist + - HPlot + - hpodder + - HPong + - hpqtypes + - hpqtypes-extras + - hprotoc-fork + - hps + - hps-cairo + - hps-kmeans + - hPushover + - hpygments + - hpylos + - hpyrg + - hpython + - hquantlib + - hR + - hranker + - HRay + - hricket + - Hricket + - hriemann + - HROOT + - HROOT-core + - HROOT-graf + - HROOT-hist + - HROOT-io + - HROOT-math + - HROOT-tree + - hs-blake2 + - hs-carbon-examples + - hs-cdb + - hs-conllu + - hs-di + - hs-dotnet + - hs-excelx + - hs-ffmpeg + - hs-fltk + - hs-gchart + - hs-gen-iface + - hs-gizapp + - hs-java + - hs-json-rpc + - hs-logo + - hs-mesos + - hs-nombre-generator + - hs-pgms + - hs-pkg-config + - hs-pkpass + - hs-re + - hs-rs-notify + - hs-scrape + - hs-snowtify + - hs-twitter + - hs-twitterarchiver + - hs-vcard + - hs-watchman + - hs2bf + - Hs2lib + - hsaml2 + - hsay + - hsbackup + - hsbc + - hsbencher + - hsbencher-codespeed + - hsbencher-fusion + - hsc3-auditor + - hsc3-cairo + - hsc3-data + - hsc3-db + - hsc3-dot + - hsc3-forth + - hsc3-graphs + - hsc3-lang + - hsc3-lisp + - hsc3-plot + - hsc3-process + - hsc3-rec + - hsc3-rw + - hsc3-server + - hsc3-sf + - hsc3-sf-hsndfile + - hsc3-unsafe + - hsc3-utils + - hscaffold + - hscamwire + - hscassandra + - hscd + - hsclock + - hscope + - hScraper + - hscuid + - hsdev + - hsdif + - hsdip + - hsdns-cache + - Hsed + - hsenv + - hsfacter + - hsfcsh + - HSFFIG + - hsfilt + - HSGEP + - hsgnutls + - hsgnutls-yj + - hsgsom + - HsHaruPDF + - HSHHelpers + - HsHTSLib + - HsHyperEstraier + - hsI2C + - hsignal + - hSimpleDB + - hsimport + - HsJudy + - hskeleton + - hslackbuilder + - hslibsvm + - hslinks + - hslogger-reader + - hslogstash + - hsluv-haskell + - hsmagick + - HSmarty + - hsmodetweaks + - Hsmtlib + - hsmtpclient + - hsnock + - hsns + - hsnsq + - hsntp + - HSoM + - hsoptions + - HSoundFile + - hsoz + - hsp-cgi + - hsparql + - HsParrot + - hspear + - hspec-expectations-match + - hspec-expectations-pretty + - hspec-experimental + - hspec-hedgehog + - hspec-jenkins + - hspec-monad-control + - hspec-pg-transact + - hspec-setup + - hspec-shouldbe + - hspec-snap + - hspec-structured-formatter + - hspec-webdriver + - hspec2 + - hspecVariant + - HsPerl5 + - hspkcs11 + - hspread + - hspresent + - hsprocess + - hsql + - hsql-mysql + - hsql-odbc + - hsql-postgresql + - hsql-sqlite3 + - hsqml + - hsqml-datamodel + - hsqml-datamodel-vinyl + - hsqml-demo-manic + - hsqml-demo-morris + - hsqml-demo-notes + - hsqml-demo-samples + - hsqml-morris + - hsreadability + - hsseccomp + - hsSqlite3 + - hssqlppp + - hssqlppp-th + - HsSVN + - hstatistics + - hstats + - hstest + - hstidy + - hstorchat + - hstox + - hstradeking + - HStringTemplateHelpers + - hstyle + - hstzaar + - hsubconvert + - hsudoku + - hswip + - hsx + - hsx-jmacro + - hsx-xhtml + - hsXenCtrl + - hsyscall + - hsyslog-tcp + - hsyslog-udp + - hszephyr + - HTab + - hTalos + - htar + - hTensor + - htestu + - HTicTacToe + - htiled + - htlset + - html-charset + - html-kure + - html-rules + - html-tokenizer + - hts + - htsn + - htsn-import + - http-attoparsec + - http-client-auth + - http-client-lens + - http-client-request-modifiers + - http-client-session + - http-client-streams + - http-conduit-browser + - http-conduit-downloader + - http-dispatch + - http-enumerator + - http-grammar + - http-kinder + - http-monad + - http-pony-serve-wai + - http-proxy + - http-querystring + - http-response-decoder + - http-shed + - http-wget + - http2-client-grpc + - https-everywhere-rules + - https-everywhere-rules-raw + - httpspec + - htune + - htvm + - htzaar + - huck + - HueAPI + - huff + - huffman + - hugs2yc + - hulk + - HulkImport + - human-parse + - human-text + - hums + - HUnit-Diff + - hunit-gui + - hunit-rematch + - hunp + - hunspell-hs + - hunt-searchengine + - hunt-server + - hup + - hurdle + - hurriyet + - husk-scheme + - husk-scheme-libs + - husky + - hutton + - huttons-razor + - huzzy + - hVOIDP + - hw-balancedparens + - hw-bits + - hw-dsv + - hw-dump + - hw-eliasfano + - hw-excess + - hw-ip + - hw-json + - hw-json-lens + - hw-json-simd + - hw-packed-vector + - hw-parser + - hw-prim + - hw-prim-bits + - hw-rankselect + - hw-rankselect-base + - hw-simd + - hw-streams + - hw-succinct + - hw-vector + - hw-xml + - hwall-auth-iitk + - hweblib + - hwhile + - hworker + - hworker-ses + - hwormhole + - hws + - hwsl2 + - hwsl2-bytevector + - hwsl2-reducers + - HXMPP + - hxmppc + - hxournal + - HXQ + - hxt-pickle-utils + - hxthelper + - hxweb + - hyahtzee + - hyakko + - hybrid + - hydra-hs + - hydra-print + - hydrogen + - Hydrogen + - hydrogen-cli + - hydrogen-cli-args + - hydrogen-data + - hydrogen-multimap + - hydrogen-parsing + - hydrogen-prelude + - hydrogen-prelude-parsec + - hydrogen-syntax + - hydrogen-util + - hyena + - hylide + - hylolib + - hylotab + - hyloutils + - hyper-haskell-server + - hyperdrive + - hyperfunctions + - hyperion + - hyperloglogplus + - hyperpublic + - hypher + - hzulip + - i18n + - i3ipc + - iap-verifier + - ib-api + - iban + - ical + - iCalendar + - IcoGrid + - ide-backend + - ide-backend-common + - ide-backend-server + - ideas + - ideas-math + - idempotent + - identifiers + - idiii + - idna2008 + - IDynamic + - ieee-utils + - ifcxt + - IFS + - ig + - ige + - ige-mac-integration + - ignore + - igraph + - igrf + - ihaskell + - ihaskell-aeson + - ihaskell-basic + - ihaskell-blaze + - ihaskell-charts + - ihaskell-diagrams + - ihaskell-display + - ihaskell-gnuplot + - ihaskell-hatex + - ihaskell-hvega + - ihaskell-inline-r + - ihaskell-juicypixels + - ihaskell-magic + - ihaskell-parsec + - ihaskell-plot + - ihaskell-rlangqq + - ihaskell-widgets + - ihttp + - illuminate + - imagepaste + - imap + - imapget + - imbib + - imgurder + - imj-animation + - imj-base + - imj-game-hamazed + - imj-measure-stdout + - imj-prelude + - imm + - imparse + - imperative-edsl + - imperative-edsl-vhdl + - ImperativeHaskell + - implicit-logging + - implicit-params + - importify + - imports + - improve + - impure-containers + - INblobs + - inch + - inchworm + - incremental-computing + - incremental-maps + - increments + - indents + - indexation + - IndexedList + - indextype + - indices + - indieweb-algorithms + - inf-interval + - infer-upstream + - infernu + - infinity + - infix + - InfixApplicative + - inflist + - informative + - inilist + - inject-function + - inline-java + - inserts + - inspector-wrecker + - instana-haskell-trace-sdk + - instant-aeson + - instant-bytes + - instant-deepseq + - instant-generics + - instant-hashable + - instant-zipper + - instapaper-sender + - instinct + - int-multimap + - integer-pure + - integreat + - intel-aes + - internetmarke + - intero + - interpol + - interpolatedstring-qq + - interpolatedstring-qq-mwotton + - interruptible + - interval + - intro-prelude + - introduction + - introduction-test + - intset + - invertible-hlist + - io-capture + - io-reactive + - ion + - IOR + - IORefCAS + - iostring + - iothread + - iotransaction + - ip + - ip2location + - ip2proxy + - ipatch + - ipc + - ipopt-hs + - iptables-helpers + - iptadmin + - IPv6DB + - ipython-kernel + - Irc + - irc-dcc + - irc-fun-bot + - irc-fun-client + - irc-fun-color + - irc-fun-messages + - irc-fun-types + - ircbot + - iri + - iridium + - iron-mq + - ironforge + - irt + - isdicom + - isevaluated + - ismtp + - IsNull + - iso8601-duration + - isobmff-builder + - isohunt + - isotope + - itcli + - itemfield + - iter-stats + - iteratee + - iteratee-compress + - iteratee-mtl + - iteratee-parsec + - iteratee-stm + - iterIO + - iterio-server + - ivor + - ivory + - ivory-backend-c + - ivory-bitdata + - ivory-eval + - ivory-examples + - ivory-hw + - ivory-opts + - ivory-quickcheck + - ivory-serialize + - ivory-stdlib + - ivy-web + - ixdopp + - ixmonad + - ixshader + - iyql + - j2hs + - jack-bindings + - JackMiniMix + - jackminimix + - jacobi-roots + - jaeger-flamegraph + - jail + - jalaali + - jalla + - jammittools + - jarfind + - jarify + - jason + - java-bridge + - java-bridge-extras + - java-character + - java-reflect + - javascript-extras + - javasf + - Javasf + - javav + - Javav + - jbi + - jcdecaux-vls + - Jdh + - jdi + - jenga + - jenkinsPlugins2nix + - jespresso + - jinquantities + - jmacro + - jmacro-rpc + - jmacro-rpc-happstack + - jmacro-rpc-snap + - jml-web-service + - jmonkey + - jni + - jobqueue + - join + - join-api + - joinlist + - jonathanscard + - jpeg + - js-good-parts + - jsaddle-hello + - jsaddle-warp + - jsaddle-wkwebview + - JsContracts + - jsmw + - json-api + - json-ast-json-encoder + - json-ast-quickcheck + - json-b + - json-builder + - json-bytes-builder + - JSON-Combinator + - JSON-Combinator-Examples + - json-enumerator + - json-extra + - json-fu + - json-incremental-decoder + - json-litobj + - json-pointer-hasql + - json-python + - json-schema + - json-togo + - json-tools + - json-tracer + - json2 + - json2-hdbc + - JSONb + - jsonextfilter + - JsonGrammar + - JSONParser + - jsonresume + - jsonrpc-conduit + - jsons-to-schema + - jsonschema-gen + - jsonsql + - jsontsv + - jsonxlsx + - jspath + - judge + - judy + - juicy-gcode + - JuicyPixels-canvas + - JunkDB + - JunkDB-driver-gdbm + - JunkDB-driver-hashtables + - jupyter + - JuPyTer-notebook + - JustParse + - jvm + - jvm-batching + - jvm-binary + - jvm-parser + - jvm-streaming + - JYU-Utils + - kademlia + - kafka-client + - kaleidoscope + - Kalman + - kalman + - kangaroo + - kanji + - kansas-lava + - kansas-lava-cores + - kansas-lava-papilio + - kansas-lava-shake + - karakuri + - karps + - katip-datadog + - katip-elasticsearch + - katip-logzio + - katip-rollbar + - katip-scalyr-scribe + - katip-syslog + - katt + - kawaii + - kd-tree + - kdesrc-build-extra + - kdt + - keccak + - keera-hails-i18n + - keera-hails-mvc-environment-gtk + - keera-hails-mvc-model-lightmodel + - keera-hails-mvc-model-protectedmodel + - keera-hails-mvc-solutions-gtk + - keera-hails-reactive-fs + - keera-hails-reactive-gtk + - keera-hails-reactive-network + - keera-hails-reactive-polling + - keera-hails-reactive-wx + - keera-hails-reactive-yampa + - keera-hails-reactivelenses + - keera-hails-reactivevalues + - Ketchup + - keter + - kevin + - keyed + - keyring + - keysafe + - keystore + - keyword-args + - khph + - kicad-data + - kickass-torrents-dump-parser + - kickchan + - kif-parser + - kit + - kleene + - kmeans-par + - kmeans-vector + - kmp-dfa + - knead + - knead-arithmetic + - knots + - koellner-phonetic + - korfu + - kqueue + - krapsh + - Kriens + - krpc + - ks-test + - KSP + - ktx + - kure + - kure-your-boilerplate + - KyotoCabinet + - l-bfgs-b + - L-seed + - labeled-graph + - laborantin-hs + - labsat + - labyrinth + - labyrinth-server + - lagrangian + - laika + - lambda-bridge + - lambda-calculator + - lambda-canvas + - lambda-devs + - lambda-options + - lambda-toolbox + - lambda2js + - lambdaBase + - lambdabot + - lambdabot-haskell-plugins + - lambdabot-utils + - lambdabot-zulip + - lambdacms-core + - lambdacms-media + - lambdacube + - lambdacube-bullet + - lambdacube-compiler + - lambdacube-core + - lambdacube-edsl + - lambdacube-engine + - lambdacube-examples + - lambdacube-gl + - lambdacube-ir + - lambdacube-samples + - LambdaDesigner + - lambdaFeed + - LambdaHack + - LambdaINet + - Lambdajudge + - lambdaLit + - LambdaNet + - LambdaPrettyQuote + - LambdaShell + - lambdatex + - lambdatwit + - lambdaya-bus + - lambdiff + - lame + - lame-tester + - lang + - language-bash + - language-boogie + - language-c-comments + - language-c-inline + - language-conf + - language-css + - language-dart + - language-dockerfile + - language-dot + - language-ecmascript-analysis + - language-eiffel + - language-elm + - language-gcl + - language-go + - language-guess + - language-hcl + - language-java-classfile + - language-kort + - language-lua + - language-lua-qq + - language-lua2 + - language-mixal + - language-ninja + - language-oberon + - language-objc + - language-ocaml + - language-openscad + - language-pig + - language-python + - language-python-colour + - language-python-test + - language-qux + - language-sh + - language-spelling + - language-sqlite + - language-thrift + - language-typescript + - language-vhdl + - language-webidl + - lapack + - Lastik + - lat + - latest-npm-version + - latex-formulae-hakyll + - latex-formulae-image + - latex-formulae-pandoc + - LATS + - lattices + - launchpad-control + - lawless-concurrent-machines + - layers + - layers-game + - layout + - layout-bootstrap + - layout-rules + - layouting + - lazy-hash + - lazy-hash-cache + - lazy-io-streams + - lazyarray + - lazyset + - LazyVault + - ld-intervals + - lda + - ldap-client + - ldapply + - ldif + - leaf + - leaky + - leanpub-wreq + - leapseconds + - learn + - learn-physics + - learn-physics-examples + - Learning + - leetify + - legion + - legion-discovery + - legion-discovery-client + - legion-extra + - leksah-server + - lendingclub + - lens-accelerate + - lens-prelude + - lens-text-encoding + - lens-time + - lens-tutorial + - lensref + - level-monad + - Level0 + - levmar + - levmar-chart + - lfst + - lgtk + - lha + - lhae + - lhc + - lhe + - lhs2TeX-hl + - lhslatex + - LibClang + - libconfig + - libcspm + - libexpect + - libGenI + - libhbb + - libinfluxdb + - libjenkins + - liblastfm + - liblawless + - liblinear-enumerator + - libltdl + - libmolude + - liboath-hs + - liboleg + - libpafe + - libpq + - librandomorg + - librato + - libsystemd-daemon + - libsystemd-journal + - libtagc + - libxls + - libxml-enumerator + - libxslt + - licensor + - life-sync + - lifted-base-tf + - lifted-protolude + - lifter + - ligature + - lightning-haskell + - lighttpd-conf + - lighttpd-conf-qq + - lilypond + - Limit + - limp-cbc + - linda + - linden + - linear-accelerate + - linear-algebra-cblas + - linear-circuit + - linear-code + - linear-maps + - linear-opengl + - linear-vect + - linearmap-category + - linearscan + - linearscan-hoopl + - LinearSplit + - lines-of-action + - LinkChecker + - linkchk + - linkcore + - linked-list-with-iterator + - linkedhashmap + - linode-v4 + - linux-blkid + - linux-cgroup + - linux-inotify + - linux-kmod + - linux-perf + - linux-ptrace + - linx-gateway + - lio + - lio-eci11 + - lio-fs + - lio-simple + - lipsum-gen + - liquid + - liquid-fixpoint + - liquidhaskell + - liquidhaskell-cabal + - liquidhaskell-cabal-demo + - list-fusion-probe + - list-mux + - list-prompt + - list-remote-forwards + - list-t-attoparsec + - list-t-html-parser + - list-t-http-client + - list-t-text + - list-zipper + - listenbrainz-client + - listlike-instances + - ListT + - lit + - literals + - live-sequencer + - ll-picosat + - llsd + - llvm + - llvm-analysis + - llvm-base + - llvm-base-types + - llvm-base-util + - llvm-data-interop + - llvm-extra + - llvm-ffi + - llvm-general + - llvm-general-pure + - llvm-general-quote + - llvm-hs + - llvm-hs-pretty + - llvm-ht + - llvm-pkg-config + - llvm-pretty + - llvm-pretty-bc-parser + - llvm-tf + - llvm-tools + - lmonad + - lmonad-yesod + - load-balancing + - load-font + - local-search + - located + - located-monad-logger + - loch + - locked-poll + - log + - log-elasticsearch + - log-postgres + - log-utils + - log-warper + - log2json + - logentries + - logger + - logging-effect-extra + - logging-effect-extra-file + - logging-effect-extra-handler + - logging-facade-journald + - Logic + - logic-classes + - logic-TPTP + - LogicGrowsOnTrees + - LogicGrowsOnTrees-MPI + - LogicGrowsOnTrees-network + - LogicGrowsOnTrees-processes + - logplex-parse + - lojban + - lojbanParser + - lojbanXiragan + - lojysamban + - lol + - lol-apps + - lol-benches + - lol-calculus + - lol-cpp + - lol-repa + - lol-tests + - lol-typing + - loli + - longboi + - lookup-tables + - loop-effin + - loop-while + - loops + - loopy + - lord + - lorem + - loris + - loshadka + - lostcities + - loup + - lowgl + - lp-diagrams + - lp-diagrams-svg + - ls-usb + - lscabal + - LslPlus + - lsp-test + - lsystem + - ltk + - lua-bc + - luachunk + - luautils + - lucid-svg + - lucienne + - Lucu + - lui + - luis-client + - luka + - luminance + - luminance-samples + - lushtags + - luthor + - lvish + - lvmlib + - lxc + - lxd-client + - lye + - Lykah + - lz4-conduit + - lzma-enumerator + - lzma-streams + - maam + - macbeth-lib + - machinecell + - machines-amazonka + - machines-process + - machines-zlib + - maclight + - macos-corelibs + - macosx-make-standalone + - madlang + - mage + - magic-wormhole + - magicbane + - MagicHaskeller + - magico + - magma + - mahoro + - maid + - mailbox-count + - mailchimp + - mailchimp-subscribe + - MailchimpSimple + - mailgun + - majordomo + - majority + - make-hard-links + - make-monofoldable-foldable + - make-package + - makedo + - makefile + - mallard + - manatee + - manatee-anything + - manatee-core + - manatee-curl + - manatee-editor + - manatee-filemanager + - manatee-imageviewer + - manatee-ircclient + - manatee-mplayer + - manatee-pdfviewer + - manatee-processmanager + - manatee-template + - manatee-terminal + - manatee-welcome + - mandrill + - mandulia + - mangopay + - manifold-random + - manifolds + - manifolds-core + - map-exts + - map-syntax + - Mapping + - mappy + - marionetta + - markdown-kate + - markdown-pap + - markdown2svg + - marked-pretty + - markov-processes + - markup + - marmalade-upload + - marquise + - mars + - marvin + - marvin-interpolate + - marxup + - masakazu-bot + - MASMGen + - master-plan + - matchers + - math-grads + - mathblog + - mathflow + - mathlink + - matplotlib + - matrix-as-xyz + - matsuri + - maude + - maxent + - maxent-learner-hw + - maxent-learner-hw-gui + - maxsharing + - maybench + - MaybeT + - MaybeT-monads-tf + - MaybeT-transformers + - MazesOfMonad + - MBot + - mbox-tools + - MC-Fold-DP + - mcl + - mcm + - mcmaster-gloss-examples + - mcmc-samplers + - mcmc-synthesis + - mcpi + - mdapi + - mdcat + - mDNSResponder-client + - mdp + - mealstrom + - MeanShift + - Measure + - mecab + - mech + - Mecha + - Mechs + - mechs + - med-module + - mediabus + - mediabus-fdk-aac + - mediabus-rtp + - median-stream + - mediawiki + - medium-sdk-haskell + - mellon-core + - mellon-gpio + - mellon-web + - melody + - memcache-conduit + - memcache-haskell + - memcached-binary + - meminfo + - memis + - memo-ptr + - memoization-utils + - memorypool + - menoh + - merkle-patricia-db + - messagepack-rpc + - messente + - meta-misc + - meta-par + - meta-par-accelerate + - metadata + - MetaHDBC + - MetaObject + - metaplug + - metar + - metar-http + - metric + - Metrics + - metricsd-client + - metronome + - mezzo + - mezzolens + - MFlow + - mgeneric + - Mhailist + - MHask + - mi + - Michelangelo + - miconix-test + - micro-recursion-schemes + - microaeson + - microformats2-types + - microgroove + - microlens-each + - micrologger + - MicrosoftTranslator + - mida + - midi-utils + - midimory + - midisurface + - mighttpd + - mighty-metropolis + - mikmod + - mikrokosmos + - miku + - mime-directory + - minecraft-data + - minesweeper + - miniforth + - minilens + - minimung + - minio-hs + - minions + - minioperational + - miniplex + - minirotate + - ministg + - minst-idx + - mios + - mirror-tweet + - miss + - miss-porcelain + - missing-py2 + - MissingPy + - mixed-strategies + - mixpanel-client + - mkbndl + - mkcabal + - ml-w + - mlist + - mltool + - mmtf + - mmtl + - mmtl-base + - moan + - Mobile-Legends-Hack-Cheats + - model + - modelicaparser + - modify-fasta + - modsplit + - modular + - modular-prelude + - modular-prelude-classy + - modularity + - module-management + - modulespection + - modulo + - Moe + - moe + - MoeDict + - mohws + - mole + - mollie-api-haskell + - monad-atom + - monad-atom-simple + - monad-codec + - monad-dijkstra + - monad-exception + - monad-fork + - monad-http + - monad-interleave + - monad-levels + - monad-lgbt + - monad-lrs + - monad-mersenne-random + - monad-mock + - monad-open + - monad-parallel-progressbar + - monad-ran + - monad-recorder + - monad-resumption + - monad-state + - monad-statevar + - monad-ste + - monad-stlike-io + - monad-stlike-stm + - monad-supply + - monad-timing + - monad-tx + - monad-unify + - monad-var + - monad-wrap + - monadacme + - MonadCatchIO-mtl + - MonadCatchIO-mtl-foreign + - MonadCatchIO-transformers + - MonadCatchIO-transformers-foreign + - MonadCompose + - monadiccp + - monadiccp-gecode + - Monadius + - MonadLab + - monadLib-compose + - monadloc-pp + - monadlog + - monadplus + - monads-fd + - MonadStack + - monarch + - Monaris + - Monatron + - Monatron-IO + - mondo + - monetdb-mapi + - money + - mongodb-queue + - mongrel2-handler + - monitor + - monky + - mono-foldable + - Monocle + - monoid-absorbing + - monoid-owns + - monoid-statistics + - monoidplus + - monoids + - monopati + - monte-carlo + - monzo + - moo + - moonshine + - more-containers + - morfette + - morfeusz + - morph + - morphisms-functors + - morphisms-functors-inventory + - morphisms-objects + - morte + - mosaico-lib + - moto + - moto-postgresql + - mount + - movie-monad + - mp + - mpdmate + - mpi-hs + - mpppc + - mpretty + - mpris + - mprover + - mps + - mpvguihs + - mqtt + - mqtt-hs + - mrifk + - mrm + - ms + - msgpack + - msgpack-aeson + - msgpack-idl + - msgpack-rpc + - msh + - msi-kb-backlit + - MSQueue + - MTGBuilder + - mtgoxapi + - mtl-evil-instances + - mtl-extras + - mtl-tf + - mtlx + - mtp + - MuCheck + - MuCheck-Hspec + - MuCheck-HUnit + - MuCheck-QuickCheck + - MuCheck-SmallCheck + - mud + - mulang + - multext-east-msd + - multi-cabal + - multiaddr + - multiarg + - multifile + - multifocal + - multihash + - multilinear + - multilinear-io + - multipass + - multipath + - multiplate-simplified + - multirec-alt-deriver + - multirec-binary + - multisetrewrite + - multistate + - multivariant + - Munkres-simple + - muon + - murder + - murmur + - murmurhash3 + - mushu + - music-graphics + - music-parts + - music-pitch + - music-preludes + - music-score + - music-sibelius + - music-suite + - music-util + - musicbrainz-email + - musicxml + - musicxml2 + - mustache-haskell + - mutable-iter + - MutationOrder + - mute-unmute + - mvar-lock + - mvc + - mvc-updates + - mvclient + - mwc-random-accelerate + - mxnet + - mxnet-dataiter + - mxnet-examples + - mxnet-nn + - mxnet-nnvm + - my-package-testing + - my-test-docs + - myanimelist-export + - myo + - MyPrimes + - mysnapsession + - mysnapsession-example + - mysql-effect + - mysql-haskell-openssl + - mysql-simple-quasi + - mysql-simple-typed + - mystem + - myTestlll + - mzv + - n-tuple + - nagios-plugin-ekg + - nakadi-client + - named-lock + - namelist + - nano-hmac + - nano-md5 + - nanocurses + - nanomsg + - nanomsg-haskell + - nanoparsec + - NanoProlog + - nanovg + - nanovg-simple + - nanq + - naqsha + - narc + - nat-sized-numbers + - nationstates + - natural + - natural-number + - naver-translate + - NearContextAlgebra + - neat + - needle + - neet + - nehe-tuts + - neither + - neko-lib + - neko-obfs + - Neks + - nemesis-titan + - nerf + - nero + - nero-wai + - nero-warp + - nest + - nested-routes + - nested-sequence + - NestedFunctor + - nestedmap + - net-spider + - netclock + - netcore + - netease-fm + - netlines + - netrium + - NetSNMP + - netspec + - netstring-enumerator + - nettle-frp + - nettle-netkit + - nettle-openflow + - netwire-input-javascript + - netwire-vinylglfw-examples + - network-address + - network-anonymous-i2p + - network-bsd + - network-builder + - network-bytestring + - network-connection + - network-enumerator + - network-hans + - network-interfacerequest + - network-messagepack-rpc-websocket + - network-minihttp + - network-msgpack-rpc + - network-netpacket + - network-protocol-xmpp + - network-rpca + - network-server + - network-service + - network-simple-sockaddr + - network-stream + - network-topic-models + - network-transport-amqp + - network-transport-inmemory + - network-transport-tcp + - network-transport-tests + - network-transport-zeromq + - network-voicetext + - network-wai-router + - network-websocket + - networked-game + - neural + - neural-network-blashs + - neural-network-hmatrix + - newports + - newt + - newtype-deriving + - newtype-th + - next-ref + - nextstep-plist + - nfc + - NGrams + - ngrams-loader + - niagra + - nibblestring + - nice-html + - nicovideo-translator + - nikepub + - nimber + - Ninjas + - nirum + - nitro + - nix-eval + - nixfromnpm + - nkjp + - nlp-scores + - nlp-scores-scripts + - nm + - NMap + - nntp + - no-role-annots + - noether + - nofib-analyse + - nofib-analyze + - noise + - Nomyx + - Nomyx-Core + - Nomyx-Language + - Nomyx-Rules + - Nomyx-Web + - non-empty-zipper + - NonEmpty + - NonEmptyList + - normalization-insensitive + - NoSlow + - not-gloss-examples + - notcpp + - notmuch-haskell + - notmuch-web + - NoTrace + - np-linear + - nptools + - ntrip-client + - NTRU + - null-canvas + - nullary + - nullpipe + - numbered-semigroups + - NumberSieves + - NumberTheory + - numerals + - numerals-base + - numeric-ode + - numeric-qq + - numeric-ranges + - numerical + - numhask + - numhask-array + - numhask-histogram + - numhask-prelude + - numhask-range + - numhask-test + - Nussinov78 + - Nutri + - nvim-hs-ghcid + - NXT + - NXTDSL + - nylas + - nymphaea + - o-clock + - oanda-rest-api + - oasis-xrd + - oauth2-jwt-bearer + - oauthenticated + - obd + - obdd + - oberon0 + - obj + - Object + - objectid + - ObjectIO + - objective + - ocaml-export + - octane + - octohat + - octopus + - Octree + - oculus + - odbc + - OddWord + - oden-go-packages + - oeis2 + - off-simple + - OGL + - ogmarkup + - ohloh-hs + - oi + - oidc-client + - ois-input-manager + - olwrapper + - om-elm + - omaketex + - ombra + - Omega + - omega + - omnifmt + - on-a-horse + - onama + - oneormore + - online + - onpartitions + - OnRmt + - onu-course + - opaleye-classy + - opaleye-sqlite + - opaleye-trans + - open-haddock + - open-pandoc + - open-signals + - open-typerep + - OpenAFP + - OpenAFP-Utils + - openapi-petstore + - opench-meteo + - OpenCL + - OpenCLRaw + - OpenCLWrappers + - opencv-raw + - opendatatable + - OpenGLCheck + - opengles + - OpenSCAD + - opensoundcontrol-ht + - openssh-github-keys + - opentheory-char + - opentok + - opentype + - OpenVG + - OpenVGRaw + - openweathermap + - Operads + - operational-extra + - optima + - optimal-blocks + - optimization + - optimusprime + - optional + - options-time + - optparse-applicative-simple + - orc + - orchestrate + - OrchestrateDB + - orchid + - orchid-demo + - order-maintenance + - order-statistics + - orders + - Ordinary + - ordrea + - organize-imports + - orgmode + - orgstat + - origami + - orizentic + - OrPatterns + - osc + - oscpacking + - Oslo-Vectize + - OSM + - osm-conduit + - osm-download + - oso2pdf + - ot + - OTP + - otp-authenticator + - overloaded-records + - overture + - pack + - package-description-remote + - package-o-tron + - package-vt + - packdeps + - packed-dawg + - packed-multikey-map + - packedstring + - packman + - packunused + - pacman-memcache + - padKONTROL + - pads-haskell + - pagarme + - PageIO + - pagure-hook-receiver + - Paillier + - pam + - panda + - pandoc-include + - pandoc-include-code + - pandoc-japanese-filters + - pandoc-lens + - pandoc-plantuml-diagrams + - pandoc-unlit + - PandocAgda + - pang-a-lambda + - pangraph + - panpipe + - papa-export + - papa-implement + - papa-include + - papa-prelude + - papa-prelude-core + - papa-prelude-lens + - papa-prelude-semigroupoids + - papa-prelude-semigroups + - paphragen + - papillon + - pappy + - paprika + - paragon + - Paraiso + - Parallel-Arrows-Eden + - parallel-tasks + - parameterized + - parameterized-utils + - paramtree + - paranoia + - parco + - parco-attoparsec + - parco-parsec + - parconc-examples + - pareto + - Parry + - parse-help + - parseargs + - parsec-free + - parsec-parsers + - parsec-pratt + - parseerror-eq + - parsely + - parser-helper + - parser241 + - parsergen + - parsestar + - partage + - partial-lens + - partial-order + - partly + - passage + - PasswordGenerator + - passwords + - pasta + - pastis + - pasty + - patat + - patches-vector + - Pathfinder + - pathfindingcore + - PathTree + - patronscraper + - patterns + - paypal-adaptive-hoops + - paypal-api + - paypal-rest-client + - pb + - pb-next + - pbc4hs + - PBKDF2 + - pcap-enumerator + - pcd-loader + - pcf + - PCLT + - PCLT-DB + - pcre-light-extra + - pdf-slave + - pdf-slave-template + - pdf-toolbox-content + - pdf-toolbox-core + - pdf-toolbox-document + - pdf-toolbox-viewer + - pdfname + - pdfsplit + - pdynload + - peakachu + - PeanoWitnesses + - pec + - pedestrian-dag + - peg + - peggy + - pencil + - penny + - penny-bin + - penny-lib + - penrose + - peparser + - perceptron + - peregrin + - perf + - perf-analysis + - PerfectHash + - perfecthash + - perhaps + - periodic + - perm + - permutations + - permute + - PermuteEffects + - persist2er + - Persistence + - persistent-audit + - persistent-cereal + - persistent-database-url + - persistent-equivalence + - persistent-hssqlppp + - persistent-map + - persistent-migration + - persistent-mongoDB + - persistent-odbc + - persistent-protobuf + - persistent-ratelimit + - persistent-refs + - persistent-relational-record + - persistent-template-classy + - persistent-test + - persistent-typed-db + - persistent-vector + - persistent-zookeeper + - persona + - persona-idp + - pesca + - peyotls + - peyotls-codec + - pez + - pg-harness + - pg-harness-server + - pg-recorder + - pg-store + - pg-transact + - pgdl + - pgsql-simple + - pgstream + - phasechange + - phoityne + - phone-numbers + - phone-push + - phooey + - photoname + - phraskell + - Phsu + - phybin + - pi-calculus + - pi-forall + - pi-hoole + - pia-forward + - pianola + - picedit + - picologic + - picoparsec + - picosat + - pictikz + - pidfile + - pier + - pier-core + - piet + - pig + - pinchot + - ping + - pinpon + - Pipe + - pipe-enumerator + - pipes-async + - pipes-attoparsec-streaming + - pipes-bgzf + - pipes-cacophony + - pipes-cereal + - pipes-cereal-plus + - pipes-conduit + - pipes-core + - pipes-courier + - pipes-errors + - pipes-extra + - pipes-files + - pipes-illumina + - pipes-io + - pipes-key-value-csv + - pipes-p2p + - pipes-p2p-examples + - pipes-protolude + - pipes-random + - pipes-rt + - pipes-s3 + - pipes-shell + - pipes-sqlite-simple + - pipes-text + - pipes-transduce + - pipes-zeromq4 + - pisigma + - Piso + - pit + - pitchtrack + - pivotal-tracker + - pixelated-avatar-generator + - pkcs10 + - pkcs7 + - pkggraph + - plailude + - plan-applicative + - plan-b + - planar-graph + - planb-token-introspection + - planet-mitchell + - planet-mitchell-test + - plankton + - plat + - platinum-parsing + - PlayingCards + - plex + - plist-buddy + - plocketed + - plot + - plot-gtk + - plot-gtk-ui + - plot-gtk3 + - Plot-ho-matic + - plot-lab + - plot-light-examples + - plots + - PlslTools + - plugins + - plugins-auto + - plugins-multistage + - plural + - png-file + - pngload + - pngload-fixed + - pocket + - pocket-dns + - point-octree + - pointfree-fancy + - pointful + - pointless-lenses + - pointless-rewrite + - pokemon-go-protobuf-types + - poker-eval + - pokitdok + - polar-configfile + - polar-shader + - polh-lexicon + - polimorf + - Pollutocracy + - poly-control + - polydata + - polydata-core + - polynomial + - polyseq + - polysoup + - polytypeable + - polytypeable-utils + - pomaps + - pomodoro + - pomohoro + - ponder + - pong-server + - pool + - pool-conduit + - popenhs + - poppler + - portager + - porte + - porter + - PortFusion + - ports + - posix-acl + - posix-realtime + - posix-waitpid + - postcodes + - postgres-embedded + - postgres-tmp + - postgres-websockets + - postgresql-copy-escape + - postgresql-lo-stream + - postgresql-named + - postgresql-query + - postgresql-simple-bind + - postgresql-simple-queue + - postgresql-simple-sop + - postgresql-simple-typed + - postgresql-simple-url + - postgresql-typed + - postgresql-typed-lifted + - postgrest + - postgrest-ws + - postie + - postmark-streams + - potato-tool + - potoki + - potoki-cereal + - potoki-conduit + - potoki-core + - potoki-hasql + - potoki-zlib + - powerpc + - powerqueue + - powerqueue-distributed + - powerqueue-levelmem + - powerqueue-sqs + - PPrinter + - pqc + - pqueue-mtl + - practice-room + - praglude + - pragmatic-show + - precursor + - pred-trie + - predicate-class + - prednote + - prednote-test + - prefork + - preliminaries + - prelude-generalize + - prelude-plus + - preprocess-haskell + - preprocessor + - presburger + - press + - presto-hdbc + - pretty-ghci + - pretty-ncols + - pretty-relative-time + - prettyprinter-vty + - preview + - prim-array + - prim-instances + - primes-type + - primitive-containers + - primitive-indexed + - primitive-maybe + - primitive-simd + - primula-board + - primula-bot + - pringletons + - print-debugger + - printcess + - Printf-TH + - priority-queue + - PriorityChansConverger + - ProbabilityMonads + - probable + - proc + - process-conduit + - process-iterio + - process-leksah + - process-listlike + - process-progress + - process-qq + - process-streaming + - processing + - procrastinating-variable + - procstat + - producer + - product + - prof2dot + - prof2pretty + - progress + - progress-meter + - progressbar + - progression + - progressive + - proj4-hs-bindings + - project-m36 + - projectile + - prolog-graph + - prometheus + - prometheus-effect + - promise + - pronounce + - proof-combinators + - propane + - Proper + - properties + - property-list + - proplang + - prosper + - proteome + - proto-lens-combinators + - proto-lens-descriptors + - protobuf-native + - protocol-buffers-descriptor-fork + - protocol-buffers-fork + - protolude-lifted + - proton-haskell + - prototype + - prove-everywhere-server + - proxy-kindness + - proxy-mapping + - psc-ide + - pseudo-trie + - pthread + - PTQ + - ptr + - publicsuffixlistcreate + - publish + - pubnub + - pubsub + - puffytools + - pugixml + - Pugs + - pugs-compat + - pugs-DrIFT + - pugs-hsregex + - PUH-Project + - punkt + - Pup-Events-Demo + - puppetresources + - pure-cdb + - pure-io + - pure-priority-queue + - pure-priority-queue-tests + - purescript + - purescript-iso + - purescript-tsd-gen + - push-notify + - push-notify-ccs + - push-notify-general + - pusher-haskell + - pusher-ws + - pushme + - putlenses + - puzzle-draw + - puzzle-draw-cmdline + - pvd + - pyffi + - pyfi + - python-pickle + - q4c12-twofinger + - qc-oi-testgenerator + - qd + - qd-vec + - qed + - qhull-simple + - qif + - QIO + - QLearn + - qr-imager + - qr-repa + - qtah-cpp-qt5 + - qtah-examples + - qtah-generator + - qtah-qt5 + - QuadEdge + - QuadTree + - quantfin + - quantum-arrow + - quantum-random + - qudb + - Quelea + - quenya-verb + - queryparser + - queryparser-demo + - queryparser-hive + - queryparser-presto + - queryparser-vertica + - questioner + - queuelike + - quick-schema + - QuickAnnotate + - quickbooks + - quickcheck-arbitrary-template + - quickcheck-classes + - quickcheck-poly + - quickcheck-property-comb + - quickcheck-property-monad + - quickcheck-regex + - quickcheck-relaxng + - quickcheck-rematch + - quickcheck-report + - quickcheck-state-machine + - quickcheck-state-machine-distributed + - quickcheck-webdriver + - QuickCheckVariant + - QuickPlot + - quickpull + - quickset + - Quickson + - quicktest + - quickwebapp + - quipper + - quipper-core + - quipper-rendering + - quiver-binary + - quiver-enumerator + - quiver-groups + - quiver-http + - quiver-instances + - quiver-interleave + - quiver-sort + - quoridor-hs + - qux + - R-pandoc + - raaz + - rad + - radium + - radium-formula-parser + - radix + - rados-haskell + - raft + - rail-compiler-editor + - rails-session + - rainbow-tests + - raketka + - rakhana + - rakuten + - rallod + - raml + - rand-vars + - randfile + - rando + - random-access-list + - random-derive + - random-eff + - random-effin + - random-fu-multivariate + - random-hypergeometric + - random-stream + - RandomDotOrg + - Range + - range-set-list + - range-space + - rangemin + - rank1dynamic + - rank2classes + - Ranka + - rapid + - rapid-term + - rasa + - rasa-example-config + - rasa-ext-bufs + - rasa-ext-cmd + - rasa-ext-cursors + - rasa-ext-files + - rasa-ext-logger + - rasa-ext-slate + - rasa-ext-status-bar + - rasa-ext-style + - rasa-ext-views + - rasa-ext-vim + - rascal + - Rasenschach + - rating-chgk-info + - rattletrap + - raven-haskell-scotty + - raw-feldspar + - rawr + - raz + - razom-text-util + - rbr + - rc + - rcu + - rdf + - rdf4h + - rdioh + - react-flux + - react-flux-servant + - react-haskell + - react-tutorial-haskell-server + - reaction-logic + - reactive-bacon + - reactive-banana-automation + - reactive-banana-gi-gtk + - reactive-banana-sdl + - reactive-banana-sdl2 + - reactive-banana-threepenny + - reactive-banana-wx + - reactive-fieldtrip + - reactive-glut + - reactive-thread + - reactor + - read-io + - readline-statevar + - readme-lhs + - readpyc + - readshp + - really-simple-xml-parser + - reasonable-lens + - record + - record-aeson + - record-encode + - record-gl + - record-preprocessor + - record-syntax + - records + - records-th + - recursors + - reddit + - redis + - redis-simple + - redland + - Redmine + - reduce-equations + - reedsolomon + - reenact + - ref + - Ref + - ref-fd + - ref-mtl + - refcount + - Referees + - refh + - refined + - reflection-extras + - reflex + - reflex-animation + - reflex-dom-core + - reflex-gloss + - reflex-gloss-scene + - reflex-orphans + - reflex-sdl2 + - reflex-transformers + - reformat + - refresht + - refurb + - regex-deriv + - regex-dfa + - regex-generator + - regex-parsec + - regex-pderiv + - regex-tdfa-pipes + - regex-tdfa-quasiquoter + - regex-tdfa-rc + - regex-tdfa-utf8 + - regex-tre + - regex-type + - regex-xmlschema + - regexp-tries + - regexpr-symbolic + - regexqq + - regional-pointers + - regions + - regions-monadsfd + - regions-monadstf + - regions-mtl + - register-machine-typelevel + - regress + - regular + - regular-extras + - regular-web + - regular-xmlpickler + - reheat + - rei + - reified-records + - reify + - relacion + - relation + - relational-postgresql8 + - relative-date + - reload + - remark + - remarks + - remote + - remote-debugger + - remote-json + - remote-json-client + - remote-json-server + - remote-monad + - remotion + - repa-array + - repa-bytestring + - repa-convert + - repa-devil + - repa-eval + - repa-flow + - repa-linear-algebra + - repa-plugin + - repa-scalar + - repa-series + - repa-stream + - repa-v4l2 + - repl + - RepLib + - replicant + - ReplicateEffects + - repo-based-blog + - repr + - representable-functors + - representable-tries + - reprinter + - reproject + - req-conduit + - request-monad + - require + - reserve + - reservoir + - resistor-cube + - resolve + - resolve-trivial-conflicts + - resource-effect + - resource-embed + - resource-pool-catchio + - resource-simple + - respond + - rest-client + - rest-core + - rest-example + - rest-gen + - rest-happstack + - rest-snap + - rest-stringmap + - rest-types + - rest-wai + - restful-snap + - restricted-workers + - restyle + - rethinkdb + - rethinkdb-client-driver + - rethinkdb-model + - rethinkdb-wereHamster + - retryer + - reverse-geocoding + - reversi + - ReviewBoard + - rewrite + - rewriting + - rezoom + - rfc + - rfc-env + - rfc-http-client + - rfc-prelude + - rfc-psql + - rfc-redis + - rfc-servant + - rhine + - rhine-gloss + - rhythm-game-tutorial + - ribosome + - RichConditional + - ridley + - ridley-extras + - riemann + - riff + - ring-buffer + - riot + - risc386 + - riscv-isa + - rivers + - rivet + - rivet-migration + - rivet-simple-deploy + - RJson + - rl-satton + - Rlang-QQ + - rlglue + - rlwe-challenges + - rmonad + - RMP + - RNAdesign + - RNAdraw + - RNAFold + - RNAFoldProgs + - RNAlien + - RNAwolf + - rncryptor + - robin + - robots-txt + - roc-cluster + - roc-cluster-demo + - roku-api + - rollbar-hs + - roller + - RollingDirectory + - rope + - rose-trees + - rose-trie + - roshask + - rosmsg + - rosmsg-bin + - rosso + - rounded + - rounding + - roundtrip + - roundtrip-aeson + - roundtrip-string + - roundtrip-xml + - route-planning + - rowrecord + - rpc + - rpc-framework + - rpf + - rpm + - rsagl + - rsagl-frp + - rsagl-math + - rspp + - rss-conduit + - rss2irc + - rtnetlink + - rtorrent-rpc + - rts-loader + - ruby-marshal + - ruby-qq + - ruin + - ruler + - ruler-core + - rungekutta + - runmany + - runtime-arbitrary + - rws + - RxHaskell + - s-expression + - SableCC2Hs + - safe-access + - safe-buffer-monad + - safe-failure-cme + - safe-freeze + - safe-globals + - safe-lazy-io + - safe-length + - safe-money + - safe-money-aeson + - safe-money-cereal + - safe-money-serialise + - safe-money-store + - safe-money-xmlbf + - safe-plugins + - safe-printf + - safecopy-store + - safeint + - safepath + - safer-file-handles + - safer-file-handles-bytestring + - safer-file-handles-text + - saferoute + - sai-shape-syb + - sajson + - salak + - Salsa + - saltine-quickcheck + - salvia + - salvia-demo + - salvia-extras + - salvia-protocol + - salvia-sessions + - salvia-websocket + - samtools + - samtools-conduit + - samtools-enumerator + - samtools-iteratee + - sandlib + - sarasvati + - sarsi + - sasl + - sat + - sat-micro-hs + - satchmo + - satchmo-backends + - satchmo-examples + - satchmo-funsat + - satchmo-minisat + - satchmo-toysat + - savage + - sax + - SBench + - sbvPlugin + - sc2-lowlevel + - sc2-proto + - sc3-rdu + - scalable-server + - scaleimage + - scalendar + - SCalendar + - scalp-webhooks + - scan-vector-machine + - scc + - scenegraph + - schedevr + - schedule-planner + - schedyield + - schematic + - scholdoc + - scholdoc-citeproc + - scholdoc-texmath + - scholdoc-types + - science-constants-dimensional + - scion + - scion-browser + - scons2dot + - scope + - scope-cairo + - scottish + - scotty-binding-play + - scotty-blaze + - scotty-fay + - scotty-format + - scotty-hastache + - scotty-resource + - scotty-rest + - scotty-session + - scotty-view + - scp-streams + - scrabble-bot + - scrapbook + - scrape-changes + - ScratchFs + - script-monad + - SCRIPTWriter + - scrobble + - Scurry + - scythe + - scyther-proof + - sde-solver + - sdl2-cairo-image + - sdl2-compositor + - sdr + - seakale + - seakale-postgresql + - seakale-tests + - search-algorithms + - sec + - secdh + - seclib + - second-transfer + - secp256k1 + - secret-santa + - secret-sharing + - secrm + - sednaDBXML + - selectors + - SelectSequencesFromMSA + - selenium + - selenium-server + - self-extract + - selinux + - Semantique + - semdoc + - semi-iso + - semibounded-lattices + - Semigroup + - semigroupoids-syntax + - semigroups-actions + - semilattices + - semiring + - semiring-num + - semver-range + - sendgrid-haskell + - sendgrid-v3 + - sensei + - sensenet + - sentence-jp + - sentry + - seqaid + - SeqAlign + - seqid + - seqid-streams + - seqloc + - seqloc-datafiles + - sequence-formats + - sequent-core + - sequor + - serialize-instances + - serokell-util + - serpentine + - serv + - serv-wai + - servant-aeson-specs + - servant-auth-cookie + - servant-auth-hmac + - servant-auth-token + - servant-auth-token-acid + - servant-auth-token-api + - servant-auth-token-leveldb + - servant-auth-token-persistent + - servant-auth-token-rocksdb + - servant-client-namedargs + - servant-csharp + - servant-db + - servant-db-postgresql + - servant-dhall + - servant-examples + - servant-generate + - servant-generic + - servant-github + - servant-haxl-client + - servant-hmac-auth + - servant-http-streams + - servant-http2-client + - servant-iCalendar + - servant-jquery + - servant-matrix-param + - servant-namedargs + - servant-nix + - servant-pool + - servant-postgresql + - servant-proto-lens + - servant-purescript + - servant-pushbullet-client + - servant-py + - servant-quickcheck + - servant-reflex + - servant-router + - servant-scotty + - servant-server-namedargs + - servant-smsc-ru + - servant-snap + - servant-streaming-client + - servant-streaming-docs + - servant-streaming-server + - servant-waargonaut + - servant-zeppelin + - servant-zeppelin-client + - servant-zeppelin-server + - servant-zeppelin-swagger + - server-generic + - serverless-haskell + - serversession-frontend-snap + - serversession-frontend-yesod + - services + - ses-html-snaplet + - SessionLogger + - sessions + - sessiontypes + - sessiontypes-distributed + - set-cover + - set-with + - setdown + - setgame + - setoid + - sets + - setters + - sexp + - sext + - SFML + - SFML-control + - sfmt + - sfnt2woff + - SFont + - SG + - SGdemo + - sgf + - SGplus + - sgrep + - sh2md + - sha-streams + - shade + - shadower + - shake-cabal-build + - shake-extras + - shake-minify + - shake-pack + - shake-path + - shake-persist + - shaker + - shakespeare-babel + - shakespeare-sass + - shapely-data + - shared-buffer + - shared-fields + - she + - shelduck + - shell-pipe + - Shellac + - Shellac-compatline + - Shellac-editline + - Shellac-haskeline + - Shellac-readline + - shellish + - shellmate + - shellmate-extras + - shivers-cfg + - shoap + - shopify + - shorten-strings + - ShortestPathProblems + - showdown + - shower + - shpider + - shuffle + - si-clock + - sibe + - sifflet + - sifflet-lib + - sigma-ij + - sign + - signals + - signed-multiset + - silvi + - simd + - simgi + - simple + - simple-actors + - simple-affine-space + - simple-atom + - simple-bluetooth + - simple-c-value + - simple-conduit + - simple-config + - simple-css + - simple-download + - simple-eval + - simple-firewire + - simple-genetic-algorithm + - simple-index + - simple-log-syslog + - simple-logging + - simple-money + - simple-neural-networks + - simple-nix + - simple-pascal + - simple-pipe + - simple-postgresql-orm + - simple-rope + - simple-session + - simple-tabular + - simple-tar + - simple-templates + - simple-ui + - simple-vec3 + - simple-zipper + - simpleargs + - simpleconfig + - SimpleGL + - simpleirc + - simpleirc-lens + - SimpleLog + - simplenote + - simpleprelude + - SimpleServer + - simplest-sqlite + - simseq + - singleton-dict + - singleton-typelits + - singnal + - sink + - siphon + - siren-json + - sirkel + - sitepipe + - sixfiguregroup + - sized + - sized-grid + - sized-types + - sized-vector + - sizes + - sjsp + - skeletal-set + - skeleton + - skeletons + - skell + - skemmtun + - skulk + - skylark-client + - skype4hs + - slack + - slidemews + - Slides + - slim + - sloane + - slope-field + - slot-lambda + - sloth + - slug + - smallarray + - smallcaps + - smallcheck-laws + - smallcheck-lens + - smallpt-hs + - smallstring + - smartcheck + - smartconstructor + - smartGroup + - smartword + - smcdel + - sme + - smerdyakov + - smiles + - smith-cli + - smith-client + - Smooth + - smsaero + - smt-lib + - SmtLib + - smtlib2-debug + - smtlib2-pipe + - smtlib2-quickcheck + - smtp-mail-ng + - SMTPClient + - smtps-gmail + - smuggler + - snake + - snake-game + - snap + - snap-auth-cli + - snap-blaze-clay + - snap-configuration-utilities + - snap-error-collector + - snap-extras + - snap-language + - snap-routes + - snap-stream + - snap-testing + - snap-utils + - snap-web-routes + - snaplet-acid-state + - snaplet-actionlog + - snaplet-amqp + - snaplet-auth-acid + - snaplet-coffee + - snaplet-css-min + - snaplet-customauth + - snaplet-environments + - snaplet-fay + - snaplet-ghcjs + - snaplet-hasql + - snaplet-haxl + - snaplet-hdbc + - snaplet-hslogger + - snaplet-i18n + - snaplet-influxdb + - snaplet-mandrill + - snaplet-mongoDB + - snaplet-mongodb-minimalistic + - snaplet-mysql-simple + - snaplet-oauth + - snaplet-persistent + - snaplet-postgresql-simple + - snaplet-postmark + - snaplet-purescript + - snaplet-recaptcha + - snaplet-redis + - snaplet-redson + - snaplet-rest + - snaplet-riak + - snaplet-sass + - snaplet-scoped-session + - snaplet-sedna + - snaplet-ses-html + - snaplet-sqlite-simple + - snaplet-sqlite-simple-jwt-auth + - snaplet-stripe + - snaplet-tasks + - snaplet-typed-sessions + - snaplet-wordpress + - snappy-conduit + - snappy-iteratee + - sndfile-enumerators + - sneakyterm + - SNet + - snm + - snmp + - snorkels + - snow-white + - snowflake-core + - snowflake-server + - snowtify + - Snusmumrik + - soap-openssl + - SoccerFun + - SoccerFunGL + - socket-sctp + - socket-unix + - socketed + - socketio + - sockets + - socketson + - sodium + - soegtk + - softfloat-hs + - solga + - solga-swagger + - solr + - sonic-visualiser + - Sonnex + - SoOSiM + - sorted + - sorting + - sorty + - sound-collage + - sounddelay + - soundgen + - source-code-server + - SourceGraph + - sousit + - soyuz + - SpaceInvaders + - spacepart + - SpacePrivateers + - spake2 + - spanout + - sparkle + - sparrow + - sparse + - sparse-lin-alg + - sparsebit + - sparsecheck + - sparser + - spata + - spatial-rotations + - special-functors + - special-keys + - specialize-th + - spectral-clustering + - speculation + - speculation-transformers + - speechmatics + - speedy-slice + - spelling-suggest + - sphero + - sphinx-cli + - sphinxesc + - spice + - SpinCounter + - spir-v + - splay + - splaytree + - splines + - splitter + - splot + - Spock + - Spock-api-ghcjs + - Spock-api-server + - Spock-auth + - Spock-core + - Spock-digestive + - Spock-lucid + - Spock-worker + - spoonutil + - spoty + - Sprig + - sprinkles + - spritz + - spsa + - spy + - sql-simple + - sql-simple-mysql + - sql-simple-pool + - sql-simple-postgresql + - sql-simple-sqlite + - sqlcipher + - sqlite + - sqlite-simple-typed + - sqlvalue-list + - sqsd-local + - squeal-postgresql + - srcinst + - sscan + - sscgi + - ssh + - ssh-tunnel + - sshd-lint + - sssp + - sstable + - SSTG + - stable-heap + - stable-maps + - stable-marriage + - stable-memo + - stable-tree + - stack-bump + - stack-hpc-coveralls + - stack-lib + - stack-network + - stack-prism + - stack-run + - stack-run-auto + - stack-type + - stack2cabal + - stackage + - stackage-build-plan + - stackage-cabal + - stackage-cli + - stackage-curator + - stackage-metadata + - stackage-sandbox + - stackage-setup + - stackage-to-hackage + - stackage-types + - stackage-upload + - stackage2nix + - standalone-derive-topdown + - standalone-haddock + - starling + - stash + - Stasis + - state + - state-bag + - state-plus + - state-record + - stateful-mtl + - stateWriter + - static-canvas + - static-closure + - static-tensor + - static-text + - statistics-dirichlet + - statistics-fusion + - statistics-hypergeometric-genvar + - stats + - statsd + - statsd-client + - statsdi + - staversion + - stb-image-redux + - stb-truetype + - stdata + - stdf + - stdio + - steambrowser + - stego-uuid + - stemmer + - stemmer-german + - stepwise + - stgi + - STL + - stm-chunked-queues + - stm-firehose + - stm-io-hooks + - stm-lifted + - stm-promise + - stm-stats + - stmcontrol + - stochastic + - Stomp + - storable + - storable-static-array + - storablevector-streamfusion + - stp + - str + - Strafunski-ATermLib + - Strafunski-Sdf2Haskell + - StrappedTemplates + - stratum-tool + - stratux + - stratux-http + - stratux-types + - stratux-websockets + - stream + - stream-fusion + - stream-monad + - streamdeck + - streamed + - streaming-benchmarks + - streaming-cassava + - streaming-concurrency + - streaming-conduit + - streaming-fft + - streaming-osm + - streaming-pcap + - streaming-png + - streaming-postgresql-simple + - streaming-process + - streaming-sort + - strelka + - strict-data + - StrictBench + - StrictCheck + - strictly + - string-isos + - string-typelits + - stringlike + - stringtable-atom + - stripe + - stripe-haskell + - stripe-http-client + - strongswan-sql + - structural-induction + - structural-traversal + - structured-mongoDB + - structures + - stt + - stunts + - stylized + - sub-state + - subhask + - subleq-toolchain + - submark + - subsample + - substring-parser + - subwordgraph + - successors + - suffix-array + - suffixarray + - SuffixStructures + - suitable + - summoner + - sump + - sunlight + - sunroof-compiler + - sunroof-examples + - sunroof-server + - super-user-spark + - superbubbles + - superbuffer + - supercollider-ht + - supercollider-midi + - superconstraints + - superevent + - supermonad + - supero + - supervisor + - supplemented + - surjective + - sv + - sv-svfactor + - SVD2HS + - svfactor + - svg-builder-fork + - SVG2Q + - svg2q + - svgutils + - svm-simple + - svndump + - swagger-petstore + - swagger-test + - swapper + - swearjure + - swf + - swift-lda + - syb-extras + - syb-with-class-instances-text + - SybWidget + - syfco + - sylvia + - sym + - sym-plot + - symantic + - symantic-cli + - symantic-grammar + - symantic-lib + - symengine + - symengine-hs + - sync + - sync-mht + - syncthing-hs + - syntactic + - syntax + - syntax-attoparsec + - syntax-example + - syntax-example-json + - syntax-pretty + - syntax-printer + - syntax-trees + - syntax-trees-fork-bairyn + - SyntaxMacros + - syntaxnet-haskell + - synthesizer + - synthesizer-llvm + - sys-process + - Sysmon + - system-canonicalpath + - system-command + - system-extra + - system-lifted + - system-linux-proc + - system-random-effect + - systemstats + - t-regex + - t3-client + - t3-server + - ta + - table + - table-layout + - table-tennis + - tableaux + - Tables + - tables + - tablestorage + - Tablify + - tabloid + - tabs + - tag-bits + - tag-stream + - tagged-exception-core + - tagged-list + - tagged-th + - tagged-timers + - taglib-api + - tagsoup-ht + - tagsoup-megaparsec + - tagsoup-parsec + - tagsoup-selection + - tai + - tai64 + - takahashi + - Takusen + - takusen-oracle + - tal + - tamarin-prover + - tamarin-prover-term + - tamarin-prover-theory + - tamarin-prover-utils + - tamper + - Tape + - target + - task + - task-distribution + - taskell + - tasty-auto + - tasty-fail-fast + - tasty-groundhog-converters + - tasty-integrate + - tasty-jenkins-xml + - tasty-laws + - tasty-lens + - tasty-stats + - tasty-tap + - tasty-travis + - TaxonomyTools + - TBC + - TBit + - tbox + - tcache-AWS + - tccli + - tcod-haskell + - tcp + - tcp-streams-openssl + - tdd-util + - tdigest-Chart + - TeaHS + - teams + - teeth + - telegram + - telegram-api + - telegram-bot + - telegram-bot-simple + - teleport + - teleshell + - tellbot + - template-default + - template-haskell-util + - template-hsml + - template-yj + - templateify + - templatepg + - tempodb + - temporal-csound + - temporary-resourcet + - tempus + - tensor + - tensorflow + - tensorflow-core-ops + - tensorflow-logging + - tensorflow-opgen + - tensorflow-ops + - tensorflow-proto + - termbox-banana + - termbox-bindings + - terminal-punch + - terminal-text + - termination-combinators + - termplot + - terntup + - terrahs + - tersmu + - test-fixture + - test-framework-doctest + - test-framework-quickcheck + - test-framework-sandbox + - test-framework-skip + - test-framework-testing-feat + - test-lib + - test-pkg + - test-sandbox-compose + - test-sandbox-hunit + - test-shouldbe + - test-simple + - testbench + - testCom + - TestExplode + - testloop + - testpack + - testpattern + - testrunner + - TeX-my-math + - tex2txt + - texbuilder + - text-all + - text-and-plots + - text-containers + - text-generic-pretty + - text-icu-normalized + - text-lens + - text-locale-encoding + - text-markup + - text-normal + - text-plus + - text-position + - text-register-machine + - text-time + - text-utf8 + - text-xml-qq + - text-zipper-monad + - textmatetags + - textocat-api + - textual + - tfp-th + - tftp + - tga + - th-alpha + - th-build + - th-context + - th-dict-discovery + - th-fold + - th-format + - th-instance-reification + - th-instances + - th-kinds-fork + - th-sccs + - th-to-exp + - th-traced + - th-typegraph + - thank-you-stars + - themoviedb + - thentos-cookie-session + - Theora + - theoremquest + - theoremquest-client + - these-skinny + - thih + - thimk + - Thingie + - thorn + - threadmanager + - threads-supervisor + - threadscope + - threepenny-gui-contextmenu + - threepenny-gui-flexbox + - thrift + - throttled-io-loop + - through-text + - throwable-exceptions + - thumbnail-plus + - tic-tac-toe + - tickle + - TicTacToe + - tictactoe3d + - tidal-midi + - tidal-serial + - tidal-vis + - tie-knot + - tiempo + - tiger + - tightrope + - tighttp + - timberc + - time-extras + - time-http + - time-io-access + - time-machine + - time-parsers + - time-quote + - time-recurrence + - time-series + - time-series-lib + - time-w3c + - time-warp + - timecalc + - timemap + - timeout + - timeout-with-results + - timeparsers + - TimePiece + - timeplot + - timeprint + - timers-tick + - timeseries + - timespan + - timezone-unix + - tintin + - tiny-scheduler + - TinyLaunchbury + - tinyMesh + - tinytemplate + - TinyURL + - tinyXml + - tip-haskell-frontend + - tip-lib + - titan + - Titim + - tkhs + - tkyprof + - tls-extra + - tn + - to-haskell + - to-string-class + - to-string-instances + - toboggan + - todo + - todos + - tofromxml + - toilet + - tokenify + - tokstyle + - toktok + - tokyocabinet-haskell + - tokyotyrant-haskell + - tomato-rubato-openal + - toml + - tomland + - too-many-cells + - toodles + - Top + - top + - topkata + - torch + - TORCS + - total-map + - touched + - Tournament + - toxcore + - toxiproxy-haskell + - toysolver + - tpar + - tpb + - tpdb + - trace + - trace-call + - trace-function-call + - traced + - tracetree + - tracker + - traction + - tracy + - traildb + - trajectory + - transactional-events + - transf + - transfer-db + - transformations + - TransformeR + - transformers-compose + - transformers-convert + - transformers-lift + - transformers-runnable + - TransformersStepByStep + - transient + - transient-universe + - transient-universe-tls + - translatable-intset + - translate + - translate-cli + - trasa + - trasa-client + - trasa-server + - travis + - travis-meta-yaml + - trawl + - traypoweroff + - tree-traversals + - TreeCounter + - treemap-html + - treemap-html-tools + - TreeStructures + - Treiber + - tremulous-query + - TrendGraph + - trhsx + - triangulation + - trie-simple + - TrieMap + - tries + - trigger + - trimpolya + - triplesec + - tripLL + - trivia + - tropical + - truelevel + - trurl + - tsession + - tsession-happstack + - tskiplist + - tsp-viz + - tsparse + - tsuntsun + - tsvsql + - ttask + - ttn-client + - tttool + - tuntap + - tup-functor + - tuple-gen + - tuple-lenses + - tuple-morph + - tuple-ops + - tupleinstances + - turing-machines + - turingMachine + - turtle-options + - tweak + - twee + - tweet-hs + - twentefp-eventloop-graphics + - twentefp-eventloop-trees + - twentefp-graphs + - twentefp-rosetree + - twentefp-trees + - twentefp-websockets + - twentyseven + - twfy-api-client + - twhs + - twidge + - twilight-stm + - twilio + - twill + - twine + - twitter + - twitter-enumerator + - twitter-feed + - tx + - txt + - txtblk + - TYB + - tyfam-witnesses + - typalyze + - type-assertions + - type-cache + - type-cereal + - type-combinators + - type-combinators-quote + - type-combinators-singletons + - type-digits + - type-eq + - type-indexed-queues + - type-int + - type-interpreter + - type-level-bst + - type-level-natural-number-induction + - type-level-natural-number-operations + - type-list + - type-natural + - type-ord + - type-ord-spine-cereal + - type-prelude + - type-settheory + - type-spine + - type-structure + - type-sub-th + - typeable-th + - TypeClass + - typed-spreadsheet + - typed-streams + - typed-wire + - typedflow + - typedquery + - typehash + - TypeIlluminator + - typelevel-tensor + - TypeNat + - typeparams + - types-compat + - typesafe-precure + - typescript-docs + - typography-geometry + - tyro + - u2f + - uber + - uberlast + - uconv + - udev + - udp-conduit + - uhc-light + - uhc-util + - uhexdump + - ui-command + - UMM + - unagi-bloomfilter + - unagi-streams + - unamb-custom + - unbeliever + - unbound + - unbounded-delays-units + - unboxed-containers + - unbreak + - uni-graphs + - uni-uDrawGraph + - unicode-normalization + - unicode-show + - unicode-symbols + - uniform-io + - union-map + - uniqueid + - uniquely-represented-sets + - units-attoparsec + - unittyped + - unity-testresult-parser + - unitym-yesod + - universe + - universe-instances-extended + - universe-th + - universum + - unix-fcntl + - unix-handle + - unix-process-conduit + - unm-hip + - unordered-containers-rematch + - unordered-graphs + - unordered-intmap + - unpack-funcs + - unpacked-either + - unpacked-maybe + - unpacked-maybe-numeric + - unpacked-these + - unpacked-validation + - unroll-ghc-plugin + - unsafely + - unscramble + - unsequential + - unused + - uom-plugin + - up + - update-nix-fetchgit + - Updater + - uploadcare + - upskirt + - ureader + - urembed + - uri + - uri-conduit + - uri-enumerator + - uri-enumerator-file + - uri-parse + - uri-template + - url-decoders + - url-generic + - URLb + - urlcheck + - urldecode + - UrlDisp + - urldisp-happstack + - urlpath + - URLT + - urn + - urn-random + - urxml + - usb-enumerator + - usb-hid + - usb-id-database + - usb-iteratee + - usb-safe + - users-mysql-haskell + - users-persistent + - utc + - utf8-prelude + - utf8-validator + - UTFTConverter + - util-exception + - util-primitive + - util-primitive-control + - uu-cco + - uu-cco-examples + - uu-cco-hut-parsing + - uu-cco-uu-parsinglib + - uuagc-bootstrap + - uuagc-diagrams + - uuid-aeson + - uvector + - uvector-algorithms + - uxadt + - v4l2 + - v4l2-examples + - vacuum + - vacuum-cairo + - vacuum-graphviz + - vacuum-opengl + - vacuum-ubigraph + - vado + - valid-names + - validate-input + - validated-literals + - validated-types + - Validation + - validations + - validationt + - vampire + - var + - varan + - variable-precision + - variables + - variation + - vault-tool + - vault-tool-server + - vault-trans + - vaultaire-common + - vcard + - vcatt + - vcf + - vcsgui + - vcswrapper + - vec + - Vec-Boolean + - Vec-OpenGLRaw + - Vec-Transform + - vect-floating + - vect-floating-accelerate + - vect-opengl + - vector-bytestring + - vector-clock + - vector-conduit + - vector-extras + - vector-functorlazy + - vector-heterogenous + - vector-instances-collections + - vector-random + - vector-read-instances + - vector-space-opengl + - vector-static + - vectortiles + - Verba + - verbalexpressions + - verdict + - verdict-json + - verifiable-expressions + - verify + - verilog + - versioning + - versioning-servant + - vfr-waypoints + - vgrep + - vhd + - vhdl + - vicinity + - ViennaRNA-extras + - views + - vigilance + - Villefort + - vimeta + - vimus + - vintage-basic + - vinyl-json + - vinyl-operational + - vinyl-plus + - vinyl-utils + - vinyl-vectors + - virthualenv + - visibility + - vision + - visual-graphrewrite + - visual-prof + - visualize-cbn + - vivid + - vivid-supercollider + - vk-aws-route53 + - VKHS + - voicebase + - vorbiscomment + - vowpal-utils + - voyeur + - vpq + - vte + - vtegtk3 + - vty-examples + - vty-menu + - vty-ui + - vty-ui-extras + - vulkan + - vulkan-api + - waargonaut + - wacom-daemon + - waddle + - wahsp + - wai-devel + - wai-git-http + - wai-graceful + - wai-handler-devel + - wai-handler-scgi + - wai-handler-snap + - wai-handler-webkit + - wai-hmac-auth + - wai-lens + - wai-lite + - wai-logger-buffered + - wai-logger-prefork + - wai-make-assets + - wai-middleware-cache + - wai-middleware-cache-redis + - wai-middleware-catch + - wai-middleware-consul + - wai-middleware-content-type + - wai-middleware-delegate + - wai-middleware-etag + - wai-middleware-headers + - wai-middleware-hmac-client + - wai-middleware-preprocessor + - wai-middleware-rollbar + - wai-middleware-route + - wai-middleware-static-caching + - wai-request-spec + - wai-responsible + - wai-router + - wai-routes + - wai-routing + - wai-secure-cookies + - wai-session-alt + - wai-session-mysql + - wai-session-postgresql + - wai-static-cache + - wai-thrift + - wai-throttler + - waitfree + - waitra + - waldo + - wallpaper + - warp-dynamic + - warp-static + - WashNGo + - wasm + - watcher + - watchit + - WAVE + - WaveFront + - wavefront-obj + - wavesurfer + - wavy + - weak-bag + - weather-api + - web-css + - web-encodings + - web-fpco + - web-mongrel2 + - web-output + - web-page + - web-push + - web-routes-quasi + - web-routes-regular + - web-routes-transformers + - web-routing + - web3 + - webapi + - webapp + - WebBits + - WebBits-Html + - WebBits-multiplate + - webcloud + - WebCont + - webcrank + - webcrank-dispatch + - webcrank-wai + - webdriver-snoy + - webdriver-w3c + - WeberLogic + - webfinger-client + - webify + - webkit-javascriptcore + - webkit2gtk3-javascriptcore + - Webrexp + - webserver + - websockets-rpc + - webwire + - weighted + - weighted-regexp + - welshy + - werewolf + - werewolf-slack + - Wheb + - wheb-mongo + - wheb-redis + - wheb-strapped + - while-lang-parser + - whim + - whiskers + - whitespace + - why3 + - wide-word + - WikimediaParser + - wikipedia4epub + - wild-bind-indicator + - wild-bind-task-x11 + - windns + - windowslive + - winerror + - winio + - Wired + - wires + - wiring + - withdependencies + - wkt + - wl-pprint-ansiterm + - wl-pprint-terminfo + - WL500gPControl + - WL500gPLib + - wlc-hs + - WMSigner + - wobsurv + - woffex + - wolf + - word2vec-model + - WordAlignment + - wordchoice + - WordNet + - WordNet-ghc74 + - wordpass + - wordsearch + - work-time + - workdays + - Workflow + - workflow-extra + - workflow-osx + - workflow-pure + - workflow-types + - workflow-windows + - wp-archivebot + - wraxml + - wrecker + - wrecker-ui + - wreq-sb + - wright + - writer-cps-full + - writer-cps-lens + - writer-cps-monads-tf + - writer-cps-morph + - ws + - wsdl + - wsedit + - wss-client + - wtk + - wtk-gtk + - wumpus-basic + - wumpus-core + - wumpus-drawing + - wumpus-microprint + - wumpus-tree + - WURFL + - wxAsteroids + - WXDiffCtrl + - wxdirect + - wxFruit + - WxGeneric + - wxhnotepad + - wxSimpleCanvas + - wxturtle + - wyvern + - x-dsp + - X11-extras + - X11-rm + - X11-xdamage + - X11-xfixes + - x86-64bit + - xchat-plugin + - xcp + - xdcc + - xdot + - Xec + - xfconf + - xformat + - xhaskell-library + - xhb + - xhb-atom-cache + - xhb-ewmh + - xilinx-lava + - xine + - xing-api + - xkbcommon + - xkcd + - xleb + - xlsior + - xlsx-templater + - xml-catalog + - xml-conduit-decode + - xml-enumerator + - xml-enumerator-combinators + - xml-html-conduit-lens + - xml-monad + - xml-parsec + - xml-pipe + - xml-prettify + - xml-push + - xml-query + - xml-query-xml-conduit + - xml-query-xml-types + - xml-tydom-conduit + - xml-tydom-core + - xml2json + - xml2x + - XmlHtmlWriter + - XMLParser + - xmltv + - XMMS + - xmms2-client + - xmms2-client-glib + - xmonad-bluetilebranch + - xmonad-contrib-bluetilebranch + - xmonad-contrib-gpl + - xmonad-eval + - xmonad-vanessa + - xmonad-windownames + - xmpipe + - XMPP + - Xorshift128Plus + - xournal-builder + - xournal-convert + - xournal-parser + - xournal-render + - xournal-types + - xsact + - XSaiga + - xsd + - xslt + - xtc + - xxhash + - y0l0bot + - yabi-muno + - Yablog + - yackage + - YACPong + - yahoo-finance-api + - yahoo-finance-conduit + - yahoo-web-search + - yajl + - yajl-enumerator + - yam + - yam-datasource + - yam-job + - yam-servant + - yam-transaction-odbc + - yam-web + - yaml-pretty-extras + - yaml-rpc + - yaml-rpc-scotty + - yaml-rpc-snap + - yaml2owl + - Yampa + - yampa-canvas + - yampa-glfw + - yampa-gloss + - yampa-glut + - yampa-sdl2 + - yampa-test + - yampa2048 + - YampaSynth + - yandex-translate + - yaop + - yap + - yarn-lock + - yarr + - yarr-image-io + - yate + - yavie + - yaya + - yaya-hedgehog + - yaya-unsafe + - ycextra + - yeller + - yeshql-postgresql-simple + - yesod-angular + - yesod-angular-ui + - yesod-articles + - yesod-auth-account + - yesod-auth-account-fork + - yesod-auth-basic + - yesod-auth-bcrypt + - yesod-auth-bcryptdb + - yesod-auth-deskcom + - yesod-auth-fb + - yesod-auth-hmac-keccak + - yesod-auth-kerberos + - yesod-auth-ldap + - yesod-auth-ldap-mediocre + - yesod-auth-ldap-native + - yesod-auth-nopassword + - yesod-auth-pam + - yesod-auth-smbclient + - yesod-auth-zendesk + - yesod-bootstrap + - yesod-comments + - yesod-content-pdf + - yesod-continuations + - yesod-crud + - yesod-crud-persist + - yesod-datatables + - yesod-dsl + - yesod-examples + - yesod-fast-devel + - yesod-fay + - yesod-form-richtext + - yesod-gitrev + - yesod-goodies + - yesod-ip + - yesod-job-queue + - yesod-links + - yesod-lucid + - yesod-mangopay + - yesod-paginate + - yesod-pagination + - yesod-paypal-rest + - yesod-platform + - yesod-pnotify + - yesod-pure + - yesod-purescript + - yesod-raml + - yesod-raml-bin + - yesod-raml-docs + - yesod-raml-mock + - yesod-recaptcha + - yesod-routes + - yesod-routes-flow + - yesod-routes-typescript + - yesod-rst + - yesod-s3 + - yesod-sass + - yesod-session-redis + - yesod-static-angular + - yesod-test-json + - yesod-tls + - yesod-vend + - yesod-worker + - YFrob + - yggdrasil + - yhccore + - yi + - yi-contrib + - yi-core + - yi-dynamic-configuration + - yi-frontend-pango + - yi-frontend-vty + - yi-fuzzy-open + - yi-ireader + - yi-keymap-cua + - yi-keymap-emacs + - yi-keymap-vim + - yi-misc-modes + - yi-mode-haskell + - yi-mode-javascript + - yi-monokai + - yi-snippet + - yi-solarized + - yi-spolsky + - yices + - yjftp + - yjftp-libs + - yoda + - Yogurt + - Yogurt-Standalone + - yoko + - york-lava + - yql + - yst + - yu-core + - yu-launch + - yu-tool + - yuuko + - yx + - yxdb-utils + - z3-encoding + - z85 + - zabt + - zampolit + - zasni-gerna + - ZEBEDDE + - zendesk-api + - zenhack-prelude + - zeno + - zephyr + - zeromq-haskell + - zeromq3-conduit + - zeromq3-haskell + - zeromq4-clone-pattern + - zeromq4-conduit + - zeromq4-haskell + - zeromq4-patterns + - zeromq4-simple + - zeroth + - ZFS + - zifter + - zifter-cabal + - zifter-git + - zifter-google-java-format + - zifter-hindent + - zifter-hlint + - zifter-stack + - zigbee-znet25 + - zip-conduit + - zipedit + - zipkin + - ziptastic-client + - ziptastic-core + - zlib-enum + - zm + - ZMachine + - zmcat + - zmidi-score + - zoneinfo + - zoom + - zoom-cache + - zoom-cache-pcm + - zoom-cache-sndfile + - zoom-refs + - zre + - zsh-battery + - zstd + - zsyntax + - ztar + - zuramaru + - Zwaluw + - zxcvbn-c diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 0502e7003133..7b433ea1d297 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -94,6 +94,8 @@ self: super: builtins.intersectAttrs super { # Won't find it's header files without help. sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL"; + cachix = enableSeparateBinOutput super.cachix; + hzk = overrideCabal super.hzk (drv: { preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; configureFlags = "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper"; @@ -286,7 +288,7 @@ self: super: builtins.intersectAttrs super { # Tries to run GUI in tests leksah = dontCheck (overrideCabal super.leksah (drv: { executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [ - gnome3.defaultIconTheme # Fix error: Icon 'window-close' not present in theme ... + gnome3.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]); @@ -487,6 +489,13 @@ self: super: builtins.intersectAttrs super { # https://github.com/plow-technologies/servant-streaming/issues/12 servant-streaming-server = dontCheck super.servant-streaming-server; + # https://github.com/haskell-servant/servant/pull/1128 + servant-client-core = if (pkgs.lib.getVersion super.servant-client-core) == "0.15" then + appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch + else + super.servant-client-core; + + # tests run executable, relying on PATH # without this, tests fail with "Couldn't launch intero process" intero = overrideCabal super.intero (drv: { diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2724ff5d6220..8047eee13187 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -19,6 +19,7 @@ in , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? [] , configureFlags ? [] , buildFlags ? [] +, haddockFlags ? [] , description ? "" , doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version , doBenchmark ? false @@ -72,6 +73,7 @@ in , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false , hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all" +, enableSeparateBinOutput ? false , enableSeparateDataOutput ? false , enableSeparateDocOutput ? doHaddock , # Don't fail at configure time if there are multiple versions of the @@ -79,6 +81,10 @@ in # built. Will delay failures, if any, to compile time. allowInconsistentDependencies ? false , maxBuildCores ? 4 # GHC usually suffers beyond -j4. https://ghc.haskell.org/trac/ghc/ticket/9221 +, # If set to true, this builds a pre-linked .o file for this Haskell library. + # This can make it slightly faster to load this library into GHCi, but takes + # extra disk space and compile time. + enableLibraryForGhci ? false } @ args: assert editedCabalFile != null -> revision != null; @@ -110,6 +116,8 @@ let # the target dir for haddock documentation docdir = docoutput: docoutput + "/share/doc/" + pname + "-" + version; + binDir = if enableSeparateBinOutput then "$bin/bin" else "$out/bin"; + newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; newCabalFile = fetchurl { url = newCabalFileUrl; @@ -142,7 +150,10 @@ let buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags); defaultConfigureFlags = [ - "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$abi/\\$libname" + "--verbose" + "--prefix=$out" + "--libdir=\\$prefix/lib/\\$compiler" + "--libsubdir=\\$abi/\\$libname" (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}") (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}") "--with-gcc=$CC" # Clang won't work without that extra information. @@ -162,7 +173,7 @@ let (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests")) (enableFeature doBenchmark "benchmarks") "--enable-library-vanilla" # TODO: Should this be configurable? - "--enable-library-for-ghci" # TODO: Should this be configurable? + (enableFeature enableLibraryForGhci "library-for-ghci") ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [ "--ghc-option=-split-sections" ] ++ optionals dontStrip [ @@ -172,7 +183,8 @@ let "--ghcjs" ] ++ optionals isCross ([ "--configure-option=--host=${stdenv.hostPlatform.config}" - ] ++ crossCabalFlags); + ] ++ crossCabalFlags + ) ++ optionals enableSeparateBinOutput ["--bindir=${binDir}"]; setupCompileFlags = [ (optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir") @@ -211,7 +223,16 @@ let nativeGhcCommand = "${nativeGhc.targetPrefix}ghc"; buildPkgDb = ghcName: packageConfDir: '' - if [ -d "$p/lib/${ghcName}/package.conf.d" ]; then + # If this dependency has a package database, then copy the contents of it, + # unless it is one of our GHCs. These can appear in our dependencies when + # we are doing native builds, and they have package databases in them, but + # we do not want to copy them over. + # + # We don't need to, since those packages will be provided by the GHC when + # we compile with it, and doing so can result in having multiple copies of + # e.g. Cabal in the database with the same name and version, which is + # ambiguous. + if [ -d "$p/lib/${ghcName}/package.conf.d" ] && [ "$p" != "${ghc}" ] && [ "$p" != "${nativeGhc}" ]; then cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf ${packageConfDir}/ continue fi @@ -223,7 +244,10 @@ assert allPkgconfigDepends != [] -> pkgconfig != null; stdenv.mkDerivation ({ name = "${pname}-${version}"; - outputs = [ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc"); + outputs = [ "out" ] + ++ (optional enableSeparateDataOutput "data") + ++ (optional enableSeparateDocOutput "doc") + ++ (optional enableSeparateBinOutput "bin"); setOutputFlags = false; pos = builtins.unsafeGetAttrPos "pname" args; @@ -372,7 +396,8 @@ stdenv.mkDerivation ({ ${optionalString (doHaddock && isLibrary) '' ${setupCommand} haddock --html \ ${optionalString doHoogle "--hoogle"} \ - ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} + ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \ + ${stdenv.lib.concatStringsSep " " haddockFlags} ''} runHook postHaddock ''; @@ -403,7 +428,7 @@ stdenv.mkDerivation ({ find $packageConfDir -maxdepth 0 -empty -delete; ''} ${optionalString isGhcjs '' - for exeDir in "$out/bin/"*.jsexe; do + for exeDir in "${binDir}/"*.jsexe; do exe="''${exeDir%.jsexe}" printWords '#!${nodejs}/bin/node' > "$exe" echo >> "$exe" @@ -413,7 +438,7 @@ stdenv.mkDerivation ({ ''} ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"} ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' - for exe in "$out/bin/"* ; do + for exe in "${binDir}/"* ; do install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe" done ''} diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f7a8e6c0182f..290f7b792692 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -29,6 +29,7 @@ self: { description = "3D model parsers"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "4Blocks" = callPackage @@ -45,6 +46,7 @@ self: { description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AAI" = callPackage @@ -57,6 +59,7 @@ self: { description = "Abstract Application Interface"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ABList" = callPackage @@ -108,6 +111,7 @@ self: { description = "Detect which OS you're running on"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AC-Colour" = callPackage @@ -131,6 +135,7 @@ self: { description = "GTK+ pixel plotting"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AC-HalfInteger" = callPackage @@ -145,6 +150,7 @@ self: { description = "Efficient half-integer type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AC-MiniTest" = callPackage @@ -159,6 +165,7 @@ self: { description = "A simple test framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AC-PPM" = callPackage @@ -195,6 +202,7 @@ self: { description = "Trivial wrapper over ansi-terminal"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AC-VanillaArray" = callPackage @@ -207,6 +215,7 @@ self: { description = "Immutable arrays with plain integer indicies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AC-Vector" = callPackage @@ -221,6 +230,7 @@ self: { description = "Efficient geometric vectors and transformations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AC-Vector-Fancy" = callPackage @@ -233,6 +243,7 @@ self: { description = "Fancy type-system stuff for AC-Vector"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ACME" = callPackage @@ -249,6 +260,7 @@ self: { description = "Essential features"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ADPfusion" = callPackage @@ -275,6 +287,7 @@ self: { description = "Efficient, high-level dynamic programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ADPfusionForest" = callPackage @@ -302,6 +315,7 @@ self: { description = "Dynamic programming on tree and forest structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ADPfusionSet" = callPackage @@ -327,6 +341,7 @@ self: { description = "Dynamic programming for Set data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AERN-Basics" = callPackage @@ -347,6 +362,7 @@ self: { description = "foundational type classes for approximating exact real numbers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AERN-Net" = callPackage @@ -363,6 +379,7 @@ self: { description = "Compositional lazy dataflow networks for exact real number computation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AERN-Real" = callPackage @@ -380,6 +397,7 @@ self: { description = "arbitrary precision real interval arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AERN-Real-Double" = callPackage @@ -404,6 +422,7 @@ self: { description = "arbitrary precision real interval arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AERN-Real-Interval" = callPackage @@ -421,6 +440,7 @@ self: { description = "arbitrary precision real interval arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AERN-RnToRm" = callPackage @@ -438,6 +458,7 @@ self: { description = "polynomial function enclosures (PFEs) approximating exact real functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AERN-RnToRm-Plot" = callPackage @@ -456,6 +477,7 @@ self: { description = "GL plotting of polynomial function enclosures (PFEs)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AES" = callPackage @@ -498,6 +520,7 @@ self: { description = "A library for writing AGI scripts for Asterisk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ALUT" = callPackage @@ -528,6 +551,7 @@ self: { description = "Low-level bindings for Asterisk Manager Interface (AMI)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ANum" = callPackage @@ -577,7 +601,7 @@ self: { libraryHaskellDepends = [ base regex-compat Win32 ]; description = "A binding to a part of the ANSI escape code for the console"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {}; "AbortT-monadstf" = callPackage @@ -590,6 +614,7 @@ self: { description = "Monads-tf instances for the AbortT monad transformer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AbortT-mtl" = callPackage @@ -602,6 +627,7 @@ self: { description = "mtl instances for the AbortT monad transformer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AbortT-transformers" = callPackage @@ -620,6 +646,7 @@ self: { description = "A monad and monadic transformer providing \"abort\" functionality"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ActionKid" = callPackage @@ -644,6 +671,7 @@ self: { description = "An easy-to-use video game framework for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Adaptive" = callPackage @@ -660,6 +688,7 @@ self: { description = "Library for incremental computing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Adaptive-Blaisorblade" = callPackage @@ -675,6 +704,7 @@ self: { description = "Library for incremental computing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Advgame" = callPackage @@ -689,6 +719,7 @@ self: { description = "Lisperati's adventure game in Lisp translated to Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AesonBson" = callPackage @@ -723,6 +754,7 @@ self: { description = "Generator-generator for QuickCheck"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Agda" = callPackage @@ -796,6 +828,7 @@ self: { description = "Aho-Corasick string matching algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AlanDeniseEricLauren" = callPackage @@ -818,6 +851,7 @@ self: { description = "Find the minimal subset/submap satisfying some property"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AlgoRhythm" = callPackage @@ -847,6 +881,7 @@ self: { description = "Algorithmic music composition"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AlgorithmW" = callPackage @@ -861,6 +896,7 @@ self: { description = "Example implementation of Algorithm W for Hindley-Milner type inference"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AlignmentAlgorithms" = callPackage @@ -878,6 +914,7 @@ self: { description = "Collection of alignment algorithms"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Allure" = callPackage @@ -923,6 +960,7 @@ self: { description = "Android view hierarchy importer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Animas" = callPackage @@ -935,6 +973,7 @@ self: { description = "Updated version of Yampa: a library for programming hybrid systems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Annotations" = callPackage @@ -948,6 +987,7 @@ self: { description = "Constructing, analyzing and destructing annotated trees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Ansi2Html" = callPackage @@ -980,6 +1020,7 @@ self: { description = "Library for Apple Push Notification Service"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AppleScript" = callPackage @@ -992,6 +1033,7 @@ self: { description = "Call AppleScript from Haskell, and then call back into Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ApproxFun-hs" = callPackage @@ -1004,6 +1046,7 @@ self: { description = "Function approximation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ArrayRef" = callPackage @@ -1016,6 +1059,7 @@ self: { description = "Unboxed references, dynamic arrays and more"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ArrowVHDL" = callPackage @@ -1028,6 +1072,7 @@ self: { description = "A library to generate Netlist code from Arrow descriptions"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AspectAG" = callPackage @@ -1044,6 +1089,7 @@ self: { description = "Attribute Grammars in the form of an EDSL"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AttoBencode" = callPackage @@ -1065,6 +1111,7 @@ self: { description = "Fast Bencode encoding and parsing library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AttoJson" = callPackage @@ -1082,6 +1129,7 @@ self: { description = "Simple lightweight JSON parser, generator & manipulator based on ByteString"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Attrac" = callPackage @@ -1098,6 +1146,7 @@ self: { description = "Visualisation of Strange Attractors in 3-Dimensions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Aurochs" = callPackage @@ -1112,6 +1161,7 @@ self: { description = "Yet another parser generator for C/C++"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AutoForms" = callPackage @@ -1128,6 +1178,7 @@ self: { description = "GUI library based upon generic programming (SYB3)"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "AvlTree" = callPackage @@ -1140,6 +1191,7 @@ self: { description = "Balanced binary trees using the AVL algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BASIC" = callPackage @@ -1152,6 +1204,7 @@ self: { description = "Embedded BASIC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BCMtools" = callPackage @@ -1179,6 +1232,7 @@ self: { description = "Big Contact Map Tools"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BNFC" = callPackage @@ -1220,6 +1274,7 @@ self: { description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Baggins" = callPackage @@ -1234,6 +1289,7 @@ self: { description = "Tools for self-assembly"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Bang" = callPackage @@ -1250,6 +1306,7 @@ self: { description = "A Drum Machine DSL for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Barracuda" = callPackage @@ -1279,6 +1336,7 @@ self: { description = "An ad-hoc P2P chat program"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Befunge93" = callPackage @@ -1293,6 +1351,7 @@ self: { description = "An interpreter for the Befunge-93 Programming Language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BenchmarkHistory" = callPackage @@ -1311,6 +1370,7 @@ self: { description = "Benchmark functions with history"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BerkeleyDB" = callPackage @@ -1338,6 +1398,7 @@ self: { description = "Berkeley DB XML binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) db; inherit (pkgs) dbxml; inherit (pkgs) xercesc; inherit (pkgs) xqilla;}; @@ -1351,6 +1412,7 @@ self: { description = "Factorization of polynomials over finite field"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiGUL" = callPackage @@ -1366,6 +1428,7 @@ self: { description = "The Bidirectional Generic Update Language"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BigPixel" = callPackage @@ -1407,7 +1470,6 @@ self: { ]; description = "Libary for Hidden Markov Models in HMMER3 format"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Biobase" = callPackage @@ -1430,6 +1492,7 @@ self: { description = "Base library for bioinformatics"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseBlast" = callPackage @@ -1454,6 +1517,7 @@ self: { description = "BLAST-related tools"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseDotP" = callPackage @@ -1466,6 +1530,7 @@ self: { description = "Vienna / DotBracket / ExtSS parsers"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseEnsembl" = callPackage @@ -1484,6 +1549,7 @@ self: { description = "Ensembl related datastructures and functions"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseFR3D" = callPackage @@ -1500,6 +1566,7 @@ self: { description = "Importer for FR3D resources"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseFasta" = callPackage @@ -1541,6 +1608,7 @@ self: { description = "Libary to interface with the Bioinformatics HTTP services - Entrez Ensembl"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseHTTPTools" = callPackage @@ -1560,6 +1628,7 @@ self: { description = "Tools to query Bioinformatics HTTP services e.g. Entrez, Ensembl."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseInfernal" = callPackage @@ -1599,6 +1668,7 @@ self: { description = "Infernal data structures and tools"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseMAF" = callPackage @@ -1611,6 +1681,7 @@ self: { description = "Multiple Alignment Format"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseNewick" = callPackage @@ -1639,6 +1710,7 @@ self: { description = "Newick file format parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseTrainingData" = callPackage @@ -1659,6 +1731,7 @@ self: { description = "RNA folding training data"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseTurner" = callPackage @@ -1677,6 +1750,7 @@ self: { description = "Import Turner RNA parameters"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseTypes" = callPackage @@ -1720,6 +1794,7 @@ self: { description = "Import Vienna energy parameters"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseXNA" = callPackage @@ -1751,6 +1826,7 @@ self: { description = "Efficient RNA/DNA/Protein Primary/Secondary Structure"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BirdPP" = callPackage @@ -1765,6 +1841,7 @@ self: { description = "A preprocessor for Bird-style Literate Haskell comments with Haddock markup"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BitStringRandomMonad" = callPackage @@ -1785,6 +1862,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BitSyntax" = callPackage @@ -1810,6 +1888,7 @@ self: { description = "A library to access bit.ly URL shortener."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BlastHTTP" = callPackage @@ -1828,6 +1907,7 @@ self: { description = "Libary to interface with the NCBI blast REST interface"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Blobs" = callPackage @@ -1850,6 +1930,7 @@ self: { description = "Diagram editor"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BlogLiterately" = callPackage @@ -1861,8 +1942,8 @@ self: { }: mkDerivation { pname = "BlogLiterately"; - version = "0.8.6.2"; - sha256 = "0prk58bxmy0va5i1blc02w8szspavnj4jz6dv9pjg7z64cs863jy"; + version = "0.8.6.3"; + sha256 = "02a4mjz9lbx19plkanmdlm730dwphkdi79a5b5hcnrbilcy8k71n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -1874,28 +1955,27 @@ self: { executableHaskellDepends = [ base cmdargs ]; description = "A tool for posting Haskelly articles to blogs"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BlogLiterately-diagrams" = callPackage ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder , diagrams-lib, diagrams-rasterific, directory, filepath - , JuicyPixels, pandoc, safe + , JuicyPixels, pandoc, safe, split }: mkDerivation { pname = "BlogLiterately-diagrams"; - version = "0.2.0.6"; - sha256 = "1ps9k7x0s7w0pbf8v7fphm1nyfh5dbxjm3zc1bfjxry4ciqljfyq"; + version = "0.2.1"; + sha256 = "0ki56kc51p1b9zkvs91adgj140pchnbdwfmhsvb4qzzf9sz90kjb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base BlogLiterately containers diagrams-builder diagrams-lib diagrams-rasterific directory filepath JuicyPixels pandoc safe + split ]; 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 @@ -1925,6 +2005,7 @@ self: { description = "A markdown-like markup language designed for blog posts"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BluePrintCSS" = callPackage @@ -1948,6 +2029,7 @@ self: { description = "Preview of a new build system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Bookshelf" = callPackage @@ -1969,6 +2051,7 @@ self: { description = "A simple document organizer with some wiki functionality"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Boolean" = callPackage @@ -2008,6 +2091,7 @@ self: { description = "Static text template generation library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BufferedSocket" = callPackage @@ -2020,6 +2104,7 @@ self: { description = "A socker wrapper that makes the IO of sockets much cleaner"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Buster" = callPackage @@ -2045,6 +2130,7 @@ self: { description = "Hits a set of urls periodically to bust caches"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CBOR" = callPackage @@ -2066,6 +2152,7 @@ self: { description = "Encode/Decode values to/from CBOR"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CC-delcont" = callPackage @@ -2096,6 +2183,7 @@ self: { description = "Three new monad transformers for multi-prompt delimited control"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CC-delcont-cxe" = callPackage @@ -2108,6 +2196,7 @@ self: { description = "A monad transformers for multi-prompt delimited control"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CC-delcont-exc" = callPackage @@ -2120,6 +2209,7 @@ self: { description = "A monad transformers for multi-prompt delimited control"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CC-delcont-ref" = callPackage @@ -2132,6 +2222,7 @@ self: { description = "A monad transformers for multi-prompt delimited control using refercence cells"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CC-delcont-ref-tf" = callPackage @@ -2144,6 +2235,7 @@ self: { description = "A monad transformers for multi-prompt delimited control using refercence cells"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CCA" = callPackage @@ -2162,6 +2254,7 @@ self: { description = "preprocessor and library for Causal Commutative Arrows (CCA)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CHXHtml" = callPackage @@ -2192,6 +2285,7 @@ self: { description = "Cursor Library for A Structured Editor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CLI" = callPackage @@ -2205,6 +2299,7 @@ self: { description = "CLI tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CMCompare" = callPackage @@ -2224,6 +2319,7 @@ self: { description = "Infernal covariance model comparison"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CMQ" = callPackage @@ -2240,7 +2336,6 @@ self: { ]; description = "cwmwl udp message queue"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "COrdering" = callPackage @@ -2253,6 +2348,7 @@ self: { description = "An algebraic data type similar to Prelude Ordering"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CPBrainfuck" = callPackage @@ -2268,6 +2364,7 @@ self: { description = "A simple Brainfuck interpretter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CPL" = callPackage @@ -2311,6 +2408,7 @@ self: { description = "Firing rules semantic of CSPM"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CSPM-Frontend" = callPackage @@ -2329,6 +2427,7 @@ self: { description = "A CSP-M parser compatible with FDR-2.91"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CSPM-Interpreter" = callPackage @@ -2346,6 +2445,7 @@ self: { description = "An interpreter for CSPM"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CSPM-ToProlog" = callPackage @@ -2360,6 +2460,7 @@ self: { description = "some modules specific for the ProB tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CSPM-cspm" = callPackage @@ -2386,6 +2487,7 @@ self: { description = "cspm command line tool for analyzing CSPM specifications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CTRex" = callPackage @@ -2431,6 +2533,7 @@ self: { description = "OpenCV based machine vision library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {opencv_calib3d = null; opencv_contrib = null; opencv_core = null; opencv_features2d = null; opencv_flann = null; opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; @@ -2520,6 +2623,7 @@ self: { description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CabalSearch" = callPackage @@ -2538,6 +2642,7 @@ self: { description = "Search cabal packages by name"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Capabilities" = callPackage @@ -2550,6 +2655,7 @@ self: { description = "Separate and contain effects of IO monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Cardinality" = callPackage @@ -2573,6 +2679,7 @@ self: { description = "An implementation and DSL for the Carneades argumentation model"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CarneadesIntoDung" = callPackage @@ -2590,6 +2697,7 @@ self: { description = "A translation from the Carneades argumentation model into Dung's AFs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Cartesian" = callPackage @@ -2602,6 +2710,7 @@ self: { description = "Coordinate systems"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Cascade" = callPackage @@ -2614,6 +2723,7 @@ self: { description = "Playing with reified categorical composition"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Cassava" = callPackage @@ -2641,6 +2751,7 @@ self: { description = "A CSV parsing and encoding library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Catana" = callPackage @@ -2653,6 +2764,7 @@ self: { description = "A monad for complex manipulation of a stream"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ChannelT" = callPackage @@ -2681,6 +2793,7 @@ self: { description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Chart-cairo" = callPackage @@ -2698,6 +2811,7 @@ self: { description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Chart-diagrams" = callPackage @@ -2720,6 +2834,7 @@ self: { description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Chart-gtk" = callPackage @@ -2737,6 +2852,7 @@ self: { description = "Utility functions for using the chart library with GTK"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Chart-simple" = callPackage @@ -2754,6 +2870,7 @@ self: { description = "A wrapper for the chart library to assist with basic plots (Deprecated - use the Easy module instead)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ChasingBottoms" = callPackage @@ -2798,6 +2915,7 @@ self: { description = "Inbuilt checking for ultra reliable computing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Chitra" = callPackage @@ -2812,6 +2930,7 @@ self: { description = "A platform independent mechanism to render graphics using vnc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ChristmasTree" = callPackage @@ -2828,6 +2947,7 @@ self: { description = "Alternative approach of 'read' that composes grammars instead of parsers"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CirruParser" = callPackage @@ -2862,6 +2982,7 @@ self: { description = "spam"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ClassLaws" = callPackage @@ -2874,6 +2995,7 @@ self: { description = "Stating and checking laws for type class methods"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ClassyPrelude" = callPackage @@ -2886,6 +3008,7 @@ self: { description = "Prelude replacement using classes instead of concrete types where reasonable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Clean" = callPackage @@ -2898,6 +3021,7 @@ self: { description = "A light, clean and powerful utility library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Clipboard" = callPackage @@ -2928,6 +3052,7 @@ self: { description = "Libary for parsing Clustal tools output"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Coadjute" = callPackage @@ -2946,6 +3071,7 @@ self: { description = "A generic build tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Codec-Compression-LZF" = callPackage @@ -2995,6 +3121,7 @@ self: { description = "A concurrent bittorrent client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Command" = callPackage @@ -3007,6 +3134,7 @@ self: { description = "A replacement for System.Exit and System.Process"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Commando" = callPackage @@ -3030,6 +3158,7 @@ self: { description = "Watch some files; Rerun a command"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ComonadSheet" = callPackage @@ -3048,6 +3177,7 @@ self: { description = "A library for expressing spreadsheet-like computations as the fixed-points of comonads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Compactable" = callPackage @@ -3060,6 +3190,7 @@ self: { description = "A generalization for containers that can be stripped of Nothing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Concurrent-Cache" = callPackage @@ -3072,6 +3203,7 @@ self: { description = "A Cached variable for IO functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ConcurrentUtils" = callPackage @@ -3090,6 +3222,7 @@ self: { description = "Concurrent utilities"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Concurrential" = callPackage @@ -3102,6 +3235,7 @@ self: { description = "Mix concurrent and sequential computation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Condor" = callPackage @@ -3124,6 +3258,7 @@ self: { description = "Information retrieval library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ConfigFile" = callPackage @@ -3151,6 +3286,7 @@ self: { description = "Template haskell for reading ConfigFiles"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Configger" = callPackage @@ -3163,6 +3299,7 @@ self: { description = "Parse config files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Configurable" = callPackage @@ -3175,6 +3312,7 @@ self: { description = "Declare types as Configurable then specialize them all in one place"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ConsStream" = callPackage @@ -3200,6 +3338,7 @@ self: { description = "Restart a command on STDIN activity"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ConstraintKinds" = callPackage @@ -3212,6 +3351,7 @@ self: { description = "Repackages standard type classes with the ConstraintKinds extension"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Consumer" = callPackage @@ -3224,6 +3364,7 @@ self: { description = "A monad and monad transformer for consuming streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ContArrow" = callPackage @@ -3236,6 +3377,7 @@ self: { description = "Control.Arrow.Transformer.Cont"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ContextAlgebra" = callPackage @@ -3254,6 +3396,7 @@ self: { description = "Implementation of the context algebra"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Contract" = callPackage @@ -3266,6 +3409,7 @@ self: { description = "Practical typed lazy contracts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Control-Engine" = callPackage @@ -3298,6 +3442,7 @@ self: { description = "A Library for Writing Multi-Pass Algorithms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Control-Monad-ST2" = callPackage @@ -3316,6 +3461,7 @@ self: { description = "A variation on the ST monad with two type parameters"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CoreDump" = callPackage @@ -3328,6 +3474,7 @@ self: { description = "A GHC plugin for printing GHC's internal Core data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CoreErlang" = callPackage @@ -3340,6 +3487,7 @@ self: { description = "Manipulating Core Erlang source code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CoreFoundation" = callPackage @@ -3359,6 +3507,7 @@ self: { description = "Bindings to Mac OSX's CoreFoundation framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Coroutine" = callPackage @@ -3371,6 +3520,7 @@ self: { description = "Type-safe coroutines using lightweight session types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "CouchDB" = callPackage @@ -3392,6 +3542,7 @@ self: { description = "CouchDB interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Craft3e" = callPackage @@ -3409,6 +3560,7 @@ self: { description = "Code for Haskell: the Craft of Functional Programming, 3rd ed"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Crypto" = callPackage @@ -3464,6 +3616,7 @@ self: { description = "CurryDB: In-memory Key/Value Database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DAG-Tournament" = callPackage @@ -3482,6 +3635,7 @@ self: { description = "Real-Time Game Tournament Evaluator"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DAV" = callPackage @@ -3514,34 +3668,6 @@ self: { }) {}; "DBFunctor" = callPackage - ({ mkDerivation, base, bytestring, cassava, cereal, containers - , deepseq, either, MissingH, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "DBFunctor"; - version = "0.1.1.0"; - sha256 = "1hjjnjs8nlqrqfiv5qxn60avl1avpgsxx8aq5hihrr6f6yj61s4a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector - ]; - executableHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector - ]; - description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "DBFunctor_0_1_1_1" = callPackage ({ mkDerivation, base, bytestring, cassava, cereal, containers , deepseq, either, MissingH, text, time, transformers , unordered-containers, vector @@ -3567,6 +3693,7 @@ self: { description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DBlimited" = callPackage @@ -3581,6 +3708,7 @@ self: { description = "A command-line SQL interface for flat files (tdf,csv,etc.)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DBus" = callPackage @@ -3593,6 +3721,7 @@ self: { description = "D-Bus bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DCFL" = callPackage @@ -3618,6 +3747,7 @@ self: { description = "Distributed Mutation Analysis framework for MuCheck"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DOH" = callPackage @@ -3655,6 +3785,7 @@ self: { description = "DOM Level 2 bindings for the WebBits package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DP" = callPackage @@ -3671,6 +3802,7 @@ self: { description = "Pragmatic framework for dynamic programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DPM" = callPackage @@ -3695,6 +3827,7 @@ self: { description = "Darcs Patch Manager"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DPutils" = callPackage @@ -3772,6 +3905,7 @@ self: { description = "Implementation of DSA, based on the description of FIPS 186-4"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DSH" = callPackage @@ -3801,6 +3935,7 @@ self: { description = "Database Supported Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DSTM" = callPackage @@ -3823,6 +3958,7 @@ self: { description = "A framework for using STM within distributed systems"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DTC" = callPackage @@ -3835,6 +3971,7 @@ self: { description = "Data To Class transformation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Dangerous" = callPackage @@ -3847,6 +3984,7 @@ self: { description = "Monads for operations that can exit early and produce warnings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Dao" = callPackage @@ -3878,6 +4016,7 @@ self: { description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DarcsHelpers" = callPackage @@ -3890,6 +4029,7 @@ self: { description = "Code used by Patch-Shack that seemed sensible to open for reusability"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Data-Angle" = callPackage @@ -3928,6 +4068,7 @@ self: { description = "Ropes, an alternative to (Byte)Strings"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DataIndex" = callPackage @@ -3962,6 +4103,7 @@ self: { description = "A GTK widget for displaying arbitrary Data.Data.Data instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Deadpan-DDP" = callPackage @@ -3991,6 +4133,7 @@ self: { description = "Write clients for Meteor's DDP Protocol"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DebugTraceHelpers" = callPackage @@ -4031,6 +4174,7 @@ self: { description = "A very simple implementation of decision trees for discrete attributes"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DeepArrow" = callPackage @@ -4079,6 +4223,7 @@ self: { description = "A simple RTS game"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Delta-Lambda" = callPackage @@ -4102,6 +4247,7 @@ self: { description = "A demonstration interpreter for type system delta-lambda (of N.G. De-bruijn)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DescriptiveKeys" = callPackage @@ -4131,6 +4277,7 @@ self: { description = "Processing Real-time event streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Diff" = callPackage @@ -4162,6 +4309,7 @@ self: { description = "A theory solver for conjunctions of literals in difference logic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DifferentialEvolution" = callPackage @@ -4178,6 +4326,7 @@ self: { description = "Global optimization using Differential Evolution"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Digit" = callPackage @@ -4213,6 +4362,7 @@ self: { description = "A client library for the DigitalOcean API"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DimensionalHash" = callPackage @@ -4225,6 +4375,7 @@ self: { description = "An n-dimensional hash using Morton numbers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DirectSound" = callPackage @@ -4237,7 +4388,7 @@ self: { librarySystemDepends = [ dsound ]; description = "Partial binding to the Microsoft DirectSound API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {dsound = null;}; "DisTract" = callPackage @@ -4259,6 +4410,7 @@ self: { description = "Distributed Bug Tracking System"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DiscussionSupportSystem" = callPackage @@ -4276,6 +4428,7 @@ self: { description = "Discussion support system"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Dish" = callPackage @@ -4291,6 +4444,7 @@ self: { description = "Hash modules (currently Murmur3)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Dist" = callPackage @@ -4304,6 +4458,7 @@ self: { description = "A Haskell library for probability distributions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DistanceTransform" = callPackage @@ -4358,6 +4513,7 @@ self: { description = "Frameshift-aware alignment of protein sequences with DNA sequences"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DocTest" = callPackage @@ -4376,6 +4532,7 @@ self: { description = "Test interactive Haskell examples"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Docs" = callPackage @@ -4406,6 +4563,7 @@ self: { description = "A tool for deriving hylomorphisms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DrIFT" = callPackage @@ -4424,6 +4582,7 @@ self: { description = "Program to derive type class instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DrIFT-cabalized" = callPackage @@ -4439,6 +4598,7 @@ self: { description = "Program to derive type class instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Dung" = callPackage @@ -4453,6 +4613,7 @@ self: { description = "An implementation of the Dung argumentation frameworks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Dust" = callPackage @@ -4479,6 +4640,7 @@ self: { description = "Polymorphic protocol engine"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Dust-crypto" = callPackage @@ -4506,6 +4668,7 @@ self: { description = "Cryptographic operations"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) openssl;}; "Dust-tools" = callPackage @@ -4531,6 +4694,7 @@ self: { description = "Network filtering exploration tools"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Dust-tools-pcap" = callPackage @@ -4553,6 +4717,7 @@ self: { description = "Network filtering exploration tools that rely on pcap"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DynamicTimeWarp" = callPackage @@ -4571,6 +4736,7 @@ self: { description = "Dynamic time warping of sequences"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DysFRP" = callPackage @@ -4585,6 +4751,7 @@ self: { description = "dysFunctional Reactive Programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DysFRP-Cairo" = callPackage @@ -4597,6 +4764,7 @@ self: { description = "dysFunctional Reactive Programming on Cairo"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "DysFRP-Craftwerk" = callPackage @@ -4614,6 +4782,7 @@ self: { description = "dysFunctional Reactive Programming on Craftwerk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "EEConfig" = callPackage @@ -4627,14 +4796,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ENIG" = callPackage + ({ mkDerivation, base, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, text, unicode-transforms, vector + }: + mkDerivation { + pname = "ENIG"; + version = "0.0.0.2"; + sha256 = "0rnqp6bdib4w683gvj6i0p3p7ms0zw6vwvmsgy9gwfwxqkh6m3ps"; + libraryHaskellDepends = [ base text unicode-transforms vector ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text + unicode-transforms + ]; + description = "Auto Korean conjugator/adjustor/adopter/converter"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "Earley" = callPackage ({ mkDerivation, base, criterion, deepseq, ListLike, parsec , QuickCheck, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "Earley"; - version = "0.13.0.0"; - sha256 = "0pyj9c5d6xvz4mdpg0nfrl0100rh34442ix73l6ys4pnsadyql0g"; + version = "0.13.0.1"; + sha256 = "169qjicjj09wg879vp86ali4rrqpw0ikazvdi3i1qi6pl3yvqq0y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ListLike ]; @@ -4646,7 +4836,6 @@ self: { ]; description = "Parsing all context-free grammars using Earley's algorithm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ebnf2ps" = callPackage @@ -4710,6 +4899,7 @@ self: { description = "Query language and report generator for edit logs"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Eight-Ball-Pool-Hack-Cheats" = callPackage @@ -4733,6 +4923,7 @@ self: { description = "spam"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "EitherT" = callPackage @@ -4751,6 +4942,7 @@ self: { description = "EitherT monad transformer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Elm" = callPackage @@ -4807,6 +4999,7 @@ self: { description = "derives heuristic rules from nominal data"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Empty" = callPackage @@ -4819,6 +5012,7 @@ self: { description = "A type class for empty containers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Encode" = callPackage @@ -4850,6 +5044,7 @@ self: { description = "Libary to interface with the NCBI Entrez REST service"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Enum" = callPackage @@ -4873,6 +5068,7 @@ self: { description = "Simple Enum-class-based int containers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "EnumMap" = callPackage @@ -4885,6 +5081,7 @@ self: { description = "More general IntMap replacement"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Eq" = callPackage @@ -4904,6 +5101,7 @@ self: { description = "Render math formula in ASCII, and perform some simplifications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "EqualitySolver" = callPackage @@ -4918,6 +5116,7 @@ self: { description = "A theory solver for conjunctions of literals in the theory of uninterpreted functions with equality"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "EsounD" = callPackage @@ -4938,6 +5137,7 @@ self: { description = "Type-safe bindings to EsounD (ESD; Enlightened Sound Daemon)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "EstProgress" = callPackage @@ -4950,6 +5150,7 @@ self: { description = "Methods for estimating the progress of functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "EtaMOO" = callPackage @@ -4975,6 +5176,7 @@ self: { description = "A new implementation of the LambdaMOO server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) pcre;}; "Etage" = callPackage @@ -4991,6 +5193,7 @@ self: { description = "A general data-flow framework"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Etage-Graph" = callPackage @@ -5010,6 +5213,7 @@ self: { description = "Data-flow based graph algorithms"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Eternal10Seconds" = callPackage @@ -5025,6 +5229,7 @@ self: { description = "A 2-D shooting game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Etherbunny" = callPackage @@ -5047,6 +5252,7 @@ self: { description = "A network analysis toolkit for Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libpcap;}; "EuroIT" = callPackage @@ -5077,6 +5283,7 @@ self: { description = "Library for computer music research and education"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "EventSocket" = callPackage @@ -5093,6 +5300,7 @@ self: { description = "Interfaces with FreeSwitch Event Socket"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Extra" = callPackage @@ -5113,6 +5321,7 @@ self: { description = "A grab bag of modules"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FAI" = callPackage @@ -5151,6 +5360,7 @@ self: { description = "Compose music"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FM-SBLEX" = callPackage @@ -5165,6 +5375,7 @@ self: { description = "A set of computational morphology tools for Swedish diachronic lexicons"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FModExRaw" = callPackage @@ -5178,6 +5389,7 @@ self: { description = "The Haskell FModEx raw API"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {fmodex64 = null;}; "FPretty" = callPackage @@ -5192,6 +5404,7 @@ self: { description = "Efficient simple pretty printing combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FTGL" = callPackage @@ -5204,7 +5417,7 @@ self: { librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ftgl;}; "FTGL-bytestring" = callPackage @@ -5222,6 +5435,7 @@ self: { description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ftgl;}; "FTPLine" = callPackage @@ -5241,6 +5455,7 @@ self: { description = "A command-line FTP client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Facebook-Password-Hacker-Online-Latest-Version" = callPackage @@ -5266,6 +5481,7 @@ self: { description = "spam"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Facts" = callPackage @@ -5282,6 +5498,7 @@ self: { description = "A collection of facts about the real world"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FailureT" = callPackage @@ -5294,6 +5511,7 @@ self: { description = "Failure Monad Transformer"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FastPush" = callPackage @@ -5306,6 +5524,7 @@ self: { description = "A monad and monad transformer for pushing things onto a stack very fast"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FastxPipe" = callPackage @@ -5323,6 +5542,7 @@ self: { description = "Fasta and Fastq streaming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FenwickTree" = callPackage @@ -5356,6 +5576,7 @@ self: { description = "Annotate ps and pdf documents"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FerryCore" = callPackage @@ -5373,6 +5594,7 @@ self: { description = "Ferry Core Components"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Feval" = callPackage @@ -5387,6 +5609,7 @@ self: { description = "Evaluation using F-Algebras"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FieldTrip" = callPackage @@ -5404,6 +5627,7 @@ self: { description = "Functional 3D"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FileManip" = callPackage @@ -5420,6 +5644,7 @@ self: { description = "Expressive file and directory manipulation for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FileManipCompat" = callPackage @@ -5436,6 +5661,7 @@ self: { description = "Expressive file and directory manipulation for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FilePather" = callPackage @@ -5453,6 +5679,7 @@ self: { description = "Functions on System.FilePath"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FileSystem" = callPackage @@ -5469,6 +5696,7 @@ self: { description = "File system data structure and monad transformer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Files" = callPackage @@ -5486,6 +5714,7 @@ self: { description = "File content extraction/rearrangement"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Fin" = callPackage @@ -5517,6 +5746,7 @@ self: { description = "Obtain quote data from finance.yahoo.com"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Finance-Treasury" = callPackage @@ -5534,6 +5764,7 @@ self: { description = "Obtain Treasury yield curve data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FindBin" = callPackage @@ -5557,6 +5788,7 @@ self: { description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562"; license = stdenv.lib.licenses.bsdOriginal; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FirstOrderTheory" = callPackage @@ -5569,6 +5801,7 @@ self: { description = "Grammar and typeclass for first order theories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FixedPoint-simple" = callPackage @@ -5599,6 +5832,7 @@ self: { description = "Wiki"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FloatingHex" = callPackage @@ -5673,6 +5907,7 @@ self: { description = "ForSyDe's Haskell-embedded Domain Specific Language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ForestStructures" = callPackage @@ -5721,6 +5956,7 @@ self: { description = "Comparison of trees and forests"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ForkableT" = callPackage @@ -5733,6 +5969,7 @@ self: { description = "Forkable monad transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FormalGrammars" = callPackage @@ -5763,6 +6000,7 @@ self: { description = "(Context-free) grammars in formal language theory"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Fortnite-Hack-Cheats-Free-V-Bucks-Generator" = callPackage @@ -5786,6 +6024,7 @@ self: { description = "spam"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Foster" = callPackage @@ -5807,6 +6046,7 @@ self: { description = "Utilities to generate and solve puzzles"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FpMLv53" = callPackage @@ -5854,6 +6094,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Frames" = callPackage @@ -5909,6 +6150,7 @@ self: { description = "A library for accessing Postgres tables as in-memory data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Frames-dsv" = callPackage @@ -5927,6 +6169,7 @@ self: { description = "Alternative CSV parser for the Frames package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Frank" = callPackage @@ -5941,6 +6184,7 @@ self: { description = "An experimental programming language with typed algebraic effects"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FreeTypeGL" = callPackage @@ -5956,6 +6200,7 @@ self: { description = "Loadable texture fonts for OpenGL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "FunGEn" = callPackage @@ -5972,6 +6217,7 @@ self: { description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Fungi" = callPackage @@ -5992,6 +6238,7 @@ self: { description = "Funge-98 interpreter written in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GA" = callPackage @@ -6017,6 +6264,7 @@ self: { description = "GGg cipher"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GHood" = callPackage @@ -6056,6 +6304,7 @@ self: { description = "A binding for GLFW (OGL)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; "GLFW-b" = callPackage @@ -6093,6 +6342,7 @@ self: { description = "GLFW-b demo"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GLFW-task" = callPackage @@ -6158,6 +6408,7 @@ self: { description = "Utilities for working with OpenGL matrices"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GLURaw" = callPackage @@ -6222,6 +6473,7 @@ self: { description = "Parse GPX files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GPipe" = callPackage @@ -6240,6 +6492,7 @@ self: { description = "Typesafe functional GPU graphics programming"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GPipe-Collada" = callPackage @@ -6254,6 +6507,7 @@ self: { description = "Load GPipe meshes from Collada files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GPipe-Examples" = callPackage @@ -6272,6 +6526,7 @@ self: { description = "Examples for the GPipes package"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GPipe-GLFW" = callPackage @@ -6285,6 +6540,7 @@ self: { description = "GLFW OpenGL context creation for GPipe"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GPipe-TextureLoad" = callPackage @@ -6297,6 +6553,7 @@ self: { description = "Load GPipe textures from filesystem"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GTALib" = callPackage @@ -6316,6 +6573,7 @@ self: { description = "A library for GTA programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Gamgine" = callPackage @@ -6340,6 +6598,7 @@ self: { description = "Some kind of game library or set of utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Ganymede" = callPackage @@ -6358,6 +6617,7 @@ self: { description = "An Io interpreter in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GaussQuadIntegration" = callPackage @@ -6386,6 +6646,7 @@ self: { description = "Several games"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GenI" = callPackage @@ -6420,6 +6681,7 @@ self: { description = "A natural language generator (specifically, an FB-LTAG surface realiser)"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GenSmsPdu" = callPackage @@ -6434,6 +6696,7 @@ self: { description = "Automatic SMS message generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Genbank" = callPackage @@ -6453,6 +6716,7 @@ self: { description = "Libary for processing the NCBI genbank format"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Gene-CluEDO" = callPackage @@ -6479,6 +6743,7 @@ self: { description = "Hox gene clustering"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GeneralTicTacToe" = callPackage @@ -6493,6 +6758,7 @@ self: { description = "A general TicTacToe game implementation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GenericPretty" = callPackage @@ -6532,6 +6798,7 @@ self: { description = "MCFGs for Genus-1 RNA Pseudoknots"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GeoIp" = callPackage @@ -6557,6 +6824,7 @@ self: { description = "Geocoder and Reverse Geocoding Service Wrapper"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Geodetic" = callPackage @@ -6591,6 +6859,7 @@ self: { description = "Geometric predicates (Intel SSE)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Get" = callPackage @@ -6604,6 +6873,7 @@ self: { description = "get stuff out of stuff"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GiST" = callPackage @@ -6616,6 +6886,7 @@ self: { description = "A Haskell implementation of a Generalized Search Tree (GiST)"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Gifcurry" = callPackage @@ -6642,6 +6913,7 @@ self: { description = "GIF creation utility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GiveYouAHead" = callPackage @@ -6710,6 +6982,7 @@ self: { description = "Ray Tracing Library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GlomeVec" = callPackage @@ -6740,6 +7013,7 @@ self: { description = "SDL Frontend for Glome ray tracer"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GoogleChart" = callPackage @@ -6767,6 +7041,7 @@ self: { description = "A monad for flexible parsing of Google Code Jam input files with automatic parallelization"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GoogleDirections" = callPackage @@ -6783,6 +7058,7 @@ self: { description = "Haskell Interface to Google Directions API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GoogleSB" = callPackage @@ -6799,6 +7075,7 @@ self: { description = "Interface to Google Safe Browsing API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GoogleSuggest" = callPackage @@ -6827,6 +7104,7 @@ self: { description = "Interface to Google Translate API"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GotoT-transformers" = callPackage @@ -6839,6 +7117,7 @@ self: { description = "A monad and monadic transformer providing \"goto\" functionality"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Grafos" = callPackage @@ -6851,6 +7130,7 @@ self: { description = "Grafos Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GrammarProducts" = callPackage @@ -6873,6 +7153,7 @@ self: { description = "Grammar products and higher-dimensional grammars"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Graph500" = callPackage @@ -6892,6 +7173,7 @@ self: { description = "Graph500 benchmark-related definitions and data set generator"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GraphHammer" = callPackage @@ -6907,6 +7189,7 @@ self: { description = "GraphHammer Haskell graph analyses framework inspired by STINGER"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GraphHammer-examples" = callPackage @@ -6925,6 +7208,7 @@ self: { description = "Test harness for TriangleCount analysis"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GraphSCC" = callPackage @@ -6969,6 +7253,7 @@ self: { description = "Embedded grammar DSL and LALR parser generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GroteTrap" = callPackage @@ -6987,6 +7272,7 @@ self: { description = "Parser and selection library for expression languages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Grow" = callPackage @@ -7030,6 +7316,7 @@ self: { description = "Notification utility for Growl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Gtk2hsGenerics" = callPackage @@ -7046,6 +7333,7 @@ self: { description = "Convenience functions to extend Gtk2hs"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GtkGLTV" = callPackage @@ -7062,6 +7350,7 @@ self: { description = "OpenGL support for Gtk-based GUIs for Tangible Values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GtkTV" = callPackage @@ -7075,7 +7364,6 @@ self: { ]; description = "Gtk-based GUIs for Tangible Values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GuiHaskell" = callPackage @@ -7095,6 +7383,7 @@ self: { description = "A graphical REPL and development environment for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "GuiTV" = callPackage @@ -7107,6 +7396,7 @@ self: { description = "GUIs for Tangible Values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "H" = callPackage @@ -7117,6 +7407,8 @@ self: { pname = "H"; version = "0.9.0.1"; sha256 = "0d3isp467pq5l1c95j0q6s2isywz8xamgrm9rs16i7xczkz4vh2z"; + revision = "1"; + editedCabalFile = "07pddiap3jzcnc09v442wq30j46nmkdibilzcv69hz5imcnmhz0h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -7125,7 +7417,6 @@ self: { ]; description = "The Haskell/R mixed programming environment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HABQT" = callPackage @@ -7151,6 +7442,7 @@ self: { description = "Hierarchical adaptive Bayesian quantum tomography for quantum bits"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HARM" = callPackage @@ -7183,6 +7475,7 @@ self: { description = "HAppS data manipulation libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HAppS-IxSet" = callPackage @@ -7199,6 +7492,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HAppS-Server" = callPackage @@ -7220,6 +7514,7 @@ self: { description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HAppS-State" = callPackage @@ -7240,6 +7535,7 @@ self: { description = "Event-based distributed state"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HAppS-Util" = callPackage @@ -7257,6 +7553,7 @@ self: { description = "Web framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HAppSHelpers" = callPackage @@ -7305,6 +7602,7 @@ self: { description = "A library for implementing a Deck of Cards"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HCodecs" = callPackage @@ -7357,6 +7655,7 @@ self: { description = "MySQL driver for HDBC"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {mysqlclient = null; inherit (pkgs) openssl; inherit (pkgs) zlib;}; @@ -7407,6 +7706,7 @@ self: { description = "Manipulate data in PostgreSQL \"hstore\" columns"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HDBC-session" = callPackage @@ -7448,6 +7748,7 @@ self: { description = "Utilities for reading, manipulating, and writing HDR images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) pfstools;}; "HERA" = callPackage @@ -7460,6 +7761,7 @@ self: { librarySystemDepends = [ mpfr ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) mpfr;}; "HFitUI" = callPackage @@ -7482,6 +7784,7 @@ self: { description = "The library for generating a graphical interface on the web"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HFrequencyQueue" = callPackage @@ -7494,6 +7797,7 @@ self: { description = "A Queue with a random (weighted) pick function"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HFuse" = callPackage @@ -7511,7 +7815,7 @@ self: { ''; description = "HFuse is a binding for the Linux FUSE library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) fuse;}; "HGE2D" = callPackage @@ -7529,6 +7833,7 @@ self: { description = "2D game engine written in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HGL" = callPackage @@ -7541,6 +7846,7 @@ self: { description = "A simple graphics library based on X11 or Win32"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HGamer3D" = callPackage @@ -7889,6 +8195,7 @@ self: { description = "Graph database stored on disk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HHDL" = callPackage @@ -7901,6 +8208,7 @@ self: { description = "Hardware Description Language embedded in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HJScript" = callPackage @@ -7913,6 +8221,7 @@ self: { description = "HJScript is a Haskell EDSL for writing JavaScript programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HJVM" = callPackage @@ -7936,6 +8245,7 @@ self: { description = "A library to create a Java Virtual Machine and manipulate Java objects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) jdk;}; "HJavaScript" = callPackage @@ -7950,6 +8260,7 @@ self: { description = "HJavaScript is an abstract syntax for a typed subset of JavaScript"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HLearn-algebra" = callPackage @@ -7970,6 +8281,7 @@ self: { description = "Algebraic foundation for homomorphic learning"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HLearn-approximation" = callPackage @@ -7989,6 +8301,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HLearn-classification" = callPackage @@ -8012,6 +8325,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HLearn-datastructures" = callPackage @@ -8028,6 +8342,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HLearn-distributions" = callPackage @@ -8052,6 +8367,7 @@ self: { description = "Distributions for use with the HLearn library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HList" = callPackage @@ -8076,6 +8392,7 @@ self: { description = "Heterogeneous lists"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HListPP" = callPackage @@ -8092,6 +8409,7 @@ self: { description = "A preprocessor for HList labelable labels"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HLogger" = callPackage @@ -8107,6 +8425,7 @@ self: { description = "Simple, concurrent and easy-to-use logging library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HMM" = callPackage @@ -8118,6 +8437,7 @@ self: { description = "A hidden markov model library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HMap" = callPackage @@ -8174,6 +8494,7 @@ self: { description = "Happy Network Manager"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HNumeric" = callPackage @@ -8205,6 +8526,7 @@ self: { description = "Binding to libODE"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ode;}; "HOpenCV" = callPackage @@ -8239,6 +8561,7 @@ self: { description = "Generation of PDF documents"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HPath" = callPackage @@ -8262,6 +8585,7 @@ self: { description = "Extract Haskell declarations by name"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HPhone" = callPackage @@ -8292,6 +8616,7 @@ self: { description = "GPIO, I2C and SPI functions for the Raspberry Pi"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {bcm2835 = null;}; "HPlot" = callPackage @@ -8310,6 +8635,7 @@ self: { description = "A minimal monadic PLplot interface for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {plplotd-gnome2 = null;}; "HPong" = callPackage @@ -8329,6 +8655,7 @@ self: { description = "A simple OpenGL Pong game based on GLFW"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HROOT" = callPackage @@ -8347,6 +8674,7 @@ self: { description = "Haskell binding to the ROOT data analysis framework"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HROOT-core" = callPackage @@ -8361,6 +8689,7 @@ self: { description = "Haskell binding to ROOT Core modules"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HROOT-graf" = callPackage @@ -8377,6 +8706,7 @@ self: { description = "Haskell binding to ROOT Graf modules"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HROOT-hist" = callPackage @@ -8393,6 +8723,7 @@ self: { description = "Haskell binding to ROOT Hist modules"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HROOT-io" = callPackage @@ -8409,6 +8740,7 @@ self: { description = "Haskell binding to ROOT IO modules"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HROOT-math" = callPackage @@ -8425,6 +8757,7 @@ self: { description = "Haskell binding to ROOT Math modules"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HROOT-tree" = callPackage @@ -8441,6 +8774,7 @@ self: { description = "Haskell binding to ROOT Tree modules"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HRay" = callPackage @@ -8456,6 +8790,7 @@ self: { description = "Haskell raytracer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HSFFIG" = callPackage @@ -8477,6 +8812,7 @@ self: { description = "Generate FFI import declarations from C include files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HSGEP" = callPackage @@ -8496,6 +8832,7 @@ self: { description = "Gene Expression Programming evolutionary algorithm in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HSH" = callPackage @@ -8533,6 +8870,7 @@ self: { description = "Convenience functions that use HSH, instances for HSH"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HSet" = callPackage @@ -8574,6 +8912,7 @@ self: { description = "Small template engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HSoM" = callPackage @@ -8591,6 +8930,7 @@ self: { description = "Library for computer music education"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HSoundFile" = callPackage @@ -8607,6 +8947,7 @@ self: { description = "Audio file reading/writing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HStringTemplate" = callPackage @@ -8642,14 +8983,15 @@ self: { description = "Convenience functions and instances for HStringTemplate"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HSvm" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "HSvm"; - version = "0.1.0.3.22"; - sha256 = "015b1l2grjx79rvn17nmjnzdc5zh30v30f21svr7a9kn7ic8mb4d"; + version = "0.1.1.3.22"; + sha256 = "0vij1xp3gm7s0d5hqlpl6jm949gpimaxz8cr3njaa4kkgpw8yd4g"; libraryHaskellDepends = [ base containers ]; description = "Haskell Bindings for libsvm"; license = stdenv.lib.licenses.bsd3; @@ -8740,6 +9082,7 @@ self: { description = "Tableau based theorem prover for hybrid logics"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HTicTacToe" = callPackage @@ -8758,6 +9101,7 @@ self: { description = "An SDL tic-tac-toe game"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HUnit" = callPackage @@ -8782,6 +9126,7 @@ self: { description = "Assertions for HUnit with difference reporting"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HUnit-Plus" = callPackage @@ -8842,6 +9187,7 @@ self: { description = "A (prototyped) easy to use XMPP library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HXQ" = callPackage @@ -8860,6 +9206,7 @@ self: { description = "A Compiler from XQuery to Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaLeX" = callPackage @@ -8886,6 +9233,7 @@ self: { description = "An Haskell library to drive the french Minitel through a serial port"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaPy" = callPackage @@ -8898,6 +9246,7 @@ self: { description = "Haskell bindings for Python"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaRe" = callPackage @@ -8933,6 +9282,7 @@ self: { description = "the Haskell Refactorer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaTeX" = callPackage @@ -8972,6 +9322,7 @@ self: { description = "This package is deprecated. From version 3, HaTeX does not need this anymore."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaTeX-qq" = callPackage @@ -8988,6 +9339,7 @@ self: { description = "Quasiquoters for HaTeX"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaVSA" = callPackage @@ -9008,6 +9360,7 @@ self: { description = "An implementation of the Version Space Algebra learning framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaXml" = callPackage @@ -9043,6 +9396,7 @@ self: { description = "Simple chat"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HackMail" = callPackage @@ -9064,6 +9418,7 @@ self: { description = "A Procmail Replacement as Haskell EDSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Haggressive" = callPackage @@ -9082,6 +9437,7 @@ self: { description = "Aggression analysis for Tweets on Twitter"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HandlerSocketClient" = callPackage @@ -9128,6 +9484,7 @@ self: { description = "The classic game of Hangman"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HappyTree" = callPackage @@ -9146,6 +9503,7 @@ self: { description = "Type Safe and End to End Decision Tree"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HarmTrace" = callPackage @@ -9170,6 +9528,7 @@ self: { description = "Harmony Analysis and Retrieval of Music"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HarmTrace-Base" = callPackage @@ -9220,6 +9579,7 @@ self: { description = "Haskell bindings for CacBDD"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {CacBDD = null;}; "HasGP" = callPackage @@ -9237,6 +9597,7 @@ self: { description = "A Haskell library for inference using Gaussian processes"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Haschoo" = callPackage @@ -9256,6 +9617,7 @@ self: { description = "Minimalist R5RS Scheme interpreter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hashell" = callPackage @@ -9275,6 +9637,7 @@ self: { description = "Simple shell written in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaskRel" = callPackage @@ -9292,6 +9655,7 @@ self: { description = "HaskRel, Haskell as a DBMS with support for the relational algebra"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaskellForMaths" = callPackage @@ -9315,6 +9679,7 @@ self: { description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaskellNN" = callPackage @@ -9327,6 +9692,7 @@ self: { description = "High Performance Neural Network in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaskellNet" = callPackage @@ -9383,6 +9749,7 @@ self: { description = "A concurrent bittorrent client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HaskellTutorials" = callPackage @@ -9397,6 +9764,7 @@ self: { description = "Haskell Tutorials by Evgeny Ukhanov"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Haskelloids" = callPackage @@ -9415,6 +9783,7 @@ self: { description = "A reproduction of the Atari 1979 classic \"Asteroids\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hastodon" = callPackage @@ -9457,6 +9826,7 @@ self: { description = "A small 2D game framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hawk" = callPackage @@ -9479,6 +9849,7 @@ self: { description = "Haskell Web Application Kit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hayoo" = callPackage @@ -9506,6 +9877,7 @@ self: { description = "The Hayoo! search engine for Haskell API search on hackage"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hclip" = callPackage @@ -9539,6 +9911,7 @@ self: { description = "Line oriented editor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HerbiePlugin" = callPackage @@ -9558,6 +9931,7 @@ self: { description = "automatically improve your code's numeric stability"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hermes" = callPackage @@ -9577,6 +9951,7 @@ self: { description = "Message-based middleware layer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hieroglyph" = callPackage @@ -9595,6 +9970,7 @@ self: { description = "Purely functional 2D graphics for visualization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HiggsSet" = callPackage @@ -9612,6 +9988,7 @@ self: { description = "A multi-index set with advanced query capabilites"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hipmunk" = callPackage @@ -9676,6 +10053,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Histogram" = callPackage @@ -9704,6 +10082,7 @@ self: { description = "An MPD client designed for a Home Theatre PC"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hoed" = callPackage @@ -9728,7 +10107,6 @@ self: { testHaskellDepends = [ base process QuickCheck ]; description = "Lightweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HoleyMonoid" = callPackage @@ -9803,6 +10181,7 @@ self: { description = "A search and indexing engine"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Holumbus-Storage" = callPackage @@ -9854,6 +10233,7 @@ self: { description = "A Simple Key Value Store"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HostAndPort" = callPackage @@ -9881,6 +10261,7 @@ self: { description = "A Cricket scoring application"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hs2lib" = callPackage @@ -9909,6 +10290,7 @@ self: { description = "A Library and Preprocessor that makes it easier to create shared libs from Haskell programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HsASA" = callPackage @@ -9942,6 +10324,7 @@ self: { description = "High level bindings to htslib"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) zlib;}; "HsHaruPDF" = callPackage @@ -9954,6 +10337,7 @@ self: { description = "Haskell binding to libharu (http://libharu.sourceforge.net/)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HsHyperEstraier" = callPackage @@ -9971,6 +10355,7 @@ self: { description = "HyperEstraier binding for Haskell"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {hyperestraier = null; qdbm = null;}; "HsJudy" = callPackage @@ -9985,6 +10370,7 @@ self: { description = "Judy bindings, and some nice APIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {Judy = null;}; "HsOpenSSL" = callPackage @@ -10027,6 +10413,7 @@ self: { description = "Haskell integration with Parrot virtual machine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HsPerl5" = callPackage @@ -10039,6 +10426,7 @@ self: { description = "Haskell interface to embedded Perl 5 interpreter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HsSVN" = callPackage @@ -10051,6 +10439,7 @@ self: { description = "Partial Subversion (SVN) binding for Haskell"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HsSyck" = callPackage @@ -10129,6 +10518,7 @@ self: { description = "Stream Editor in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hsmtlib" = callPackage @@ -10147,6 +10537,7 @@ self: { description = "Haskell library for easy interaction with SMT-LIB 2 compliant solvers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HueAPI" = callPackage @@ -10163,6 +10554,7 @@ self: { description = "API for controlling Philips Hue lights"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "HulkImport" = callPackage @@ -10181,6 +10573,7 @@ self: { description = "Easily bulk import CSV data to SQL Server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Hungarian-Munkres" = callPackage @@ -10219,6 +10612,7 @@ self: { description = "The library for generating a WebGL scene for the web"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "IDynamic" = callPackage @@ -10231,6 +10625,7 @@ self: { description = "Indexable, serializable form of Data.Dynamic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "IFS" = callPackage @@ -10247,6 +10642,7 @@ self: { description = "Iterated Function System generation for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "INblobs" = callPackage @@ -10267,6 +10663,7 @@ self: { description = "Editor and interpreter for Interaction Nets"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "IOR" = callPackage @@ -10280,6 +10677,7 @@ self: { description = "Region based resource management for the IO monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "IORefCAS" = callPackage @@ -10299,6 +10697,7 @@ self: { description = "Atomic compare and swap for IORefs and STRefs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "IOSpec" = callPackage @@ -10357,6 +10756,7 @@ self: { description = "A RESTful microService for IPv6-related data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "IcoGrid" = callPackage @@ -10369,6 +10769,7 @@ self: { description = "Library for generating grids of hexagons and pentagons mapped to a sphere"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "IfElse" = callPackage @@ -10403,6 +10804,7 @@ self: { description = "A library for writing Imperative style haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "IndentParser" = callPackage @@ -10426,6 +10828,7 @@ self: { description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "InfixApplicative" = callPackage @@ -10438,6 +10841,7 @@ self: { description = "liftA2 for infix operators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "IntGraph" = callPackage @@ -10511,6 +10915,7 @@ self: { description = "DSL for IRC bots"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "IrrHaskell" = callPackage @@ -10543,6 +10948,7 @@ self: { description = "A typeclass to determine if a given value is null"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JSON-Combinator" = callPackage @@ -10561,6 +10967,7 @@ self: { description = "A combinator library on top of a generalised JSON type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JSON-Combinator-Examples" = callPackage @@ -10575,6 +10982,7 @@ self: { description = "Example uses of the JSON-Combinator library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JSONParser" = callPackage @@ -10587,6 +10995,7 @@ self: { description = "Parse JSON"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JSONb" = callPackage @@ -10608,6 +11017,7 @@ self: { description = "JSON parser that uses byte strings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JYU-Utils" = callPackage @@ -10628,6 +11038,7 @@ self: { description = "Some utility functions for JYU projects"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JackMiniMix" = callPackage @@ -10640,6 +11051,7 @@ self: { description = "control JackMiniMix"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Javasf" = callPackage @@ -10657,6 +11069,7 @@ self: { description = "A utility to print the SourceFile attribute of one or more Java class files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Javav" = callPackage @@ -10671,6 +11084,7 @@ self: { description = "A utility to print the target version of Java class files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Jdh" = callPackage @@ -10683,6 +11097,7 @@ self: { description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JsContracts" = callPackage @@ -10706,6 +11121,7 @@ self: { description = "Design-by-contract for JavaScript"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JsonGrammar" = callPackage @@ -10728,6 +11144,7 @@ self: { description = "Combinators for bidirectional JSON parsing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JuPyTer-notebook" = callPackage @@ -10745,6 +11162,7 @@ self: { description = "JuPyTer notebook parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JuicyPixels" = callPackage @@ -10798,6 +11216,7 @@ self: { description = "Functions for drawing lines, squares and so on pixel by pixel"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JuicyPixels-extra" = callPackage @@ -10890,6 +11309,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JunkDB-driver-gdbm" = callPackage @@ -10905,6 +11325,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JunkDB-driver-hashtables" = callPackage @@ -10920,6 +11341,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "JustParse" = callPackage @@ -10932,6 +11354,7 @@ self: { description = "A simple and comprehensive Haskell parsing library"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "KMP" = callPackage @@ -10956,6 +11379,7 @@ self: { description = "A library with the kerbal space program universe and demo code"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Kalman" = callPackage @@ -10968,6 +11392,7 @@ self: { description = "A slightly extended Kalman filter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "KdTree" = callPackage @@ -10996,6 +11421,7 @@ self: { description = "A super small web framework for those who don't like big and fancy codebases"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "KiCS" = callPackage @@ -11095,6 +11521,7 @@ self: { description = "Category for Continuation Passing Style"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Kulitta" = callPackage @@ -11126,6 +11553,7 @@ self: { description = "Kyoto Cabinet DB bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) kyotocabinet;}; "L-seed" = callPackage @@ -11144,6 +11572,7 @@ self: { description = "Plant growing programming game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LATS" = callPackage @@ -11161,6 +11590,7 @@ self: { description = "Linear Algebra on Typed Spaces"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) openblasCompat;}; "LC3" = callPackage @@ -11276,6 +11706,7 @@ self: { description = "A type-safe EDSL for TouchDesigner written in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LambdaHack" = callPackage @@ -11317,6 +11748,7 @@ self: { description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LambdaINet" = callPackage @@ -11337,6 +11769,7 @@ self: { description = "Graphical Interaction Net Evaluator for Optimal Evaluation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LambdaNet" = callPackage @@ -11353,6 +11786,7 @@ self: { description = "A configurable and extensible neural network library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LambdaPrettyQuote" = callPackage @@ -11378,6 +11812,7 @@ self: { description = "Quasiquoter, and Arbitrary helpers for the lambda calculus"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LambdaShell" = callPackage @@ -11396,6 +11831,7 @@ self: { description = "Simple shell for evaluating lambda expressions"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Lambdajudge" = callPackage @@ -11409,6 +11845,7 @@ self: { description = "A library to easily host Haskell based programming competitions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Lambdaya" = callPackage @@ -11454,6 +11891,7 @@ self: { description = "A library for compiling programs in a variety of languages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Lattices" = callPackage @@ -11504,6 +11942,7 @@ self: { description = "A simple sandboxing tool for Haskell packages"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Learning" = callPackage @@ -11520,6 +11959,7 @@ self: { description = "The most frequently used machine learning tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Level0" = callPackage @@ -11534,6 +11974,7 @@ self: { description = "A Snake II clone written using SDL"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LibClang" = callPackage @@ -11555,6 +11996,7 @@ self: { description = "Haskell bindings for libclang (a C++ parsing library)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (self.llvmPackages) clang; inherit (pkgs) ncurses;}; "LibZip" = callPackage @@ -11586,6 +12028,7 @@ self: { description = "Wrapper for data that can be unbounded"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LinearSplit" = callPackage @@ -11601,6 +12044,7 @@ self: { description = "Partition the sequence of items to the subsequences in the order given"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LinguisticsTypes" = callPackage @@ -11646,6 +12090,7 @@ self: { description = "Check a bunch of local html files for broken links"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "List" = callPackage @@ -11699,6 +12144,7 @@ self: { description = "List transformer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ListTree" = callPackage @@ -11747,6 +12193,7 @@ self: { description = "Logic"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LogicGrowsOnTrees" = callPackage @@ -11784,6 +12231,7 @@ self: { description = "a parallel implementation of logic programming using distributed tree exploration"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LogicGrowsOnTrees-MPI" = callPackage @@ -11806,6 +12254,7 @@ self: { description = "an adapter for LogicGrowsOnTrees that uses MPI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) openmpi;}; "LogicGrowsOnTrees-network" = callPackage @@ -11832,6 +12281,7 @@ self: { description = "an adapter for LogicGrowsOnTrees that uses multiple processes running in a network"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LogicGrowsOnTrees-processes" = callPackage @@ -11859,6 +12309,7 @@ self: { description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LslPlus" = callPackage @@ -11880,6 +12331,7 @@ self: { description = "An execution and testing framework for the Linden Scripting Language (LSL)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Lucu" = callPackage @@ -11901,6 +12353,7 @@ self: { description = "HTTP Daemonic Library"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Lykah" = callPackage @@ -11930,6 +12383,7 @@ self: { description = "A static website and blog generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MASMGen" = callPackage @@ -11943,6 +12397,7 @@ self: { description = "Generate MASM code from haskell"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MBot" = callPackage @@ -11955,6 +12410,7 @@ self: { description = "Haskell interface for controlling the mBot educational robot"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MC-Fold-DP" = callPackage @@ -11974,6 +12430,7 @@ self: { description = "Folding algorithm based on nucleotide cyclic motifs"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MFlow" = callPackage @@ -12000,6 +12457,7 @@ self: { description = "stateful, RESTful web framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MHask" = callPackage @@ -12012,6 +12470,7 @@ self: { description = "The category of monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MSQueue" = callPackage @@ -12024,6 +12483,7 @@ self: { description = "Michael-Scott queue"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MTGBuilder" = callPackage @@ -12038,6 +12498,7 @@ self: { description = "Builds decks out of a meta"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MagicHaskeller" = callPackage @@ -12068,6 +12529,7 @@ self: { description = "Automatic inductive functional programmer by systematic search"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MailchimpSimple" = callPackage @@ -12087,6 +12549,7 @@ self: { description = "Haskell library to interact with Mailchimp JSON API Version 3.0"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Map" = callPackage @@ -12119,6 +12582,7 @@ self: { description = "Mapping"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MaybeT" = callPackage @@ -12133,6 +12597,7 @@ self: { description = "MaybeT monad transformer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MaybeT-monads-tf" = callPackage @@ -12145,6 +12610,7 @@ self: { description = "MaybeT monad transformer compatible with monads-tf (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MaybeT-transformers" = callPackage @@ -12157,6 +12623,7 @@ self: { description = "MaybeT monad transformer using transformers instead of mtl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MazesOfMonad" = callPackage @@ -12177,6 +12644,7 @@ self: { description = "Console-based Role Playing Game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MeanShift" = callPackage @@ -12189,6 +12657,7 @@ self: { description = "Mean shift algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Measure" = callPackage @@ -12201,6 +12670,7 @@ self: { description = "A library for units of measurement"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Mecha" = callPackage @@ -12213,6 +12683,7 @@ self: { description = "mecha are the most complex composite machines known to humanity, lets build them well!"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Mechs" = callPackage @@ -12225,6 +12696,7 @@ self: { description = "mecha are the most complex composite machines known to humanity, lets build them well!"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MemoTrie" = callPackage @@ -12254,6 +12726,7 @@ self: { description = "Statically checked database access"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MetaObject" = callPackage @@ -12266,6 +12739,7 @@ self: { description = "A meta-object system for Haskell based on Perl 6"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Metrics" = callPackage @@ -12278,6 +12752,7 @@ self: { description = "Evaluation metrics commonly used in supervised machine learning"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Mhailist" = callPackage @@ -12297,6 +12772,7 @@ self: { description = "Haskell mailing list manager"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Michelangelo" = callPackage @@ -12314,6 +12790,7 @@ self: { description = "OpenGL for dummies"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MicrosoftTranslator" = callPackage @@ -12331,6 +12808,7 @@ self: { description = "Interface for Microsoft Translator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MiniAgda" = callPackage @@ -12411,7 +12889,6 @@ self: { libraryHaskellDepends = [ base glib template-haskell ]; description = "Useful types and definitions missing from other libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MissingM" = callPackage @@ -12441,6 +12918,7 @@ self: { description = "Haskell interface to Python"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Mobile-Legends-Hack-Cheats" = callPackage @@ -12464,6 +12942,7 @@ self: { description = "spam"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Modulo" = callPackage @@ -12490,6 +12969,7 @@ self: { description = "A FRP library based on signal functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MoeDict" = callPackage @@ -12506,6 +12986,7 @@ self: { description = "Utilities working with MoeDict.tw JSON dataset"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MonadCatchIO-mtl" = callPackage @@ -12522,6 +13003,7 @@ self: { description = "Monad-transformer version of the Control.Exception module"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MonadCatchIO-mtl-foreign" = callPackage @@ -12534,6 +13016,7 @@ self: { description = "Polymorphic combinators for working with foreign functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MonadCatchIO-transformers" = callPackage @@ -12550,6 +13033,7 @@ self: { description = "Monad-transformer compatible version of the Control.Exception module"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MonadCatchIO-transformers-foreign" = callPackage @@ -12566,6 +13050,7 @@ self: { description = "Polymorphic combinators for working with foreign functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MonadCompose" = callPackage @@ -12578,6 +13063,7 @@ self: { description = "Methods for composing monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MonadLab" = callPackage @@ -12595,6 +13081,7 @@ self: { description = "Automatically generate layered monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MonadPrompt" = callPackage @@ -12616,6 +13103,8 @@ self: { pname = "MonadRandom"; version = "0.5.1.1"; sha256 = "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb"; + revision = "1"; + editedCabalFile = "14izcj2myfsvfwiy1w78q5zddxd6za77yy6b8zwb1x49lnw7jpck"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -12644,6 +13133,7 @@ self: { description = "Generalizing lift to monad stacks"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Monadius" = callPackage @@ -12659,6 +13149,7 @@ self: { description = "2-D arcade scroller"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Monaris" = callPackage @@ -12678,6 +13169,7 @@ self: { description = "A simple tetris clone"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Monatron" = callPackage @@ -12690,6 +13182,7 @@ self: { description = "Monad transformer library with uniform liftings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Monatron-IO" = callPackage @@ -12702,6 +13195,7 @@ self: { description = "MonadIO instances for the Monatron transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Monocle" = callPackage @@ -12714,6 +13208,7 @@ self: { description = "Symbolic computations in strict monoidal categories with LaTeX output"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MorseCode" = callPackage @@ -12746,6 +13241,7 @@ self: { description = "Automated Mutation Testing"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MuCheck-HUnit" = callPackage @@ -12761,6 +13257,7 @@ self: { description = "Automated Mutation Testing for HUnit tests"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MuCheck-Hspec" = callPackage @@ -12776,6 +13273,7 @@ self: { description = "Automated Mutation Testing for Hspec tests"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MuCheck-QuickCheck" = callPackage @@ -12791,6 +13289,7 @@ self: { description = "Automated Mutation Testing for QuickCheck tests"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MuCheck-SmallCheck" = callPackage @@ -12806,6 +13305,7 @@ self: { description = "Automated Mutation Testing for SmallCheck tests"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Munkres" = callPackage @@ -12829,6 +13329,7 @@ self: { description = "Simple and typesafe layer over the Munkres package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MusicBrainz" = callPackage @@ -12896,6 +13397,7 @@ self: { description = "Most likely order of mutation events in RNA"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MyPrimes" = callPackage @@ -12912,6 +13414,7 @@ self: { description = "Generate all primes"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NGrams" = callPackage @@ -12926,6 +13429,7 @@ self: { description = "Simple application for calculating n-grams using Google"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NMap" = callPackage @@ -12938,6 +13442,7 @@ self: { description = "A transparent nested Map structure"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NTRU" = callPackage @@ -12955,6 +13460,7 @@ self: { description = "NTRU Cryptography"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NXT" = callPackage @@ -12980,6 +13486,7 @@ self: { description = "A Haskell interface to Lego Mindstorms NXT"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {bluetooth = null;}; "NXTDSL" = callPackage @@ -12999,6 +13506,7 @@ self: { description = "Generate NXC Code from DSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NameGenerator" = callPackage @@ -13027,6 +13535,7 @@ self: { description = "Very small interpreter for a Prolog-like language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Naperian" = callPackage @@ -13096,6 +13605,7 @@ self: { description = "Context Algebra of near"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Neks" = callPackage @@ -13119,6 +13629,7 @@ self: { description = "Simple networked key/value store"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NestedFunctor" = callPackage @@ -13131,6 +13642,7 @@ self: { description = "Nested composition of functors with a type index tracking nesting"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NestedSampling" = callPackage @@ -13156,6 +13668,7 @@ self: { description = "Bindings for net-snmp's C API for clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) net_snmp;}; "Network-NineP" = callPackage @@ -13221,6 +13734,7 @@ self: { description = "Ninja game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NoHoed" = callPackage @@ -13252,6 +13766,7 @@ self: { description = "Microbenchmarks for various array libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NoTrace" = callPackage @@ -13265,6 +13780,7 @@ self: { description = "Remove all the functions come from Debug.Trace after debugging"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Noise" = callPackage @@ -13296,6 +13812,7 @@ self: { description = "A Nomic game in haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Nomyx-Core" = callPackage @@ -13323,6 +13840,7 @@ self: { description = "A Nomic game in haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Nomyx-Language" = callPackage @@ -13343,6 +13861,7 @@ self: { description = "Language to express rules for Nomic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Nomyx-Rules" = callPackage @@ -13361,6 +13880,7 @@ self: { description = "Language to express rules for Nomic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Nomyx-Web" = callPackage @@ -13386,6 +13906,7 @@ self: { description = "Web gui for Nomyx"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NonEmpty" = callPackage @@ -13398,6 +13919,7 @@ self: { description = "Library providing a non-empty list datatype, and total functions operating on it"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NonEmptyList" = callPackage @@ -13415,6 +13937,7 @@ self: { description = "A list with a length of at least one"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NumInstances" = callPackage @@ -13449,6 +13972,7 @@ self: { description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NumberTheory" = callPackage @@ -13462,6 +13986,7 @@ self: { description = "A library for number theoretic computations, written in Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Numbers" = callPackage @@ -13491,6 +14016,7 @@ self: { description = "Nussinov78 using the ADPfusion library"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Nutri" = callPackage @@ -13503,6 +14029,7 @@ self: { description = "A little library to calculate nutrition values of food items"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OGL" = callPackage @@ -13515,6 +14042,7 @@ self: { description = "A context aware binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ONC-RPC" = callPackage @@ -13555,6 +14083,7 @@ self: { description = "Parse OpenStreetMap files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OTP" = callPackage @@ -13575,6 +14104,7 @@ self: { description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Object" = callPackage @@ -13587,6 +14117,7 @@ self: { description = "Object oriented programming for haskell using multiparameter typeclasses"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ObjectIO" = callPackage @@ -13603,6 +14134,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {comctl32 = null; comdlg32 = null; gdi32 = null; kernel32 = null; ole32 = null; shell32 = null; user32 = null; winmm = null; winspool = null;}; @@ -13652,6 +14184,7 @@ self: { description = "Simple unbalanced Octree for storing data about 3D points"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OddWord" = callPackage @@ -13666,6 +14199,7 @@ self: { description = "Provides a wrapper for deriving word types with fewer bits"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Omega" = callPackage @@ -13679,6 +14213,7 @@ self: { description = "Integer sets and relations using Presburger arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OnRmt" = callPackage @@ -13716,6 +14251,7 @@ self: { description = "Text UI library for performing parallel remote SSH operations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OneTuple" = callPackage @@ -13759,6 +14295,7 @@ self: { description = "IBM AFP document format parser and generator"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OpenAFP-Utils" = callPackage @@ -13780,6 +14317,7 @@ self: { description = "Assorted utilities to work with AFP data streams"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OpenAL" = callPackage @@ -13813,6 +14351,7 @@ self: { description = "Haskell high-level wrapper for OpenCL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {OpenCL = null;}; "OpenCLRaw" = callPackage @@ -13825,6 +14364,7 @@ self: { description = "The OpenCL Standard for heterogenous data-parallel computing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OpenCLWrappers" = callPackage @@ -13837,6 +14377,7 @@ self: { description = "The OpenCL Standard for heterogenous data-parallel computing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OpenGL" = callPackage @@ -13867,6 +14408,7 @@ self: { description = "Quickcheck instances for various data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OpenGLRaw" = callPackage @@ -13915,6 +14457,7 @@ self: { description = "ADT wrapper and renderer for OpenSCAD models"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OpenVG" = callPackage @@ -13927,6 +14470,7 @@ self: { description = "OpenVG (ShivaVG-0.2.1) binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OpenVGRaw" = callPackage @@ -13939,6 +14483,7 @@ self: { description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation)."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Operads" = callPackage @@ -13951,6 +14496,7 @@ self: { description = "Groebner basis computation for Operads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OptDir" = callPackage @@ -13979,6 +14525,7 @@ self: { description = "A quasiquoter for or-patterns"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OrchestrateDB" = callPackage @@ -13999,6 +14546,7 @@ self: { description = "Unofficial Haskell Client Library for the Orchestrate.io API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "OrderedBits" = callPackage @@ -14045,6 +14593,7 @@ self: { description = "A Programming Language in Construction"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Oslo-Vectize" = callPackage @@ -14061,6 +14610,7 @@ self: { description = "spam"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PArrows" = callPackage @@ -14086,6 +14636,7 @@ self: { description = "Make password-based security schemes more secure"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PCLT" = callPackage @@ -14100,6 +14651,7 @@ self: { description = "Extension to Show: templating, catalogizing, languages, parameters, etc"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PCLT-DB" = callPackage @@ -14117,6 +14669,7 @@ self: { description = "An addon to PCLT package: enchance PCLT catalog with PostgreSQL powers"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PDBtools" = callPackage @@ -14142,6 +14695,7 @@ self: { description = "A generic derivable Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PSQueue" = callPackage @@ -14153,7 +14707,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Priority Search Queue"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PTQ" = callPackage @@ -14172,6 +14725,7 @@ self: { description = "An implementation of Montague's PTQ"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PUH-Project" = callPackage @@ -14192,6 +14746,7 @@ self: { description = "This is a package which includes Assignments, Email, User and Reviews modules for Programming in Haskell course"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PageIO" = callPackage @@ -14219,6 +14774,7 @@ self: { description = "Page-oriented extraction and composition library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Paillier" = callPackage @@ -14238,6 +14794,7 @@ self: { description = "a simple Paillier cryptosystem"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PandocAgda" = callPackage @@ -14259,6 +14816,7 @@ self: { description = "Pandoc support for literate Agda"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Paraiso" = callPackage @@ -14284,6 +14842,7 @@ self: { description = "a code generator for partial differential equations solvers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Parallel-Arrows-BaseSpec" = callPackage @@ -14334,6 +14893,7 @@ self: { description = "Eden based backend for @Parallel-Arrows-Definition@"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Parallel-Arrows-Multicore" = callPackage @@ -14390,6 +14950,7 @@ self: { description = "A proven synchronization server for high performance computing"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ParsecTools" = callPackage @@ -14435,6 +14996,7 @@ self: { description = "Simple library for generating passwords"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PastePipe" = callPackage @@ -14466,6 +15028,7 @@ self: { description = "A tree used to merge and maintain paths"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Pathfinder" = callPackage @@ -14479,6 +15042,7 @@ self: { description = "Relational optimiser and code generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libxml2;}; "Peano" = callPackage @@ -14502,6 +15066,7 @@ self: { description = "GADT type witnesses for Peano-style natural numbers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PerfectHash" = callPackage @@ -14519,6 +15084,7 @@ self: { description = "A perfect hashing library for mapping bytestrings to values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {cmph = null;}; "PermuteEffects" = callPackage @@ -14531,6 +15097,7 @@ self: { description = "Permutations of effectful computations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Persistence" = callPackage @@ -14547,6 +15114,7 @@ self: { description = "Quickly detect clusters and holes in data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Phsu" = callPackage @@ -14572,6 +15140,7 @@ self: { description = "Personal Happstack Server Utils"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Pipe" = callPackage @@ -14584,6 +15153,7 @@ self: { description = "Process piping library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Piso" = callPackage @@ -14596,6 +15166,7 @@ self: { description = "Partial isomorphisms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PlayHangmanGame" = callPackage @@ -14630,6 +15201,7 @@ self: { description = "Playing cards api"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Plot-ho-matic" = callPackage @@ -14652,6 +15224,7 @@ self: { description = "Real-time line plotter for generic data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PlslTools" = callPackage @@ -14672,6 +15245,7 @@ self: { description = "So far just a lint like program for PL/SQL. Diff and refactoring tools are planned"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Plural" = callPackage @@ -14697,6 +15271,7 @@ self: { description = "An imaginary world"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PortFusion" = callPackage @@ -14711,6 +15286,7 @@ self: { description = "high-performance distributed reverse / forward proxy & tunneling for TCP"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PortMidi" = callPackage @@ -14725,7 +15301,7 @@ self: { librarySystemDepends = [ alsaLib ]; description = "A binding for PortMedia/PortMidi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "PostgreSQL" = callPackage @@ -14795,7 +15371,6 @@ self: { ]; description = "Pretty-printing for primitive arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Printf-TH" = callPackage @@ -14807,6 +15382,7 @@ self: { libraryHaskellDepends = [ base haskell98 pretty template-haskell ]; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PriorityChansConverger" = callPackage @@ -14819,6 +15395,7 @@ self: { description = "Read single output from an array of inputs - channels with priorities"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ProbabilityMonads" = callPackage @@ -14831,6 +15408,7 @@ self: { description = "Probability distribution monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "PropLogic" = callPackage @@ -14860,6 +15438,7 @@ self: { description = "An implementation of propositional logic in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ProxN" = callPackage @@ -14896,6 +15475,7 @@ self: { description = "A Perl 6 Implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Pup-Events" = callPackage @@ -14949,6 +15529,7 @@ self: { description = "A networked event handling framework for hooking into other programs"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Pup-Events-PQueue" = callPackage @@ -14984,8 +15565,8 @@ self: { }: mkDerivation { pname = "PyF"; - version = "0.7.1.0"; - sha256 = "1zgf37q6jcvda28vfmbhlr1jvcgpq2ma4n67i2id02bmc86nk4x1"; + version = "0.7.3.0"; + sha256 = "17asilwlq7c8kj5jk0gm0pkfr2m65pgdspgx8hl0hwlp1wsg74yl"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta megaparsec template-haskell text @@ -14997,7 +15578,6 @@ self: { testToolDepends = [ python3 ]; description = "Quasiquotations for a python like interpolated string formater"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) python3;}; "QIO" = callPackage @@ -15010,6 +15590,7 @@ self: { description = "The Quantum IO Monad is a library for defining quantum computations in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "QLearn" = callPackage @@ -15022,6 +15603,7 @@ self: { description = "A library for fast, easy-to-use Q-learning"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "QuadEdge" = callPackage @@ -15034,6 +15616,7 @@ self: { description = "QuadEdge structure for representing triangulations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "QuadTree" = callPackage @@ -15047,6 +15630,7 @@ self: { description = "QuadTree library for Haskell, with lens support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "QuasiText" = callPackage @@ -15083,6 +15667,7 @@ self: { description = "Programming with Eventual Consistency over Cassandra"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "QuickAnnotate" = callPackage @@ -15098,6 +15683,7 @@ self: { description = "Annotation Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "QuickCheck_1_2_0_1" = callPackage @@ -15166,6 +15752,7 @@ self: { description = "Generator of \"valid\" and \"invalid\" data in a type class"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "QuickPlot" = callPackage @@ -15190,6 +15777,7 @@ self: { description = "Quick and easy data visualization with Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Quickson" = callPackage @@ -15205,6 +15793,7 @@ self: { description = "Quick JSON extractions with Aeson"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "R-pandoc" = callPackage @@ -15224,6 +15813,7 @@ self: { description = "A pandoc filter to express R plots inside markdown"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RANSAC" = callPackage @@ -15300,6 +15890,7 @@ self: { description = "A reflective JSON serializer/parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RLP" = callPackage @@ -15333,6 +15924,7 @@ self: { description = "Binding to code that controls a Segway RMP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {canlib = null; ftd2xx = null;}; "RNAFold" = callPackage @@ -15356,6 +15948,7 @@ self: { description = "RNA secondary structure prediction"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RNAFoldProgs" = callPackage @@ -15376,6 +15969,7 @@ self: { description = "RNA secondary structure folding"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RNAdesign" = callPackage @@ -15402,6 +15996,7 @@ self: { description = "Multi-target RNA sequence design"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RNAdraw" = callPackage @@ -15422,6 +16017,7 @@ self: { description = "Draw RNA secondary structures"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RNAlien" = callPackage @@ -15455,6 +16051,7 @@ self: { description = "Unsupervized construction of RNA family models"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RNAwolf" = callPackage @@ -15476,6 +16073,7 @@ self: { description = "RNA folding with non-canonical basepairs and base-triplets"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RSA" = callPackage @@ -15526,7 +16124,7 @@ self: { ]; description = "A puzzle game written in Haskell with a cat in lead role"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Random123" = callPackage @@ -15558,6 +16156,7 @@ self: { description = "Interface to random.org"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Randometer" = callPackage @@ -15583,20 +16182,19 @@ self: { description = "Data structure for managing ranges"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Ranged-sets" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { pname = "Ranged-sets"; - version = "0.3.0"; - sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l"; - revision = "1"; - editedCabalFile = "0xv8ph5vfwfcvk5hbkcxbsf9vwhpikxzkz7zsr7c5ky2bw707gfv"; + version = "0.4.0"; + sha256 = "1skd2a6yw7dd5vq8x81kwh28gi8sgyzg9qqqyadxmgpvy11sh9ab"; libraryHaskellDepends = [ base HUnit QuickCheck ]; + testHaskellDepends = [ base HUnit QuickCheck ]; description = "Ranged sets for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ranka" = callPackage @@ -15614,6 +16212,7 @@ self: { description = "HTTP to XMPP omegle chats gate"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Rasenschach" = callPackage @@ -15635,6 +16234,7 @@ self: { description = "Soccer simulation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Rasterific" = callPackage @@ -15691,6 +16291,7 @@ self: { description = "Library to access Redmine's REST services"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Ref" = callPackage @@ -15703,6 +16304,7 @@ self: { description = "Generic Mutable Ref Abstraction Layer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RefSerialize" = callPackage @@ -15739,6 +16341,7 @@ self: { description = "A utility for computing distributions of material to review among reviewers"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RepLib" = callPackage @@ -15755,6 +16358,7 @@ self: { description = "Generic programming library with representation types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ReplicateEffects" = callPackage @@ -15767,6 +16371,7 @@ self: { description = "Composable replication schemes of applicative functors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ReviewBoard" = callPackage @@ -15786,6 +16391,7 @@ self: { description = "Haskell bindings to ReviewBoard"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RichConditional" = callPackage @@ -15798,6 +16404,7 @@ self: { description = "Tiny library to replace classic if/else"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Rlang-QQ" = callPackage @@ -15822,6 +16429,7 @@ self: { description = "quasiquoter for inline-R code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RollingDirectory" = callPackage @@ -15847,6 +16455,7 @@ self: { description = "Limits the size of a directory's contents"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "RoyalMonad" = callPackage @@ -15880,6 +16489,7 @@ self: { description = "Reactive Extensions for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SBench" = callPackage @@ -15898,6 +16508,7 @@ self: { description = "A benchmark suite for runtime and heap measurements over a series of inputs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SCRIPTWriter" = callPackage @@ -15918,6 +16529,7 @@ self: { description = "ESCRIPT: a human friendly language for programming Bitcoin scripts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SCalendar" = callPackage @@ -15935,6 +16547,7 @@ self: { description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SDL" = callPackage @@ -16051,6 +16664,7 @@ self: { description = "SFML bindings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {csfml-audio = null; csfml-graphics = null; csfml-network = null; csfml-system = null; csfml-window = null; sfml-audio = null; sfml-graphics = null; sfml-network = null; @@ -16066,6 +16680,7 @@ self: { description = "Higher level library on top of SFML"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SFont" = callPackage @@ -16078,6 +16693,7 @@ self: { description = "SFont SDL Bitmap Fonts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SG" = callPackage @@ -16090,6 +16706,7 @@ self: { description = "Small geometry library for dealing with vectors and collision detection"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SGdemo" = callPackage @@ -16104,6 +16721,7 @@ self: { description = "An example of using the SG and OpenGL libraries"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SGplus" = callPackage @@ -16116,6 +16734,7 @@ self: { description = "(updated) Small geometry library for dealing with vectors and collision detection"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SHA" = callPackage @@ -16165,6 +16784,7 @@ self: { description = "A simple SMTP client library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SNet" = callPackage @@ -16182,6 +16802,7 @@ self: { description = "Declarative coördination language for streaming networks"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SQLDeps" = callPackage @@ -16213,6 +16834,7 @@ self: { description = "STG Symbolic Execution"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "STL" = callPackage @@ -16225,6 +16847,7 @@ self: { description = "STL 3D geometry format parsing and pretty-printing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "STLinkUSB" = callPackage @@ -16297,6 +16920,7 @@ self: { description = "translate a SVD of a Microcontroller to Haskell tables"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SVG2Q" = callPackage @@ -16315,6 +16939,7 @@ self: { description = "Code generation tool for Quartz code from a SVG"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SVGFonts" = callPackage @@ -16382,6 +17007,7 @@ self: { description = "Generate a parser (in Haskell) with the SableCC parser generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Safe" = callPackage @@ -16420,6 +17046,7 @@ self: { description = "A .NET Bridge for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) glib; inherit (pkgs) mono;}; "Saturnin" = callPackage @@ -16506,6 +17133,7 @@ self: { description = "Size limited temp filesystem based on fuse"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Scurry" = callPackage @@ -16525,6 +17153,7 @@ self: { description = "A cross platform P2P VPN application built using Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SecureHash-SHA3" = callPackage @@ -16576,6 +17205,7 @@ self: { description = "Selects a representative subset of sequences from multiple sequence alignment"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Semantique" = callPackage @@ -16595,6 +17225,7 @@ self: { description = "Command-line tool for maintaining the Semantique database"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Semigroup" = callPackage @@ -16607,6 +17238,7 @@ self: { description = "A semigroup"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SeqAlign" = callPackage @@ -16619,6 +17251,7 @@ self: { description = "Sequence Alignment"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SessionLogger" = callPackage @@ -16635,6 +17268,7 @@ self: { description = "Easy Loggingframework"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ShellCheck" = callPackage @@ -16676,6 +17310,7 @@ self: { description = "A framework for creating shell envinronments"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Shellac-compatline" = callPackage @@ -16690,6 +17325,7 @@ self: { description = "\"compatline\" backend module for Shellac"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Shellac-editline" = callPackage @@ -16704,6 +17340,7 @@ self: { description = "Editline backend module for Shellac"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Shellac-haskeline" = callPackage @@ -16716,6 +17353,7 @@ self: { description = "Haskeline backend module for Shellac"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Shellac-readline" = callPackage @@ -16730,6 +17368,7 @@ self: { description = "Readline backend module for Shellac"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ShortestPathProblems" = callPackage @@ -16751,6 +17390,7 @@ self: { description = "grammars for TSP and SHP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ShowF" = callPackage @@ -16825,6 +17465,7 @@ self: { description = "A Simple Graphics Library from the SimpleH framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SimpleH" = callPackage @@ -16862,6 +17503,7 @@ self: { description = "Simple, configurable logging"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SimpleServer" = callPackage @@ -16883,6 +17525,7 @@ self: { description = "A simple static file server, for when apache is overkill"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SimpleTableGenerator" = callPackage @@ -16945,6 +17588,7 @@ self: { description = "Generate slides from Haskell code"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Smooth" = callPackage @@ -16961,6 +17605,7 @@ self: { description = "A tiny, lazy SMT solver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SmtLib" = callPackage @@ -16973,6 +17618,7 @@ self: { description = "Library for parsing SMTLIB2"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Snusmumrik" = callPackage @@ -16996,6 +17642,7 @@ self: { description = "E-library directory based on FUSE virtual file system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) zip;}; "SoOSiM" = callPackage @@ -17013,6 +17660,7 @@ self: { description = "Abstract full system simulator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SoccerFun" = callPackage @@ -17033,6 +17681,7 @@ self: { description = "Football simulation framework for teaching functional programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SoccerFunGL" = callPackage @@ -17053,6 +17702,7 @@ self: { description = "OpenGL UI for the SoccerFun framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Sonnex" = callPackage @@ -17066,6 +17716,7 @@ self: { description = "Sonnex is an alternative to Soundex for french language"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SourceGraph" = callPackage @@ -17085,6 +17736,7 @@ self: { description = "Static code analysis using graph-theoretic techniques"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Southpaw" = callPackage @@ -17118,6 +17770,7 @@ self: { description = "Video game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SpacePrivateers" = callPackage @@ -17140,6 +17793,7 @@ self: { description = "Simple space pirate roguelike"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SpinCounter" = callPackage @@ -17152,6 +17806,7 @@ self: { description = "Lock free Spin Counter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Spintax" = callPackage @@ -17191,6 +17846,7 @@ self: { description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Spock-api" = callPackage @@ -17218,6 +17874,7 @@ self: { description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Spock-api-server" = callPackage @@ -17230,6 +17887,7 @@ self: { description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Spock-auth" = callPackage @@ -17242,6 +17900,7 @@ self: { description = "Provides authentification helpers for Spock"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Spock-core" = callPackage @@ -17271,6 +17930,7 @@ self: { description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Spock-digestive" = callPackage @@ -17288,6 +17948,7 @@ self: { description = "Digestive functors support for Spock"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Spock-lucid" = callPackage @@ -17300,6 +17961,7 @@ self: { description = "Lucid support for Spock"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Spock-worker" = callPackage @@ -17318,6 +17980,7 @@ self: { description = "Background workers for Spock"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SpreadsheetML" = callPackage @@ -17341,6 +18004,7 @@ self: { description = "Binding to Sprig"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Stack" = callPackage @@ -17369,6 +18033,7 @@ self: { description = "A simple MVCC like library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "StateVar" = callPackage @@ -17419,7 +18084,6 @@ self: { ]; description = "Libary for Stockholm aligmnent format"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Stomp" = callPackage @@ -17436,6 +18100,7 @@ self: { description = "Client library for Stomp brokers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Strafunski-ATermLib" = callPackage @@ -17448,6 +18113,7 @@ self: { description = "An abstract data type designed for the exchange of tree-like data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Strafunski-Sdf2Haskell" = callPackage @@ -17468,6 +18134,7 @@ self: { description = "Converts SDF to Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Strafunski-StrategyLib" = callPackage @@ -17499,6 +18166,7 @@ self: { description = "General purpose templates in haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "StrategyLib" = callPackage @@ -17534,6 +18202,7 @@ self: { description = "Benchmarking code through strict evaluation"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "StrictCheck" = callPackage @@ -17553,6 +18222,7 @@ self: { description = "Keep Your Laziness In Check"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "StringUtils" = callPackage @@ -17591,6 +18261,7 @@ self: { description = "Suffix array construction"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SybWidget" = callPackage @@ -17607,6 +18278,7 @@ self: { description = "Library which aids constructing generic (SYB3-based) widgets"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SyntaxMacros" = callPackage @@ -17624,6 +18296,7 @@ self: { description = "Syntax Macros in the form of an EDSL"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Sysmon" = callPackage @@ -17645,6 +18318,7 @@ self: { description = "Sybase 15 sysmon reports processor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TBC" = callPackage @@ -17666,6 +18340,7 @@ self: { description = "Testing By Convention"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TBit" = callPackage @@ -17683,6 +18358,7 @@ self: { description = "Utilities for condensed matter physics tight binding calculations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TCache" = callPackage @@ -17732,6 +18408,7 @@ self: { description = "Bindings to the TORCS vehicle simulator"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TTTAS" = callPackage @@ -17770,6 +18447,7 @@ self: { description = "Template Your Boilerplate - a Template Haskell version of SYB"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TableAlgebra" = callPackage @@ -17799,6 +18477,7 @@ self: { description = "A client for Quill databases"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Tablify" = callPackage @@ -17813,6 +18492,7 @@ self: { description = "Tool to render CSV into tables of various formats"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Tahin" = callPackage @@ -17857,6 +18537,7 @@ self: { description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Tape" = callPackage @@ -17869,6 +18550,7 @@ self: { description = "Bidirectionally infinite streams, akin to the tape of a Turing machine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Taxonomy" = callPackage @@ -17904,6 +18586,7 @@ self: { description = "Tool for parsing, processing, comparing and visualizing taxonomy data"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TeX-my-math" = callPackage @@ -17926,6 +18609,7 @@ self: { 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; + broken = true; }) {}; "TeaHS" = callPackage @@ -17942,6 +18626,7 @@ self: { description = "TeaHS Game Creation Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Tensor" = callPackage @@ -17986,6 +18671,7 @@ self: { description = "Generates testcases from program-snippets"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Theora" = callPackage @@ -17998,6 +18684,7 @@ self: { librarySystemDepends = [ ogg theora ]; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {ogg = null; theora = null;}; "Thingie" = callPackage @@ -18010,6 +18697,7 @@ self: { description = "Purely functional 2D drawing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ThreadObjects" = callPackage @@ -18068,6 +18756,7 @@ self: { description = "A sub-project (exercise) for a functional programming course"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TigerHash" = callPackage @@ -18103,6 +18792,7 @@ self: { description = "A simple tile-based digital clock screen saver"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TinyLaunchbury" = callPackage @@ -18115,6 +18805,7 @@ self: { description = "Simple implementation of call-by-need using Launchbury's semantics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TinyURL" = callPackage @@ -18127,6 +18818,7 @@ self: { description = "Use TinyURL to compress URLs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Titim" = callPackage @@ -18141,6 +18833,7 @@ self: { description = "Game for Lounge Marmelade"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Top" = callPackage @@ -18156,6 +18849,7 @@ self: { description = "Constraint solving framework employed by the Helium Compiler"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TotalMap" = callPackage @@ -18193,6 +18887,7 @@ self: { description = "Tournament related algorithms"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TraceUtils" = callPackage @@ -18222,6 +18917,7 @@ self: { description = "eDSL in R for Safe Variable Transformarion"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TransformersStepByStep" = callPackage @@ -18236,6 +18932,7 @@ self: { description = "Tutorial on monad transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Transhare" = callPackage @@ -18259,6 +18956,7 @@ self: { description = "Wait-free Tree Counter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TreeStructures" = callPackage @@ -18271,6 +18969,7 @@ self: { description = "A collection of heaps and search trees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TreeT" = callPackage @@ -18294,6 +18993,7 @@ self: { description = "Lock free Treiber stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TrendGraph" = callPackage @@ -18311,6 +19011,7 @@ self: { description = "A simple trend Graph script"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TrieMap" = callPackage @@ -18329,6 +19030,7 @@ self: { description = "Automatic type inference of generalized tries with Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Twofish" = callPackage @@ -18368,6 +19070,7 @@ self: { description = "Typing speed game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TypeCompose" = callPackage @@ -18395,6 +19098,7 @@ self: { description = "TypeIlluminator is a prototype tool exploring debugging of type errors/"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TypeNat" = callPackage @@ -18407,6 +19111,7 @@ self: { description = "Some Nat-indexed types for GHC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "TypingTester" = callPackage @@ -18453,6 +19158,7 @@ self: { description = "A small command-line accounting tool"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "URLT" = callPackage @@ -18471,6 +19177,7 @@ self: { description = "Library for maintaining correctness of URLs within an application"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "URLb" = callPackage @@ -18483,6 +19190,7 @@ self: { description = "DEPRECATED A simple, liberal URL parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "UTFTConverter" = callPackage @@ -18507,6 +19215,7 @@ self: { description = "Processing popular picture formats into .c or .raw format in RGB565"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Unique" = callPackage @@ -18527,7 +19236,6 @@ self: { ]; description = "It provides the functionality like unix \"uniq\" utility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Unixutils" = callPackage @@ -18567,6 +19275,7 @@ self: { description = "Monadic FRP library based on stm"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "UrlDisp" = callPackage @@ -18579,6 +19288,7 @@ self: { description = "Url dispatcher. Helps to retain friendly URLs in web applications."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Useful" = callPackage @@ -18632,6 +19342,7 @@ self: { description = "Provides access to Vkontakte social network via public API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Validation" = callPackage @@ -18646,6 +19357,7 @@ self: { description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Vec" = callPackage @@ -18669,6 +19381,7 @@ self: { description = "Provides Boolean instances for the Vec package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Vec-OpenGLRaw" = callPackage @@ -18681,6 +19394,7 @@ self: { description = "Instances and functions to interoperate Vec and OpenGL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Vec-Transform" = callPackage @@ -18693,6 +19407,7 @@ self: { description = "This package is obsolete"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "VecN" = callPackage @@ -18719,6 +19434,7 @@ self: { description = "A solver for the WordBrain game"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ViennaRNA-bindings" = callPackage @@ -18763,6 +19479,7 @@ self: { description = "ViennaRNA v2 extensions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ViennaRNAParser" = callPackage @@ -18809,6 +19526,7 @@ self: { description = "Villefort is a task manager and time tracker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Vulkan" = callPackage @@ -18836,6 +19554,8 @@ self: { ]; description = "WAVE audio file IO library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WL500gPControl" = callPackage @@ -18853,6 +19573,7 @@ self: { description = "A simple command line tools to control the Asus WL500gP router"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WL500gPLib" = callPackage @@ -18868,6 +19589,7 @@ self: { description = "A simple library to access to the WL 500gP router from the Haskell code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WMSigner" = callPackage @@ -18888,6 +19610,7 @@ self: { description = "WebMoney authentication module"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WURFL" = callPackage @@ -18900,6 +19623,7 @@ self: { description = "Convert the WURFL file into a Parsec parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WXDiffCtrl" = callPackage @@ -18913,6 +19637,7 @@ self: { description = "WXDiffCtrl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WashNGo" = callPackage @@ -18932,6 +19657,7 @@ self: { description = "WASH is a family of EDSLs for programming Web applications in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WaveFront" = callPackage @@ -18949,6 +19675,7 @@ self: { description = "Parsers and utilities for the OBJ WaveFront 3D model format"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Weather" = callPackage @@ -18976,6 +19703,7 @@ self: { description = "JavaScript analysis tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WebBits-Html" = callPackage @@ -18992,6 +19720,7 @@ self: { description = "JavaScript analysis tools"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WebBits-multiplate" = callPackage @@ -19009,6 +19738,7 @@ self: { description = "A Multiplate instance for JavaScript"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WebCont" = callPackage @@ -19028,6 +19758,7 @@ self: { description = "Continuation based web programming for Happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WeberLogic" = callPackage @@ -19043,6 +19774,7 @@ self: { description = "Logic interpreter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Webrexp" = callPackage @@ -19070,6 +19802,7 @@ self: { description = "Regexp-like engine to scrap web data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Wheb" = callPackage @@ -19095,6 +19828,7 @@ self: { description = "The frictionless WAI Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WikimediaParser" = callPackage @@ -19107,6 +19841,7 @@ self: { description = "A parser for wikimedia style article markup"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Win32" = callPackage @@ -19129,7 +19864,7 @@ self: { libraryHaskellDepends = [ base Win32 ]; description = "Binding to the Win32 console API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {}; "Win32-dhcp-server" = callPackage @@ -19141,7 +19876,7 @@ self: { libraryHaskellDepends = [ base text Win32 Win32-errors ]; description = "Win32 DHCP Server Management API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {}; "Win32-errors" = callPackage @@ -19156,7 +19891,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck Win32 ]; description = "Alternative error handling for Win32 foreign calls"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {}; "Win32-extras" = callPackage @@ -19171,7 +19906,7 @@ self: { librarySystemDepends = [ imm32 msimg32 ]; description = "Provides missing Win32 API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {imm32 = null; msimg32 = null;}; "Win32-junction-point" = callPackage @@ -19183,7 +19918,7 @@ self: { libraryHaskellDepends = [ base text Win32 Win32-errors ]; description = "Support for manipulating NTFS junction points"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {}; "Win32-notify" = callPackage @@ -19197,7 +19932,7 @@ self: { libraryHaskellDepends = [ base containers directory Win32 ]; description = "A binding to part of the Win32 library for file notification"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {}; "Win32-security" = callPackage @@ -19211,7 +19946,7 @@ self: { libraryHaskellDepends = [ base text Win32 Win32-errors ]; description = "Haskell bindings to a security-related functions of the Windows API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {}; "Win32-services" = callPackage @@ -19224,7 +19959,7 @@ self: { librarySystemDepends = [ Advapi32 ]; description = "Windows service applications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {Advapi32 = null;}; "Win32-services-wrapper" = callPackage @@ -19240,7 +19975,7 @@ self: { ]; description = "Wrapper code for making a Win32 service"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {}; "Win32-shortcut" = callPackage @@ -19273,6 +20008,7 @@ self: { description = "Wire-aware hardware description"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WordAlignment" = callPackage @@ -19313,6 +20049,7 @@ self: { description = "Bigram word pair alignments"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WordNet" = callPackage @@ -19327,6 +20064,7 @@ self: { description = "Haskell interface to the WordNet database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WordNet-ghc74" = callPackage @@ -19341,6 +20079,7 @@ self: { description = "Haskell interface to the WordNet database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Wordlint" = callPackage @@ -19376,6 +20115,7 @@ self: { description = "Workflow patterns over a monad for thread state logging & recovery"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "WxGeneric" = callPackage @@ -19391,6 +20131,7 @@ self: { description = "Generic (SYB3) construction of wxHaskell widgets"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "X11" = callPackage @@ -19424,6 +20165,7 @@ self: { description = "Missing bindings to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs.xorg) libX11;}; "X11-rm" = callPackage @@ -19436,6 +20178,7 @@ self: { description = "A binding to the resource management functions missing from X11"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "X11-xdamage" = callPackage @@ -19449,6 +20192,7 @@ self: { description = "A binding to the Xdamage X11 extension library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {Xdamage = null;}; "X11-xfixes" = callPackage @@ -19462,6 +20206,7 @@ self: { description = "A binding to the Xfixes X11 extension library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {Xfixes = null;}; "X11-xft" = callPackage @@ -19508,7 +20253,7 @@ self: { librarySystemDepends = [ xinput ]; description = "Bindings for the DirectX XInput library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) xinput;}; "XML" = callPackage @@ -19539,6 +20284,7 @@ self: { description = "A library to parse xml"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "XMMS" = callPackage @@ -19553,6 +20299,7 @@ self: { description = "XMMS2 client library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {xmmsclient = null; xmmsclient-glib = null;}; "XMPP" = callPackage @@ -19570,6 +20317,7 @@ self: { description = "XMPP library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "XSaiga" = callPackage @@ -19593,6 +20341,7 @@ self: { description = "An implementation of a polynomial-time top-down parser suitable for NLP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Xauth" = callPackage @@ -19624,6 +20373,7 @@ self: { description = "Gtk command launcher with identicon"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "XmlHtmlWriter" = callPackage @@ -19636,6 +20386,7 @@ self: { description = "A library for writing XML and HTML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Xorshift128Plus" = callPackage @@ -19648,6 +20399,7 @@ self: { description = "Pure haskell implementation of xorshift128plus random number generator"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "YACPong" = callPackage @@ -19669,6 +20421,7 @@ self: { description = "Yet Another Pong Clone using SDL"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "YFrob" = callPackage @@ -19681,6 +20434,7 @@ self: { description = "Yampa-based library for programming robots"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Yablog" = callPackage @@ -19716,6 +20470,7 @@ self: { description = "A simple blog engine powered by Yesod"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "YamlReference" = callPackage @@ -19760,6 +20515,7 @@ self: { description = "Elegant Functional Reactive Programming Language for Hybrid Systems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Yampa-core" = callPackage @@ -19792,6 +20548,7 @@ self: { description = "Software synthesizer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Yocto" = callPackage @@ -19820,6 +20577,7 @@ self: { description = "A MUD client library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Yogurt-Standalone" = callPackage @@ -19840,6 +20598,7 @@ self: { description = "A functional MUD client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) readline;}; "ZEBEDDE" = callPackage @@ -19854,6 +20613,7 @@ self: { description = "Polymer growth simulation method"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ZFS" = callPackage @@ -19870,6 +20630,7 @@ self: { description = "Oleg's Zipper FS"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ZMachine" = callPackage @@ -19885,6 +20646,7 @@ self: { description = "A Z-machine interpreter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ZipFold" = callPackage @@ -19936,6 +20698,7 @@ self: { description = "Combinators for bidirectional URL routing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "a50" = callPackage @@ -19955,6 +20718,7 @@ self: { description = "Compare genome assemblies"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "abacate" = callPackage @@ -20009,6 +20773,7 @@ self: { description = "Bindings for ABC, A System for Sequential Synthesis and Verification"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {abc = null;}; "abcnotation" = callPackage @@ -20023,6 +20788,7 @@ self: { description = "Haskell representation and parser for ABC notation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "abeson" = callPackage @@ -20043,6 +20809,7 @@ self: { description = "interconversion between aeson and bson"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "abnf" = callPackage @@ -20063,6 +20830,7 @@ self: { description = "Parse ABNF and generate parsers for the specified document"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "abstract-deque" = callPackage @@ -20119,6 +20887,7 @@ self: { description = "Provides the class ParAccelerate, nothing more"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "abt" = callPackage @@ -20135,6 +20904,7 @@ self: { description = "Abstract binding trees for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ac-machine" = callPackage @@ -20149,6 +20919,7 @@ self: { description = "Aho-Corasick string matching algorithm in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ac-machine-conduit" = callPackage @@ -20161,6 +20932,7 @@ self: { description = "Drive Aho-Corasick machines in Conduit pipelines"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "accelerate" = callPackage @@ -20188,6 +20960,7 @@ self: { description = "An embedded language for accelerated array processing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "accelerate-arithmetic" = callPackage @@ -20207,6 +20980,7 @@ self: { description = "Linear algebra and interpolation using the Accelerate framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "accelerate-bignum" = callPackage @@ -20416,6 +21190,7 @@ self: { description = "Accelerate frontend to the FFTW library (Fourier transform)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "accelerate-fourier" = callPackage @@ -20442,6 +21217,7 @@ self: { description = "Fast Fourier transform and convolution using the Accelerate framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "accelerate-fourier-benchmark" = callPackage @@ -20482,6 +21258,7 @@ self: { description = "Read and write Accelerate arrays in various formats"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "accelerate-llvm" = callPackage @@ -20504,6 +21281,7 @@ self: { description = "Accelerate backend component generating LLVM IR"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "accelerate-llvm-native" = callPackage @@ -20526,6 +21304,7 @@ self: { description = "Accelerate backend for multicore CPUs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "accelerate-llvm-ptx" = callPackage @@ -20561,6 +21340,7 @@ self: { description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "accelerate-typelits" = callPackage @@ -20584,6 +21364,7 @@ self: { description = "a typesafe way encode accelerate matrices and vectors"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "accelerate-utility" = callPackage @@ -20596,6 +21377,7 @@ self: { description = "Utility functions for the Accelerate framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "accentuateus" = callPackage @@ -20608,6 +21390,7 @@ self: { description = "A Haskell implementation of the Accentuate.us API."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "access-time" = callPackage @@ -20620,6 +21403,7 @@ self: { description = "Cross-platform support for retrieving file access times"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "access-token-provider" = callPackage @@ -20647,6 +21431,7 @@ self: { description = "Provides Access Token for Services"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "accuerr" = callPackage @@ -20729,6 +21514,7 @@ self: { description = "A replication backend for acid-state"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acid-state-tls" = callPackage @@ -20745,6 +21531,7 @@ self: { description = "Add TLS support for Data.Acid.Remote"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acl2" = callPackage @@ -20768,6 +21555,7 @@ self: { description = "A monad which is powerful enough to interpret any action"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-box" = callPackage @@ -20844,6 +21632,7 @@ self: { description = "A more efficient dualization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-cuteboy" = callPackage @@ -20906,6 +21695,7 @@ self: { description = "Stop execution with rage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-functors" = callPackage @@ -20940,6 +21730,7 @@ self: { description = "An embedded DSL for the HQ9+ programming language"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-http" = callPackage @@ -20958,6 +21749,7 @@ self: { description = "fastest Haskell PONG server in the world"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-inator" = callPackage @@ -20973,6 +21765,7 @@ self: { description = "Evil inventions in the Tri-State area"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-io" = callPackage @@ -21008,6 +21801,7 @@ self: { description = "A place for dumping that does-not-feel-right code while you improve it"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-left-pad" = callPackage @@ -21020,6 +21814,7 @@ self: { description = "free your haskell from the tyranny of npm!"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-lolcat" = callPackage @@ -21076,6 +21871,7 @@ self: { description = "Miscellaneous newtypes for orderings of discutable use"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-missiles" = callPackage @@ -21102,6 +21898,7 @@ self: { description = "A mutable package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-now" = callPackage @@ -21114,6 +21911,7 @@ self: { description = "An interface to the philosophical and metaphysical \"now\""; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-numbersystem" = callPackage @@ -21126,6 +21924,7 @@ self: { description = "Define the less than and add and subtract for nats"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-omitted" = callPackage @@ -21161,6 +21960,7 @@ self: { description = "Operators of base, all in one place!"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-php" = callPackage @@ -21173,6 +21973,7 @@ self: { description = "The flexibility of Haskell and the safety of PHP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-pointful-numbers" = callPackage @@ -21225,6 +22026,7 @@ self: { description = "Proper names for curry and uncurry"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-smuggler" = callPackage @@ -21249,6 +22051,7 @@ self: { description = "A binding to the glibc strfry function"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-stringly-typed" = callPackage @@ -21263,6 +22066,7 @@ self: { description = "Stringly Typed Programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-strtok" = callPackage @@ -21306,10 +22110,13 @@ self: { pname = "acme-zalgo"; version = "0.1.2.1"; sha256 = "1yd3xrdkxf3hgapi4w5vg79nxmw8y5rnyki5pqi00mca9wjspdhz"; + revision = "1"; + editedCabalFile = "1bwpaqqvp8mwpw7966xjn8zhi0rs9iqpwkhkzjxw8c885h45n1za"; libraryHaskellDepends = [ array base random ]; description = "A somewhat flexible Zalgo̐ te̳͜x̥̖̉̓͞t̍̌̔ ̀̃t̴̢̞̜͓̝r̶̬̆̂̒͟á̧̡͎͔̯̰̕n̹̾̓ͬͦ̍͘ṡ̢͓͉ͮ͆l̠̖̹̗̳̖̽̌ͤ͞a͚̭͙̹̲ͭͩt͈͐o̢̭͇͍̟͐ͬ̾ͪ͜r͇.̸̅ͭ̐̀̊ͨ͛"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acme-zero" = callPackage @@ -21322,6 +22129,7 @@ self: { description = "The absorbing element of package dependencies"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acquire" = callPackage @@ -21395,6 +22203,7 @@ self: { description = "Haskell code presentation tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "activehs-base" = callPackage @@ -21409,6 +22218,7 @@ self: { description = "Basic definitions for activehs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "activitypub" = callPackage @@ -21421,6 +22231,7 @@ self: { description = "ActivityPub Haskell Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "activitystreams-aeson" = callPackage @@ -21435,6 +22246,7 @@ self: { description = "An interface to the ActivityStreams specification"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "actor" = callPackage @@ -21448,6 +22260,7 @@ self: { description = "Actors with multi-headed receive clauses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ad" = callPackage @@ -21457,10 +22270,8 @@ self: { }: mkDerivation { pname = "ad"; - version = "4.3.5"; - sha256 = "0q4dvi02k21jq8xf0ywgmcs5mph4hpx5s3y3pj839y0g3x5paplw"; - revision = "5"; - editedCabalFile = "0yzyfqhsafzaqzj8wmjrj5ghm6jwbxya3wxc9sjl59j9q20jc4nq"; + version = "4.3.6"; + sha256 = "0fgpv3lm20k1vwlychs7a76hn96cvpbczkdcbg9mr9f1nivg7035"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base comonad containers data-reify erf free nats reflection @@ -21482,6 +22293,7 @@ self: { description = "Self optimizing container types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "adaptive-tuple" = callPackage @@ -21494,6 +22306,7 @@ self: { description = "Self-optimizing tuple types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "adb" = callPackage @@ -21509,6 +22322,7 @@ self: { description = "Android Debug Bridge (ADB) protocol"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "adblock2privoxy" = callPackage @@ -21561,6 +22375,7 @@ self: { description = "Ad-hoc P2P network protocol"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "adict" = callPackage @@ -21583,6 +22398,7 @@ self: { description = "Approximate dictionary searching"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "adjunctions" = callPackage @@ -21640,6 +22456,7 @@ self: { description = "parse Adobe Swatch Exchange files and (optionally) output .css files with the colors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "adp-multi" = callPackage @@ -21661,6 +22478,7 @@ self: { description = "ADP for multiple context-free languages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "adp-multi-monadiccp" = callPackage @@ -21681,6 +22499,20 @@ self: { description = "Subword construction in adp-multi using monadiccp"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "adtrees" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "adtrees"; + version = "0.1.0.0"; + sha256 = "0cp14n2l3scbsp7f6s4r19ngn2ympns03pm6s07hdkpavvgli1zg"; + libraryHaskellDepends = [ base ]; + description = "Modelling, rendering and quantitative analysis on attack defense trees"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "advent-of-code-api" = callPackage @@ -21718,6 +22550,7 @@ self: { description = "Multi-precision ball (interval) arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aern2-real" = callPackage @@ -21742,6 +22575,7 @@ self: { description = "Exact real numbers via Cauchy sequences and MPFR"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson_0_7_0_6" = callPackage @@ -21815,6 +22649,7 @@ self: { description = "make To/From JSOn instances from an applicative description"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-attoparsec" = callPackage @@ -21869,8 +22704,8 @@ self: { }: mkDerivation { pname = "aeson-casing"; - version = "0.1.0.5"; - sha256 = "0xq587sqn68gnx1np035wl5j1341v19h26d7b1c06bw2qqymdv6g"; + version = "0.1.1.0"; + sha256 = "14qx1aqrf25bdasrwibprl116ixxfr0s4fc62fa6pdj64a7jc480"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base tasty tasty-hunit tasty-quickcheck tasty-th @@ -21933,6 +22768,7 @@ self: { description = "Easy functions for converting from Aeson.Value"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-diff" = callPackage @@ -21982,6 +22818,7 @@ self: { description = "Apply a json-patch to any haskell datatype"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-extra" = callPackage @@ -21996,8 +22833,8 @@ self: { pname = "aeson-extra"; version = "0.4.1.1"; sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl"; - revision = "3"; - editedCabalFile = "0b9ccv529msmqay0gw2xcxm67n08hmv6s45ivyd8vq0rig4wz407"; + revision = "4"; + editedCabalFile = "0ja5vr9w22wyknkjyl7w43frdfdfnxphvrai1b18lhinjqcd9bl5"; libraryHaskellDepends = [ aeson aeson-compat attoparsec attoparsec-iso8601 base base-compat-batteries bytestring containers deepseq exceptions @@ -22012,6 +22849,7 @@ self: { description = "Extra goodies for aeson"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-filthy" = callPackage @@ -22080,6 +22918,7 @@ self: { description = "Create Flow type definitions from Haskell data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-gadt-th" = callPackage @@ -22133,6 +22972,7 @@ self: { description = "Injecting fields into aeson values"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-iproute" = callPackage @@ -22197,6 +23037,7 @@ self: { description = "Fast JSON parsing and encoding (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-options" = callPackage @@ -22210,7 +23051,6 @@ self: { libraryHaskellDepends = [ aeson base ]; description = "Options to derive FromJSON/ToJSON instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-parsec-picky" = callPackage @@ -22255,6 +23095,7 @@ self: { description = "Hiearchical prefixing for aeson"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-pretty_0_7_2" = callPackage @@ -22368,6 +23209,7 @@ self: { description = "Haskell JSON schema validator and parser generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-serialize" = callPackage @@ -22397,6 +23239,7 @@ self: { description = "Smart derivation of Aeson instances"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-streams" = callPackage @@ -22413,6 +23256,7 @@ self: { description = "An HTTP client library for JSON-based APIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-t" = callPackage @@ -22433,6 +23277,7 @@ self: { description = "Transform JSON"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-tiled" = callPackage @@ -22453,6 +23298,7 @@ self: { description = "Aeson instances for the Tiled map editor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-toolkit" = callPackage @@ -22488,6 +23334,7 @@ self: { description = "Generate TypeScript definition files from your ADTs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-utils" = callPackage @@ -22521,7 +23368,6 @@ self: { ]; description = "API for parsing \"aeson\" JSON tree into Haskell types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-yak" = callPackage @@ -22552,7 +23398,6 @@ self: { ]; description = "A simple Game Engine using SDL"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "affine" = callPackage @@ -22580,6 +23425,7 @@ self: { description = "General-purpose sampling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "affinely-extended" = callPackage @@ -22630,6 +23476,7 @@ self: { description = "Infinite state model checking of iterative C programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ag-pictgen" = callPackage @@ -22644,6 +23491,7 @@ self: { description = "Attribute Grammar picture generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "agda-server" = callPackage @@ -22665,6 +23513,7 @@ self: { description = "Http server for Agda (prototype)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "agda-snippets" = callPackage @@ -22686,6 +23535,7 @@ self: { description = "Render just the Agda snippets of a literate Agda file to HTML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "agda-snippets-hakyll" = callPackage @@ -22703,6 +23553,7 @@ self: { description = "Literate Agda support using agda-snippets, for Hakyll pages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "agentx" = callPackage @@ -22725,6 +23576,7 @@ self: { description = "AgentX protocol for write SNMP subagents"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "agum" = callPackage @@ -22756,6 +23608,7 @@ self: { description = "And-inverter graphs in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aip" = callPackage @@ -22768,8 +23621,8 @@ self: { }: mkDerivation { pname = "aip"; - version = "0.1.1"; - sha256 = "05pv8m5wjzpj5wxsad6rzka9fcch5aakd73697ndaiwasqajvx3d"; + version = "0.1.3"; + sha256 = "10gc9k74ag5i7qbir1jarpap919b010k9zgqadj15cg1hb138k18"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -22785,6 +23638,7 @@ self: { description = "Aeronautical Information Package (AIP)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "air" = callPackage @@ -22840,6 +23694,7 @@ self: { description = "air"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "airbrake" = callPackage @@ -22860,6 +23715,7 @@ self: { description = "An Airbrake notifier for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "airship" = callPackage @@ -22867,20 +23723,20 @@ self: { , bytestring, bytestring-trie, case-insensitive, containers , cryptohash, directory, either, filepath, http-date, http-media , http-types, lifted-base, microlens, mime-types, mmorph - , monad-control, mtl, network, old-locale, random, tasty - , tasty-hunit, tasty-quickcheck, text, time, transformers + , monad-control, mtl, network, old-locale, random, semigroups + , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers , transformers-base, unix, unordered-containers, wai, wai-extra }: mkDerivation { pname = "airship"; - version = "0.9.3"; - sha256 = "0nildnm2f8n87sy6lrzkfxjypf72vy3d8yknl9qcnzv6kmyq6m72"; + version = "0.9.4"; + sha256 = "03wawmbd1dcf9bmv9046q93gn6isdlpcyvzb7bp0awqmzaymyw4z"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder bytestring bytestring-trie case-insensitive containers cryptohash directory either filepath http-date http-media http-types lifted-base microlens mime-types mmorph monad-control mtl network old-locale - random text time transformers transformers-base unix + random semigroups text time transformers transformers-base unix unordered-containers wai wai-extra ]; testHaskellDepends = [ @@ -22890,6 +23746,7 @@ self: { description = "A Webmachine-inspired HTTP library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "airtable-api" = callPackage @@ -22908,6 +23765,7 @@ self: { description = "Requesting and introspecting Tables within an Airtable project"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aivika" = callPackage @@ -22957,6 +23815,7 @@ self: { description = "Parallel distributed discrete event simulation module for the Aivika library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aivika-experiment" = callPackage @@ -22990,6 +23849,7 @@ self: { description = "Cairo-based charting backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aivika-experiment-chart" = callPackage @@ -23008,6 +23868,7 @@ self: { description = "Simulation experiments with charting for the Aivika library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aivika-experiment-diagrams" = callPackage @@ -23025,6 +23886,7 @@ self: { description = "Diagrams-based charting backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aivika-gpss" = callPackage @@ -23117,6 +23979,7 @@ self: { description = "Haskell compiler that produce binary through C language"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "al" = callPackage @@ -23183,6 +24046,7 @@ self: { description = "Bindings to the alerta REST API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alerts" = callPackage @@ -23230,6 +24094,7 @@ self: { description = "Quasi-quoter for Alex lexers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alex-prelude" = callPackage @@ -23242,6 +24107,7 @@ self: { description = "Collection of useful functions for writing console applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alex-tools" = callPackage @@ -23274,14 +24140,15 @@ self: { description = "utility library for Alfred version 2"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alg" = callPackage ({ mkDerivation, base, util }: mkDerivation { pname = "alg"; - version = "0.2.9.0"; - sha256 = "0w5lxmz52nskh8ms3nliya78v1pb77f7nyn19klqf8yskaalywlq"; + version = "0.2.10.0"; + sha256 = "1zpr3knnj37fwi6h7mlxdlm88iy47srx1nkhgkix3f81ig9hlzd9"; libraryHaskellDepends = [ base util ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; @@ -23316,6 +24183,7 @@ self: { description = "Algorithmic automation for various DAWs"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "algebra" = callPackage @@ -23335,6 +24203,7 @@ self: { description = "Constructive abstract algebra"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "algebra-dag" = callPackage @@ -23377,6 +24246,7 @@ self: { description = "Relational Algebra and SQL Code Generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "algebraic" = callPackage @@ -23389,6 +24259,7 @@ self: { description = "General linear algebra structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "algebraic-classes" = callPackage @@ -23435,6 +24306,7 @@ self: { description = "Algebraically structured Prelude"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "algo-s" = callPackage @@ -23461,6 +24333,7 @@ self: { description = "An implementation of Knuth's algorithm S"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "algolia" = callPackage @@ -23487,6 +24360,7 @@ self: { description = "A client implementing the Algolia search API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "align" = callPackage @@ -23512,6 +24386,7 @@ self: { description = "A simple unix filter to align text on specified substrings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aligned-foreignptr" = callPackage @@ -23529,10 +24404,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "alist"; - version = "0.1.0.5"; - sha256 = "19771h6vxzxn0zj0r59qgc6lclks3ysxli21dziavmr784z2dbgn"; - revision = "1"; - editedCabalFile = "1lc1x072g6vkfifh11cfpw95wb0ly9ifs8xg3y1yrpqv4fyl8y0b"; + version = "0.1.0.6"; + sha256 = "19r7g8ghpiklam6pv081sh60d7lrlznpwbp5yqlm5h7ah1m284jh"; libraryHaskellDepends = [ base ]; description = "lists with O(1) append"; license = stdenv.lib.licenses.bsd3; @@ -23603,6 +24476,7 @@ self: { description = "a practical affine language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alpha" = callPackage @@ -23624,6 +24498,7 @@ self: { description = "A compiler for the Alpha language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alphachar" = callPackage @@ -23645,6 +24520,7 @@ self: { description = "A character between a-z"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alpino-tools" = callPackage @@ -23685,6 +24561,7 @@ self: { description = "Binding to the ALSA Library API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) alsaLib;}; "alsa-core" = callPackage @@ -23716,6 +24593,7 @@ self: { description = "Some simple interactive programs for sending MIDI control messages via ALSA"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alsa-midi" = callPackage @@ -23737,6 +24615,7 @@ self: { description = "Bindings for the ALSA sequencer API (MIDI stuff)"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) alsaLib;}; "alsa-mixer" = callPackage @@ -23750,7 +24629,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings to the ALSA simple mixer API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm" = callPackage @@ -23770,7 +24649,7 @@ self: { libraryPkgconfigDepends = [ alsaLib ]; description = "Binding to the ALSA Library API (PCM audio)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm-tests" = callPackage @@ -23785,6 +24664,7 @@ self: { description = "Tests for the ALSA audio signal library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alsa-seq" = callPackage @@ -23805,7 +24685,7 @@ self: { libraryPkgconfigDepends = [ alsaLib ]; description = "Binding to the ALSA Library API (MIDI sequencer)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-seq-tests" = callPackage @@ -23820,6 +24700,7 @@ self: { description = "Tests for the ALSA sequencer library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "altcomposition" = callPackage @@ -23832,6 +24713,7 @@ self: { description = "Alternative combinators for unorthodox function composition"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alternative-extra" = callPackage @@ -23844,6 +24726,7 @@ self: { description = "Extra utilities for alternatives"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alternative-io" = callPackage @@ -23862,6 +24745,7 @@ self: { description = "IO as Alternative instance (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alternative-vector" = callPackage @@ -23925,6 +24809,7 @@ self: { description = "Implement a menu experience fit for web users"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alure" = callPackage @@ -23938,6 +24823,7 @@ self: { description = "A Haskell binding for ALURE"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) alure;}; "amazon-emailer" = callPackage @@ -23958,6 +24844,7 @@ self: { description = "A queue daemon for Amazon's SES with a PostgreSQL table as a queue"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazon-emailer-client-snap" = callPackage @@ -23973,6 +24860,7 @@ self: { description = "Client library for amazon-emailer daemon"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazon-products" = callPackage @@ -23999,6 +24887,7 @@ self: { description = "Connector for Amazon Products API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka" = callPackage @@ -25963,6 +26852,7 @@ self: { description = "Provides conduits to upload data to S3 using the Multipart API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-sagemaker" = callPackage @@ -26452,6 +27342,7 @@ self: { description = "Statistical data visualization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ampersand" = callPackage @@ -26483,6 +27374,7 @@ self: { description = "Toolsuite for automated design of business processes"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amqp" = callPackage @@ -26531,6 +27423,7 @@ self: { description = "Conduit bindings for AMQP (see amqp package)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amqp-utils" = callPackage @@ -26609,6 +27502,7 @@ self: { description = "making data science easy and safe with data frames"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "analyze-client" = callPackage @@ -26626,6 +27520,7 @@ self: { description = "Client for analyze service"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "anansi" = callPackage @@ -26679,6 +27574,7 @@ self: { description = "Looms which use Pandoc to parse and produce a variety of formats"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "anatomy" = callPackage @@ -26706,6 +27602,7 @@ self: { description = "Anatomy: Atomo documentation system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "android" = callPackage @@ -26718,6 +27615,7 @@ self: { description = "Android methods exposed to Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "android-activity" = callPackage @@ -26730,6 +27628,7 @@ self: { description = "Turn regular Haskell programs into Android Activities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "android-lint-summary" = callPackage @@ -26757,6 +27656,7 @@ self: { description = "A pretty printer for Android Lint errors"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "angel" = callPackage @@ -26785,6 +27685,7 @@ self: { description = "Process management and supervision daemon"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "angle" = callPackage @@ -26814,6 +27715,7 @@ self: { description = "A small, general-purpose programming language"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "animalcase" = callPackage @@ -26847,6 +27749,7 @@ self: { description = "text-file based ASCII animator"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "animate" = callPackage @@ -26864,6 +27767,7 @@ self: { description = "Animation for sprites"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "animate-example" = callPackage @@ -26883,6 +27787,7 @@ self: { description = "Animation for sprites"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "animate-frames" = callPackage @@ -26905,6 +27810,7 @@ self: { description = "Convert sprite frames to animate files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "animate-preview" = callPackage @@ -26931,6 +27837,7 @@ self: { description = "Preview tool for sprite animation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "animate-sdl2" = callPackage @@ -26943,6 +27850,7 @@ self: { description = "sdl2 + animate auxiliary library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "anki-tools" = callPackage @@ -26987,6 +27895,7 @@ self: { description = "Medium-level language that desugars to Morte"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "annihilator" = callPackage @@ -27023,6 +27932,7 @@ self: { description = "Anonymous sum types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "anonymous-sums-tests" = callPackage @@ -27035,6 +27945,7 @@ self: { description = "QuickCheck functions to accompany the anonymous-sums package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ansi-escape-codes" = callPackage @@ -27113,6 +28024,7 @@ self: { description = "sdl-like functions for terminal applications, based on ansi-terminal"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ansi-wl-pprint" = callPackage @@ -27142,7 +28054,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Terminal-based graphing via ANSI and Unicode"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antagonist" = callPackage @@ -27167,6 +28078,7 @@ self: { description = "A web interface to Antisplice dungeons"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antfarm" = callPackage @@ -27190,6 +28102,7 @@ self: { description = "Referring expressions for definitions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "anticiv" = callPackage @@ -27214,6 +28127,7 @@ self: { description = "This is an IRC bot for Mafia and Resistance"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antigate" = callPackage @@ -27232,6 +28146,7 @@ self: { description = "Interface for antigate.com captcha recognition API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antimirov" = callPackage @@ -27247,6 +28162,7 @@ self: { description = "Define the language containment (=subtyping) relation on regulare expressions"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-athena" = callPackage @@ -27268,14 +28184,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-athena_6_3_0" = callPackage + "antiope-athena_6_4_0" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base , lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "6.3.0"; - sha256 = "0yzvzhwl92k1v50w1jzlz2zq5rp7n6x1j51fpqrqq97vj7vqzfsq"; + version = "6.4.0"; + sha256 = "0537hjh070l6z5wylbzr41qka3j75q2sbshqcmaazarzllsr5mxk"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -27292,13 +28208,14 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "6.3.0"; - sha256 = "1d9z3vm7ab6fn0b1v0795v36x36j7lczjgkn2krx7zxq7srzf77l"; + version = "6.4.0"; + sha256 = "1l6a80plff3f9yd2iaw7hpqvas177xbkprz9maxk2xlf7klzpvcd"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-core" = callPackage @@ -27321,18 +28238,17 @@ self: { transformers unliftio-core ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-core_6_3_0" = callPackage + "antiope-core_6_4_0" = callPackage ({ mkDerivation, amazonka, amazonka-core, base, bytestring , exceptions, generic-lens, http-client, http-types, lens , monad-logger, mtl, resourcet, text, transformers, unliftio-core }: mkDerivation { pname = "antiope-core"; - version = "6.3.0"; - sha256 = "001qkmiild396pg9hnw776djygjm692k1w9bmckn6l9ahiz8yah0"; + version = "6.4.0"; + sha256 = "0snfalkpv9ckh3mkffx96zql3vnr479kkxxdyl2f2iad616a5wss"; libraryHaskellDepends = [ amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens monad-logger mtl resourcet text @@ -27365,18 +28281,17 @@ self: { generic-lens lens text unliftio-core unordered-containers ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-dynamodb_6_3_0" = callPackage + "antiope-dynamodb_6_4_0" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "6.3.0"; - sha256 = "0912726sm6g2ssrzni3ldiavb506wa51ib07n4gm8vapzhnwxxlb"; + version = "6.4.0"; + sha256 = "10kdvmfy7aya2yv77048mrkr9xdms5rq4gdip9ssidasib0fxcai"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -27410,17 +28325,18 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "antiope-messages_6_3_0" = callPackage + "antiope-messages_6_4_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , amazonka-sqs, antiope-s3, base, generic-lens, lens, lens-aeson , monad-loops, network-uri, text, unliftio-core }: mkDerivation { pname = "antiope-messages"; - version = "6.3.0"; - sha256 = "0yg38mayxzm7awgn0jczyh3vkyvhm3nmi47vry7knws916xrpr4x"; + version = "6.4.0"; + sha256 = "0m7sag2pk0sba1v14xpc60b7h5pk6s807yi0n5h6xrfsvslp09k9"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 base generic-lens lens lens-aeson monad-loops network-uri text @@ -27433,6 +28349,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-s3" = callPackage @@ -27459,32 +28376,35 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "antiope-s3_6_3_0" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core - , attoparsec, base, bytestring, conduit, conduit-extra, exceptions - , generic-lens, hedgehog, hspec, http-types, hw-hspec-hedgehog - , lens, monad-logger, mtl, network-uri, resourcet, text - , unliftio-core + "antiope-s3_6_4_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 + , antiope-core, attoparsec, base, bytestring, conduit + , conduit-extra, exceptions, generic-lens, hedgehog, hspec + , http-types, hw-hspec-hedgehog, lens, monad-logger, mtl + , network-uri, resourcet, text, time, unliftio-core }: mkDerivation { pname = "antiope-s3"; - version = "6.3.0"; - sha256 = "00szjn9vbb6xndzs0wpq2hw9a529ldy5y0pckfm3xkd6ap5ifx41"; + version = "6.4.0"; + sha256 = "019j8n0rmv4cmkaa8lc69r02lrwbk267y99qbwy3fx2wqdicdij2"; libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 antiope-core attoparsec base - bytestring conduit conduit-extra exceptions generic-lens http-types - lens monad-logger mtl network-uri resourcet text unliftio-core + aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec + base bytestring conduit conduit-extra exceptions generic-lens + http-types lens monad-logger mtl network-uri resourcet text time + unliftio-core ]; testHaskellDepends = [ - amazonka amazonka-core amazonka-s3 antiope-core attoparsec base - bytestring conduit conduit-extra exceptions generic-lens hedgehog - hspec http-types hw-hspec-hedgehog lens monad-logger mtl - network-uri resourcet text unliftio-core + aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec + base bytestring conduit conduit-extra exceptions generic-lens + hedgehog hspec http-types hw-hspec-hedgehog lens monad-logger mtl + network-uri resourcet text time unliftio-core ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-sns" = callPackage @@ -27504,24 +28424,23 @@ self: { text unliftio-core ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-sns_6_3_0" = callPackage + "antiope-sns_6_4_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base - , generic-lens, lens, text, unliftio-core + , generic-lens, lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "6.3.0"; - sha256 = "0fr51vp8ihlv7pnlrl73knd8wwck1rsw5v4yzm2b8299m7gqd86v"; + version = "6.4.0"; + sha256 = "0ghr37p0k8pgch42cksfdinz7h7q7brvknj7flj1bgkh03j3gw03"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens - text unliftio-core + text time unliftio-core ]; testHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens - text unliftio-core + text time unliftio-core ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -27548,9 +28467,10 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "antiope-sqs_6_3_0" = callPackage + "antiope-sqs_6_4_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , amazonka-sqs, antiope-messages, antiope-s3, base, conduit , generic-lens, lens, lens-aeson, monad-loops, mtl, network-uri @@ -27558,8 +28478,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "6.3.0"; - sha256 = "0a1kkzy9nldhwgh8xvnp4lqv49gpm6q9prnv2bgwlp00izy2r5s1"; + version = "6.4.0"; + sha256 = "067c29virlmi3lizhr9kmakr23ipc6sy2wwhg7wgf1wbmwcszs8j"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-messages antiope-s3 base conduit generic-lens lens @@ -27572,6 +28492,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiprimes" = callPackage @@ -27612,6 +28533,7 @@ self: { description = "An engine for text-based dungeons"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antlr-haskell" = callPackage @@ -27637,6 +28559,7 @@ self: { description = "A Haskell implementation of the ANTLR top-down parser generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antlrc" = callPackage @@ -27658,6 +28581,7 @@ self: { description = "Haskell binding to the ANTLR parser generator C runtime library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {antlr3c = null;}; "anydbm" = callPackage @@ -27674,6 +28598,7 @@ self: { description = "Interface for DBM-like database systems"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aos-signature" = callPackage @@ -27715,6 +28640,7 @@ self: { description = "Bindings to libaosd, a library for Cairo-based on-screen displays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libaosd;}; "ap-reflect" = callPackage @@ -27776,6 +28702,7 @@ self: { description = "Get all your structure and rip it apart"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apecs" = callPackage @@ -27784,18 +28711,14 @@ self: { }: mkDerivation { pname = "apecs"; - version = "0.7.1"; - sha256 = "0cvjqv6zbjzvp01ikfx5lkwb7fbq25555rbvfriwhsfjqanw5pj7"; - revision = "1"; - editedCabalFile = "14v5704fhysxpip0s7bfsg073kfbal3b0335s9nb14nwwak7bsyn"; + version = "0.7.3"; + sha256 = "1vrfmpnpihsywd8lq1kc7bsjsp8kxrcv341mzxsaa68qd5xi698l"; libraryHaskellDepends = [ base containers mtl template-haskell vector ]; - testHaskellDepends = [ - base containers criterion linear QuickCheck vector - ]; + testHaskellDepends = [ base containers linear QuickCheck vector ]; benchmarkHaskellDepends = [ base criterion linear ]; - description = "Fast ECS framework for game programming"; + description = "Fast Entity-Component-System library for game programming"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -27820,8 +28743,8 @@ self: { }: mkDerivation { pname = "apecs-physics"; - version = "0.3.1"; - sha256 = "0ij8wv9vrard7nfh8hhzrs9j7w5jlw3353w396alwnbb40hvk7gj"; + version = "0.3.2"; + sha256 = "15xwhji60garvryv971ahibdb6b0qlpafx9xy5898h0s4bhrhysf"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ apecs base containers inline-c linear template-haskell vector @@ -27877,6 +28800,7 @@ self: { description = "Server and community browser for the game Tremulous"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "api-builder" = callPackage @@ -27901,6 +28825,7 @@ self: { description = "Library for easily building REST API wrappers in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "api-field-json-th" = callPackage @@ -27967,6 +28892,7 @@ self: { description = "DSL for generating API boilerplate and docs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary" = callPackage @@ -28000,6 +28926,7 @@ self: { description = "Simple and type safe web framework that generate web API documentation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary-authenticate" = callPackage @@ -28020,6 +28947,7 @@ self: { description = "authenticate support for apiary web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary-clientsession" = callPackage @@ -28038,6 +28966,7 @@ self: { description = "clientsession support for apiary web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary-cookie" = callPackage @@ -28054,6 +28983,7 @@ self: { description = "Cookie support for apiary web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary-eventsource" = callPackage @@ -28066,6 +28996,7 @@ self: { description = "eventsource support for apiary web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary-helics" = callPackage @@ -28086,6 +29017,7 @@ self: { description = "helics support for apiary web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary-http-client" = callPackage @@ -28103,6 +29035,7 @@ self: { description = "A http client for Apiary"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary-logger" = callPackage @@ -28121,6 +29054,7 @@ self: { description = "fast-logger support for apiary web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary-memcached" = callPackage @@ -28140,6 +29074,7 @@ self: { description = "memcached client for apiary web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary-mongoDB" = callPackage @@ -28158,6 +29093,7 @@ self: { description = "mongoDB support for apiary web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary-persistent" = callPackage @@ -28176,6 +29112,7 @@ self: { description = "persistent support for apiary web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary-purescript" = callPackage @@ -28196,6 +29133,7 @@ self: { description = "purescript compiler for apiary web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary-redis" = callPackage @@ -28208,6 +29146,7 @@ self: { description = "redis support for apiary web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary-session" = callPackage @@ -28220,6 +29159,7 @@ self: { description = "session support for apiary web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apiary-websockets" = callPackage @@ -28232,6 +29172,7 @@ self: { description = "websockets support for apiary web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apioiaf-client" = callPackage @@ -28265,6 +29206,7 @@ self: { description = "A Template Haskell library for generating type safe API calls"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apns-http2" = callPackage @@ -28294,6 +29236,7 @@ self: { description = "Apple Push Notification service HTTP/2 integration"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apotiki" = callPackage @@ -28324,6 +29267,7 @@ self: { description = "a faster debian repository"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "app-lens" = callPackage @@ -28339,6 +29283,7 @@ self: { description = "applicative (functional) bidirectional programming beyond composition chains"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "app-settings" = callPackage @@ -28394,6 +29339,7 @@ self: { description = "app container types and tools"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "appendmap" = callPackage @@ -28436,6 +29382,7 @@ self: { description = "Applicative functor and monad which collects all your fails"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "applicative-numbers" = callPackage @@ -28464,6 +29411,7 @@ self: { description = "An applicative parser combinator library"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "applicative-quoters" = callPackage @@ -28478,6 +29426,7 @@ self: { description = "Quasiquoters for idiom brackets and an applicative do-notation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "applicative-splice" = callPackage @@ -28494,6 +29443,7 @@ self: { description = "Write applicative programs in direct style (generalizes idiom brackets)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apply-refact_0_3_0_1" = callPackage @@ -28670,6 +29620,7 @@ self: { description = "Pure Haskell arbitrary length FFT library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arbb-vm" = callPackage @@ -28687,6 +29638,7 @@ self: { description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {arbb_dev = null;}; "arbor-datadog" = callPackage @@ -28710,7 +29662,6 @@ self: { ]; description = "Datadog client for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arbor-lru-cache" = callPackage @@ -28727,7 +29678,6 @@ self: { stm ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arbor-monad-counter" = callPackage @@ -28746,7 +29696,25 @@ self: { mtl resourcet stm transformers ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "arbor-monad-logger" = callPackage + ({ mkDerivation, base, bytestring, fast-logger, hedgehog, hspec + , hw-hspec-hedgehog, monad-logger, mtl, text + }: + mkDerivation { + pname = "arbor-monad-logger"; + version = "0.1.0.0"; + sha256 = "0m6gi36ckaq4v5mzpp6abcq93hyvvr0f7fdh4v87c4n044757agn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring fast-logger monad-logger text + ]; + executableHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; + description = "Simple logging library"; + license = stdenv.lib.licenses.mit; }) {}; "arbor-monad-metric" = callPackage @@ -28756,8 +29724,8 @@ self: { }: mkDerivation { pname = "arbor-monad-metric"; - version = "1.1.1"; - sha256 = "1ypacqjd7hf5s7r4w432v9yndxxb40w9kwhxhlqzc4wim798vj3h"; + version = "1.2.0"; + sha256 = "0mn6pc5h1rwd3w2cw393skm62yxii21j5f7q9rlpdw7np9xgwfcf"; libraryHaskellDepends = [ base containers generic-lens lens mtl resourcet stm text transformers @@ -28770,6 +29738,7 @@ self: { description = "Core metric library for publishing metrics"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arbor-monad-metric-datadog" = callPackage @@ -28782,6 +29751,8 @@ self: { pname = "arbor-monad-metric-datadog"; version = "1.0.0"; sha256 = "07hqghjrl25ky0rn4mnwia5b90zhf88w6zkqyscs527c0c6dkybc"; + revision = "2"; + editedCabalFile = "0x8dp7xh1rpd9db2kiya8sr9nc7wzka256jxsvxqfmphd08yc4ad"; libraryHaskellDepends = [ arbor-datadog arbor-monad-metric base bytestring containers generic-lens lens mtl network resourcet stm text transformers @@ -28795,6 +29766,7 @@ self: { description = "Metric library backend for datadog"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arbor-postgres" = callPackage @@ -28812,6 +29784,7 @@ self: { description = "Convenience types and functions for postgresql-simple"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arbtt" = callPackage @@ -28824,8 +29797,8 @@ self: { }: mkDerivation { pname = "arbtt"; - version = "0.10.1"; - sha256 = "09n6v32yz612ag4acjd4jwnmv0ljarxi3b7v2mp4bj18c2gx1wbq"; + version = "0.10.2"; + sha256 = "02izfga7nv2saq4d1xwigq41hhbc02830sjppqsqw6vcb8082vs1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -28913,6 +29886,7 @@ self: { description = "Archive supplied URLs in WebCite & Internet Archive"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "archlinux" = callPackage @@ -28929,6 +29903,7 @@ self: { description = "Support for working with Arch Linux packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "archlinux-web" = callPackage @@ -28955,6 +29930,7 @@ self: { description = "Website maintenance for Arch Linux packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "archnews" = callPackage @@ -28971,6 +29947,7 @@ self: { description = "Convert Arch Linux package updates in RSS to pretty markdown"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arena" = callPackage @@ -28997,6 +29974,7 @@ self: { description = "A journaled data store"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arff" = callPackage @@ -29014,6 +29992,7 @@ self: { description = "Generate Attribute-Relation File Format (ARFF) files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arghwxhaskell" = callPackage @@ -29028,6 +30007,7 @@ self: { description = "An interpreter for the Argh! programming language in wxHaskell"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "argon" = callPackage @@ -29055,6 +30035,7 @@ self: { description = "Measure your code's complexity"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "argon2" = callPackage @@ -29074,6 +30055,7 @@ self: { description = "Memory-hard password hash and proof-of-work function"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "argparser" = callPackage @@ -29087,6 +30069,7 @@ self: { description = "Command line parsing framework for console applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arguedit" = callPackage @@ -29105,6 +30088,7 @@ self: { description = "A computer assisted argumentation transcription and editing software"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ariadne" = callPackage @@ -29133,6 +30117,7 @@ self: { description = "Go-to-definition for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arion" = callPackage @@ -29157,6 +30142,7 @@ self: { description = "Watcher and runner for Hspec"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arith-encode" = callPackage @@ -29178,6 +30164,7 @@ self: { description = "A practical arithmetic encoding (aka Godel numbering) library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arithmatic" = callPackage @@ -29244,7 +30231,6 @@ self: { ]; description = "Efficient basic number-theoretic functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arity-generic-liftA" = callPackage @@ -29273,6 +30259,7 @@ self: { description = "Space-based real time strategy game"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "armor" = callPackage @@ -29294,6 +30281,7 @@ self: { description = "Prevent serialization backwards compatibility problems using golden tests"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arpa" = callPackage @@ -29309,6 +30297,7 @@ self: { description = "Library for reading ARPA n-gram models"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arpack" = callPackage @@ -29333,6 +30322,7 @@ self: { description = "Solve large scale eigenvalue problems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) arpack;}; "array_0_5_3_0" = callPackage @@ -29371,6 +30361,7 @@ self: { description = "A simple interpreter for arrayForth, the language used on GreenArrays chips"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "array-memoize" = callPackage @@ -29400,6 +30391,7 @@ self: { description = "Extra foreign primops for primitive arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "array-utils" = callPackage @@ -29454,6 +30446,7 @@ self: { description = "Improved arrows"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arrow-list" = callPackage @@ -29466,6 +30459,7 @@ self: { description = "List arrows for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arrowapply-utils" = callPackage @@ -29478,6 +30472,7 @@ self: { description = "Utilities for working with ArrowApply instances more naturally"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arrowp" = callPackage @@ -29492,6 +30487,7 @@ self: { description = "preprocessor translating arrow notation into Haskell 98"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arrowp-qq" = callPackage @@ -29513,6 +30509,7 @@ self: { description = "A preprocessor and quasiquoter for translating arrow notation"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arrows" = callPackage @@ -29538,6 +30535,7 @@ self: { description = "A simple, arrow-based reactive programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "artifact" = callPackage @@ -29552,6 +30550,7 @@ self: { description = "Basic types and instances for Valve's Artifact Card-set API"; license = stdenv.lib.licenses.agpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arx" = callPackage @@ -29658,6 +30657,7 @@ self: { description = "Flattens European non-ASCII characaters into ASCII"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ascii-progress" = callPackage @@ -29708,15 +30708,14 @@ self: { }: mkDerivation { pname = "ascii-table"; - version = "0.3.0.1"; - sha256 = "01m7rdvjrn0mrqc100d81ji17f1h8lyqyyp5ydv2xzns8cmrcdzp"; + version = "0.3.0.2"; + sha256 = "04v2dlza1i6xsacm35qc3p5mpv1pny2dij4nz5wwv7p3pybbhvmd"; libraryHaskellDepends = [ aeson base containers dlist hashable text unordered-containers vector wl-pprint-extras ]; description = "ASCII table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ascii-vector-avc" = callPackage @@ -29740,6 +30739,7 @@ self: { description = "Process Ascii Vectors for Advantest 93k"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ascii85-conduit" = callPackage @@ -29753,6 +30753,7 @@ self: { description = "Conduit for encoding ByteString into Ascii85"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "asciichart" = callPackage @@ -29804,6 +30805,7 @@ self: { description = "Action Script Instrumentation Compiler"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "asif" = callPackage @@ -29841,9 +30843,10 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "asif_4_0_0" = callPackage + "asif_4_1_0" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, conduit , conduit-combinators, conduit-extra, containers, cpu, directory , either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits @@ -29853,8 +30856,8 @@ self: { }: mkDerivation { pname = "asif"; - version = "4.0.0"; - sha256 = "1xf5x7jm01w30l2cwb3m9sv5qimnc2n6a6dhrykq81ajcf5ix0p6"; + version = "4.1.0"; + sha256 = "1ys8cj08pj7z3yiks014z9jmvzkxnbh11khihzg57ig4z4w7bvp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29877,8 +30880,10 @@ self: { old-locale profunctors resourcet temporary-resourcet text thyme transformers vector ]; + description = "Library for creating and querying segmented feeds"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "asil" = callPackage @@ -29898,6 +30903,7 @@ self: { description = "Action Script Instrumentation Library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "asn" = callPackage @@ -29913,6 +30919,7 @@ self: { description = "asn type and encoding/decoding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "asn1-codec" = callPackage @@ -29938,6 +30945,7 @@ self: { description = "Encode and decode ASN.1"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "asn1-data" = callPackage @@ -30056,6 +31064,7 @@ self: { description = "Helpers for Control.Exception.assert"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "assert-failure" = callPackage @@ -30084,6 +31093,7 @@ self: { description = "A simple testing framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "asset-bundle" = callPackage @@ -30113,6 +31123,7 @@ self: { description = "Asset map support for the JavaScript broccoli-asset-rev library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "assimp" = callPackage @@ -30127,6 +31138,7 @@ self: { description = "The Assimp asset import library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) assimp;}; "assoc" = callPackage @@ -30178,6 +31190,7 @@ self: { description = "A library for constructing AST by using do-notation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ast-monad-json" = callPackage @@ -30193,6 +31206,7 @@ self: { description = "A library for writing JSON"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "astar" = callPackage @@ -30226,6 +31240,7 @@ self: { description = "an incomplete 2d space game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "astro" = callPackage @@ -30264,6 +31279,7 @@ self: { description = "A GTK-based abstract syntax tree viewer for custom languages and parsers"; license = stdenv.lib.licenses.bsdOriginal; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "astview-utils" = callPackage @@ -30328,6 +31344,7 @@ self: { description = "Async combinators"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "async-dejafu" = callPackage @@ -30345,6 +31362,7 @@ self: { description = "Run MonadConc operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "async-extra" = callPackage @@ -30398,6 +31416,7 @@ self: { description = "A thread manager for async"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "async-pool" = callPackage @@ -30421,6 +31440,7 @@ self: { description = "A modified version of async that supports worker groups and many-to-many task dependencies"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "async-refresh" = callPackage @@ -30484,6 +31504,7 @@ self: { description = "Provides API for timer based execution of IO actions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "asynchronous-exceptions" = callPackage @@ -30496,6 +31517,7 @@ self: { description = "Distinguish between synchronous and asynchronous exceptions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aterm" = callPackage @@ -30508,6 +31530,7 @@ self: { description = "serialisation for Haskell values with sharing support"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aterm-utils" = callPackage @@ -30523,6 +31546,7 @@ self: { description = "Utility functions for working with aterms as generated by Minitermite"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "atl" = callPackage @@ -30560,6 +31584,7 @@ self: { description = "Atlassian Connect snaplet for the Snap Framework and helper code"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) zlib;}; "atlassian-connect-descriptor" = callPackage @@ -30597,7 +31622,6 @@ self: { ]; description = "1976 US Standard Atmosphere Model"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atmos-dimensional" = callPackage @@ -30609,7 +31633,6 @@ self: { libraryHaskellDepends = [ atmos base dimensional ]; description = "dimensional wrapper on atmos package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atmos-dimensional-tf" = callPackage @@ -30622,6 +31645,7 @@ self: { description = "dimensional-tf wrapper on atmos package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "atndapi" = callPackage @@ -30647,6 +31671,7 @@ self: { description = "An interface of ATND API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "atom" = callPackage @@ -30700,6 +31725,7 @@ self: { description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "atom-msp430" = callPackage @@ -30712,6 +31738,7 @@ self: { description = "Convenience functions for using Atom with the MSP430 microcontroller family"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "atomic-file-ops" = callPackage @@ -30739,6 +31766,7 @@ self: { description = "A typeclass for mutable references that have an atomic modify operation"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "atomic-primops" = callPackage @@ -30771,6 +31799,7 @@ self: { description = "An atomic counter implemented using the FFI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "atomic-primops-vector" = callPackage @@ -30784,6 +31813,7 @@ self: { description = "Atomic operations on Data.Vector types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "atomic-write" = callPackage @@ -30828,6 +31858,7 @@ self: { description = "A highly dynamic, extremely simple, very fun programming language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "atp-haskell" = callPackage @@ -30878,29 +31909,30 @@ self: { description = "A source-code formatter for ATS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ats-pkg" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib , Cabal, cli-setup, composition-prelude, containers, cpphs - , dependency, dhall, directory, file-embed, filemanip, filepath - , http-client, http-client-tls, lzma, microlens, mtl + , dependency, dhall, directory, file-embed, filepath, http-client + , http-client-tls, libarchive, lzma, microlens, mtl , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib + , shake-c, shake-ext, temporary, text, unix, zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "3.2.4.6"; - sha256 = "0cfh04fpn912cmz0pi71avhx6y6i3l5bzrcwwzxkas134yc22wng"; + version = "3.2.5.3"; + sha256 = "0imd4xikj15cb066713c38ik7a5r4dgdw95wgynjpi39clv4rmbz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring bzlib Cabal composition-prelude containers dependency dhall directory - file-embed filemanip filepath http-client http-client-tls lzma + file-embed filepath http-client http-client-tls libarchive lzma microlens mtl parallel-io process shake shake-ats shake-c shake-ext - tar text unix zip-archive zlib + text unix zip-archive zlib ]; libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ @@ -30929,6 +31961,7 @@ self: { description = "ATS scripts for Cabal builds"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ats-storable" = callPackage @@ -30947,6 +31980,7 @@ self: { description = "Marshal ATS types into Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {storable = null;}; "attempt" = callPackage @@ -30978,6 +32012,7 @@ self: { description = "A script I use to run \"attic\" for my backups"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "atto-lisp" = callPackage @@ -31127,6 +32162,7 @@ self: { description = "Parsers for the standard Haskell data types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "attoparsec-enumerator" = callPackage @@ -31141,6 +32177,7 @@ self: { description = "Pass input from an enumerator to an Attoparsec parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "attoparsec-expr" = callPackage @@ -31169,6 +32206,7 @@ self: { description = "Parse IP data types with attoparsec"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "attoparsec-iso8601" = callPackage @@ -31196,6 +32234,7 @@ self: { description = "An adapter to convert attoparsec Parsers into blazing-fast Iteratees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "attoparsec-parsec" = callPackage @@ -31241,6 +32280,7 @@ self: { description = "(deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "attoparsec-text-enumerator" = callPackage @@ -31253,6 +32293,7 @@ self: { description = "(deprecated)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "attoparsec-time" = callPackage @@ -31274,6 +32315,7 @@ self: { description = "Attoparsec parsers of time"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "attoparsec-trans" = callPackage @@ -31286,6 +32328,7 @@ self: { description = "Interleaved effects for attoparsec parsers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "attoparsec-uri" = callPackage @@ -31308,6 +32351,7 @@ self: { description = "URI parser / printer using attoparsec"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "attoparsec-varword" = callPackage @@ -31326,6 +32370,7 @@ self: { description = "Variable-length integer decoding for Attoparsec"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "attosplit" = callPackage @@ -31338,6 +32383,7 @@ self: { description = "Split a lazy bytestring at boundaries defined by an attoparsec parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "atuin" = callPackage @@ -31355,6 +32401,7 @@ self: { description = "Embedded Turtle language compiler in Haskell, with Epic output"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "audacity" = callPackage @@ -31397,6 +32444,7 @@ self: { description = "A battery-included audiovisual framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "augeas" = callPackage @@ -31417,6 +32465,7 @@ self: { description = "A Haskell FFI wrapper for the Augeas API"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) augeas;}; "augur" = callPackage @@ -31436,6 +32485,7 @@ self: { description = "Renaming media collections in a breeze"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aur" = callPackage @@ -31455,6 +32505,7 @@ self: { description = "Access metadata from the Arch Linux User Repository"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aur-api" = callPackage @@ -31472,6 +32523,7 @@ self: { description = "ArchLinux AUR json v5 API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aura" = callPackage @@ -31519,6 +32571,7 @@ self: { description = "A secure package manager for Arch Linux and the AUR, written in Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "authenticate" = callPackage @@ -31564,6 +32617,7 @@ self: { description = "LDAP authentication for Haskell web applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "authenticate-oauth" = callPackage @@ -31614,6 +32668,7 @@ self: { description = "A library for writing papers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "auto" = callPackage @@ -31637,8 +32692,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "auto-update"; - version = "0.1.4"; - sha256 = "09dlh2alsx2mw5kvj931yhbj0aw7jmly2cm9xbscm2sf098w35jy"; + version = "0.1.4.1"; + sha256 = "1jfgxwicd0r31dcbcd83sj99v1w9mbg873xp7v7z21gmxhalpzrm"; libraryHaskellDepends = [ base ]; description = "Efficiently run periodic, on-demand actions"; license = stdenv.lib.licenses.mit; @@ -31672,6 +32727,7 @@ self: { description = "Generates and displays patterns from next nearest neighbors cellular automata"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "automata" = callPackage @@ -31697,6 +32753,7 @@ self: { description = "automata"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "automitive-cse" = callPackage @@ -31756,6 +32813,7 @@ self: { description = "Library for Nix expression dependency generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "autonix-deps-kf5" = callPackage @@ -31780,6 +32838,7 @@ self: { description = "Generate dependencies for KDE 5 Nix expressions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "autoproc" = callPackage @@ -31822,6 +32881,7 @@ self: { description = "A simple random avatar icon generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "average" = callPackage @@ -31869,6 +32929,7 @@ self: { description = "Server-side implementation of the Avers storage model"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "avers-api" = callPackage @@ -31886,6 +32947,7 @@ self: { description = "Types describing the core and extended Avers APIs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "avers-api-docs" = callPackage @@ -31905,6 +32967,7 @@ self: { description = "Swagger documentation for the Avers API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "avers-server" = callPackage @@ -31926,6 +32989,7 @@ self: { description = "Server implementation of the Avers API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aviation-cessna172-diagrams" = callPackage @@ -31970,6 +33034,7 @@ self: { description = "A compile-time balanced AVL tree"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "avr-shake" = callPackage @@ -31982,24 +33047,26 @@ self: { description = "AVR Crosspack actions for shake build systems"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "avro" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, bytestring, containers, data-binary-ieee754, directory - , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib - , QuickCheck, scientific, semigroups, tagged, template-haskell - , text, tf-random, transformers, unordered-containers, vector + , binary, bytestring, containers, data-binary-ieee754, deepseq + , directory, extra, fail, gauge, hashable, hspec, hspec-discover + , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random, scientific + , semigroups, tagged, template-haskell, text, tf-random + , transformers, unordered-containers, vector, zlib }: mkDerivation { pname = "avro"; - version = "0.4.2.0"; - sha256 = "1hail3k27xsb4p4964429wv9s3hwvziwmn02hhy928mh5my1r8lp"; + version = "0.4.3.0"; + sha256 = "0sv1l51gv6yf4zr4xv5icksmj59qxfzz80y0k5y10mzh7qgyxf88"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring - containers data-binary-ieee754 fail hashable mtl pure-zlib - scientific semigroups tagged template-haskell text tf-random - unordered-containers vector + containers data-binary-ieee754 deepseq fail hashable mtl scientific + semigroups tagged template-haskell text tf-random + unordered-containers vector zlib ]; testHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring @@ -32007,6 +33074,11 @@ self: { pure-zlib QuickCheck scientific semigroups tagged template-haskell text tf-random transformers unordered-containers vector ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers gauge hashable mtl random text + transformers unordered-containers vector + ]; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -32040,6 +33112,7 @@ self: { description = "A prelude which I can be happy with. Based on base-prelude."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "awesomium" = callPackage @@ -32056,6 +33129,7 @@ self: { description = "High-level Awesomium bindings"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "awesomium-glut" = callPackage @@ -32068,6 +33142,7 @@ self: { description = "Utilities for using Awesomium with GLUT"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "awesomium-raw" = callPackage @@ -32082,6 +33157,7 @@ self: { description = "Low-level Awesomium bindings"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {awesomium = null;}; "aws_0_18" = callPackage @@ -32137,8 +33213,8 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.21"; - sha256 = "0g6sp8wgirinp0kaa73s283mjws6wbihg38jklbj9dx6sxdmdja9"; + version = "0.21.1"; + sha256 = "047zfpc3bzdxgh6adfi1xls3j300vhyzcykzf9wyasxksw4xnrxl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32217,6 +33293,7 @@ self: { description = "Configuration types, parsers & renderers for AWS services"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-dynamodb-conduit" = callPackage @@ -32235,6 +33312,7 @@ self: { description = "Conduit-based interface for AWS DynamoDB"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-dynamodb-streams" = callPackage @@ -32258,6 +33336,7 @@ self: { description = "Haskell bindings for Amazon DynamoDB Streams"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-easy" = callPackage @@ -32311,6 +33390,7 @@ self: { description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-ec2-knownhosts" = callPackage @@ -32334,6 +33414,7 @@ self: { description = "Capture and manage AWS EC2 known_host pubkeys"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-elastic-transcoder" = callPackage @@ -32357,6 +33438,7 @@ self: { description = "Haskell suite for the Elastic Transcoder service"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-general" = callPackage @@ -32383,6 +33465,7 @@ self: { description = "Bindings for Amazon Web Services (AWS) General Reference"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-kinesis" = callPackage @@ -32409,6 +33492,7 @@ self: { description = "Bindings for Amazon Kinesis"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-kinesis-client" = callPackage @@ -32444,6 +33528,7 @@ self: { description = "A producer & consumer client library for AWS Kinesis"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-kinesis-reshard" = callPackage @@ -32473,6 +33558,7 @@ self: { description = "Reshard AWS Kinesis streams in response to Cloud Watch metrics"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-lambda" = callPackage @@ -32493,6 +33579,7 @@ self: { description = "Haskell bindings for AWS Lambda"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-lambda-haskell-runtime" = callPackage @@ -32559,6 +33646,7 @@ self: { description = "Keep your AWS credentials file up to date with MFA-carrying credentials"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-performance-tests" = callPackage @@ -32585,6 +33673,7 @@ self: { description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-route53" = callPackage @@ -32603,6 +33692,7 @@ self: { description = "Amazon Route53 DNS service plugin for the aws package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-sdk" = callPackage @@ -32632,6 +33722,7 @@ self: { description = "AWS SDK for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-sdk-text-converter" = callPackage @@ -32654,6 +33745,7 @@ self: { description = "The text converter for aws-sdk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-sdk-xml-unordered" = callPackage @@ -32675,6 +33767,7 @@ self: { description = "The xml parser for aws-sdk package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-ses-easy" = callPackage @@ -32718,6 +33811,7 @@ self: { description = "Amazon Web Services (AWS) Signature v4 HTTP request signer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-simple" = callPackage @@ -32736,6 +33830,7 @@ self: { description = "Dead simple bindings to commonly used AWS Services"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aws-sns" = callPackage @@ -32760,6 +33855,7 @@ self: { description = "Bindings for AWS SNS Version 2013-03-31"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "axel" = callPackage @@ -32811,6 +33907,7 @@ self: { description = "Web EDSL for running in browsers and server nodes using transient"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "axiomatic-classes" = callPackage @@ -32851,6 +33948,7 @@ self: { description = "A simple DevOps tool which will never \"reach\" enterprice level"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "azure-acs" = callPackage @@ -32905,6 +34003,7 @@ self: { description = "Haskell bindings for the Microsoft Azure Service Management API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "azure-servicebus" = callPackage @@ -32923,6 +34022,7 @@ self: { description = "Haskell wrapper over Microsoft Azure ServiceBus REST API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "azurify" = callPackage @@ -32953,6 +34053,7 @@ self: { description = "A simple library for accessing Azure blob storage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "b-tree" = callPackage @@ -32981,34 +34082,37 @@ self: { "b9" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bifunctors , binary, boxes, bytestring, conduit, conduit-extra, ConfigFile - , directory, filepath, free, hashable, hspec, hspec-expectations - , lens, mtl, optparse-applicative, parallel, parsec, pretty - , pretty-show, process, QuickCheck, random, shake, syb, template - , text, time, transformers, unordered-containers, vector, yaml + , directory, exceptions, extensible-effects, filepath, free + , hashable, hspec, hspec-expectations, lens, monad-control, mtl + , optparse-applicative, parallel, parsec, pretty, pretty-show + , process, QuickCheck, random, shake, syb, tagged, template, text + , time, transformers, unordered-containers, vector, yaml }: mkDerivation { pname = "b9"; - version = "0.5.61"; - sha256 = "0yr29ynxiwc2qr000c5h1w3k373qvbr5p8z451r3q24i4c6rcrid"; + version = "0.5.68"; + sha256 = "13v843lma4yrlcsx60ils1j0h8q4aj6p09phqrfc0r1zc25a5ssv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bifunctors binary boxes - bytestring conduit conduit-extra ConfigFile directory filepath free - hashable lens mtl parallel parsec pretty pretty-show process - QuickCheck random shake syb template text time transformers - unordered-containers vector yaml + bytestring conduit conduit-extra ConfigFile directory exceptions + extensible-effects filepath free hashable lens monad-control mtl + parallel parsec pretty pretty-show process QuickCheck random shake + syb tagged template text time transformers unordered-containers + vector yaml ]; executableHaskellDepends = [ - base bytestring directory lens optparse-applicative + base bytestring directory extensible-effects lens + optparse-applicative text ]; testHaskellDepends = [ - aeson base bytestring hspec hspec-expectations QuickCheck text - unordered-containers vector yaml + aeson base binary bytestring directory extensible-effects hspec + hspec-expectations lens QuickCheck text unordered-containers vector + yaml ]; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "babl" = callPackage @@ -33039,6 +34143,7 @@ self: { description = "An implementation of a simple 2-player board game"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "backdropper" = callPackage @@ -33057,6 +34162,7 @@ self: { description = "Rotates backdrops for X11 displays using Imagemagic"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "backprop" = callPackage @@ -33095,6 +34201,7 @@ self: { description = "A monad transformer for backtracking exceptions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "backward-state" = callPackage @@ -33107,6 +34214,7 @@ self: { description = "A state monad that runs the state in reverse through the computation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bacteria" = callPackage @@ -33133,6 +34241,7 @@ self: { description = "A simple stable bag"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bake" = callPackage @@ -33167,6 +34276,7 @@ self: { description = "Continuous integration system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ballast" = callPackage @@ -33191,6 +34301,7 @@ self: { description = "Shipwire API client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bamboo" = callPackage @@ -33212,6 +34323,7 @@ self: { description = "A blog engine on Hack"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bamboo-launcher" = callPackage @@ -33233,6 +34345,7 @@ self: { description = "bamboo-launcher"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bamboo-plugin-highlight" = callPackage @@ -33251,6 +34364,7 @@ self: { description = "A highlight middleware"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bamboo-plugin-photo" = callPackage @@ -33270,6 +34384,7 @@ self: { description = "A photo album middleware"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bamboo-theme-blueprint" = callPackage @@ -33289,6 +34404,7 @@ self: { description = "bamboo blueprint theme"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bamboo-theme-mini-html5" = callPackage @@ -33312,6 +34428,7 @@ self: { description = "bamboo mini html5 theme"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bamse" = callPackage @@ -33330,6 +34447,7 @@ self: { description = "A Windows Installer (MSI) generator framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bamstats" = callPackage @@ -33344,6 +34462,7 @@ self: { description = "A program to extract various information from BAM alignmnet files"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bank-holiday-usa" = callPackage @@ -33357,6 +34476,7 @@ self: { description = "A library for determining US bank holidays"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bank-holidays-england" = callPackage @@ -33389,6 +34509,7 @@ self: { description = "Generalized word blacklister"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "barbies" = callPackage @@ -33397,8 +34518,8 @@ self: { }: mkDerivation { pname = "barbies"; - version = "1.1.0.0"; - sha256 = "02lnq2f5n75r214lrhkhdl3a85lzn3am197df4a0mp6pvw07z1cs"; + version = "1.1.1.0"; + sha256 = "1rlrsxddnlrhx15ki3pwh2hpvcawl5gd6x6i8n9n716ra2p6ca90"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck @@ -33420,6 +34541,7 @@ self: { description = "Creating Bar Charts in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "barcodes-code128" = callPackage @@ -33432,6 +34554,7 @@ self: { description = "Generate Code 128 barcodes as PDFs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "barecheck" = callPackage @@ -33444,6 +34567,7 @@ self: { description = "QuickCheck implementations for common types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "barley" = callPackage @@ -33477,6 +34601,7 @@ self: { description = "Declarative Gtk GUI library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "barrier" = callPackage @@ -33502,6 +34627,7 @@ self: { description = "Shields.io style badge generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "barrier-monad" = callPackage @@ -33514,6 +34640,7 @@ self: { description = "Implementation of barrier monad, can use custom front/back type"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "base_4_12_0_0" = callPackage @@ -33570,6 +34697,7 @@ self: { description = "Helps migrating projects to base-compat(-batteries)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "base-encoding" = callPackage @@ -33600,6 +34728,7 @@ self: { description = "Semantic CPP feature macros for base"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "base-generics" = callPackage @@ -33612,6 +34741,7 @@ self: { description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "base-io-access" = callPackage @@ -33624,6 +34754,7 @@ self: { description = "The IO functions included in base delimited into small, composable classes"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "base-noprelude" = callPackage @@ -33806,6 +34937,7 @@ self: { description = "A newtype around ByteString, for base64 encoding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "base64-conduit" = callPackage @@ -33826,6 +34958,7 @@ self: { description = "Base64-encode and decode streams of bytes. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "base64-string" = callPackage @@ -33911,6 +35044,7 @@ self: { description = "Baserock Definitions Schema"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "basex-client" = callPackage @@ -34023,6 +35157,7 @@ self: { description = "An interpreter for a small functional language"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "batch" = callPackage @@ -34041,6 +35176,7 @@ self: { description = "Simplify queuing up data and processing it in batch"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "batch-rename" = callPackage @@ -34086,6 +35222,7 @@ self: { description = "Batch processing toolset for Linux / Unix"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "battlenet" = callPackage @@ -34100,6 +35237,7 @@ self: { description = "API client for Battle.Net"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "battlenet-yesod" = callPackage @@ -34114,6 +35252,7 @@ self: { description = "Yesod integration for the battlenet package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "battleplace" = callPackage @@ -34143,7 +35282,6 @@ self: { ]; description = "Public API definitions of BattlePlace.io service"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "battleship-combinatorics" = callPackage @@ -34168,6 +35306,7 @@ self: { description = "Compute number of possible arrangements in the battleship game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "battleships" = callPackage @@ -34201,6 +35340,7 @@ self: { description = "A web-based implementation of battleships including an AI opponent"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bayes-stack" = callPackage @@ -34221,6 +35361,7 @@ self: { description = "Framework for inferring generative probabilistic models with Gibbs sampling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bazel-runfiles" = callPackage @@ -34321,6 +35462,7 @@ self: { description = "Tools for managing a content store of software packages"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ostree;}; "bdcs-api" = callPackage @@ -34358,7 +35500,8 @@ self: { description = "BDCS API Server"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) libgit2-glib;}; + broken = true; + }) {inherit (pkgs) libgit2-glib;}; "bdd" = callPackage ({ mkDerivation, base, directory, HUnit, mtl, process @@ -34421,6 +35564,7 @@ self: { description = "A type-safe SQL mapper for Haskell that doesn't use Template Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "beam-core" = callPackage @@ -34442,6 +35586,7 @@ self: { description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "beam-migrate" = callPackage @@ -34463,6 +35608,7 @@ self: { description = "SQL DDL support and migrations support library for Beam"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "beam-newtype-field" = callPackage @@ -34479,6 +35625,7 @@ self: { description = "A newtype for wrapping newtypes into beam schemas"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "beam-postgres" = callPackage @@ -34501,6 +35648,7 @@ self: { description = "Connection layer between beam and postgres"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "beam-sqlite" = callPackage @@ -34519,6 +35667,7 @@ self: { description = "Beam driver for SQLite"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "beam-th" = callPackage @@ -34541,6 +35690,7 @@ self: { description = "Template Haskell utilities for beam"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "beamable" = callPackage @@ -34566,6 +35716,7 @@ self: { description = "Generic serializer/deserializer with compact representation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bearriver" = callPackage @@ -34593,6 +35744,7 @@ self: { description = "A pretty-printer for higher-order logic"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bed-and-breakfast" = callPackage @@ -34633,6 +35785,7 @@ self: { description = "Bindings to the beeminder.com JSON API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bein" = callPackage @@ -34657,6 +35810,7 @@ self: { description = "Bein is a provenance and workflow management system for bioinformatics"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "belka" = callPackage @@ -34686,6 +35840,7 @@ self: { description = "HTTP client DSL"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bench" = callPackage @@ -34720,6 +35875,7 @@ self: { description = "Plot and compare benchmarks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bench-show" = callPackage @@ -34739,6 +35895,7 @@ self: { description = "Show, plot and compare benchmark results"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "benchmark-function" = callPackage @@ -34801,6 +35958,7 @@ self: { description = "Bencodex reader/writer for Haskell"; license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bencoding" = callPackage @@ -34850,6 +36008,7 @@ self: { description = "Pretty BerkeleyDB v4 binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) db;}; "berp" = callPackage @@ -34876,6 +36035,7 @@ self: { description = "An implementation of Python 3"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bert" = callPackage @@ -34910,6 +36070,7 @@ self: { description = "Extended GCD of polynomials over F_p[x]"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bet" = callPackage @@ -34937,6 +36098,7 @@ self: { description = "Betfair API bindings. Bet on sports on betting exchanges."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "betacode" = callPackage @@ -34954,6 +36116,7 @@ self: { description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code)."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "betris" = callPackage @@ -34977,6 +36140,7 @@ self: { description = "A horizontal version of tetris for braille users"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "between" = callPackage @@ -35017,6 +36181,7 @@ self: { description = "Bidirectionalization for Free! (POPL'09)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bff-mono" = callPackage @@ -35040,6 +36205,7 @@ self: { description = "Parse BgMax-files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bgzf" = callPackage @@ -35056,6 +36222,7 @@ self: { description = "Blocked GZip"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bhoogle" = callPackage @@ -35078,6 +36245,7 @@ self: { description = "Simple terminal GUI for local hoogle"; license = "(BSD-3-Clause OR Apache-2.0)"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bibdb" = callPackage @@ -35101,6 +36269,7 @@ self: { description = "A database based bibliography manager for BibTeX"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bibtex" = callPackage @@ -35134,6 +36303,7 @@ self: { description = "Prototype Implementation of Combining Syntactic and Semantic Bidirectionalization (ICFP'10)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bidispec" = callPackage @@ -35146,6 +36316,7 @@ self: { description = "Specification of generators and parsers"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bidispec-extras" = callPackage @@ -35158,6 +36329,7 @@ self: { description = "Extra helper functions for bidirectional specifications"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bifunctor" = callPackage @@ -35170,6 +36342,7 @@ self: { description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bifunctors" = callPackage @@ -35226,6 +36399,7 @@ self: { description = "A parser for the Billboard chord dataset"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "billeksah-forms" = callPackage @@ -35244,6 +36418,7 @@ self: { description = "Leksah library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "billeksah-main" = callPackage @@ -35263,6 +36438,7 @@ self: { description = "Leksah plugin base"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "billeksah-main-static" = callPackage @@ -35304,6 +36480,7 @@ self: { description = "Leksah library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "billeksah-services" = callPackage @@ -35320,6 +36497,7 @@ self: { description = "Leksah library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bimap" = callPackage @@ -35457,6 +36635,7 @@ self: { description = "Flexible way to ease transmission of binary data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binary-conduit" = callPackage @@ -35488,6 +36667,7 @@ self: { description = "Automatic deriving of Binary using GHC.Generics"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binary-enum" = callPackage @@ -35525,6 +36705,7 @@ self: { description = "An alternate with strong-typed errors for `Data.Binary.Get` monad from `binary` package."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binary-file" = callPackage @@ -35541,6 +36722,7 @@ self: { description = "read/write binary file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binary-generic" = callPackage @@ -35579,6 +36761,7 @@ self: { description = "Binary Indexed Trees (a.k.a. Fenwick Trees)."; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binary-list" = callPackage @@ -35634,7 +36817,6 @@ self: { ]; description = "Orphan instances for binary"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-parser" = callPackage @@ -35699,6 +36881,7 @@ self: { description = "Monad to ease implementing a binary network protocol"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binary-protocol-zmq" = callPackage @@ -35715,6 +36898,7 @@ self: { description = "Monad to ease implementing a binary network protocol over ZeroMQ"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binary-search" = callPackage @@ -35804,6 +36988,7 @@ self: { description = "data serialization/deserialization io-streams library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binary-strict" = callPackage @@ -35818,6 +37003,7 @@ self: { description = "Binary deserialisation using strict ByteStrings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binary-tagged" = callPackage @@ -35851,7 +37037,6 @@ self: { ]; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-tree" = callPackage @@ -35892,6 +37077,7 @@ self: { description = "Type-safe binary serialization"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binarydefer" = callPackage @@ -35921,6 +37107,7 @@ self: { description = "Data marshaling library that uses type level equations to optimize buffering"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binding-core" = callPackage @@ -35950,6 +37137,7 @@ self: { description = "Data Binding in Gtk2Hs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binding-wx" = callPackage @@ -35965,6 +37153,7 @@ self: { description = "Data Binding in WxHaskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bindings" = callPackage @@ -36000,6 +37189,7 @@ self: { description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {esound = null;}; "bindings-GLFW" = callPackage @@ -36039,6 +37229,7 @@ self: { description = "Bindings to Velleman K8055 dll"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {K8055D = null;}; "bindings-apr" = callPackage @@ -36052,6 +37243,7 @@ self: { description = "Low level bindings to Apache Portable Runtime (APR)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) apr;}; "bindings-apr-util" = callPackage @@ -36065,6 +37257,7 @@ self: { description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {apr-util = null;}; "bindings-audiofile" = callPackage @@ -36093,6 +37286,7 @@ self: { description = "Bindings for libbfd, a library of the GNU `binutils'"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {bfd = null; opcodes = null;}; "bindings-cctools" = callPackage @@ -36106,6 +37300,7 @@ self: { description = "Bindings to the CCTools WorkQueue C library"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {dttools = null;}; "bindings-codec2" = callPackage @@ -36137,6 +37332,7 @@ self: { description = "This package is obsolete. Look for bindings-DSL instead."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bindings-dc1394" = callPackage @@ -36151,6 +37347,7 @@ self: { description = "Library for using firewire (iidc-1394) cameras"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {dc1394 = null;}; "bindings-directfb" = callPackage @@ -36163,7 +37360,7 @@ self: { libraryPkgconfigDepends = [ directfb ]; description = "Low level bindings to DirectFB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) directfb;}; "bindings-eskit" = callPackage @@ -36178,6 +37375,7 @@ self: { description = "Bindings to ESKit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {eskit = null;}; "bindings-fann" = callPackage @@ -36191,6 +37389,7 @@ self: { description = "Low level bindings to FANN neural network library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {fann = null;}; "bindings-fluidsynth" = callPackage @@ -36204,6 +37403,7 @@ self: { description = "Haskell FFI bindings for fluidsynth software synthesizer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) fluidsynth;}; "bindings-friso" = callPackage @@ -36217,6 +37417,7 @@ self: { description = "Low level bindings for friso"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {friso = null;}; "bindings-glib" = callPackage @@ -36266,6 +37467,7 @@ self: { description = "Low level bindings to GNU GSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gsl;}; "bindings-gts" = callPackage @@ -36279,6 +37481,7 @@ self: { description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gts;}; "bindings-hamlib" = callPackage @@ -36297,6 +37500,7 @@ self: { description = "Hamlib bindings for Haskell"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) hamlib;}; "bindings-hdf5" = callPackage @@ -36309,6 +37513,7 @@ self: { description = "Project bindings-* raw interface to HDF5 library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bindings-levmar" = callPackage @@ -36359,6 +37564,7 @@ self: { description = "Low level bindings to libftdi"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libftdi; inherit (pkgs) libusb;}; "bindings-libg15" = callPackage @@ -36372,6 +37578,7 @@ self: { description = "Bindings to libg15"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {g15 = null;}; "bindings-librrd" = callPackage @@ -36385,6 +37592,7 @@ self: { description = "Low level bindings to RRDtool"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {librrd = null;}; "bindings-libstemmer" = callPackage @@ -36402,6 +37610,7 @@ self: { description = "Binding for libstemmer with low level binding"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {stemmer = null;}; "bindings-libusb" = callPackage @@ -36427,6 +37636,7 @@ self: { description = "bindings to libv4l2 for Linux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {v4l2 = null;}; "bindings-libzip" = callPackage @@ -36487,6 +37697,7 @@ self: { description = "Low-level bindings for the MonetDB API (mapi)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {monetdb-mapi = null;}; "bindings-mpdecimal" = callPackage @@ -36499,6 +37710,7 @@ self: { description = "bindings to mpdecimal library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bindings-nettle" = callPackage @@ -36540,6 +37752,7 @@ self: { description = "Low-level bindings to portaudio library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) portaudio;}; "bindings-posix" = callPackage @@ -36620,6 +37833,7 @@ self: { description = "Low-level bindings to the SuperCollider synthesis engine library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {scsynth = null;}; "bindings-sipc" = callPackage @@ -36636,6 +37850,7 @@ self: { description = "Low level bindings to SIPC"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {sipc = null;}; "bindings-sophia" = callPackage @@ -36695,6 +37910,7 @@ self: { description = "Bindings against the wlc library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) wlc;}; "bindings-yices" = callPackage @@ -36720,6 +37936,7 @@ self: { description = "A variation of Data.Dynamic.Dynamic with a Binary instance"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binembed" = callPackage @@ -36739,6 +37956,7 @@ self: { description = "Embed data into object files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binembed-example" = callPackage @@ -36756,6 +37974,7 @@ self: { description = "Example project using binembed to embed data in object files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bini" = callPackage @@ -36788,6 +38007,7 @@ self: { description = "Aggregate continuous values into discrete bins"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bio" = callPackage @@ -36809,6 +38029,7 @@ self: { description = "A bioinformatics library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bio-sequence" = callPackage @@ -36826,6 +38047,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bioace" = callPackage @@ -36840,6 +38062,7 @@ self: { description = "Library for reading ace assembly files"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bioalign" = callPackage @@ -36852,6 +38075,7 @@ self: { description = "Data structures and helper functions for calculating alignments"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "biocore" = callPackage @@ -36866,6 +38090,7 @@ self: { description = "A bioinformatics library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "biofasta" = callPackage @@ -36878,6 +38103,7 @@ self: { description = "Library for reading fasta sequence files"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "biofastq" = callPackage @@ -36890,6 +38116,7 @@ self: { description = "A library for reading FASTQ files"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "biohazard" = callPackage @@ -36910,6 +38137,7 @@ self: { description = "bioinformatics support library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bioinformatics-toolkit" = callPackage @@ -36947,6 +38175,7 @@ self: { description = "A collection of bioinformatics tools"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "biophd" = callPackage @@ -36963,6 +38192,7 @@ self: { description = "Library for reading phd sequence files"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "biopsl" = callPackage @@ -36980,6 +38210,7 @@ self: { description = "Library and executables for working with PSL files"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "biosff" = callPackage @@ -36997,6 +38228,7 @@ self: { description = "Library and executables for working with SFF files"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "biostockholm" = callPackage @@ -37020,6 +38252,7 @@ self: { description = "Parsing and rendering of Stockholm files (used by Pfam, Rfam and Infernal)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "birch-beer" = callPackage @@ -37055,6 +38288,7 @@ self: { description = "Plot a colorful tree"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bird" = callPackage @@ -37076,6 +38310,7 @@ self: { description = "A simple, sinatra-inspired web framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bisc" = callPackage @@ -37114,6 +38349,7 @@ self: { description = "Determine relevant parts of binary data"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bishbosh" = callPackage @@ -37157,6 +38393,7 @@ self: { description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bit-protocol" = callPackage @@ -37197,6 +38434,7 @@ self: { description = "Lazy, infinite, compact stream of Bool with O(1) indexing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bit-vector" = callPackage @@ -37316,6 +38554,7 @@ self: { description = "Partial implementation of the Bitcoin protocol (as of 2013)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bitcoin-payment-channel" = callPackage @@ -37382,6 +38621,7 @@ self: { description = "Library to communicate with the Satoshi Bitcoin daemon"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bitcoin-script" = callPackage @@ -37454,6 +38694,7 @@ self: { description = "A command line tool to access bit.ly URL shortener."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bitmap" = callPackage @@ -37493,6 +38734,7 @@ self: { description = "Bitmap library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bits" = callPackage @@ -37573,6 +38815,7 @@ self: { description = "Bitstream support for Conduit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bits-extra" = callPackage @@ -37628,6 +38871,7 @@ self: { description = "A space-efficient set data structure"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gmp;}; "bitset-word8" = callPackage @@ -37669,7 +38913,8 @@ self: { description = "Proof-of-concept tool for writing using binary choices"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs.gnome2) pango;}; + broken = true; + }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) pango;}; "bitstream" = callPackage ({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck @@ -37688,6 +38933,7 @@ self: { description = "Fast, packed, strict and lazy bit streams with stream fusion"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bitstring" = callPackage @@ -37732,6 +38978,7 @@ self: { description = "Bittorrent protocol implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bittrex" = callPackage @@ -37771,6 +39018,7 @@ self: { description = "Unboxed bit vectors"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bitwise" = callPackage @@ -37825,6 +39073,7 @@ self: { description = "A lousy Prelude replacement by a lousy dude"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bizzlelude-js" = callPackage @@ -37837,6 +39086,7 @@ self: { description = "A lousy Prelude replacement by a lousy dude"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bk-tree" = callPackage @@ -37872,6 +39122,7 @@ self: { description = "Backup utility for backing up to cloud storage services (S3 only right now)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bktrees" = callPackage @@ -37898,6 +39149,7 @@ self: { description = "a stupid cron"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "black-jewel" = callPackage @@ -37988,6 +39240,7 @@ self: { description = "The BLAKE SHA-3 candidate hashes, in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blakesum-demo" = callPackage @@ -38006,6 +39259,7 @@ self: { description = "The BLAKE SHA-3 candidate hashes, in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blank-canvas_0_6_2" = callPackage @@ -38062,7 +39316,6 @@ self: { ]; description = "HTML5 Canvas Graphics Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blas" = callPackage @@ -38075,6 +39328,7 @@ self: { description = "Bindings to the BLAS library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blas-carray" = callPackage @@ -38092,6 +39346,7 @@ self: { description = "Auto-generated interface to Fortran BLAS via CArrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blas-comfort-array" = callPackage @@ -38109,6 +39364,7 @@ self: { description = "Auto-generated interface to Fortran BLAS via comfort-array"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blas-ffi" = callPackage @@ -38124,6 +39380,7 @@ self: { description = "Auto-generated interface to Fortran BLAS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) blas;}; "blas-hs" = callPackage @@ -38138,6 +39395,7 @@ self: { description = "Low-level Haskell bindings to Blas"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) blas;}; "blastxml" = callPackage @@ -38152,6 +39410,7 @@ self: { description = "Library for reading Blast XML output"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blatex" = callPackage @@ -38170,6 +39429,7 @@ self: { description = "Blog in LaTeX"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blaze" = callPackage @@ -38241,6 +39501,7 @@ self: { description = "Enumeratees for the incremental conversion of builders to bytestrings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blaze-colonnade" = callPackage @@ -38309,6 +39570,7 @@ self: { description = "Some contributions to add handy things to blaze html"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blaze-html-hexpat" = callPackage @@ -38321,6 +39583,7 @@ self: { description = "A hexpat backend for blaze-html"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blaze-html-truncate" = callPackage @@ -38337,6 +39600,7 @@ self: { description = "A truncator for blaze-html"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blaze-json" = callPackage @@ -38359,6 +39623,7 @@ self: { description = "tiny library for encoding json"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blaze-markup" = callPackage @@ -38440,6 +39705,7 @@ self: { description = "Fast rendering of common datatypes (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blazeMarker" = callPackage @@ -38469,6 +39735,7 @@ self: { description = "A true monad (transformer) version of the blaze-markup and blaze-html libraries"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ble" = callPackage @@ -38501,6 +39768,7 @@ self: { description = "Bluetooth Low Energy (BLE) peripherals"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blink1" = callPackage @@ -38520,6 +39788,7 @@ self: { description = "Control library for blink(1) LED from ThingM"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blip" = callPackage @@ -38539,6 +39808,7 @@ self: { description = "Python to bytecode compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bliplib" = callPackage @@ -38555,6 +39825,7 @@ self: { description = "Support code for Blip"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blockchain" = callPackage @@ -38579,6 +39850,7 @@ self: { description = "Generic blockchain implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blockhash" = callPackage @@ -38601,6 +39873,7 @@ self: { description = "Blockhash perceptual image hash algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blocking-transactions" = callPackage @@ -38634,6 +39907,7 @@ self: { description = "Very simple static blog software"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bloodhound" = callPackage @@ -38663,6 +39937,7 @@ self: { description = "Elasticsearch client library for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bloodhound-amazonka-auth" = callPackage @@ -38686,6 +39961,7 @@ self: { description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bloomfilter" = callPackage @@ -38725,6 +40001,7 @@ self: { description = "Distributed bloom filters on Redis (using the Hedis client)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blosum" = callPackage @@ -38747,6 +40024,7 @@ self: { description = "BLOSUM generator"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bloxorz" = callPackage @@ -38779,6 +40057,7 @@ self: { description = "The blubber client; connects to the blubber server"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blubber-server" = callPackage @@ -38801,6 +40080,7 @@ self: { description = "The blubber server, serves blubber clients"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bluemix-sdk" = callPackage @@ -38839,7 +40119,8 @@ self: { description = "full-featured tiling for the GNOME desktop environment"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk2 = pkgs.gnome2.gtk;}; + broken = true; + }) {inherit (pkgs) gtk2;}; "bluetileutils" = callPackage ({ mkDerivation, base, gtk }: @@ -38853,6 +40134,7 @@ self: { description = "Utilities for Bluetile"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blunk-hask-tests" = callPackage @@ -38869,6 +40151,7 @@ self: { description = "spam"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "blunt" = callPackage @@ -38891,6 +40174,7 @@ self: { description = "Convert between pointfree and pointful expressions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bmp" = callPackage @@ -38916,6 +40200,7 @@ self: { description = "Library for communication with the Bosch BNO055 orientation sensor"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "board-games" = callPackage @@ -38981,6 +40266,7 @@ self: { executableHaskellDepends = [ base hogre hois random ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bolt" = callPackage @@ -39005,6 +40291,7 @@ self: { description = "Bolt driver for Neo4j"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "boltzmann-brain" = callPackage @@ -39030,6 +40317,7 @@ self: { description = "Boltzmann sampler compiler for combinatorial systems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "boltzmann-samplers" = callPackage @@ -39078,6 +40366,7 @@ self: { description = "Bond schema compiler and code generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bond-haskell" = callPackage @@ -39107,6 +40396,7 @@ self: { description = "Runtime support for BOND serialization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bond-haskell-compiler" = callPackage @@ -39129,6 +40419,7 @@ self: { description = "Bond code generator for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bookkeeper" = callPackage @@ -39157,6 +40448,7 @@ self: { description = "Anonymous records and overloaded labels"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bookkeeper-permissions" = callPackage @@ -39169,6 +40461,7 @@ self: { description = "Permissions for bookkeeper records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bookkeeping" = callPackage @@ -39299,6 +40592,7 @@ self: { description = "Boolean expressions with various representations and search queries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bools" = callPackage @@ -39357,6 +40651,7 @@ self: { description = "Chronokinetic stream sources and incremental consumers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "boomerang" = callPackage @@ -39390,6 +40685,7 @@ self: { description = "Boomshine clone"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "boop" = callPackage @@ -39457,6 +40753,7 @@ self: { description = "Metering System for OpenStack metrics provided by Vaultaire"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "boring" = callPackage @@ -39477,6 +40774,7 @@ self: { description = "Boring and Absurd types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "boring-game" = callPackage @@ -39507,6 +40805,7 @@ self: { description = "A boring window switcher"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bot" = callPackage @@ -39519,6 +40818,7 @@ self: { description = "bots for functional reactive programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "both" = callPackage @@ -39591,6 +40891,7 @@ self: { description = "ScopeH and ScopeT extras for bound"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bound-gen" = callPackage @@ -39614,6 +40915,7 @@ self: { description = "Arrays with a value for every index"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bounded-tchan" = callPackage @@ -39672,6 +40974,7 @@ self: { description = "audio-visual pseudo-physical simulation of colliding circles"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "box-tuples" = callPackage @@ -39729,6 +41032,7 @@ self: { description = "Types and functions to work with braids and Khovanov homology"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "brain-bleep" = callPackage @@ -39743,6 +41047,7 @@ self: { description = "primitive imperative language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "brainfuck" = callPackage @@ -39826,6 +41131,7 @@ self: { description = "A simple Breakout game implementation"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "breve" = callPackage @@ -39850,6 +41156,7 @@ self: { description = "a url shortener"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "brians-brain" = callPackage @@ -39864,6 +41171,7 @@ self: { description = "A Haskell implementation of the Brian's Brain cellular automaton"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "brick" = callPackage @@ -39908,6 +41216,7 @@ self: { description = "A drop-down menu widget for brick"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "brick-filetree" = callPackage @@ -39968,6 +41277,7 @@ self: { description = "Bricks is a lazy functional language based on Nix"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bricks-internal" = callPackage @@ -39987,6 +41297,7 @@ self: { description = "..."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bricks-internal-test" = callPackage @@ -40003,6 +41314,7 @@ self: { description = "..."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bricks-parsec" = callPackage @@ -40024,6 +41336,7 @@ self: { description = "..."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bricks-rendering" = callPackage @@ -40045,6 +41358,7 @@ self: { description = "..."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bricks-syntax" = callPackage @@ -40066,6 +41380,7 @@ self: { description = "..."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "brillig" = callPackage @@ -40087,6 +41402,7 @@ self: { description = "Simple part of speech tagger"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "brittany" = callPackage @@ -40129,6 +41445,7 @@ self: { description = "Haskell source code formatter"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "broadcast-chan" = callPackage @@ -40146,6 +41463,7 @@ self: { description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "broadcast-chan-conduit" = callPackage @@ -40165,6 +41483,7 @@ self: { description = "Conduit-based parallel streaming code for broadcast-chan"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "broadcast-chan-pipes" = callPackage @@ -40182,6 +41501,7 @@ self: { description = "Pipes-based parallel streaming code for broadcast-chan"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "broadcast-chan-tests" = callPackage @@ -40205,6 +41525,7 @@ self: { description = "Helpers for generating tests for broadcast-chan"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "broccoli" = callPackage @@ -40217,6 +41538,7 @@ self: { description = "Small library for interactive functional programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "brok" = callPackage @@ -40242,6 +41564,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Finds broken links in text files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "broker-haskell" = callPackage @@ -40256,6 +41580,7 @@ self: { description = "Haskell bindings to Broker, Bro's messaging library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {broker = null;}; "bronyradiogermany-common" = callPackage @@ -40290,6 +41615,7 @@ self: { description = "Streaming interface for the BronyRadioGermany API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "browscap" = callPackage @@ -40307,6 +41633,7 @@ self: { description = "A reader and interface for the Browser Capabilities Project data files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bsb-http-chunked" = callPackage @@ -40374,6 +41701,7 @@ self: { description = "Generic functionality for BSON"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bson-generics" = callPackage @@ -40386,6 +41714,7 @@ self: { description = "Generics functionality for BSON"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bson-lens" = callPackage @@ -40486,6 +41815,7 @@ self: { description = "A backend agnostic, concurrent BTree"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "btrfs" = callPackage @@ -40538,6 +41868,7 @@ self: { description = "Automates most of your plain text accounting data entry in ledger format"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "buffer" = callPackage @@ -40560,6 +41891,7 @@ self: { description = "Simple mutable low-level buffer for IO"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "buffer-builder" = callPackage @@ -40613,6 +41945,7 @@ self: { description = "Serialize Aeson values with Data.BufferBuilder"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "buffer-pipe" = callPackage @@ -40643,6 +41976,7 @@ self: { description = "An implementation of Buffon machines"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "buffon-machines" = callPackage @@ -40713,6 +42047,7 @@ self: { description = "A Haskell interface to the Bugzilla native REST API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "build" = callPackage @@ -40731,6 +42066,7 @@ self: { description = "Build systems a la carte"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "buildable" = callPackage @@ -40743,6 +42079,7 @@ self: { description = "Typeclass for builders of linear data structures"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "buildbox" = callPackage @@ -40773,6 +42110,7 @@ self: { description = "Tools for working with buildbox benchmark result files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "buildwrapper" = callPackage @@ -40811,6 +42149,7 @@ self: { description = "A library and an executable that provide an easy API for a Haskell IDE"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bullet" = callPackage @@ -40825,6 +42164,7 @@ self: { description = "A wrapper for the Bullet physics engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) bullet;}; "bulletproofs" = callPackage @@ -40852,7 +42192,6 @@ self: { tasty-quickcheck text ]; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bumper" = callPackage @@ -40873,14 +42212,15 @@ self: { description = "Automatically bump package versions, also transitively"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bunz" = callPackage ({ mkDerivation, base, cmdargs, doctest, hspec, text, unix }: mkDerivation { pname = "bunz"; - version = "0.0.7"; - sha256 = "124vas0i5hdx7wmcdmydxal6c3iqy89fypparf9hzpkbb7gwrpwz"; + version = "0.0.9"; + sha256 = "0q5520pdq52fhx4yd6lhxr77c00njmy0wqbmb0gi1p4ahqs5wrgs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; @@ -40889,6 +42229,7 @@ self: { description = "CLI tool to beautify JSON string"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "burnt-explorer" = callPackage @@ -40907,6 +42248,7 @@ self: { description = "List OP_RETURN cryptocurrency transaction outputs"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "burst-detection" = callPackage @@ -40921,6 +42263,7 @@ self: { description = "Burst detection algorithms"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bus-pirate" = callPackage @@ -40938,6 +42281,7 @@ self: { description = "Haskell interface to the Bus Pirate binary interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "buster" = callPackage @@ -40955,6 +42299,7 @@ self: { description = "Almost but not quite entirely unlike FRP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "buster-gtk" = callPackage @@ -40972,6 +42317,7 @@ self: { description = "Almost but not quite entirely unlike FRP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "buster-network" = callPackage @@ -40989,6 +42335,7 @@ self: { description = "Almost but not quite entirely unlike FRP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bustle" = callPackage @@ -40999,8 +42346,8 @@ self: { }: mkDerivation { pname = "bustle"; - version = "0.7.4"; - sha256 = "1ivisgd7w7hi0yvfnm689grq0mfn03k2rmj5sn570qcpa4xfm2kw"; + version = "0.7.5"; + sha256 = "0r0ng67b2q9ww0adv1fdrpmgmdyjqv6ksd9g6kkn9cjwnaascq3p"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -41041,6 +42388,7 @@ self: { description = "Chops a command or program invocation into digestable pieces"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "butter" = callPackage @@ -41063,6 +42411,7 @@ self: { description = "Monad Transformer for Asyncronous Message Passing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "butterflies" = callPackage @@ -41083,6 +42432,7 @@ self: { description = "butterfly tilings"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bv" = callPackage @@ -41177,6 +42527,7 @@ self: { description = "a BitVector datatype that is parameterized by the vector width"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "byline" = callPackage @@ -41207,6 +42558,7 @@ self: { description = "data from/to ByteString"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "byteable" = callPackage @@ -41327,6 +42679,7 @@ self: { description = "Arbitrary instances for ByteStrings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring-builder" = callPackage @@ -41356,6 +42709,7 @@ self: { description = "Variable-length integer encoding"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring-class" = callPackage @@ -41370,6 +42724,7 @@ self: { description = "Classes for automatic conversion to and from strict and lazy bytestrings. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring-conversion" = callPackage @@ -41406,6 +42761,7 @@ self: { description = "Parse CSV formatted data efficiently"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring-delta" = callPackage @@ -41487,6 +42843,7 @@ self: { description = "ByteString-backed Handles"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring-lexing" = callPackage @@ -41538,6 +42895,7 @@ self: { description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring-progress" = callPackage @@ -41576,6 +42934,7 @@ self: { description = "fast ByteString to number converting library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring-rematch" = callPackage @@ -41590,6 +42949,7 @@ self: { description = "Rematch support for ByteString"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring-short" = callPackage @@ -41620,6 +42980,7 @@ self: { description = "Efficient conversion of values into readable byte strings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring-strict-builder" = callPackage @@ -41660,6 +43021,7 @@ self: { description = "Library for Time parsing from ByteString"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring-to-vector" = callPackage @@ -41703,14 +43065,11 @@ self: { ({ mkDerivation, base, binary, bytestring }: mkDerivation { pname = "bytestring-trie"; - version = "0.2.4.1"; - sha256 = "0qqklrvdcprchnl4bxr6w7zf6k5gncincl3kysm34gd04sszxr1g"; - revision = "1"; - editedCabalFile = "0f56pb1k1va7bs9rpn0b8hclxhn5pcjln857k50myhyzrwz8qg7r"; + version = "0.2.5.0"; + sha256 = "1jpynpyarikxhlc4ifdswvkj0ph9fd5d0vcxhjv0lrv0zwqvv488"; libraryHaskellDepends = [ base binary bytestring ]; description = "An efficient finite map from (byte)strings to values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-typenats" = callPackage @@ -41730,6 +43089,7 @@ self: { description = "Bytestrings with typenat lengths"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestringparser" = callPackage @@ -41742,6 +43102,7 @@ self: { description = "Combinator parsing with Data.ByteString.Lazy"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestringparser-temporary" = callPackage @@ -41765,6 +43126,7 @@ self: { description = "A ReadP style parser library for ByteString"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "byteunits" = callPackage @@ -41827,6 +43189,7 @@ self: { description = "A higher level DSL on top of language-c"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "c-io" = callPackage @@ -41839,6 +43202,7 @@ self: { description = "C IO"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "c-mosquitto" = callPackage @@ -41896,6 +43260,7 @@ self: { description = "Simple C0 Syntax Check"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "c0parser" = callPackage @@ -41908,6 +43273,7 @@ self: { description = "Simple C0 Parser"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "c10k" = callPackage @@ -41942,6 +43308,7 @@ self: { description = "Translate C code into ATS"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "c2hs" = callPackage @@ -42004,6 +43371,7 @@ self: { description = "Convert C API header files to .hsc and .hsc.helper.c files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ca" = callPackage @@ -42084,6 +43452,7 @@ self: { description = "Check how up-to-date your .cabal dependencies are."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-bounds" = callPackage @@ -42124,6 +43493,8 @@ self: { ]; description = "Bundling C/C++ projects in Cabal package made easy"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-cargs" = callPackage @@ -42147,6 +43518,7 @@ self: { description = "A command line program for extracting compiler arguments from a cabal file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-constraints" = callPackage @@ -42161,6 +43533,7 @@ self: { description = "Repeatable builds for cabalized Haskell projects"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-db" = callPackage @@ -42181,6 +43554,7 @@ self: { description = "query tools for the local cabal database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-debian" = callPackage @@ -42210,6 +43584,7 @@ self: { description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-dependency-licenses" = callPackage @@ -42226,6 +43601,7 @@ self: { description = "Compose a list of a project's transitive dependencies with their licenses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-dev" = callPackage @@ -42249,6 +43625,7 @@ self: { description = "Manage sandboxed Haskell build environments"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-dir" = callPackage @@ -42263,6 +43640,7 @@ self: { description = "show dist dir of 'cabal copy/install'"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-doctest" = callPackage @@ -42291,7 +43669,6 @@ self: { testHaskellDepends = [ base Cabal ]; description = "Template Haskell expressions for reading fields from a project's cabal file"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-ghc-dynflags" = callPackage @@ -42304,6 +43681,7 @@ self: { description = "Conveniently configure GHC's dynamic flags for use with Cabal projects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-ghci" = callPackage @@ -42321,6 +43699,7 @@ self: { description = "Set up ghci with options taken from a .cabal file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-graphdeps" = callPackage @@ -42339,6 +43718,7 @@ self: { description = "Generate graphs of install-time Cabal dependencies"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-helper" = callPackage @@ -42374,6 +43754,7 @@ self: { description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-info" = callPackage @@ -42395,6 +43776,7 @@ self: { description = "Read information from cabal files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-install" = callPackage @@ -42449,6 +43831,7 @@ self: { description = "The (bundled) command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) zlib;}; "cabal-install-ghc72" = callPackage @@ -42469,6 +43852,7 @@ self: { description = "Temporary version of cabal-install for ghc-7.2"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-install-ghc74" = callPackage @@ -42489,6 +43873,7 @@ self: { description = "Temporary version of cabal-install for ghc-7.4"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-lenses" = callPackage @@ -42555,6 +43940,7 @@ self: { description = "build multiple packages at once"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-mon" = callPackage @@ -42573,6 +43959,7 @@ self: { description = "A monitor for cabal builds"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-nirvana" = callPackage @@ -42591,6 +43978,7 @@ self: { description = "Avoid Cabal dependency hell by constraining to known good versions. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-plan" = callPackage @@ -42633,6 +44021,7 @@ self: { description = "Show dependencies of program being built in current directory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-query" = callPackage @@ -42650,6 +44039,7 @@ self: { description = "Helpers for quering .cabal files or hackageDB's 00-index.tar"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-rpm" = callPackage @@ -42671,6 +44061,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "cabal-rpm_0_13_1" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , http-client, http-client-tls, http-conduit, process, simple-cmd + , time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "0.13.1"; + sha256 = "1k61jknk99hrw1h4kfkpl0905lgybidvlqn5ny6d54kr5f7fn9d3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal directory filepath http-client + http-client-tls http-conduit process simple-cmd time unix + ]; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -42696,6 +44106,7 @@ self: { description = "The user interface for building and installing Cabal packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-sign" = callPackage @@ -42733,6 +44144,7 @@ self: { description = "Topologically sort cabal packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-src" = callPackage @@ -42755,6 +44167,7 @@ self: { description = "Alternative install procedure to avoid the diamond dependency issue"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-test" = callPackage @@ -42771,6 +44184,7 @@ self: { description = "Automated test tool for cabal projects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-test-bin" = callPackage @@ -42826,6 +44240,7 @@ self: { description = "Helper functions for writing custom Setup.hs scripts."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-uninstall" = callPackage @@ -42853,6 +44268,7 @@ self: { description = "Command-line tool for uploading packages to Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal2arch" = callPackage @@ -42873,6 +44289,7 @@ self: { description = "Create Arch Linux packages from Cabal packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal2doap" = callPackage @@ -42889,6 +44306,7 @@ self: { description = "Cabal to Description-of-a-Project (DOAP)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal2ebuild" = callPackage @@ -42904,6 +44322,7 @@ self: { description = "make gentoo's .ebuild file from .cabal file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal2ghci" = callPackage @@ -42923,6 +44342,7 @@ self: { description = "A tool to generate .ghci file from .cabal"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal2nix" = callPackage @@ -42934,8 +44354,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.14.1"; - sha256 = "1bkhh5s3x6as4pz70p2rgwkrb121k5ic7j5dhmlh0rwvhrr9g1z2"; + version = "2.14.2"; + sha256 = "0fa0rhglp3xlv8zr9pnx2l14bz7jvdvdxwiy63rpvf44jzjdknkr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42999,6 +44419,7 @@ self: { description = "A simple tool to query cabal files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabalg" = callPackage @@ -43032,6 +44453,7 @@ self: { description = "Generate pretty graphs of module trees from cabal files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabalish" = callPackage @@ -43051,6 +44473,7 @@ self: { description = "Provides access to the cabal file data for shell scripts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabalmdvrpm" = callPackage @@ -43066,6 +44489,7 @@ self: { description = "Create mandriva rpm from cabal package"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabalrpmdeps" = callPackage @@ -43081,6 +44505,7 @@ self: { description = "Autogenerate rpm dependencies from cabal files"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabalvchk" = callPackage @@ -43095,6 +44520,7 @@ self: { description = "Verify installed package version against user-specified constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabin" = callPackage @@ -43114,6 +44540,7 @@ self: { description = "Cabal binary sandboxes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabocha" = callPackage @@ -43127,6 +44554,7 @@ self: { testHaskellDepends = [ base text-format ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {cabocha = null;}; "cache" = callPackage @@ -43145,6 +44573,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cached" = callPackage + ({ mkDerivation, base, containers, directory, doctest, filepath + , protolude, QuickCheck, quickcheck-assertions, shake, text + }: + mkDerivation { + pname = "cached"; + version = "0.1.0.0"; + sha256 = "19x5pwcdkhmk32w9ccb2ixc73k2hhqki61yi39lahda5k86jisdv"; + libraryHaskellDepends = [ base containers protolude shake text ]; + testHaskellDepends = [ + base containers directory doctest filepath protolude QuickCheck + quickcheck-assertions shake text + ]; + description = "Cache values to disk"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "cached-io" = callPackage ({ mkDerivation, base, stm, time, transformers }: mkDerivation { @@ -43176,74 +44623,76 @@ self: { "cachix" = callPackage ({ mkDerivation, async, base, base16-bytestring, base64-bytestring - , bifunctors, bytestring, cachix-api, conduit, conduit-extra - , cookie, cryptonite, data-default, dhall, directory, ed25519 - , filepath, fsnotify, here, hspec, hspec-discover, http-client + , bytestring, cachix-api, conduit, conduit-extra, cookie + , cryptonite, data-default, dhall, directory, ed25519, filepath + , fsnotify, here, hspec, hspec-discover, http-client , http-client-tls, http-conduit, http-types, lzma-conduit - , megaparsec, memory, mmorph, optparse-applicative, process - , protolude, resourcet, retry, safe-exceptions, servant - , servant-auth, servant-auth-client, servant-client - , servant-client-core, servant-streaming-client, streaming, text - , unix, uri-bytestring, versions + , megaparsec, memory, mmorph, netrc, optparse-applicative, process + , protolude, retry, safe-exceptions, servant, servant-auth + , servant-auth-client, servant-client, servant-client-core + , servant-conduit, temporary, text, unix, uri-bytestring, versions }: mkDerivation { pname = "cachix"; - version = "0.1.3"; - sha256 = "0vhgkdrrj8wmnzqsjwyrhflwprnizjibgjwcwn5771mjv38amyx0"; + version = "0.2.0"; + sha256 = "0nk6ay0vdq656bwkbnd16y95ivjbi34k8k58gcabr91bgypp1fhn"; + revision = "1"; + editedCabalFile = "103ypqp0kclc1814q2ci5fi2jpfbxwmjqfsnkvwf3c1vr8cqplmh"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - async base base16-bytestring base64-bytestring bifunctors - bytestring cachix-api conduit conduit-extra cookie cryptonite - data-default dhall directory ed25519 filepath fsnotify here - http-client http-client-tls http-conduit http-types lzma-conduit - megaparsec memory mmorph optparse-applicative process protolude - resourcet retry safe-exceptions servant servant-auth - servant-auth-client servant-client servant-client-core - servant-streaming-client streaming text unix uri-bytestring - versions + async base base16-bytestring base64-bytestring bytestring + cachix-api conduit conduit-extra cookie cryptonite data-default + dhall directory ed25519 filepath fsnotify here http-client + http-client-tls http-conduit http-types lzma-conduit megaparsec + memory mmorph netrc optparse-applicative process protolude retry + safe-exceptions servant servant-auth servant-auth-client + servant-client servant-client-core servant-conduit text unix + uri-bytestring versions ]; executableHaskellDepends = [ base cachix-api ]; executableToolDepends = [ hspec-discover ]; - testHaskellDepends = [ base cachix-api here hspec protolude ]; + testHaskellDepends = [ + base cachix-api directory here hspec protolude temporary + ]; description = "Command line client for Nix binary cache hosting https://cachix.org"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cachix-api" = callPackage - ({ mkDerivation, aeson, amazonka, base, base16-bytestring - , bytestring, conduit, cookie, cryptonite, hspec, hspec-discover - , http-api-data, http-media, lens, memory, protolude, servant - , servant-auth, servant-auth-server, servant-auth-swagger - , servant-streaming, servant-swagger, servant-swagger-ui-core - , string-conv, swagger2, text, transformers + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , conduit, cookie, cryptonite, deepseq, exceptions, hspec + , hspec-discover, http-api-data, http-media, lens, memory + , protolude, resourcet, servant, servant-auth, servant-auth-server + , servant-auth-swagger, servant-client, servant-swagger + , servant-swagger-ui-core, string-conv, swagger2, text + , transformers }: mkDerivation { pname = "cachix-api"; - version = "0.1.0.3"; - sha256 = "00j5m3pqnlwwvbj4669lpng6awsn5xzz67c6qq5dmc5q7ii2vzdf"; + version = "0.2.0"; + sha256 = "1wmyxknd5fliqfsavngpj01i34jcl39rsm1lx0nf13vlsf279wkk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson amazonka base base16-bytestring bytestring conduit cookie - cryptonite http-api-data http-media lens memory servant - servant-auth servant-auth-server servant-auth-swagger - servant-streaming servant-swagger servant-swagger-ui-core - string-conv swagger2 text transformers + aeson base base16-bytestring bytestring conduit cookie cryptonite + deepseq exceptions http-api-data http-media lens memory resourcet + servant servant-auth servant-auth-server servant-auth-swagger + servant-client servant-swagger string-conv swagger2 text + transformers ]; executableHaskellDepends = [ aeson base ]; testHaskellDepends = [ - aeson amazonka base base16-bytestring bytestring conduit cookie - cryptonite hspec http-api-data http-media lens memory protolude - servant servant-auth servant-auth-server servant-auth-swagger - servant-streaming servant-swagger servant-swagger-ui-core - string-conv swagger2 text transformers + aeson base base16-bytestring bytestring conduit cookie cryptonite + hspec http-api-data http-media lens memory protolude servant + servant-auth servant-auth-server servant-auth-swagger + servant-swagger servant-swagger-ui-core string-conv swagger2 text + transformers ]; testToolDepends = [ hspec-discover ]; description = "Servant HTTP API specification for https://cachix.org"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cacophony" = callPackage @@ -43312,6 +44761,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cairo" = callPackage @@ -43332,7 +44782,6 @@ self: { libraryPkgconfigDepends = [ cairo ]; description = "Binding to the Cairo library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo;}; "cairo-appbase" = callPackage @@ -43347,7 +44796,6 @@ self: { executableHaskellDepends = [ base cairo glib gtk ]; description = "A template for building new GUI applications using GTK and Cairo"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cairo-canvas" = callPackage @@ -43361,7 +44809,6 @@ self: { libraryHaskellDepends = [ base cairo linear mtl random time ]; description = "Simpler drawing API for Cairo"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cairo-core" = callPackage @@ -43382,6 +44829,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "Cairo Haskell binding (partial)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) cairo;}; "cake" = callPackage @@ -43405,6 +44854,7 @@ self: { description = "A build-system library and driver"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cake3" = callPackage @@ -43435,6 +44885,7 @@ self: { description = "Third cake the Makefile EDSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cakyrespa" = callPackage @@ -43453,6 +44904,7 @@ self: { description = "run turtle like LOGO with lojban"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cal-layout" = callPackage @@ -43468,6 +44920,7 @@ self: { description = "Calendar Layout Algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cal3d" = callPackage @@ -43481,6 +44934,7 @@ self: { description = "Haskell binding to the Cal3D animation library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {cal3d = null;}; "cal3d-examples" = callPackage @@ -43496,6 +44950,7 @@ self: { description = "Examples for the Cal3d animation library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cal3d-opengl" = callPackage @@ -43508,6 +44963,7 @@ self: { description = "OpenGL rendering for the Cal3D animation library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "calc" = callPackage @@ -43522,6 +44978,7 @@ self: { description = "A small compiler for arithmetic expressions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "calculator" = callPackage @@ -43544,6 +45001,7 @@ self: { description = "A calculator repl, with variables, functions & Mathematica like dynamic plots"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "caldims" = callPackage @@ -43565,6 +45023,7 @@ self: { description = "Calculation tool and library supporting units"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "caledon" = callPackage @@ -43583,6 +45042,7 @@ self: { description = "a logic programming language based on the calculus of constructions"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "calendar-recycling" = callPackage @@ -43624,6 +45084,7 @@ self: { description = "The call game engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "call-haskell-from-anything" = callPackage @@ -43643,6 +45104,7 @@ self: { description = "Call Haskell functions from other languages via serialization and dynamic libraries"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "call-stack" = callPackage @@ -43690,6 +45152,7 @@ self: { description = "CamFort - Cambridge Fortran infrastructure"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) flint;}; "camh" = callPackage @@ -43723,6 +45186,7 @@ self: { description = "Haskell implementation of the Campfire API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "canon" = callPackage @@ -43737,6 +45201,7 @@ self: { description = "Massive Number Arithmetic"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "canonical-filepath" = callPackage @@ -43749,6 +45214,7 @@ self: { description = "Abstract data type for canonical file paths"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "canonical-json" = callPackage @@ -43770,6 +45236,7 @@ self: { description = "Canonical JSON for signing and hashing JSON values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "canteven-config" = callPackage @@ -43801,6 +45268,7 @@ self: { description = "Utilities for HTTP programming"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "canteven-listen-http" = callPackage @@ -43813,6 +45281,7 @@ self: { description = "data types to describe HTTP services"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "canteven-log" = callPackage @@ -43831,6 +45300,7 @@ self: { description = "A canteven way of setting up logging for your program"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "canteven-parsedate" = callPackage @@ -43847,6 +45317,7 @@ self: { description = "Date / time parsing utilities that try to guess the date / time format"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "canteven-template" = callPackage @@ -43886,6 +45357,7 @@ self: { description = "Application for analysis of java source code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cantor-pairing" = callPackage @@ -43903,7 +45375,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Convert data to and from a natural number representation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cao" = callPackage @@ -43926,6 +45397,7 @@ self: { description = "CAO Compiler"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cap" = callPackage @@ -43941,6 +45413,7 @@ self: { description = "Interprets and debug the cap language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "capability" = callPackage @@ -43965,6 +45438,7 @@ self: { description = "Extensional capabilities and deriving combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "capataz" = callPackage @@ -43987,6 +45461,7 @@ self: { description = "OTP-like supervision trees in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "capnp" = callPackage @@ -44026,6 +45501,7 @@ self: { description = "Cap'n Proto for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "capped-list" = callPackage @@ -44038,6 +45514,7 @@ self: { description = "A list-like type for lazy sequences, with a user-defined termination value"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "capri" = callPackage @@ -44054,6 +45531,7 @@ self: { description = "A simple wrapper over cabal-install to operate in project-private mode"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "car-pool" = callPackage @@ -44077,6 +45555,7 @@ self: { description = "Simple web-server for organizing car-pooling for an event"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "caramia" = callPackage @@ -44116,6 +45595,7 @@ self: { description = "some spaghetti code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "carboncopy" = callPackage @@ -44134,6 +45614,7 @@ self: { description = "Drop emails from threads being watched into special CC folder"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "carettah" = callPackage @@ -44155,6 +45636,7 @@ self: { description = "A presentation tool written with Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "carray" = callPackage @@ -44191,6 +45673,7 @@ self: { description = "Carte: A commandline pastebin server"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cartel" = callPackage @@ -44220,6 +45703,7 @@ self: { description = "Specify Cabal files in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "casa-abbreviations-and-acronyms" = callPackage @@ -44242,6 +45726,7 @@ self: { description = "CASA Abbreviations and Acronyms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "casadi-bindings" = callPackage @@ -44267,6 +45752,7 @@ self: { description = "mid-level bindings to CasADi"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {casadi = null;}; "casadi-bindings-control" = callPackage @@ -44284,6 +45770,7 @@ self: { description = "low level bindings to casadi-control"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {casadi_control = null;}; "casadi-bindings-core" = callPackage @@ -44301,6 +45788,7 @@ self: { description = "autogenerated low level bindings to casadi"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {casadi = null;}; "casadi-bindings-internal" = callPackage @@ -44314,6 +45802,7 @@ self: { description = "low level bindings to CasADi"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {casadi = null;}; "casadi-bindings-ipopt-interface" = callPackage @@ -44331,6 +45820,7 @@ self: { description = "low level bindings to casadi-ipopt_interface"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {casadi_ipopt_interface = null;}; "casadi-bindings-snopt-interface" = callPackage @@ -44348,6 +45838,7 @@ self: { description = "low level bindings to casadi-snopt_interface"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {casadi_snopt_interface = null;}; "cascading" = callPackage @@ -44365,6 +45856,7 @@ self: { description = "DSL for HTML CSS (Cascading Style Sheets)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "case-conversion" = callPackage @@ -44476,6 +45968,7 @@ self: { description = "the Computer Algebra SHell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "casing" = callPackage @@ -44687,6 +46180,7 @@ self: { description = "Haskell client for Cassandra's CQL protocol"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cassandra-thrift" = callPackage @@ -44826,6 +46320,7 @@ self: { description = "io-streams interface for the cassava CSV library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cassette" = callPackage @@ -44838,6 +46333,7 @@ self: { description = "A combinator library for simultaneously defining parsers and pretty printers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cassy" = callPackage @@ -44866,6 +46362,7 @@ self: { description = "A high level driver for the Cassandra datastore"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cast" = callPackage @@ -44896,6 +46393,7 @@ self: { description = "A tool to manage shared cabal-install sandboxes"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "casui" = callPackage @@ -44911,6 +46409,7 @@ self: { description = "Equation Manipulator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "catamorphism" = callPackage @@ -44924,6 +46423,7 @@ self: { description = "Exposes a Template Haskell function for generating catamorphisms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "catch-fd" = callPackage @@ -44936,6 +46436,7 @@ self: { description = "MonadThrow and MonadCatch, using functional dependencies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "categorical-algebra" = callPackage @@ -44948,6 +46449,7 @@ self: { description = "Categorical Monoids and Semirings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "categories" = callPackage @@ -44971,6 +46473,7 @@ self: { description = "Categorical types and classes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "category-extras" = callPackage @@ -44999,6 +46502,7 @@ self: { description = "A meta-package documenting various packages inspired by category theory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "category-printf" = callPackage @@ -45022,6 +46526,7 @@ self: { description = "Traced monoidal categories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "catnplus" = callPackage @@ -45042,6 +46547,7 @@ self: { description = "Simple tool to display text files with line numbers and paging"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cautious" = callPackage @@ -45087,7 +46593,6 @@ self: { hspec QuickCheck ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cayene-lpp" = callPackage @@ -45107,26 +46612,6 @@ self: { }) {}; "cayley-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , exceptions, hspec, http-client, http-conduit, lens, lens-aeson - , mtl, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; - version = "0.4.8"; - sha256 = "09hrq1k8s8w7rawyn78hjagirs3yrkp79nn7p5w1l8amp27k5cdi"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cayley-client_0_4_9" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector @@ -45144,6 +46629,7 @@ self: { description = "A Haskell client for the Cayley graph database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cayley-dickson" = callPackage @@ -45271,6 +46757,7 @@ self: { description = "Bindings for the CCI networking library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {cci = null;}; "ccnx" = callPackage @@ -45283,6 +46770,7 @@ self: { description = "A Haskell implementation of the CCNx network protocol"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cctools-workqueue" = callPackage @@ -45300,6 +46788,7 @@ self: { description = "High-level interface to CCTools' WorkQueue library"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {dttools = null;}; "cdeps" = callPackage @@ -45338,6 +46827,7 @@ self: { description = "Convenient Chinese phrase & character lookup"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cef" = callPackage @@ -45353,6 +46843,7 @@ self: { description = "CEF log format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cef3-raw" = callPackage @@ -45367,7 +46858,8 @@ self: { description = "Raw CEF3 bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {cef = null; gtk2 = pkgs.gnome2.gtk;}; + broken = true; + }) {cef = null; inherit (pkgs) gtk2;}; "cef3-simple" = callPackage ({ mkDerivation, base, cef3-raw }: @@ -45379,6 +46871,7 @@ self: { description = "Simple wrapper around cef3-raw"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ceilometer-common" = callPackage @@ -45403,6 +46896,7 @@ self: { description = "Common Haskell types and encoding for OpenStack Ceilometer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cellrenderer-cairo" = callPackage @@ -45417,7 +46911,8 @@ self: { description = "Cairo-based CellRenderer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk2 = pkgs.gnome2.gtk;}; + broken = true; + }) {inherit (pkgs) gtk2;}; "celtchar" = callPackage ({ mkDerivation, base, bytestring, directory, file-embed, filepath @@ -45442,6 +46937,7 @@ self: { description = "A tool to build a novel"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cerberus" = callPackage @@ -45470,6 +46966,7 @@ self: { description = "Protect and control API access with cerberus"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cereal" = callPackage @@ -45532,6 +47029,7 @@ self: { description = "Automatic deriving of Serialize using GHC.Generics"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cereal-enumerator" = callPackage @@ -45544,6 +47042,7 @@ self: { description = "Deserialize things with cereal and enumerator"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cereal-ieee754" = callPackage @@ -45556,6 +47055,7 @@ self: { description = "Floating point support for the 'cereal' serialization library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cereal-io-streams" = callPackage @@ -45579,6 +47079,7 @@ self: { description = "io-streams support for the cereal binary serialization library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cereal-plus" = callPackage @@ -45603,6 +47104,7 @@ self: { description = "An extended serialization library on top of \"cereal\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cereal-streams" = callPackage @@ -45625,7 +47127,6 @@ self: { ]; description = "Use cereal to encode/decode io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-text" = callPackage @@ -45707,6 +47208,7 @@ self: { description = "Certificates and Key Reader/Writer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cf" = callPackage @@ -45725,6 +47227,7 @@ self: { description = "Exact real arithmetic using continued fractions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cfenv" = callPackage @@ -45759,6 +47262,7 @@ self: { description = "cfipu processor for toy brainfuck-like language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cflp" = callPackage @@ -45778,6 +47282,7 @@ self: { description = "Constraint Functional-Logic Programming in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cfopu" = callPackage @@ -45796,6 +47301,7 @@ self: { description = "cfopu processor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cg" = callPackage @@ -45817,6 +47323,7 @@ self: { description = "Parser for categorial grammars"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cgen" = callPackage @@ -45837,6 +47344,7 @@ self: { description = "generates Haskell bindings and C wrappers for C++ libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cgi" = callPackage @@ -45901,6 +47409,7 @@ self: { description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cgrep" = callPackage @@ -45927,6 +47436,7 @@ self: { description = "Command line tool"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chain-codes" = callPackage @@ -45969,6 +47479,7 @@ self: { description = "Combinators for building and processing 2D images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chalkboard-viewer" = callPackage @@ -45981,6 +47492,7 @@ self: { description = "OpenGL based viewer for chalkboard rendered images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chalmers-lava2000" = callPackage @@ -46108,6 +47620,7 @@ self: { description = "Rapid prototyping websites with Snap and Heist"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "charset" = callPackage @@ -46159,6 +47672,7 @@ self: { description = "Easily render histograms with Chart"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chart-unit" = callPackage @@ -46184,6 +47698,7 @@ self: { description = "Native haskell charts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chaselev-deque" = callPackage @@ -46241,6 +47756,7 @@ self: { description = "A library of simple NLP algorithms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chatty" = callPackage @@ -46270,6 +47786,7 @@ self: { description = "Provides some classes and types for dealing with text, using the fundaments of Chatty"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chatty-utils" = callPackage @@ -46310,6 +47827,7 @@ self: { description = "The ChatWork API in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cheapskate" = callPackage @@ -46388,6 +47906,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "check-email" = callPackage @@ -46419,6 +47938,7 @@ self: { description = "Check whether module and package imports conform to the PVP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "checked" = callPackage @@ -46433,6 +47953,7 @@ self: { description = "Bounds-checking integer types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "checkers" = callPackage @@ -46477,6 +47998,7 @@ self: { description = "Generate checklists relevant to a given patch"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "checksum" = callPackage @@ -46504,7 +48026,6 @@ self: { ]; description = "A simple and intuitive library for automated testing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chell-hunit" = callPackage @@ -46516,7 +48037,6 @@ self: { libraryHaskellDepends = [ base chell HUnit ]; description = "HUnit support for the Chell testing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chell-quickcheck" = callPackage @@ -46528,7 +48048,6 @@ self: { libraryHaskellDepends = [ base chell QuickCheck random ]; description = "QuickCheck support for the Chell testing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chesshs" = callPackage @@ -46560,6 +48079,7 @@ self: { description = "Query interface for Chevalier"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chiasma" = callPackage @@ -46585,6 +48105,7 @@ self: { description = "tmux api"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chimera" = callPackage @@ -46595,6 +48116,8 @@ self: { pname = "chimera"; version = "0.2.0.0"; sha256 = "1hrnvyp8d7qc1c3xl4mzfsycb554yn3b49yy8jjyvaqazmvrb4zi"; + revision = "1"; + editedCabalFile = "029hpcs3x1sv3jsq10bygm4246b4gy83yxg3s4r98f37055dyzyd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim vector ]; @@ -46643,6 +48166,7 @@ self: { description = "Helper for the Major System"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "choice" = callPackage @@ -46666,6 +48190,7 @@ self: { description = "Choose random elements from a stream"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "choose-exe" = callPackage @@ -46683,6 +48208,7 @@ self: { description = "Command-line program to choose random element from a stream"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chorale" = callPackage @@ -46701,6 +48227,7 @@ self: { description = "A module containing basic functions that the prelude does not offer"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chorale-geo" = callPackage @@ -46719,6 +48246,7 @@ self: { description = "A module containing basic geo functions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chp" = callPackage @@ -46735,6 +48263,7 @@ self: { description = "An implementation of concurrency ideas from Communicating Sequential Processes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chp-mtl" = callPackage @@ -46747,6 +48276,7 @@ self: { description = "MTL class instances for the CHP library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chp-plus" = callPackage @@ -46764,6 +48294,7 @@ self: { description = "A set of high-level concurrency utilities built on Communicating Haskell Processes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chp-spec" = callPackage @@ -46780,6 +48311,7 @@ self: { description = "A mirror implementation of chp that generates a specification of the program"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chp-transformers" = callPackage @@ -46792,6 +48324,7 @@ self: { description = "Transformers instances for the CHP library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chr-core" = callPackage @@ -46809,6 +48342,7 @@ self: { description = "Constraint Handling Rules"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chr-data" = callPackage @@ -46847,6 +48381,7 @@ self: { description = "AST + surface language around chr"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chr-parse" = callPackage @@ -46861,6 +48396,7 @@ self: { description = "Parsing for chr library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chr-pretty" = callPackage @@ -46910,6 +48446,7 @@ self: { description = "neovim package manager"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chronograph" = callPackage @@ -46924,6 +48461,7 @@ self: { description = "measure timings of data evaluation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chronologique" = callPackage @@ -46970,6 +48508,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chronos-bench" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, chronos + , containers, deepseq, optparse-applicative, process, terminal-size + }: + mkDerivation { + pname = "chronos-bench"; + version = "0.2.0.2"; + sha256 = "1h2v4nzgpr4ivn1xw0n6mlphnzjzz3b1iym6sfxd1nkk56q8060v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring chronos containers deepseq + optparse-applicative process terminal-size + ]; + executableHaskellDepends = [ base optparse-applicative ]; + benchmarkHaskellDepends = [ base ]; + description = "Benchmarking tool with focus on comparing results"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chu2" = callPackage ({ mkDerivation, base, bytestring, data-default, hack2 , hack2-handler-snap-server, utf8-string @@ -46986,6 +48544,7 @@ self: { description = "FFI for Chu2 Agda Web Server Interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chuchu" = callPackage @@ -47031,6 +48590,7 @@ self: { description = "Simple template library with static safety"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chunky" = callPackage @@ -47047,6 +48607,7 @@ self: { description = "Human-readable storage of text/binary objects"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "church" = callPackage @@ -47117,6 +48678,7 @@ self: { description = "Cielo API v3 Bindings for Haskell"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cil" = callPackage @@ -47129,6 +48691,7 @@ self: { description = "An interface to CIL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cinvoke" = callPackage @@ -47142,6 +48705,7 @@ self: { description = "A binding to cinvoke"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {cinvoke = null;}; "cio" = callPackage @@ -47154,6 +48718,7 @@ self: { description = "A monad for concurrent IO on a thread pool"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cipher-aes" = callPackage @@ -47325,6 +48890,8 @@ self: { executableHaskellDepends = [ array base bytestring parseargs ]; description = "Implementation of CipherSaber2 RC4 cryptography"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "circ" = callPackage @@ -47367,6 +48934,7 @@ self: { description = "The CircleCI REST API for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cirru-parser" = callPackage @@ -47430,6 +48998,7 @@ self: { description = "convert document IDs such as DOI, ISBN, arXiv ID to bibliographic reference"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "citeproc-hs" = callPackage @@ -47450,6 +49019,7 @@ self: { description = "A Citation Style Language implementation in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "citeproc-hs-pandoc-filter" = callPackage @@ -47470,6 +49040,7 @@ self: { description = "A Pandoc filter for processing bibliographic references with citeproc-hs"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cityhash" = callPackage @@ -47510,6 +49081,7 @@ self: { description = "A new Haskeleton package"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cjk" = callPackage @@ -47528,6 +49100,7 @@ self: { description = "Data about Chinese, Japanese and Korean characters and languages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cl3" = callPackage @@ -47582,6 +49155,7 @@ self: { description = "Simple CLI RPN calculator"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clafer" = callPackage @@ -47617,6 +49191,7 @@ self: { description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "claferIG" = callPackage @@ -47650,6 +49225,7 @@ self: { description = "claferIG is an interactive tool that generates instances of Clafer models"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "claferwiki" = callPackage @@ -47670,6 +49246,7 @@ self: { description = "A wiki-based IDE for literate modeling with Clafer"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clang-compilation-database" = callPackage @@ -47683,6 +49260,7 @@ self: { description = "JSON Compilation Database Format encoding and decoding"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clang-pure" = callPackage @@ -47706,6 +49284,7 @@ self: { description = "Pure C++ code analysis with libclang"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (self.llvmPackages) clang;}; "clanki" = callPackage @@ -47722,6 +49301,7 @@ self: { description = "Command-line spaced-repetition software"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clarifai" = callPackage @@ -47740,6 +49320,7 @@ self: { description = "API Client for the Clarifai API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clash" = callPackage @@ -47760,6 +49341,7 @@ self: { description = "CAES Language for Synchronous Hardware (CLaSH)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clash-ghc" = callPackage @@ -47791,6 +49373,7 @@ self: { description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clash-lib" = callPackage @@ -47817,6 +49400,7 @@ self: { description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clash-multisignal" = callPackage @@ -47832,6 +49416,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clash-prelude" = callPackage @@ -47858,6 +49443,7 @@ self: { description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clash-prelude-quickcheck" = callPackage @@ -47889,6 +49475,7 @@ self: { description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clash-verilog" = callPackage @@ -47907,6 +49494,7 @@ self: { description = "CAES Language for Synchronous Hardware - Verilog backend"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clash-vhdl" = callPackage @@ -47925,6 +49513,7 @@ self: { description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "classify" = callPackage @@ -47967,6 +49556,7 @@ self: { description = "Classify sounds produced by Xenopus laevis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "classy-influxdb-simple" = callPackage @@ -48004,6 +49594,7 @@ self: { description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "classy-parallel" = callPackage @@ -48020,6 +49611,7 @@ self: { description = "Fork of the monad-parallel package using monad-control"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "classy-prelude" = callPackage @@ -48112,6 +49704,7 @@ self: { description = "CSS preprocessor as embedded Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clckwrks" = callPackage @@ -48148,6 +49741,7 @@ self: { description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) openssl;}; "clckwrks-cli" = callPackage @@ -48166,6 +49760,7 @@ self: { description = "a command-line interface for adminstrating some aspects of clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clckwrks-dot-com" = callPackage @@ -48188,6 +49783,7 @@ self: { description = "clckwrks.com"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clckwrks-plugin-bugs" = callPackage @@ -48214,6 +49810,7 @@ self: { description = "bug tracking plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clckwrks-plugin-ircbot" = callPackage @@ -48238,6 +49835,7 @@ self: { description = "ircbot plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clckwrks-plugin-mailinglist" = callPackage @@ -48263,6 +49861,7 @@ self: { description = "mailing list plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clckwrks-plugin-media" = callPackage @@ -48287,6 +49886,7 @@ self: { description = "media plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clckwrks-plugin-page" = callPackage @@ -48315,6 +49915,7 @@ self: { description = "support for CMS/Blogging in clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clckwrks-theme-bootstrap" = callPackage @@ -48334,6 +49935,7 @@ self: { description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clckwrks-theme-clckwrks" = callPackage @@ -48352,6 +49954,7 @@ self: { description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clckwrks-theme-geo-bootstrap" = callPackage @@ -48365,6 +49968,7 @@ self: { description = "geo bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cld2" = callPackage @@ -48405,6 +50009,7 @@ self: { description = "Open unions without need for Typeable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cless" = callPackage @@ -48424,6 +50029,7 @@ self: { description = "Colorized LESS"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clevercss" = callPackage @@ -48439,6 +50045,7 @@ self: { description = "A CSS preprocessor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clexer" = callPackage @@ -48451,6 +50058,7 @@ self: { description = "Lexes C++ code into simple tokens"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cli" = callPackage @@ -48467,7 +50075,6 @@ self: { executableHaskellDepends = [ base basement foundation ]; description = "CLI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cli-builder" = callPackage @@ -48485,6 +50092,7 @@ self: { description = "Simple project template from stack"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cli-setup" = callPackage @@ -48561,6 +50169,7 @@ self: { description = "A Clifford algebra number type for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clifford" = callPackage @@ -48594,6 +50203,7 @@ self: { description = "A Clifford algebra library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clifm" = callPackage @@ -48614,6 +50224,7 @@ self: { description = "Command Line Interface File Manager"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clingo" = callPackage @@ -48634,6 +50245,7 @@ self: { description = "Haskell bindings to the Clingo ASP solver"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) clingo;}; "clippard" = callPackage @@ -48646,6 +50258,7 @@ self: { description = "A simple Haskell library for copying text to the clipboard in a cross-platform way"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clipper" = callPackage @@ -48658,6 +50271,7 @@ self: { description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clippings" = callPackage @@ -48684,6 +50298,7 @@ self: { description = "A parser/generator for Kindle-format clipping files (`My Clippings.txt`),"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clist" = callPackage @@ -48719,6 +50334,7 @@ self: { description = "Post tweets from stdin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cloben" = callPackage @@ -48777,6 +50393,7 @@ self: { description = "timer functionality to clock IO commands"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {QtCore = null;}; "clogparse" = callPackage @@ -48794,6 +50411,7 @@ self: { description = "Parse IRC logs such as the #haskell logs on tunes.org"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clone-all" = callPackage @@ -48814,6 +50432,7 @@ self: { description = "Clone all github repositories from a given user"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "closed" = callPackage @@ -48845,6 +50464,7 @@ self: { description = "Depth- and breadth-first set closures"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cloud-haskell" = callPackage @@ -48869,6 +50489,7 @@ self: { description = "The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cloud-seeder" = callPackage @@ -48898,6 +50519,7 @@ self: { description = "A tool for interacting with AWS CloudFormation"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cloudfront-signer" = callPackage @@ -48915,6 +50537,7 @@ self: { description = "CloudFront URL signer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cloudi" = callPackage @@ -49016,6 +50639,7 @@ self: { description = "Quasiquoters for inline C# and F#"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clr-marshal" = callPackage @@ -49085,6 +50709,7 @@ self: { description = "C to Lua data wrapper generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clumpiness" = callPackage @@ -49108,6 +50733,7 @@ self: { description = "simple alternative to type classes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clustering" = callPackage @@ -49134,6 +50760,7 @@ self: { description = "High performance clustering algorithms"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clustertools" = callPackage @@ -49153,6 +50780,7 @@ self: { description = "Tools for manipulating sequence clusters"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clutterhs" = callPackage @@ -49171,6 +50799,7 @@ self: { description = "Bindings to the Clutter animation library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) clutter; inherit (pkgs.gnome2) pango;}; "cmaes" = callPackage @@ -49197,8 +50826,8 @@ self: { }: mkDerivation { pname = "cmark"; - version = "0.5.6"; - sha256 = "1c1j3a8b9qx5zk9myqm3gap8ymz7fipwrdmyfsq9wkkdr9x4np45"; + version = "0.5.6.3"; + sha256 = "09vzb6hsh20ykr7z7vb5af1m68w0aj0yah39kjqkwbahsq2y5qpf"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; benchmarkHaskellDepends = [ @@ -49214,8 +50843,8 @@ self: { }: mkDerivation { pname = "cmark-gfm"; - version = "0.1.6"; - sha256 = "0s39djd1j0rq63g4sy0cnras14m263anr56nvijcbcy9zg41dyf8"; + version = "0.1.8"; + sha256 = "0z5zkhax975b3ih71x846n09zrhqb7j4pn6rmfv6p4q8gncrrv9l"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; benchmarkHaskellDepends = [ @@ -49282,6 +50911,7 @@ self: { description = "Represent cmark-parsed Markdown as a tree of sections"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cmath" = callPackage @@ -49294,6 +50924,7 @@ self: { description = "A binding to the standard C math library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cmathml3" = callPackage @@ -49314,6 +50945,7 @@ self: { description = "Data model, parser, serialiser and transformations for Content MathML 3"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cmd-item" = callPackage @@ -49331,6 +50963,7 @@ self: { description = "Library to compose and reuse command line fragments"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cmdargs" = callPackage @@ -49368,6 +51001,7 @@ self: { description = "Helper to enter cmdargs command lines using a web browser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cmdlib" = callPackage @@ -49382,6 +51016,7 @@ self: { description = "a library for command line parsing & online help"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cmdtheline" = callPackage @@ -49404,6 +51039,7 @@ self: { description = "Declarative command-line option parsing and documentation library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cml" = callPackage @@ -49427,6 +51063,7 @@ self: { description = "A library for C-like programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cmph" = callPackage @@ -49446,8 +51083,36 @@ self: { description = "low level interface to CMPH"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {cmph = null;}; + "cmt" = callPackage + ({ mkDerivation, attoparsec, base, classy-prelude, directory + , file-embed, filepath, process, tasty, tasty-discover + , tasty-expected-failure, tasty-hunit, terminal-size, text + }: + mkDerivation { + pname = "cmt"; + version = "0.4.0.0"; + sha256 = "17faw3g078i2a15zl1d31wd0ag3hk347hf23widdkcnf6bs4qmr6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base classy-prelude directory filepath process + terminal-size text + ]; + executableHaskellDepends = [ base classy-prelude ]; + testHaskellDepends = [ + base classy-prelude file-embed tasty tasty-discover + tasty-expected-failure tasty-hunit + ]; + testToolDepends = [ tasty-discover ]; + description = "Write consistent git commit messages"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "cmu" = callPackage ({ mkDerivation, array, base, containers }: mkDerivation { @@ -49489,6 +51154,7 @@ self: { description = "Detailed visualization of CMs, HMMs and their comparisions"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cnc-spec-compiler" = callPackage @@ -49511,6 +51177,7 @@ self: { description = "Compiler/Translator for CnC Specification Files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cndict" = callPackage @@ -49576,6 +51243,7 @@ self: { description = "Syslog implementation on top of 'co-log-core'"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "coalpit" = callPackage @@ -49595,6 +51263,7 @@ self: { description = "Command-line options and DSV parsing and printing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "code-builder" = callPackage @@ -49607,6 +51276,7 @@ self: { description = "Simple system for generating code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "code-page" = callPackage @@ -49656,6 +51326,7 @@ self: { description = "Erlang VM byte code assembler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "codec-libevent" = callPackage @@ -49679,6 +51350,7 @@ self: { description = "Cross-platform structure serialisation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "codec-mbox" = callPackage @@ -49714,6 +51386,7 @@ self: { description = "A library for manipulating RPM files"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "codecov-haskell" = callPackage @@ -49738,6 +51411,7 @@ self: { description = "Codecov.io support for Haskell."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "codemonitor" = callPackage @@ -49757,6 +51431,7 @@ self: { description = "Tool that automatically runs arbitrary commands when files change on disk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "codepad" = callPackage @@ -49771,6 +51446,7 @@ self: { description = "Submit and retrieve paste output from CodePad.org."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "codeworld-api" = callPackage @@ -49780,15 +51456,14 @@ self: { }: mkDerivation { pname = "codeworld-api"; - version = "0.2.5"; - sha256 = "0gc1c0hc2sssiksii927kcg5rhalrw1fv3sr4zf4xvzj3nrd0k3m"; + version = "0.3.1"; + sha256 = "13kggrhm7hvkh3c9pilzgsb7yhkdbyxzj6jmfxqf4lskws17h0bg"; libraryHaskellDepends = [ base blank-canvas cereal cereal-text containers ghc-prim hashable mtl random random-shuffle text time ]; description = "Graphics library for CodeWorld"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codex" = callPackage @@ -49817,6 +51492,7 @@ self: { description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "codo-notation" = callPackage @@ -49918,6 +51594,7 @@ self: { description = "Simple account manager"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "coinbase-exchange" = callPackage @@ -49957,6 +51634,7 @@ self: { description = "Connector library for the coinbase exchange"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "coincident-root-loci" = callPackage @@ -49976,6 +51654,7 @@ self: { description = "Equivariant CSM classes of coincident root loci"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "colada" = callPackage @@ -50000,6 +51679,7 @@ self: { description = "Colada implements incremental word class class induction using online LDA"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "colchis" = callPackage @@ -50018,6 +51698,7 @@ self: { description = "Rudimentary JSON-RPC 2.0 client over raw TCP."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cold-widow" = callPackage @@ -50051,6 +51732,7 @@ self: { description = "Generate animated 3d objects in COLLADA"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "collada-types" = callPackage @@ -50067,6 +51749,7 @@ self: { description = "Data exchange between graphic applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "collapse-duplication" = callPackage @@ -50090,6 +51773,7 @@ self: { description = "Collapse the duplication output into clones and return their frequencies"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "collapse-util" = callPackage @@ -50104,6 +51788,7 @@ self: { description = "utility for collapsing adjacent writes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "collection-json" = callPackage @@ -50113,8 +51798,8 @@ self: { }: mkDerivation { pname = "collection-json"; - version = "1.3.1.0"; - sha256 = "0wlpv47jj5q2kiwm1daaw4p4s9vh3xfs4rpb78y2a1qw6r6nw9vw"; + version = "1.3.1.3"; + sha256 = "098in13gkrv4lrdn67b010c5wsl0zqwzcyfd504039wdcm6pazng"; libraryHaskellDepends = [ aeson base network-uri network-uri-json text ]; @@ -50140,6 +51825,7 @@ self: { description = "Useful standard collections types and related functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "collections-api" = callPackage @@ -50154,6 +51840,7 @@ self: { description = "API for collection data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "collections-base-instances" = callPackage @@ -50170,6 +51857,7 @@ self: { description = "Useful standard collections types and related functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "colock" = callPackage @@ -50222,6 +51910,7 @@ self: { description = "Count colors in images"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "colorful-monoids" = callPackage @@ -50271,6 +51960,7 @@ self: { description = "Colorless | The Programmatic IDL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "colorless-http-client" = callPackage @@ -50288,6 +51978,7 @@ self: { description = "Http Client addon for Colorless"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "colorless-scotty" = callPackage @@ -50302,6 +51993,7 @@ self: { description = "Scotty server add-on for Colorless"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "colors" = callPackage @@ -50359,6 +52051,7 @@ self: { description = "Working with colours in Accelerate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "colour-space" = callPackage @@ -50378,6 +52071,7 @@ self: { description = "Instances of the manifold-classes for colour types"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "coltrane" = callPackage @@ -50395,6 +52089,7 @@ self: { description = "A jazzy, minimal web framework for Haskell, inspired by Sinatra"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "columbia" = callPackage @@ -50416,6 +52111,7 @@ self: { description = "Enhanced serialization using seeking"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "com" = callPackage @@ -50428,6 +52124,7 @@ self: { description = "Haskell COM support library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "comark" = callPackage @@ -50507,6 +52204,7 @@ self: { description = "Definitions of AST that represents a Commonmark (markdown) document"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "combinat" = callPackage @@ -50531,6 +52229,7 @@ self: { description = "Generate and manipulate various combinatorial objects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "combinat-compat" = callPackage @@ -50567,6 +52266,7 @@ self: { description = "Graphical representations for various combinatorial objects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "combinator-interactive" = callPackage @@ -50589,6 +52289,7 @@ self: { description = "SKI Combinator interpreter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "combinatorial" = callPackage @@ -50623,6 +52324,7 @@ self: { description = "A number of data structures to represent and allow the manipulation of standard combinatorial problems, used as test problems in computer science"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "combinatorics" = callPackage @@ -50650,6 +52352,7 @@ self: { description = "Various buffer implementations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "comfort-array" = callPackage @@ -50698,6 +52401,7 @@ self: { description = "A format for describing comics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "comma" = callPackage @@ -50752,6 +52456,7 @@ self: { description = "pattern matching against string based commands"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "commodities" = callPackage @@ -50776,6 +52481,7 @@ self: { description = "Library for working with commoditized amounts and price histories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "commsec" = callPackage @@ -50792,6 +52498,7 @@ self: { description = "Provide communications security using symmetric ephemeral keys"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "commsec-keyexchange" = callPackage @@ -50811,6 +52518,7 @@ self: { description = "Key agreement for commsec"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "commutative" = callPackage @@ -50866,6 +52574,7 @@ self: { description = "Exotic comonad transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "comonad-random" = callPackage @@ -50943,6 +52652,7 @@ self: { description = "Compact Data.Map implementation using Data.Binary"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "compact-mutable" = callPackage @@ -50963,6 +52673,20 @@ self: { description = "Mutable arrays living on the compact heap"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "compact-mutable-vector" = callPackage + ({ mkDerivation, base, compact, ghc-prim, hspec, primitive, vector + }: + mkDerivation { + pname = "compact-mutable-vector"; + version = "0.0.0.1"; + sha256 = "1plz7rwn66r3b03hn60gsh8w5wk8hgzj0g3hdnc36f2rrav4n7mj"; + libraryHaskellDepends = [ base compact ghc-prim primitive vector ]; + testHaskellDepends = [ base compact hspec ]; + description = "Mutable vector with different GC characteristics"; + license = stdenv.lib.licenses.bsd3; }) {}; "compact-socket" = callPackage @@ -50980,6 +52704,7 @@ self: { description = "Socket functions for compact normal form"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "compact-string" = callPackage @@ -50994,6 +52719,7 @@ self: { description = "Fast, packed and strict strings with Unicode support, based on bytestrings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "compact-string-fix" = callPackage @@ -51008,6 +52734,7 @@ self: { description = "Same as compact-string except with a small fix so it builds on ghc-6.12"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "compactable" = callPackage @@ -51019,7 +52746,6 @@ self: { libraryHaskellDepends = [ base containers transformers vector ]; description = "A typeclass for structures which can be catMaybed, filtered, and partitioned"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compactmap" = callPackage @@ -51107,6 +52833,7 @@ self: { description = "Compositional Data Types on DAGs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "compdata-fixplate" = callPackage @@ -51176,6 +52903,7 @@ self: { description = "Helpers and runners for code competitions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "compilation" = callPackage @@ -51188,6 +52916,7 @@ self: { description = "Haskell functionality for quickly assembling simple compilers"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "compiler-warnings" = callPackage @@ -51245,6 +52974,7 @@ self: { description = "Empirical algorithmic complexity"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "componentm" = callPackage @@ -51265,7 +52995,6 @@ self: { ]; description = "Monad for allocation and cleanup of application resources"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "componentm-devel" = callPackage @@ -51279,7 +53008,6 @@ self: { ]; description = "Easy REPL driven development using ComponentM"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composable-associations" = callPackage @@ -51335,6 +53063,7 @@ self: { description = "Composable monad transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "composite-aeson" = callPackage @@ -51363,6 +53092,7 @@ self: { description = "JSON for Vinyl/Frames records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "composite-aeson-refined" = callPackage @@ -51379,6 +53109,7 @@ self: { description = "composite-aeson support for Refined from the refined package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "composite-base" = callPackage @@ -51402,6 +53133,7 @@ self: { description = "Shared utilities for composite-* packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "composite-ekg" = callPackage @@ -51417,6 +53149,7 @@ self: { description = "EKG Metrics for Vinyl/Frames records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "composite-opaleye" = callPackage @@ -51440,6 +53173,7 @@ self: { description = "Opaleye SQL for Frames records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "composite-swagger" = callPackage @@ -51462,6 +53196,7 @@ self: { description = "Swagger for Vinyl/Frames records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "composition" = callPackage @@ -51507,6 +53242,7 @@ self: { description = "Composition trees for arbitrary monoids"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "compositional-data" = callPackage @@ -51539,6 +53275,7 @@ self: { description = "Sum and Product types and such"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "compressed" = callPackage @@ -51559,6 +53296,7 @@ self: { description = "Compressed containers and reducers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "compression" = callPackage @@ -51587,6 +53325,7 @@ self: { description = "Strategy combinators for compositional data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "comptrans" = callPackage @@ -51605,6 +53344,7 @@ self: { description = "Automatically converting ASTs into compositional data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "computational-algebra" = callPackage @@ -51657,6 +53397,7 @@ self: { description = "Well-kinded computational algebra library, currently supporting Groebner basis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "computational-geometry" = callPackage @@ -51685,6 +53426,7 @@ self: { description = "Advanced notions of computation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concatenative" = callPackage @@ -51763,6 +53505,7 @@ self: { description = "Morphological disambiguation based on constrained CRFs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concraft-hr" = callPackage @@ -51785,6 +53528,7 @@ self: { description = "Part-of-speech tagger for Croatian"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concraft-pl" = callPackage @@ -51814,6 +53558,7 @@ self: { description = "Morphological tagger for Polish"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concrete-haskell" = callPackage @@ -51858,6 +53603,7 @@ self: { description = "Library for the Concrete data format"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concrete-haskell-autogen" = callPackage @@ -51875,6 +53621,7 @@ self: { description = "Automatically generated Thrift definitions for the Concrete data format"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concrete-relaxng-parser" = callPackage @@ -51895,6 +53642,7 @@ self: { description = "A parser driven by a standard RELAX NG schema with concrete syntax extensions"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concrete-typerep" = callPackage @@ -51915,6 +53663,7 @@ self: { description = "Binary and Hashable instances for TypeRep"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concur-core" = callPackage @@ -51969,6 +53718,7 @@ self: { description = "Benchmarks to compare concurrency APIs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concurrent-barrier" = callPackage @@ -52011,6 +53761,7 @@ self: { description = "Concurrent expanding buffer"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concurrent-dns-cache" = callPackage @@ -52074,6 +53825,7 @@ self: { description = "Concurrent networked stream transducers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concurrent-output" = callPackage @@ -52148,6 +53900,7 @@ self: { description = "MTL-like library using TVars"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "concurrent-supply" = callPackage @@ -52173,7 +53926,6 @@ self: { libraryHaskellDepends = [ base ]; description = "More utilities and broad-used datastructures for concurrency"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrentoutput" = callPackage @@ -52218,6 +53970,7 @@ self: { description = "Information retrieval library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "condorcet" = callPackage @@ -52230,6 +53983,7 @@ self: { description = "Library for Condorcet voting"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conductive-base" = callPackage @@ -52242,6 +53996,7 @@ self: { description = "a library for live coding and real-time musical applications"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conductive-clock" = callPackage @@ -52270,6 +54025,7 @@ self: { description = "a library with examples of using Conductive with hsc3"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conductive-song" = callPackage @@ -52282,6 +54038,7 @@ self: { description = "a library of functions which are useful for composing music"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conduit_1_2_13_1" = callPackage @@ -52320,8 +54077,8 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.3.1"; - sha256 = "1mi0ad2ha51lyx1sw15zkzbh2bvv1q7jcfrxd4xc91d7mmk9n4mf"; + version = "1.3.1.1"; + sha256 = "18izjgff4pmrknc8py06yvg3g6x27nx0rzmlwjxcflwm5v4szpw4"; libraryHaskellDepends = [ base bytestring directory exceptions filepath mono-traversable mtl primitive resourcet text transformers unix unliftio-core vector @@ -52373,6 +54130,7 @@ self: { description = "Conduit-based algorithms"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conduit-audio" = callPackage @@ -52406,6 +54164,7 @@ self: { description = "conduit-audio interface to the LAME MP3 library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {mp3lame = null;}; "conduit-audio-samplerate" = callPackage @@ -52426,6 +54185,7 @@ self: { description = "conduit-audio interface to the libsamplerate resampling library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {samplerate = null;}; "conduit-audio-sndfile" = callPackage @@ -52536,8 +54296,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.3.0"; - sha256 = "1bi2b6kdzy5f9glq46jzsk02has95jkxqz0cchpbmnakzhjwjh9c"; + version = "1.3.1.1"; + sha256 = "0jaj350vv6mbb26gdwcqz4gwzfzrjydv5pis2da49wz1npbakcfw"; libraryHaskellDepends = [ async attoparsec base bytestring conduit directory filepath network primitive process resourcet stm streaming-commons text transformers @@ -52545,8 +54305,8 @@ self: { ]; testHaskellDepends = [ async attoparsec base bytestring bytestring-builder conduit - directory exceptions hspec process QuickCheck resourcet stm - streaming-commons text transformers transformers-base + directory exceptions filepath hspec process QuickCheck resourcet + stm streaming-commons text transformers transformers-base ]; benchmarkHaskellDepends = [ base bytestring bytestring-builder conduit gauge transformers @@ -52588,6 +54348,7 @@ self: { description = "A file-finding conduit that allows user control over traversals"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conduit-iconv" = callPackage @@ -52620,6 +54381,7 @@ self: { description = "Merge multiple sorted conduits"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conduit-network-stream" = callPackage @@ -52636,6 +54398,7 @@ self: { description = "A base layer for network protocols using Conduits"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conduit-parse" = callPackage @@ -52675,6 +54438,7 @@ self: { description = "Allows conduit to resume sinks to feed multiple sources into it"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conduit-throttle" = callPackage @@ -52699,6 +54463,7 @@ self: { description = "Throttle Conduit Producers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conduit-tokenize-attoparsec" = callPackage @@ -52719,6 +54484,7 @@ self: { description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conduit-zstd" = callPackage @@ -52738,6 +54504,7 @@ self: { description = "Conduit-based ZStd Compression"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conf" = callPackage @@ -52755,6 +54522,7 @@ self: { description = "Parser for Haskell-based configuration files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conf-json" = callPackage @@ -52808,7 +54576,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "confcrypt_0_2_0_0" = callPackage + "confcrypt_0_2_3_0" = callPackage ({ mkDerivation, amazonka, amazonka-kms, base, base64-bytestring , bytestring, conduit, containers, crypto-pubkey-openssh , crypto-pubkey-types, cryptonite, deepseq, HUnit, lens, megaparsec @@ -52817,8 +54585,8 @@ self: { }: mkDerivation { pname = "confcrypt"; - version = "0.2.0.0"; - sha256 = "0gg1p06lmv7rs143am5kak6n7777f1ccf36xlscxwsyza5j1gi57"; + version = "0.2.3.0"; + sha256 = "1pqgh5jhnf18mfhhq8z39l2kv5pn11zw9zqxb30r75l5qhqvjjic"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52881,6 +54649,7 @@ self: { description = "A .conf file formatter"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "confide" = callPackage @@ -52896,6 +54665,7 @@ self: { description = "derive typeclass instances for decoding types from HOCON conf"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "config-ini" = callPackage @@ -52948,6 +54718,7 @@ self: { description = "Parse config files using parsec and generate parse errors on unhandled keys"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "config-schema" = callPackage @@ -52983,6 +54754,7 @@ self: { description = "A small program for swapping out dot files"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "config-value" = callPackage @@ -53039,6 +54811,7 @@ self: { description = "parser for config files, shell variables, command line args"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "configuration" = callPackage @@ -53051,6 +54824,7 @@ self: { description = "Simple data type for application configuration"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "configuration-tools" = callPackage @@ -53149,6 +54923,7 @@ self: { description = "The next generation of configuration management"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "confsolve" = callPackage @@ -53179,6 +54954,7 @@ self: { description = "Decidable congruence relations for Haskell: up to you whether this is a joke"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conjugateGradient" = callPackage @@ -53211,6 +54987,7 @@ self: { description = "A BitTorrent client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conkin" = callPackage @@ -53229,6 +55006,7 @@ self: { description = "Tools for functors from Hask^k to Hask"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conlogger" = callPackage @@ -53244,6 +55022,7 @@ self: { description = "A logger for a concurrent program"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "connection" = callPackage @@ -53297,6 +55076,7 @@ self: { description = "A library for parsing connection strings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "consistent" = callPackage @@ -53315,6 +55095,7 @@ self: { description = "Eventually consistent STM transactions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "console-program" = callPackage @@ -53333,6 +55114,7 @@ self: { description = "Interpret the command line and a config file as commands and options"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "console-prompt" = callPackage @@ -53368,6 +55150,7 @@ self: { description = "Compiler plugin for constant math elimination"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "constaparser" = callPackage @@ -53408,6 +55191,7 @@ self: { description = "Constrained Categories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "constrained-dynamic" = callPackage @@ -53421,6 +55205,7 @@ self: { description = "Dynamic typing with retained constraints"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "constrained-monads" = callPackage @@ -53445,6 +55230,7 @@ self: { description = "Typeclasses and instances for monads with constraints"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "constrained-normal" = callPackage @@ -53470,6 +55256,7 @@ self: { description = "Reified constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "constraint-classes" = callPackage @@ -53493,6 +55280,7 @@ self: { description = "Some conviencience type functions for manipulating constraints"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "constraint-reflection" = callPackage @@ -53505,6 +55293,7 @@ self: { description = "Constraint reflection"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "constraints" = callPackage @@ -53526,6 +55315,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "constraints-deriving" = callPackage + ({ mkDerivation, base, bytestring, Cabal, filepath, ghc, ghc-paths + , path, path-io + }: + mkDerivation { + pname = "constraints-deriving"; + version = "1.0.0.0"; + sha256 = "0a1r5pd1npfahx8hpr5kzw9xvla7f4d6463j80ar35vz854llxhm"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base ghc ]; + testHaskellDepends = [ + base bytestring filepath ghc ghc-paths path path-io + ]; + description = "Manipulating constraints and deriving class instances programmatically"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "constraints-emerge" = callPackage ({ mkDerivation, base, constraints, containers, ghc, hashable , hspec, transformers @@ -53541,6 +55351,7 @@ self: { description = "Defer instance lookups until runtime"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "constraints-extras" = callPackage @@ -53559,6 +55370,7 @@ self: { description = "Utility package for constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "constrictor" = callPackage @@ -53583,7 +55395,6 @@ self: { ]; description = "Exact computation with constructible real numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constructive-algebra" = callPackage @@ -53596,6 +55407,7 @@ self: { description = "A library of constructive algebra"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "consul-haskell" = callPackage @@ -53622,6 +55434,7 @@ self: { description = "A consul client for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "consumers" = callPackage @@ -53632,8 +55445,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.1.2.0"; - sha256 = "1fgnb4q5bbad6rmknclvwv79s593r054x7iafrhj3czrfzg94dfx"; + version = "2.2.0.0"; + sha256 = "0r7v5gfi7lw19h9chhn80fwnlgph5ak6n1vf153gq6l7bm10hacl"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -53647,6 +55460,7 @@ self: { description = "Concurrent PostgreSQL data consumers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "container" = callPackage @@ -53737,6 +55551,7 @@ self: { description = "Extensive benchmark suite for containers package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "containers-deepseq" = callPackage @@ -53760,6 +55575,7 @@ self: { description = "Unicode alternatives for common functions and operators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "containers-verified" = callPackage @@ -53796,6 +55612,7 @@ self: { description = "Store and retrieve data from an on-disk store"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "context-free-grammar" = callPackage @@ -53820,6 +55637,7 @@ self: { description = "Basic algorithms on context-free grammars"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "context-stack" = callPackage @@ -53834,6 +55652,7 @@ self: { description = "An abstraction of a stack and stack-based monadic context"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "contiguous" = callPackage @@ -53868,6 +55687,7 @@ self: { description = "dft of contiguous memory structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "continue" = callPackage @@ -53885,6 +55705,7 @@ self: { description = "Monads with suspension and arbitrary-spot reentry"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "continued-fraction" = callPackage @@ -53932,6 +55753,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "continuum-client" = callPackage @@ -53947,6 +55769,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "contravariant" = callPackage @@ -54042,6 +55865,7 @@ self: { description = "Event scheduling system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "control-iso" = callPackage @@ -54057,7 +55881,6 @@ self: { ]; description = "A typeclass for type isomorphisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-monad-attempt" = callPackage @@ -54070,6 +55893,7 @@ self: { description = "Monad transformer for attempt. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "control-monad-exception" = callPackage @@ -54087,6 +55911,7 @@ self: { description = "Explicitly typed, checked exceptions with stack traces"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "control-monad-exception-monadsfd" = callPackage @@ -54103,6 +55928,7 @@ self: { description = "Monads-fd instances for the EMT exceptions monad transformer"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "control-monad-exception-monadstf" = callPackage @@ -54119,6 +55945,7 @@ self: { description = "Monads-tf instances for the EMT exceptions monad transformer"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "control-monad-exception-mtl" = callPackage @@ -54132,6 +55959,7 @@ self: { description = "MTL instances for the EMT exceptions monad transformer"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "control-monad-failure" = callPackage @@ -54144,6 +55972,7 @@ self: { description = "A class for monads which can fail with an error. (deprecated)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "control-monad-failure-mtl" = callPackage @@ -54156,6 +55985,7 @@ self: { description = "A class for monads which can fail with an error for mtl 1 (deprecated)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "control-monad-free_0_5_3" = callPackage @@ -54246,6 +56076,7 @@ self: { description = "ContStuff instances for monads-tf transformers (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "contstuff-transformers" = callPackage @@ -54258,6 +56089,7 @@ self: { description = "Deprecated interface between contstuff 0.7.0 and the transformers package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "converge" = callPackage @@ -54360,6 +56192,7 @@ self: { description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "convertible" = callPackage @@ -54394,6 +56227,7 @@ self: { description = "convertible instances for ascii"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "convertible-text" = callPackage @@ -54415,6 +56249,7 @@ self: { description = "Typeclasses and instances for converting between types (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cookbook" = callPackage @@ -54495,6 +56330,7 @@ self: { description = "A stream DSL for writing embedded C programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copilot-c99" = callPackage @@ -54518,6 +56354,7 @@ self: { description = "A compiler for Copilot targeting C99"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copilot-cbmc" = callPackage @@ -54535,6 +56372,7 @@ self: { description = "Copilot interface to a C model-checker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copilot-core" = callPackage @@ -54551,6 +56389,7 @@ self: { description = "An intermediate representation for Copilot"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copilot-language" = callPackage @@ -54568,6 +56407,7 @@ self: { description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copilot-libraries" = callPackage @@ -54584,6 +56424,7 @@ self: { description = "Libraries for the Copilot language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copilot-sbv" = callPackage @@ -54600,6 +56441,7 @@ self: { description = "A compiler for CoPilot targeting SBV"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copilot-theorem" = callPackage @@ -54618,6 +56460,7 @@ self: { description = "k-induction for Copilot"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copr" = callPackage @@ -54638,6 +56481,7 @@ self: { description = "Haskell interface to the Fedora Copr system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "core" = callPackage @@ -54650,6 +56494,7 @@ self: { description = "External core parser and pretty printer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "core-compiler" = callPackage @@ -54685,6 +56530,7 @@ self: { description = "A subset of Haskell using in UCC for teaching purpose"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "corebot-bliki" = callPackage @@ -54712,6 +56558,7 @@ self: { description = "A bliki written using yesod. Uses pandoc to process files stored in git."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "corecursive-main" = callPackage @@ -54751,6 +56598,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) rocksdb;}; + "cornea" = callPackage + ({ mkDerivation, base, HTF, lens, mtl, template-haskell + , th-abstraction, transformers + }: + mkDerivation { + pname = "cornea"; + version = "0.2.2.0"; + sha256 = "0b33599clz9cxlqhci8xlizhqzslw7k0mv60g04vf8b5pj3q2zyk"; + libraryHaskellDepends = [ + base lens mtl template-haskell th-abstraction transformers + ]; + testHaskellDepends = [ + base HTF lens mtl template-haskell th-abstraction transformers + ]; + description = "classy optical monadic state"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "coroutine-enumerator" = callPackage ({ mkDerivation, base, enumerator, monad-coroutine }: mkDerivation { @@ -54761,6 +56627,7 @@ self: { description = "Bridge between the monad-coroutine and enumerator packages"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "coroutine-iteratee" = callPackage @@ -54773,6 +56640,7 @@ self: { description = "Bridge between the monad-coroutine and iteratee packages"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "coroutine-object" = callPackage @@ -54785,6 +56653,7 @@ self: { description = "Object-oriented programming realization using coroutine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "couch-hs" = callPackage @@ -54804,6 +56673,7 @@ self: { description = "A CouchDB view server for Haskell"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "couch-simple" = callPackage @@ -54831,6 +56701,7 @@ self: { description = "A modern, lightweight, complete client for CouchDB"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) couchdb;}; "couchdb-conduit" = callPackage @@ -54861,6 +56732,7 @@ self: { description = "Couch DB client library using http-conduit and aeson"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "couchdb-enumerator" = callPackage @@ -54889,6 +56761,7 @@ self: { description = "Couch DB client library using http-enumerator and aeson"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "count" = callPackage @@ -54933,6 +56806,7 @@ self: { description = "Countable Text Inflections"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "counter" = callPackage @@ -54945,6 +56819,7 @@ self: { description = "An object frequency counter"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "country" = callPackage @@ -55006,6 +56881,7 @@ self: { description = "A message-passing library for simplifying network applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "court" = callPackage @@ -55026,6 +56902,7 @@ self: { description = "Simple and flexible CI system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "coverage" = callPackage @@ -55039,6 +56916,7 @@ self: { description = "Exhaustivity Checking Library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cparsing" = callPackage @@ -55056,6 +56934,7 @@ self: { description = "A simple C++ parser with preprocessor features. C++ refactorings included."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cpio-conduit" = callPackage @@ -55076,27 +56955,30 @@ self: { description = "Conduit-based CPIO"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cpkg" = callPackage ({ mkDerivation, base, binary, bytestring, bzlib , composition-prelude, containers, cpphs, dhall, directory , filemanip, filepath, hashable, hspec, hspec-megaparsec - , http-client, http-client-tls, lzma, megaparsec, microlens, mtl - , network-uri, optparse-applicative, prettyprinter, process - , recursion, tar, temporary, text, zip-archive, zlib + , http-client, http-client-tls, libarchive, lzma, megaparsec + , microlens, mtl, network-uri, optparse-applicative, prettyprinter + , process, recursion, tar, temporary, text, zip-archive, zlib }: mkDerivation { pname = "cpkg"; - version = "0.1.0.0"; - sha256 = "1hfnmxcwlm6jnh0q1mm0bzi2xirqanz9ygijp3rzngv51m69n35q"; + version = "0.1.1.0"; + sha256 = "1qmz4m9kbkmcb0i7iy1ay1hkkqh826v98lpqf0zpk7sin686xjv4"; + revision = "1"; + editedCabalFile = "004178xsld8mmy07z23x51vzbjrjprv17k8mq29vgibkm5kd1l5r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring bzlib composition-prelude containers dhall directory filemanip filepath hashable http-client http-client-tls - lzma megaparsec microlens mtl network-uri prettyprinter process - recursion tar temporary text zip-archive zlib + libarchive lzma megaparsec microlens mtl network-uri prettyprinter + process recursion tar temporary text zip-archive zlib ]; libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ @@ -55140,6 +57022,7 @@ self: { description = "C++ Foreign Import Generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cppfilt" = callPackage @@ -55210,6 +57093,7 @@ self: { description = "Run random effect using cprng-aes, a crypto pseudo number generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cpsa" = callPackage @@ -55276,6 +57160,7 @@ self: { description = "Modify the cpu frequency on OpenBSD systems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cpython" = callPackage @@ -55290,6 +57175,7 @@ self: { description = "Bindings for libpython"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {python34 = null;}; "cql" = callPackage @@ -55340,6 +57226,7 @@ self: { description = "Cassandra CQL client"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cql-io_1_1_0" = callPackage @@ -55368,6 +57255,7 @@ self: { description = "Cassandra CQL client"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cql-io-tinylog" = callPackage @@ -55380,6 +57268,7 @@ self: { description = "Tinylog integration for cql-io"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cqrs" = callPackage @@ -55409,6 +57298,7 @@ self: { description = "Command-Query Responsibility Segregation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cqrs-example" = callPackage @@ -55431,6 +57321,7 @@ self: { description = "Example for cqrs package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cqrs-memory" = callPackage @@ -55448,6 +57339,7 @@ self: { description = "Memory backend for the cqrs package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cqrs-postgresql" = callPackage @@ -55472,6 +57364,7 @@ self: { description = "PostgreSQL backend for the cqrs package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cqrs-sqlite3" = callPackage @@ -55493,6 +57386,7 @@ self: { description = "SQLite3 backend for the cqrs package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cqrs-test" = callPackage @@ -55510,6 +57404,7 @@ self: { description = "Command-Query Responsibility Segregation Test Support"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cqrs-testkit" = callPackage @@ -55528,6 +57423,7 @@ self: { description = "Command-Query Responsibility Segregation Test Support"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cqrs-types" = callPackage @@ -55559,6 +57455,7 @@ self: { description = "Code review tool"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crack" = callPackage @@ -55572,6 +57469,7 @@ self: { description = "A haskell binding to cracklib"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {crack = null;}; "crackNum" = callPackage @@ -55618,6 +57516,7 @@ self: { description = "A UNIX configuration management library in Haskell"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "craftwerk" = callPackage @@ -55632,6 +57531,7 @@ self: { description = "2D graphics library with integrated TikZ output"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "craftwerk-cairo" = callPackage @@ -55644,6 +57544,7 @@ self: { description = "Cairo backend for Craftwerk"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "craftwerk-gtk" = callPackage @@ -55662,6 +57563,7 @@ self: { description = "Gtk UI for Craftwerk"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crawlchain" = callPackage @@ -55683,6 +57585,7 @@ self: { description = "Simulation user crawl paths"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "craze" = callPackage @@ -55716,6 +57619,7 @@ self: { description = "HTTP Racing Library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crc" = callPackage @@ -55734,6 +57638,7 @@ self: { description = "Implements various Cyclic Redundancy Checks (CRC)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crc16" = callPackage @@ -55746,6 +57651,7 @@ self: { description = "Calculate the crc16-ccitt"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crc16-table" = callPackage @@ -55765,15 +57671,14 @@ self: { }: mkDerivation { pname = "crdt"; - version = "10.3"; - sha256 = "0hjk66ygs9kr6mxzqnxgbbh9ww2f2xdshk7gq35jlrvhc3csfqsp"; + version = "10.4"; + sha256 = "182lnbci8vdp7mc6mihap00ffv59xdnjhbbbx5pwjjhxwpavfvv6"; libraryHaskellDepends = [ base binary bytestring containers Diff hashable mtl network-info safe stm time vector ]; description = "Conflict-free replicated data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "creatur" = callPackage @@ -55800,6 +57705,7 @@ self: { description = "Framework for artificial life experiments"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "credential-store" = callPackage @@ -55820,6 +57726,7 @@ self: { description = "Library to access secure credential storage providers"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "credentials" = callPackage @@ -55886,6 +57793,7 @@ self: { description = "First-order, linear-chain conditional random fields"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crf-chain1-constrained" = callPackage @@ -55906,6 +57814,7 @@ self: { description = "First-order, constrained, linear-chain conditional random fields"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crf-chain2-generic" = callPackage @@ -55924,6 +57833,7 @@ self: { description = "Second-order, generic, constrained, linear conditional random fields"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crf-chain2-tiers" = callPackage @@ -55943,6 +57853,7 @@ self: { description = "Second-order, tiered, constrained, linear conditional random fields"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "critbit" = callPackage @@ -55972,44 +57883,10 @@ self: { description = "Crit-bit maps and sets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "criterion" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat - , base-compat-batteries, binary, bytestring, cassava, code-page - , containers, criterion-measurement, deepseq, directory, exceptions - , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl - , mwc-random, optparse-applicative, parsec, QuickCheck, statistics - , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-compat, vector, vector-algorithms - }: - mkDerivation { - pname = "criterion"; - version = "1.5.3.0"; - sha256 = "17q4dj9sl9dp2gyknycc9kdp5y6ak4vlmbfqp1w0fwfy76aaj0mn"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base base-compat-batteries binary bytestring - cassava code-page containers criterion-measurement deepseq - directory exceptions filepath Glob js-flot js-jquery microstache - mtl mwc-random optparse-applicative parsec statistics text time - transformers transformers-compat vector vector-algorithms - ]; - executableHaskellDepends = [ - base base-compat-batteries optparse-applicative - ]; - testHaskellDepends = [ - aeson base base-compat base-compat-batteries bytestring deepseq - directory HUnit QuickCheck statistics tasty tasty-hunit - tasty-quickcheck vector - ]; - description = "Robust, reliable performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "criterion_1_5_4_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, bytestring, cassava, code-page , containers, criterion-measurement, deepseq, directory, exceptions @@ -56042,7 +57919,6 @@ self: { ]; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-measurement" = callPackage @@ -56086,6 +57962,7 @@ self: { description = "Enhancement of the \"criterion\" benchmarking library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "criterion-to-html" = callPackage @@ -56105,6 +57982,7 @@ self: { description = "Convert criterion output to HTML reports"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "criu-rpc" = callPackage @@ -56122,6 +58000,7 @@ self: { description = "CRIU RPC client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "criu-rpc-types" = callPackage @@ -56136,6 +58015,7 @@ self: { description = "Criu RPC protocol buffer types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) protobuf;}; "crjdt-haskell" = callPackage @@ -56152,6 +58032,7 @@ self: { description = "A Conflict-Free Replicated JSON Datatype for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crockford" = callPackage @@ -56182,6 +58063,7 @@ self: { description = "An offline renderer supporting ray tracing and photon mapping"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cron" = callPackage @@ -56206,6 +58088,7 @@ self: { description = "Cron datatypes and Attoparsec parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cron-compat" = callPackage @@ -56228,6 +58111,7 @@ self: { description = "Cron datatypes and Attoparsec parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cruncher-types" = callPackage @@ -56241,6 +58125,7 @@ self: { description = "Request and Response types for Eval.so's API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crunghc" = callPackage @@ -56260,6 +58145,7 @@ self: { description = "A runghc replacement with transparent caching"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crypt-sha512" = callPackage @@ -56334,6 +58220,7 @@ self: { description = "Generic cryptography cipher benchmarks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crypto-cipher-tests" = callPackage @@ -56387,6 +58274,7 @@ self: { description = "An educational tool for studying classical cryptography schemes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crypto-conduit" = callPackage @@ -56409,6 +58297,7 @@ self: { description = "Conduit interface for cryptographic operations (from crypto-api)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crypto-enigma" = callPackage @@ -56449,6 +58338,7 @@ self: { description = "Multihash library on top of cryptonite crypto library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crypto-numbers" = callPackage @@ -56575,6 +58465,7 @@ self: { description = "A random effect using crypto-random"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crypto-rng" = callPackage @@ -56606,6 +58497,7 @@ self: { description = "A simple high level encryption interface based on cryptonite"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crypto-totp" = callPackage @@ -56656,6 +58548,7 @@ self: { description = "Haskell wrapper for the cryptocompare API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cryptoconditions" = callPackage @@ -56680,6 +58573,7 @@ self: { description = "Interledger Crypto-Conditions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cryptohash" = callPackage @@ -56900,6 +58794,7 @@ self: { description = "Cryptol: The Language of Cryptography"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cryptonite" = callPackage @@ -57006,6 +58901,7 @@ self: { description = "Bindings for Cryptsy cryptocurrency exchange API"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crystalfontz" = callPackage @@ -57018,6 +58914,7 @@ self: { description = "Control Crystalfontz LCD displays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "csa" = callPackage @@ -57046,6 +58943,7 @@ self: { description = "Compiler plugin for common subexpression elimination"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "csg" = callPackage @@ -57078,6 +58976,7 @@ self: { description = "Analytical CSG (Constructive Solid Geometry) library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "csound-catalog" = callPackage @@ -57094,6 +58993,7 @@ self: { description = "a gallery of Csound instruments"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "csound-expression" = callPackage @@ -57206,6 +59106,7 @@ self: { description = "A command line type checker for CSPM files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cspretty" = callPackage @@ -57218,6 +59119,7 @@ self: { description = "AST and pretty printer for CSPm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "css" = callPackage @@ -57230,6 +59132,7 @@ self: { description = "Minimal monadic CSS DSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "css-syntax" = callPackage @@ -57318,6 +59221,7 @@ self: { description = "A flexible, fast, enumerator-based CSV parser library for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "csv-nptools" = callPackage @@ -57336,6 +59240,7 @@ self: { description = "A collection of CSV tools"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "csv-table" = callPackage @@ -57381,6 +59286,7 @@ self: { description = "Binding to the Google ctemplate library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {ctemplate = null;}; "ctkl" = callPackage @@ -57393,6 +59299,7 @@ self: { description = "packaging of Manuel Chakravarty's CTK Light for Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ctpl" = callPackage @@ -57408,6 +59315,7 @@ self: { description = "A programming language for text modification"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ctrie" = callPackage @@ -57449,6 +59357,7 @@ self: { description = "Cubic DSL for 3D printing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cubical" = callPackage @@ -57549,6 +59458,7 @@ self: { description = "3D Yampa/GLUT Puzzle Game"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cuckoo-filter" = callPackage @@ -57609,6 +59519,7 @@ self: { description = "Bindings to the CUDD binary decision diagrams library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {cudd = null;}; "cue-sheet" = callPackage @@ -57679,20 +59590,21 @@ self: { "curl-runnings" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, cmdargs - , directory, hspec, hspec-expectations, http-conduit, http-types - , megaparsec, pretty-simple, regex-posix, tar, text - , unordered-containers, vector, yaml, zlib + , connection, directory, hspec, hspec-expectations, http-client-tls + , http-conduit, http-types, megaparsec, pretty-simple, regex-posix + , tar, text, unordered-containers, vector, yaml, zlib }: mkDerivation { pname = "curl-runnings"; - version = "0.9.2"; - sha256 = "1xslp7zg6l3adljac6iga9c421cf0hab9zi4dyjbkws76imh1d0b"; + version = "0.10.0"; + sha256 = "11mzxsqiikwa0xjiiq4mk4r850zdp9q75x0qz5wrjq4ks4743wp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring case-insensitive directory hspec - hspec-expectations http-conduit http-types megaparsec pretty-simple - regex-posix text unordered-containers vector yaml + aeson base bytestring case-insensitive connection directory hspec + hspec-expectations http-client-tls http-conduit http-types + megaparsec pretty-simple regex-posix text unordered-containers + vector yaml ]; executableHaskellDepends = [ aeson base bytestring cmdargs directory http-conduit tar text zlib @@ -57701,6 +59613,7 @@ self: { description = "A framework for declaratively writing curl based API tests"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "curlhs" = callPackage @@ -57775,6 +59688,7 @@ self: { description = "Typesafe currency conversion"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "current-locale" = callPackage @@ -57814,7 +59728,6 @@ self: { testHaskellDepends = [ base Cabal filepath mtl ]; description = "Functions for manipulating Curry programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "curry-frontend" = callPackage @@ -57841,6 +59754,7 @@ self: { description = "Compile the functional logic language Curry to several intermediate formats"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "curryer" = callPackage @@ -57892,6 +59806,7 @@ self: { description = "Terminal tool for viewing tabular data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cursor" = callPackage @@ -57931,6 +59846,7 @@ self: { description = "Generators for Purely Functional Cursors"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "curve25519" = callPackage @@ -57950,6 +59866,7 @@ self: { description = "Fast implementations of the curve25519 elliptic curve primitives"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "curves" = callPackage @@ -57967,6 +59884,7 @@ self: { description = "Library for drawing curve based images"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cusolver" = callPackage @@ -58013,6 +59931,7 @@ self: { description = "An enhanced prelude, serving as a foundation for my projects"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cutter" = callPackage @@ -58079,6 +59998,7 @@ self: { description = "A subfield of the complex numbers for exact calculation"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cypher" = callPackage @@ -58099,6 +60019,7 @@ self: { description = "Haskell bindings for the neo4j \"cypher\" query language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "czipwith" = callPackage @@ -58142,6 +60063,7 @@ self: { description = "Permissively licensed D-Bus client library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "d10" = callPackage @@ -58173,7 +60095,7 @@ self: { executableHaskellDepends = [ base c-storable-deriving vect Win32 ]; description = "A raw binding for the directX 11"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {D3DCompiler = null; d3d11 = null; d3dx11 = null; d3dxof = null; dxgi = null; dxguid = null;}; @@ -58187,6 +60109,7 @@ self: { description = "Declarative visualization on a web browser with DSL approach"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "daemonize-doublefork" = callPackage @@ -58244,6 +60167,7 @@ self: { description = "Compile-time, type-safe directed acyclic graphs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "damnpacket" = callPackage @@ -58315,6 +60239,7 @@ self: { description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dapi" = callPackage @@ -58334,6 +60259,7 @@ self: { description = "Prints a series of dates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "darcs" = callPackage @@ -58402,6 +60328,7 @@ self: { description = "Comparative benchmark suite for darcs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "darcs-beta" = callPackage @@ -58434,6 +60361,7 @@ self: { description = "a distributed, interactive, smart revision control system"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) curl;}; "darcs-buildpackage" = callPackage @@ -58453,6 +60381,7 @@ self: { description = "Tools to help manage Debian packages with Darcs"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "darcs-cabalized" = callPackage @@ -58475,6 +60404,7 @@ self: { description = "David's Advanced Version Control System"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) curl; inherit (pkgs) ncurses; inherit (pkgs) zlib;}; @@ -58496,6 +60426,7 @@ self: { description = "Import/export git fast-import streams to/from darcs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "darcs-graph" = callPackage @@ -58515,6 +60446,7 @@ self: { description = "Generate graphs of darcs repository activity"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "darcs-monitor" = callPackage @@ -58533,6 +60465,7 @@ self: { description = "Darcs repository monitor (sends email)"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "darcs-scripts" = callPackage @@ -58564,6 +60497,7 @@ self: { description = "Outputs dependencies of darcs patches in dot format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "darcsden" = callPackage @@ -58592,6 +60526,7 @@ self: { description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch)."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "darcswatch" = callPackage @@ -58615,6 +60550,7 @@ self: { description = "Track application of Darcs patches"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "darkplaces-demo" = callPackage @@ -58643,6 +60579,7 @@ self: { description = "Utility and parser for DarkPlaces demo files"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "darkplaces-rcon" = callPackage @@ -58660,6 +60597,7 @@ self: { description = "Darkplaces rcon client library"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "darkplaces-rcon-util" = callPackage @@ -58690,6 +60628,7 @@ self: { description = "Darplaces rcon utility"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "darkplaces-text" = callPackage @@ -58708,6 +60647,7 @@ self: { description = "Parser for darkplaces colorful text"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dash-haskell" = callPackage @@ -58729,6 +60669,7 @@ self: { description = "Convert package Haddock to Dash docsets (IDE docs)"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-accessor" = callPackage @@ -58766,6 +60707,7 @@ self: { description = "Use Accessor to access state in monads-fd State monad class"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-accessor-monads-tf" = callPackage @@ -58780,6 +60722,7 @@ self: { description = "Use Accessor to access state in monads-tf State monad type family"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-accessor-mtl" = callPackage @@ -58839,6 +60782,7 @@ self: { description = "Utilities for accessing and comparing types based on so called bases - representations with limited polymorphism"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-basic" = callPackage @@ -58863,6 +60807,7 @@ self: { description = "A database library with a focus on ease of use, type safety and useful error messages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-binary-ieee754" = callPackage @@ -58910,6 +60855,7 @@ self: { description = "Category theory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-cell" = callPackage @@ -58934,6 +60880,7 @@ self: { description = "Library for checking and normalization of data (e.g. from web forms)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-checked" = callPackage @@ -58968,6 +60915,7 @@ self: { description = "A Library for directional queues"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-construction" = callPackage @@ -58980,6 +60928,7 @@ self: { description = "Data construction abstractions including Constructor, Destructor, Maker, Destroyer, Producer and Consumer"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-constructors" = callPackage @@ -59010,6 +60959,7 @@ self: { description = "a cyclic doubly linked list"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-default" = callPackage @@ -59229,6 +61179,7 @@ self: { description = "Space-efficient and privacy-preserving data dispersal algorithms"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-diverse" = callPackage @@ -59297,6 +61248,7 @@ self: { description = "Consistent set of utility functions for Maybe, Either, List and Monoids"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-elf" = callPackage @@ -59320,6 +61272,8 @@ self: { pname = "data-embed"; version = "0.1.0.0"; sha256 = "1pppd4w0sfb71i7ppqcp71rqx36b30g1dj468d2hb6fvnnhm830q"; + revision = "2"; + editedCabalFile = "0c51kfsyl7nzizx6awx8m0m4z2rjz8zn8ivl4869fgqdjkrmw8my"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59332,7 +61286,6 @@ self: { ]; description = "Embed files and other binary blobs inside executables without Template Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-emoticons" = callPackage @@ -59345,6 +61298,7 @@ self: { description = "Combinator emoticons: data-aviary in the flavor of emoticons"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-endian" = callPackage @@ -59397,6 +61351,7 @@ self: { description = "A type safe file path data structure"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-files-gen" = callPackage @@ -59444,6 +61399,7 @@ self: { description = "Finite totally ordered sets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-fin-simple" = callPackage @@ -59457,6 +61413,7 @@ self: { description = "Simple integral finite set"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-fix" = callPackage @@ -59502,6 +61459,7 @@ self: { description = "An efficient data type for sets of flags"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-foldapp" = callPackage @@ -59521,11 +61479,12 @@ self: { pname = "data-forest"; version = "0.1.0.7"; sha256 = "1q41cwinvv0ys260f1f7005403pvz1gbwn0d6cnwh8b7rlgp8f4j"; + revision = "1"; + editedCabalFile = "1kwvjmbchz6nv770x81q7f8i3blfzzifhjqww702c8zbnnafzgar"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "A simple multi-way tree data structure"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-fresh" = callPackage @@ -59622,6 +61581,7 @@ self: { description = "Interval datatype, interval arithmetic and interval-based containers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-inttrie" = callPackage @@ -59645,6 +61605,7 @@ self: { description = "Write-once variables with concurrency support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-json-token" = callPackage @@ -59676,6 +61637,7 @@ self: { description = "Sculpt mutable recursive data with reference equality; bake it using a data kiln into an immutable lazy structure"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-layer" = callPackage @@ -59688,6 +61650,7 @@ self: { description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-layout" = callPackage @@ -59715,6 +61678,7 @@ self: { description = "Used to be Haskell 98 Lenses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-lens-fd" = callPackage @@ -59729,6 +61693,7 @@ self: { description = "Lenses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-lens-ixset" = callPackage @@ -59742,6 +61707,7 @@ self: { description = "A Lens for IxSet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-lens-light" = callPackage @@ -59765,6 +61731,7 @@ self: { description = "Utilities for Data.Lens"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-list-sequences" = callPackage @@ -59799,6 +61766,7 @@ self: { description = "Data.Map with multiple, unique keys"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-memocombinators" = callPackage @@ -59865,6 +61833,7 @@ self: { description = "Data types for named entities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-nat" = callPackage @@ -59877,6 +61846,7 @@ self: { description = "data Nat = Zero | Succ Nat"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-object" = callPackage @@ -59889,6 +61859,7 @@ self: { description = "Represent hierachichal structures, called objects in JSON. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-object-json" = callPackage @@ -59906,6 +61877,7 @@ self: { description = "Serialize JSON data to/from Haskell using the data-object library. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-object-yaml" = callPackage @@ -59925,6 +61897,7 @@ self: { description = "Serialize data to and from Yaml files (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-or" = callPackage @@ -59972,6 +61945,7 @@ self: { description = "Prettyprint and compare Data values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-quotientref" = callPackage @@ -59984,6 +61958,7 @@ self: { description = "Reference cells that need two independent indices to be accessed"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-r-tree" = callPackage @@ -60003,6 +61978,7 @@ self: { description = "R-Tree is a spatial data structure similar to Quadtrees or B-Trees"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-ref" = callPackage @@ -60041,6 +62017,7 @@ self: { description = "Common Sub-Expression Elimination for graphs generated by Data.Reify."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-repr" = callPackage @@ -60053,6 +62030,7 @@ self: { description = "Alternative to Show data printing utility"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-result" = callPackage @@ -60065,6 +62043,7 @@ self: { description = "Data types for returning results distinguishable by types"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-rev" = callPackage @@ -60077,6 +62056,7 @@ self: { description = "A typeclass for reversing order of contents"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-rope" = callPackage @@ -60089,6 +62069,7 @@ self: { description = "Ropes, an alternative to (Byte)Strings"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-rtuple" = callPackage @@ -60101,6 +62082,7 @@ self: { description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-serializer" = callPackage @@ -60133,6 +62115,7 @@ self: { description = "Profiling of data structures"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-spacepart" = callPackage @@ -60145,6 +62128,7 @@ self: { description = "Deprecated. Now called \"spacepart\". Space partitioning data structures."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-standards" = callPackage @@ -60157,6 +62141,7 @@ self: { description = "A collection of standards representable by simple data types"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-stm32" = callPackage @@ -60210,6 +62195,7 @@ self: { description = "Type safe, in-memory dictionary with multidimensional keys"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-stringmap" = callPackage @@ -60229,6 +62215,7 @@ self: { description = "An efficient implementation of maps from strings to arbitrary values"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-structure-inferrer" = callPackage @@ -60250,6 +62237,7 @@ self: { description = "Program that infers the fastest data structure available for your program"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-sword" = callPackage @@ -60357,6 +62345,7 @@ self: { description = "Basic type wrangling types and classes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-util" = callPackage @@ -60369,6 +62358,7 @@ self: { description = "utilities for handle data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "data-variant" = callPackage @@ -60381,6 +62371,7 @@ self: { description = "A variant data type, useful for modeling dynamically-typed programming languages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "database-migrate" = callPackage @@ -60410,6 +62401,7 @@ self: { description = "Demonstrate how a database can be implemented the functional way"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "datadog" = callPackage @@ -60438,34 +62430,40 @@ self: { description = "Datadog client for Haskell. Supports both the HTTP API and StatsD."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "datadog-tracing" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , generic-random, hspec-golden-aeson, prettyprinter, QuickCheck - , quickcheck-text, refined, servant, servant-client, servant-server - , tasty, tasty-discover, tasty-hspec, text, time, warp + ({ mkDerivation, aeson, base, bytestring, containers, ffunctor + , generic-random, hspec-golden-aeson, mtl, prettyprinter + , QuickCheck, quickcheck-text, refined, servant, servant-client + , servant-server, tasty, tasty-discover, tasty-hspec, text, time + , warp }: mkDerivation { pname = "datadog-tracing"; - version = "1.0.1"; - sha256 = "007cpk9iwxy4jgj6fr1yih090dxgbj9d6jpc6kf3610p0a14nlzq"; + version = "1.2.0"; + sha256 = "1227rkrmlbqbxbvmyhm5yg5wd0jbbiy7vjyqq6vzksvpx2kifsdy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers generic-random prettyprinter - QuickCheck quickcheck-text refined servant servant-client text time + aeson base bytestring containers ffunctor generic-random mtl + prettyprinter QuickCheck quickcheck-text refined servant + servant-client text time ]; executableHaskellDepends = [ - aeson base bytestring containers servant servant-server text warp + aeson base bytestring containers mtl servant servant-server text + warp ]; testHaskellDepends = [ - aeson base bytestring containers hspec-golden-aeson servant tasty - tasty-hspec text + aeson base bytestring containers hspec-golden-aeson mtl servant + tasty tasty-hspec text ]; testToolDepends = [ tasty-discover ]; description = "Datadog tracing client and mock agent"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dataenc" = callPackage @@ -60507,6 +62505,7 @@ self: { description = "Fixing data-flow problems"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dataflow" = callPackage @@ -60531,6 +62530,7 @@ self: { description = "Generate Graphviz documents from a Haskell representation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "datalog" = callPackage @@ -60559,6 +62559,7 @@ self: { description = "An implementation of datalog in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "datapacker" = callPackage @@ -60627,6 +62628,8 @@ self: { ]; description = "Classical data sets for statistics and machine learning"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dataurl" = callPackage @@ -60668,7 +62671,6 @@ self: { testHaskellDepends = [ base dates hspec QuickCheck time ]; description = "Date conversions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dates" = callPackage @@ -60684,7 +62686,6 @@ self: { ]; description = "Small library for parsing different dates formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "datetime" = callPackage @@ -60704,6 +62705,7 @@ self: { description = "Utilities to make Data.Time.* easier to use"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "datetime-sb" = callPackage @@ -60723,6 +62725,7 @@ self: { description = "Utilities to make Data.Time.* easier to use."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dawdle" = callPackage @@ -60738,6 +62741,7 @@ self: { description = "Generates DDL suggestions based on a CSV file"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dawg" = callPackage @@ -60754,6 +62758,7 @@ self: { description = "Directed acyclic word graphs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dawg-ord" = callPackage @@ -60775,6 +62780,7 @@ self: { description = "Directed acyclic word graphs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dbcleaner" = callPackage @@ -60788,6 +62794,7 @@ self: { description = "Clean database tables automatically around hspec tests"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dbf" = callPackage @@ -60822,6 +62829,7 @@ self: { description = "Decompiler Bytecode Java"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dbm" = callPackage @@ -60841,6 +62849,7 @@ self: { description = "A *simple* database migration tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dbmigrations" = callPackage @@ -60889,6 +62898,7 @@ self: { description = "The dbmigrations tool built for MySQL databases"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dbmigrations-postgresql" = callPackage @@ -60908,6 +62918,7 @@ self: { description = "The dbmigrations tool built for PostgreSQL databases"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dbmigrations-sqlite" = callPackage @@ -60923,6 +62934,7 @@ self: { description = "The dbmigrations tool built for SQLite databases"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dbus_0_10_15" = callPackage @@ -60955,33 +62967,6 @@ self: { }) {}; "dbus" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, containers - , criterion, deepseq, directory, exceptions, extra, filepath, lens - , network, parsec, process, QuickCheck, random, resourcet, split - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , th-lift, transformers, unix, vector, xml-conduit, xml-types - }: - mkDerivation { - pname = "dbus"; - version = "1.2.3"; - sha256 = "04x0scjl9kyhh2wl02slfa7ykd2lmxbx6x7bp7wv8x4pwgd849zc"; - libraryHaskellDepends = [ - base bytestring cereal conduit containers deepseq exceptions - filepath lens network parsec random split template-haskell text - th-lift transformers unix vector xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring cereal containers directory extra filepath network - parsec process QuickCheck random resourcet tasty tasty-hunit - tasty-quickcheck text transformers unix vector - ]; - benchmarkHaskellDepends = [ base criterion ]; - doCheck = false; - description = "A client library for the D-Bus IPC system"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "dbus_1_2_4" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens , network, parsec, process, QuickCheck, random, resourcet, split @@ -61006,7 +62991,6 @@ self: { doCheck = false; description = "A client library for the D-Bus IPC system"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbus-client" = callPackage @@ -61023,6 +63007,7 @@ self: { description = "Monadic and object-oriented interfaces to DBus"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dbus-core" = callPackage @@ -61041,6 +63026,7 @@ self: { description = "Low-level D-Bus protocol implementation"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dbus-hslogger" = callPackage @@ -61074,6 +63060,7 @@ self: { description = "Quasi-quoter for DBus functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dbus-th" = callPackage @@ -61132,6 +63119,7 @@ self: { description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dclabel-eci11" = callPackage @@ -61144,6 +63132,7 @@ self: { description = "The Disjunction Category Label Format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dcpu16" = callPackage @@ -61164,6 +63153,7 @@ self: { description = "DCPU-16 Emulator & Assembler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddate" = callPackage @@ -61176,6 +63166,7 @@ self: { description = "Discordian Date Types for Haskell"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-base" = callPackage @@ -61192,6 +63183,7 @@ self: { description = "Disciplined Disciple Compiler common utilities"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-build" = callPackage @@ -61212,6 +63204,7 @@ self: { description = "Disciplined Disciple Compiler build framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-code" = callPackage @@ -61225,6 +63218,7 @@ self: { description = "Disciplined Disciple Compiler base libraries"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-core" = callPackage @@ -61242,6 +63236,7 @@ self: { description = "Disciplined Disciple Compiler core language and type checker"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-core-babel" = callPackage @@ -61256,6 +63251,7 @@ self: { description = "Disciplined Disciple Compiler PHP code generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-core-eval" = callPackage @@ -61272,6 +63268,7 @@ self: { description = "Disciplined Disciple Compiler semantic evaluator for the core language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-core-flow" = callPackage @@ -61290,6 +63287,7 @@ self: { description = "Disciplined Disciple Compiler data flow compiler"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-core-llvm" = callPackage @@ -61307,6 +63305,7 @@ self: { description = "Disciplined Disciple Compiler LLVM code generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-core-salt" = callPackage @@ -61323,6 +63322,7 @@ self: { description = "Disciplined Disciple Compiler C code generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-core-simpl" = callPackage @@ -61339,6 +63339,7 @@ self: { description = "Disciplined Disciple Compiler code transformations"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-core-tetra" = callPackage @@ -61356,6 +63357,7 @@ self: { description = "Disciplined Disciple Compiler intermediate language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-driver" = callPackage @@ -61376,6 +63378,7 @@ self: { description = "Disciplined Disciple Compiler top-level driver"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-interface" = callPackage @@ -61388,6 +63391,7 @@ self: { description = "Disciplined Disciple Compiler user interface support"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-source-tetra" = callPackage @@ -61405,6 +63409,7 @@ self: { description = "Disciplined Disciple Compiler source language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-tools" = callPackage @@ -61428,6 +63433,7 @@ self: { description = "Disciplined Disciple Compiler command line tools"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddc-war" = callPackage @@ -61446,6 +63452,7 @@ self: { description = "Disciplined Disciple Compiler test driver and buildbot"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ddci-core" = callPackage @@ -61465,6 +63472,7 @@ self: { description = "Disciple Core language interactive interpreter"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dde" = callPackage @@ -61492,6 +63500,7 @@ self: { description = "Delay differential equations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dead-code-detection" = callPackage @@ -61518,6 +63527,7 @@ self: { description = "detect dead code in haskell projects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dead-simple-json" = callPackage @@ -61534,6 +63544,7 @@ self: { description = "Dead simple JSON parser, with some Template Haskell sugar"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "debian" = callPackage @@ -61566,6 +63577,7 @@ self: { description = "Modules for working with the Debian package system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "debian-binary" = callPackage @@ -61626,7 +63638,6 @@ self: { ]; description = "Simple trace-based debugger"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "debug-diff" = callPackage @@ -61667,6 +63678,7 @@ self: { description = "secure remote debugging"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "debug-pp" = callPackage @@ -61709,6 +63721,7 @@ self: { description = "You do not have to write variable names twice in Debug.Trace"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "debug-tracy" = callPackage @@ -61723,7 +63736,6 @@ self: { executableHaskellDepends = [ base ]; description = "More useful trace functions for investigating bugs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deburr" = callPackage @@ -61748,14 +63760,15 @@ self: { description = "The categorical dual of transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "decidable" = callPackage ({ mkDerivation, base, singletons }: mkDerivation { pname = "decidable"; - version = "0.1.4.0"; - sha256 = "07cw2jhvii3prsbczxpmq7g492wc89yxp77ivs01gp3bl7m25cky"; + version = "0.1.5.0"; + sha256 = "1rsgwmvbx4mip26pihhmv6rssn23q8la22qxqj73i60863fkkwbj"; libraryHaskellDepends = [ base singletons ]; description = "Combinators for manipulating dependently-typed predicates"; license = stdenv.lib.licenses.bsd3; @@ -61774,21 +63787,19 @@ self: { description = "An implementation of the General Decimal Arithmetic Specification"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "decimal-literals" = callPackage ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "decimal-literals"; - version = "0.1.0.0"; - sha256 = "0zsykb1ydihcd6x7v5xx1i0v5wn6a48g7ndzi68iwhivmj0qxyi7"; - revision = "3"; - editedCabalFile = "0v53iwn2f5fhjhzf8zgzxrc1inp1bb0qjsghf1jlcp98az7avsjb"; + version = "0.1.0.1"; + sha256 = "0lbpnc4c266fbqjzzrnig648zzsqfaphlxqwyly9xd15qggzasb0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; 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 @@ -61809,6 +63820,7 @@ self: { description = "DIY Markov Chains"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "decode-utf8" = callPackage @@ -61837,6 +63849,7 @@ self: { description = "Conduit for decoding ByteStrings using Data.Binary.Get"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dedukti" = callPackage @@ -61860,6 +63873,7 @@ self: { description = "A type-checker for the λΠ-modulo calculus"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "deepcontrol" = callPackage @@ -61877,6 +63891,7 @@ self: { description = "A library that provides deep-level programming style and(or) notation on Applicative and Monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "deeplearning-hs" = callPackage @@ -61905,6 +63920,7 @@ self: { description = "Deep Learning in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "deepseq_1_3_0_1" = callPackage @@ -61958,6 +63974,7 @@ self: { description = "Bounded deepseq, including support for generic deriving"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "deepseq-generics" = callPackage @@ -61988,6 +64005,7 @@ self: { description = "Deep evaluation of data structures without NFData"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "deepseq-th" = callPackage @@ -62001,6 +64019,7 @@ self: { description = "Template Haskell based deriver for optimised NFData instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "deepzoom" = callPackage @@ -62013,6 +64032,7 @@ self: { description = "A DeepZoom image slicer. Only known to work on 32bit Linux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "defargs" = callPackage @@ -62025,6 +64045,7 @@ self: { description = "default arguments in haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "deferred-folds" = callPackage @@ -62198,14 +64219,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_2_0_0_0" = callPackage + "dejafu_2_0_0_1" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "2.0.0.0"; - sha256 = "1chl50yb0sydpvn1irfyc6vi6mcggjjk9vcip2mp973zf9a0i0v6"; + version = "2.0.0.1"; + sha256 = "0hdw4y81inxq4ivkfb4b7sj68ysb8n9czfyhifmhkqfaddg5inzg"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -62226,6 +64247,7 @@ self: { description = "Decimal floating point arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {mpdec = null;}; "deka-tests" = callPackage @@ -62247,6 +64269,7 @@ self: { description = "Tests for deka, decimal floating point arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "delaunay" = callPackage @@ -62264,6 +64287,7 @@ self: { description = "Build a Delaunay triangulation of a set of points"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "delay" = callPackage @@ -62280,7 +64304,6 @@ self: { testHaskellDepends = [ async base dimensional exceptions time ]; description = "More useful and humain delaying functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "delicious" = callPackage @@ -62296,6 +64319,7 @@ self: { description = "Accessing the del.icio.us APIs from Haskell (v2)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "delimited-text" = callPackage @@ -62312,6 +64336,7 @@ self: { description = "Parse character delimited textual data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "delimiter-separated" = callPackage @@ -62325,6 +64350,7 @@ self: { description = "Library for dealing with tab and/or comma (or other) separated files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "delta" = callPackage @@ -62349,6 +64375,7 @@ self: { description = "A library for detecting file changes"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "delta-h" = callPackage @@ -62371,6 +64398,7 @@ self: { description = "Online entropy-based model of lexical category acquisition"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "delude" = callPackage @@ -62383,6 +64411,7 @@ self: { description = "Generalized the Prelude more functionally"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "demarcate" = callPackage @@ -62396,6 +64425,7 @@ self: { description = "Demarcating transformed monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "denominate" = callPackage @@ -62411,6 +64441,7 @@ self: { description = "Functions supporting bulk file and directory name normalization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dense" = callPackage @@ -62457,6 +64488,7 @@ self: { description = "Dense int-set"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dense-linear-algebra" = callPackage @@ -62521,6 +64553,7 @@ self: { description = "Data.Dependent.Map variant that appends conflicting entries when merging maps instead of discarding one side of the conflict."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dependent-state" = callPackage @@ -62533,6 +64566,7 @@ self: { description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dependent-sum" = callPackage @@ -62560,6 +64594,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dependent-sum-template" = callPackage @@ -62597,6 +64632,7 @@ self: { description = "A simple configuration management tool for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dephd" = callPackage @@ -62616,6 +64652,7 @@ self: { description = "Analyze quality of nucleotide sequences"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "deptrack-core" = callPackage @@ -62628,6 +64665,7 @@ self: { description = "DepTrack Core types and model"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "deptrack-devops" = callPackage @@ -62647,6 +64685,7 @@ self: { description = "DepTrack applied to DevOps"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "deptrack-dot" = callPackage @@ -62660,6 +64699,7 @@ self: { description = "Facilitate Graphviz representations of DepTrack dependencies"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "deque" = callPackage @@ -62679,6 +64719,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "deque_0_4_0_2" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances + , rerebase, strict-list, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "deque"; + version = "0.4.0.2"; + sha256 = "01ipk4dw8lgc5r3d224va9imli8wa5i8dknk7xzfv64pmm6gh6wa"; + libraryHaskellDepends = [ base mtl strict-list ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Double-ended queues"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dequeue" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck , safe @@ -62703,6 +64761,7 @@ self: { description = "Find derangements of lists"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "derivation-trees" = callPackage @@ -62717,6 +64776,7 @@ self: { description = "Typeset Derivation Trees via MetaPost"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "derive" = callPackage @@ -62737,7 +64797,6 @@ self: { executableHaskellDepends = [ base ]; description = "A program and library to derive instances for data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derive-IG" = callPackage @@ -62750,6 +64809,7 @@ self: { description = "Macro to derive instances for Instant-Generics using Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "derive-enumerable" = callPackage @@ -62762,6 +64822,7 @@ self: { description = "Generic instances for enumerating complex data types"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "derive-gadt" = callPackage @@ -62784,6 +64845,7 @@ self: { description = "Instance deriving for (a subset of) GADTs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "derive-monoid" = callPackage @@ -62800,6 +64862,7 @@ self: { description = "derive Semigroup/Monoid/IsList"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "derive-storable" = callPackage @@ -62854,6 +64917,7 @@ self: { description = "Help Haskellers derive class instances for composited data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "derive-trie" = callPackage @@ -62866,6 +64930,7 @@ self: { description = "Automatic derivation of Trie implementations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "deriveJsonNoPrefix" = callPackage @@ -62928,6 +64993,7 @@ self: { description = "combinators based on parsing with derivatives (derp) package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "derulo" = callPackage @@ -62989,6 +65055,7 @@ self: { description = "Library, interpreter, and CLI for Descript programming language"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "descriptive" = callPackage @@ -63052,6 +65119,7 @@ self: { description = "Simple deterministic game engine"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "detour-via-sci" = callPackage @@ -63096,6 +65164,7 @@ self: { description = "JSON and CSV encoding for quantities"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "detrospector" = callPackage @@ -63128,6 +65197,7 @@ self: { description = "Get rid of unicode (utf-8) symbols in Haskell sources"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "devil" = callPackage @@ -63147,6 +65217,7 @@ self: { description = "A small tool to make it easier to update program managed by Angel"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dewdrop" = callPackage @@ -63161,6 +65232,7 @@ self: { description = "Find gadgets for return-oriented programming on x86"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "df1" = callPackage @@ -63181,45 +65253,45 @@ self: { description = "Type, render and parse the df1 hierarchical structured log format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dfinity-radix-tree" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, blake2 - , bloomfilter, BoundedChan, bytestring, cmdargs, concurrent-extra - , conduit, containers, criterion, data-default-class, deepseq - , directory, dlist, filepath, ghc-prim, hashtables, lens-simple - , leveldb-haskell, lmdb-simple, lrucaching, mtl, QuickCheck - , reducers, resourcet, semigroups, serialise, stm, tasty - , tasty-hunit, tasty-quickcheck, temporary, text, transformers - , unordered-containers + ({ mkDerivation, aeson, base, base16-bytestring, BoundedChan + , bytestring, clock, concurrent-extra, conduit, containers + , cryptonite, data-default-class, deepseq, directory, dlist + , filepath, hashtables, lens-simple, leveldb, leveldb-haskell + , lrucaching, memory, mtl, QuickCheck, reducers, resourcet + , serialise, tasty, tasty-hunit, tasty-quickcheck, temporary, text + , transformers, unordered-containers }: mkDerivation { pname = "dfinity-radix-tree"; - version = "0.5.2"; - sha256 = "16w7na8sh5fvwrps0wa3m80yzrdg7znx8jgw2i64glvjjs7d5c61"; + version = "0.6.3"; + sha256 = "0rr02k5wycd7qy9p2pqhck7hqnr85aps4cl5wdfw32jcjvk325mj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base16-bytestring blake2 bloomfilter BoundedChan bytestring - concurrent-extra conduit containers data-default-class deepseq - directory dlist ghc-prim hashtables lens-simple leveldb-haskell - lmdb-simple lrucaching mtl reducers resourcet semigroups serialise - stm temporary transformers + base base16-bytestring BoundedChan bytestring concurrent-extra + conduit containers cryptonite data-default-class deepseq directory + dlist hashtables lens-simple leveldb-haskell lrucaching memory mtl + reducers resourcet serialise temporary transformers ]; + librarySystemDepends = [ leveldb ]; executableHaskellDepends = [ - base blake2 bytestring cmdargs criterion data-default-class - leveldb-haskell lmdb-simple resourcet temporary + base base16-bytestring bytestring containers ]; testHaskellDepends = [ - aeson base base16-bytestring blake2 BoundedChan bytestring - concurrent-extra conduit containers filepath leveldb-haskell mtl - QuickCheck resourcet tasty tasty-hunit tasty-quickcheck temporary - text transformers unordered-containers + aeson base base16-bytestring BoundedChan bytestring clock + concurrent-extra conduit containers cryptonite filepath + leveldb-haskell memory mtl QuickCheck resourcet tasty tasty-hunit + tasty-quickcheck temporary text transformers unordered-containers ]; description = "A generic data integrity layer"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {inherit (pkgs) leveldb;}; "dfrac" = callPackage ({ mkDerivation, base, scientific }: @@ -63250,6 +65322,7 @@ self: { description = "Build Debian From Scratch CD/DVD images"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dgim" = callPackage @@ -63263,6 +65336,7 @@ self: { description = "Implementation of DGIM algorithm"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dgs" = callPackage @@ -63275,6 +65349,7 @@ self: { description = "Haskell front-end for DGS' bot interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhall" = callPackage @@ -63318,7 +65393,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_20_1" = callPackage + "dhall_1_21_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, criterion, cryptonite, deepseq, Diff, directory @@ -63332,10 +65407,8 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.20.1"; - sha256 = "1p5whphy666q0h22yq3jb4aipb5bkqp45bp86m7dp12ljksfhxz0"; - revision = "2"; - editedCabalFile = "0629z8lc97rapfcqcgvxwp9x4x3xqpzrly8m0nsn0dds7400jxrk"; + version = "1.21.0"; + sha256 = "03nzp79mmivnyg6s179abf8bj8j60hkng9kgbmfjzvwlfrpwq8lv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63350,9 +65423,9 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base containers deepseq directory doctest filepath mockery - prettyprinter QuickCheck quickcheck-instances serialise tasty - tasty-hunit tasty-quickcheck text transformers vector + base bytestring cborg containers deepseq directory doctest filepath + mockery prettyprinter QuickCheck quickcheck-instances serialise + tasty tasty-hunit tasty-quickcheck text transformers vector ]; benchmarkHaskellDepends = [ base bytestring containers criterion directory serialise text @@ -63383,6 +65456,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-bash_1_0_19" = callPackage + ({ mkDerivation, base, bytestring, containers, dhall + , neat-interpolation, optparse-generic, shell-escape, text + }: + mkDerivation { + pname = "dhall-bash"; + version = "1.0.19"; + sha256 = "11933vw6khyhggdp6a3ib4c3qln6cmrm9ng9cc7mjmm3vpc11l7x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dhall neat-interpolation shell-escape + text + ]; + executableHaskellDepends = [ + base bytestring dhall optparse-generic text + ]; + description = "Compile Dhall to Bash"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-check" = callPackage ({ mkDerivation, base, containers, dhall, directory, filepath , fsnotify, text, trifecta @@ -63399,6 +65494,7 @@ self: { description = "Check all dhall files in a project"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhall-json" = callPackage @@ -63428,6 +65524,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-json_1_2_7" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall + , optparse-applicative, tasty, tasty-hunit, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "dhall-json"; + version = "1.2.7"; + sha256 = "1wg3cdp1m11lqkz9qs1f5payjbxq8lph31nangrzkgxcrs7s3z0i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base dhall optparse-applicative text unordered-containers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring dhall optparse-applicative text + vector yaml + ]; + testHaskellDepends = [ + aeson base bytestring dhall tasty tasty-hunit text + ]; + description = "Compile Dhall to JSON or YAML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-lex" = callPackage ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq , hspec, hspec-dirstream, scientific @@ -63468,14 +65590,15 @@ self: { description = "Dhall to Nix compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhall-text" = callPackage ({ mkDerivation, base, dhall, optparse-applicative, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.15"; - sha256 = "1cijr733xbls3lc5av1hki0za194rxrzd24ryxf1n9kdpc6dv8mg"; + version = "1.0.16"; + sha256 = "1hjqm03vj89pkpnrl49jgqwzmlw6s4xr54ga7y50wkj5sd2lrwd1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -63512,6 +65635,7 @@ self: { description = "Compile Dhall expressions to Cabal files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhcp-lease-parser" = callPackage @@ -63531,6 +65655,7 @@ self: { description = "Parse a DHCP lease file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "di" = callPackage @@ -63547,6 +65672,7 @@ self: { description = "Typeful hierarchical structured logging using di, mtl and df1"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "di-core" = callPackage @@ -63586,6 +65712,7 @@ self: { description = "Write logs in the df1 format using the di logging framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "di-handle" = callPackage @@ -63600,6 +65727,7 @@ self: { description = "IO support for file handles in di-core"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "di-monad" = callPackage @@ -63629,6 +65757,7 @@ self: { description = "An EDSL for teaching Haskell with diagrams - data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dia-functions" = callPackage @@ -63647,6 +65776,7 @@ self: { description = "An EDSL for teaching Haskell with diagrams - functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diagrams" = callPackage @@ -63663,7 +65793,6 @@ self: { doHaddock = false; description = "Embedded domain-specific language for declarative vector graphics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-boolean" = callPackage @@ -63678,6 +65807,7 @@ self: { description = "deprecated, part of diagrams-contrib since 1.4"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diagrams-braille" = callPackage @@ -63731,7 +65861,6 @@ self: { ]; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-cairo" = callPackage @@ -63754,7 +65883,6 @@ self: { ]; description = "Cairo backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-canvas" = callPackage @@ -63774,6 +65902,7 @@ self: { description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diagrams-contrib" = callPackage @@ -63802,7 +65931,6 @@ self: { ]; description = "Collection of user contributions to diagrams EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-core" = callPackage @@ -63838,6 +65966,7 @@ self: { description = "Graph layout and drawing with GrahpViz and diagrams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diagrams-gtk" = callPackage @@ -63854,6 +65983,7 @@ self: { description = "Backend for rendering diagrams directly to GTK windows"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diagrams-haddock" = callPackage @@ -63884,7 +66014,6 @@ self: { ]; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-hsqml" = callPackage @@ -63902,6 +66031,7 @@ self: { description = "HsQML (Qt5) backend for Diagrams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diagrams-html5" = callPackage @@ -63921,6 +66051,7 @@ self: { description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diagrams-lib" = callPackage @@ -63978,6 +66109,7 @@ self: { description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diagrams-pdf" = callPackage @@ -63996,6 +66128,7 @@ self: { description = "PDF backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diagrams-pgf" = callPackage @@ -64034,7 +66167,6 @@ self: { ]; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-qrcode" = callPackage @@ -64050,6 +66182,7 @@ self: { description = "Draw QR codes to SVG, PNG, PDF or PS files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diagrams-rasterific" = callPackage @@ -64157,6 +66290,7 @@ self: { description = "TikZ backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diagrams-wx" = callPackage @@ -64175,6 +66309,7 @@ self: { description = "Backend for rendering diagrams in wxWidgets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dialog" = callPackage @@ -64215,6 +66350,7 @@ self: { description = "A simple, forward build system"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dice" = callPackage @@ -64247,6 +66383,7 @@ self: { description = "Cryptographically secure n-sided dice via rejection sampling"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dice2tex" = callPackage @@ -64261,6 +66398,7 @@ self: { description = "Convert a Diceware wordlist into a printer-ready LaTeX file"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dicom" = callPackage @@ -64275,6 +66413,7 @@ self: { description = "A library for reading and writing DICOM files in the Explicit VR Little Endian transfer syntax"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dictionaries" = callPackage @@ -64304,6 +66443,7 @@ self: { description = "Tools to handle StarDict dictionaries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dictionary-sharing" = callPackage @@ -64333,6 +66473,7 @@ self: { description = "Parsec parsers for the DICT format produced by dictfmt -t"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diet" = callPackage @@ -64351,6 +66492,7 @@ self: { description = "Discrete Interval Encoding Trees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diff" = callPackage @@ -64435,6 +66577,7 @@ self: { description = "Diff two .cabal files syntactically"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diffdump" = callPackage @@ -64474,6 +66617,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "differential" = callPackage @@ -64500,6 +66644,7 @@ self: { description = "Finds out whether an entity comes from different distributions (statuses)"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diffmap" = callPackage @@ -64539,6 +66684,7 @@ self: { description = "Generate todo lists from source code"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "digamma" = callPackage @@ -64592,6 +66738,7 @@ self: { description = "Speed up form designing using digestive functors and bootstrap"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "digestive-foundation-lucid" = callPackage @@ -64609,6 +66756,7 @@ self: { description = "Speed up form designing using digestive functors and foundation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "digestive-functors" = callPackage @@ -64698,6 +66846,7 @@ self: { description = "Heist frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "digestive-functors-hsp" = callPackage @@ -64711,6 +66860,7 @@ self: { description = "HSP support for digestive-functors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "digestive-functors-lucid" = callPackage @@ -64740,7 +66890,6 @@ self: { ]; description = "Scotty backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-snap" = callPackage @@ -64798,6 +66947,7 @@ self: { description = "digitalocean api for haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "digits" = callPackage @@ -64850,7 +67000,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Statically checked physical dimensions, using Type Families and Data Kinds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dimensional-codata" = callPackage @@ -64862,7 +67011,6 @@ self: { libraryHaskellDepends = [ base dimensional numtype-dk ]; description = "CODATA Recommended Physical Constants with Dimensional Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dimensional-tf" = callPackage @@ -64875,6 +67023,7 @@ self: { description = "Statically checked physical dimensions, implemented using type families"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dimensions" = callPackage @@ -64911,6 +67060,7 @@ self: { description = "Dingo is a Rich Internet Application platform based on the Warp web server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dingo-example" = callPackage @@ -64931,6 +67081,7 @@ self: { description = "Dingo Example"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dingo-widgets" = callPackage @@ -64950,6 +67101,7 @@ self: { description = "Dingo Widgets"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diophantine" = callPackage @@ -64963,6 +67115,7 @@ self: { description = "A quadratic diophantine equation solving library"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diplomacy" = callPackage @@ -64979,6 +67132,7 @@ self: { description = "Diplomacy board game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diplomacy-server" = callPackage @@ -65003,6 +67157,7 @@ self: { description = "Play Diplomacy over HTTP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "direct-binary-files" = callPackage @@ -65015,6 +67170,7 @@ self: { description = "Serialization and deserialization monads for streams and ByteStrings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "direct-daemonize" = callPackage @@ -65042,6 +67198,7 @@ self: { description = "Native implementation of the FastCGI protocol"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "direct-http" = callPackage @@ -65061,6 +67218,7 @@ self: { description = "Native webserver that acts as a library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "direct-murmur-hash" = callPackage @@ -65084,6 +67242,7 @@ self: { description = "Lightweight replacement for Plugins, specific to GHC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "direct-rocksdb" = callPackage @@ -65104,25 +67263,10 @@ self: { description = "Bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "direct-sqlite" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, directory - , HUnit, semigroups, temporary, text - }: - mkDerivation { - pname = "direct-sqlite"; - version = "2.3.23"; - sha256 = "0ywkah9gmjnx0zdlvinc2i898jsbdrw4ba315zkpijaaldp6znqz"; - libraryHaskellDepends = [ base bytestring semigroups text ]; - testHaskellDepends = [ - base base16-bytestring bytestring directory HUnit temporary text - ]; - description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "direct-sqlite_2_3_24" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, directory , HUnit, semigroups, temporary, text }: @@ -65130,13 +67274,14 @@ self: { pname = "direct-sqlite"; version = "2.3.24"; sha256 = "0xd6wcmshzadwqjgd9ddcfi76p0v2c18h49spl076h285kp3plj1"; + revision = "1"; + editedCabalFile = "0cfl7h43q2qib1qq8sipgcxcm3i9d6cp1diwmxv8n7ygx7awz6w6"; libraryHaskellDepends = [ base bytestring semigroups text ]; testHaskellDepends = [ base base16-bytestring bytestring directory HUnit temporary text ]; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "directed-cubical" = callPackage @@ -65154,6 +67299,7 @@ self: { description = "Finite directed cubical complexes and associated algorithms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "directory_1_3_3_2" = callPackage @@ -65233,6 +67379,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dirstream" = callPackage @@ -65285,6 +67432,7 @@ self: { description = "Client for Discogs REST API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "discord-gateway" = callPackage @@ -65303,6 +67451,7 @@ self: { description = "An API wrapper for Discord in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "discord-haskell" = callPackage @@ -65313,8 +67462,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "0.8.0"; - sha256 = "10lmn9wkrzzslwbxgw9l25hyxldprz1ig87glg681aibssh0p54m"; + version = "0.8.1"; + sha256 = "0r7nlivcrqazjgsh54k8qrl64h7065c9vdg4ndv8bahvxvw1ld8r"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring containers data-default http-client iso8601-time JuicyPixels MonadRandom req @@ -65324,6 +67473,7 @@ self: { description = "Write bots for Discord in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "discord-hs" = callPackage @@ -65341,6 +67491,7 @@ self: { description = "An API wrapper for Discord in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "discord-rest" = callPackage @@ -65361,6 +67512,7 @@ self: { description = "An API wrapper for Discord in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "discord-types" = callPackage @@ -65380,6 +67532,7 @@ self: { description = "Type information for discord-hs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "discordian-calendar" = callPackage @@ -65392,6 +67545,7 @@ self: { description = "library for handling Discordian calendar dates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "discount" = callPackage @@ -65486,6 +67640,7 @@ self: { description = "Disjoint containers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "disjoint-set" = callPackage @@ -65503,6 +67658,7 @@ self: { description = "Persistent disjoint-sets, a.k.a union-find."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "disjoint-set-stateful" = callPackage @@ -65516,6 +67672,7 @@ self: { description = "Monadic disjoint set"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "disjoint-sets-st" = callPackage @@ -65559,6 +67716,7 @@ self: { description = "Disk-based hash table"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "display" = callPackage @@ -65593,6 +67751,7 @@ self: { description = "Allows storing different resource-releasing actions together"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dist-upload" = callPackage @@ -65608,6 +67767,7 @@ self: { description = "Generate/Upload cabal package to Hackage"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distance" = callPackage @@ -65622,6 +67782,7 @@ self: { description = "Useful distance datatype and functions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distance-of-time" = callPackage @@ -65654,6 +67815,7 @@ self: { description = "Serializable closures for distributed programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-fork" = callPackage @@ -65673,6 +67835,7 @@ self: { description = "Like 'forkIO', but uses remote machines instead of local threads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-fork-aws-lambda" = callPackage @@ -65700,6 +67863,7 @@ self: { description = "AWS Lambda backend for distributed-fork"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process" = callPackage @@ -65725,6 +67889,7 @@ self: { description = "Cloud Haskell: Erlang-style concurrency in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-async" = callPackage @@ -65753,6 +67918,7 @@ self: { description = "Cloud Haskell Async API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-azure" = callPackage @@ -65776,6 +67942,7 @@ self: { description = "Microsoft Azure backend for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-client-server" = callPackage @@ -65806,6 +67973,7 @@ self: { description = "The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-ekg" = callPackage @@ -65822,6 +67990,7 @@ self: { description = "Collect node stats for EKG"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-execution" = callPackage @@ -65858,6 +68027,7 @@ self: { description = "Execution Framework for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-extras" = callPackage @@ -65889,6 +68059,7 @@ self: { description = "Cloud Haskell Extras"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-fsm" = callPackage @@ -65922,6 +68093,7 @@ self: { description = "The Cloud Haskell implementation of Erlang/OTP gen_statem"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-lifted" = callPackage @@ -65948,6 +68120,7 @@ self: { description = "monad-control style typeclass and transformer instances for Process monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-monad-control" = callPackage @@ -65965,6 +68138,7 @@ self: { description = "Orphan instances for MonadBase and MonadBaseControl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-p2p" = callPackage @@ -65986,6 +68160,7 @@ self: { description = "Peer-to-peer node discovery for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-platform" = callPackage @@ -66017,6 +68192,7 @@ self: { description = "The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-registry" = callPackage @@ -66050,6 +68226,7 @@ self: { description = "Cloud Haskell Extended Process Registry"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-simplelocalnet" = callPackage @@ -66073,6 +68250,7 @@ self: { description = "Simple zero-configuration backend for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-supervisor" = callPackage @@ -66105,6 +68283,7 @@ self: { description = "Supervisors for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-systest" = callPackage @@ -66125,6 +68304,7 @@ self: { description = "Cloud Haskell Test Support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-task" = callPackage @@ -66162,6 +68342,7 @@ self: { description = "Task Framework for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-tests" = callPackage @@ -66186,6 +68367,7 @@ self: { description = "Tests and test support tools for distributed-process"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-process-zookeeper" = callPackage @@ -66215,6 +68397,7 @@ self: { description = "A Zookeeper back-end for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributed-static" = callPackage @@ -66231,6 +68414,7 @@ self: { description = "Compositional, type-safe, polymorphic static values and closures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distribution" = callPackage @@ -66245,6 +68429,7 @@ self: { description = "Finite discrete probability distributions"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distribution-nixpkgs" = callPackage @@ -66253,8 +68438,8 @@ self: { }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.1.1"; - sha256 = "1694crd3l9cyc0c5xvqmx62154519g2cnpzc5qmlypwrk258bssm"; + version = "1.2"; + sha256 = "0123plf001136q5gd9brq6vhpnx7db6gixx5sagp5l8jd2qpb244"; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq language-nix lens pretty process split @@ -66301,6 +68486,7 @@ self: { description = "Easily plot distributions from the distribution package.."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "distributive" = callPackage @@ -66340,6 +68526,7 @@ self: { description = "Quantify the diversity of a population"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dixi" = callPackage @@ -66378,6 +68565,7 @@ self: { description = "A wiki implemented with a firm theoretical foundation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "djembe" = callPackage @@ -66394,6 +68582,7 @@ self: { description = "Hit drums with haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "djinn" = callPackage @@ -66451,6 +68640,7 @@ self: { description = "Generate executable Haskell code from a type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dlist" = callPackage @@ -66556,6 +68746,7 @@ self: { description = "Complete bindings to the dmenu and dmenu2 command line tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dmenu-pkill" = callPackage @@ -66574,6 +68765,7 @@ self: { description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dmenu-pmount" = callPackage @@ -66592,6 +68784,7 @@ self: { description = "Mounting and unmounting linux devices as user with dmenu and pmount"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dmenu-search" = callPackage @@ -66610,6 +68803,7 @@ self: { description = "dmenu script for searching the web with customizable search engines"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dns" = callPackage @@ -66654,6 +68848,7 @@ self: { description = "Caching DNS resolver library and mass DNS resolver utility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dnsrbl" = callPackage @@ -66667,6 +68862,7 @@ self: { description = "Asynchronous DNS RBL lookup"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dnssd" = callPackage @@ -66680,6 +68876,7 @@ self: { description = "DNS service discovery bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {dns_sd = null;}; "do-list" = callPackage @@ -66747,6 +68944,7 @@ self: { description = "Document review Web application, like http://book.realworldhaskell.org/"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "doccheck" = callPackage @@ -66766,6 +68964,7 @@ self: { description = "Checks Haddock comments for pitfalls and version changes"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "docidx" = callPackage @@ -66785,6 +68984,7 @@ self: { description = "Generate an HTML index of installed Haskell packages and their documentation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "docker" = callPackage @@ -66819,6 +69019,7 @@ self: { description = "An API client for docker written in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "docker-build-cacher" = callPackage @@ -66842,6 +69043,7 @@ self: { description = "Builds a docker image and caches all of its intermediate stages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dockercook" = callPackage @@ -66876,6 +69078,7 @@ self: { description = "A build tool for multiple docker image layers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dockerfile" = callPackage @@ -67016,25 +69219,10 @@ self: { description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "doctest-driver-gen" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "doctest-driver-gen"; - version = "0.3.0.0"; - sha256 = "13m5f15076grwln29pnpqrq9h45cy46pagpk1qw3vzspp7k4ahk1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Generate driver file for doctest's cabal integration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "doctest-driver-gen_0_3_0_1" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; @@ -67048,6 +69236,7 @@ self: { description = "Generate driver file for doctest's cabal integration"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "doctest-prop" = callPackage @@ -67061,6 +69250,7 @@ self: { description = "Allow QuickCheck-style property testing within doctest"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "docusign-base" = callPackage @@ -67077,7 +69267,6 @@ self: { ]; description = "Low-level bindings to the DocuSign API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "docusign-base-minimal" = callPackage @@ -67094,7 +69283,6 @@ self: { ]; description = "Low-level bindings to the DocuSign API (only what is necessary for docusign-client)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "docusign-client" = callPackage @@ -67113,7 +69301,6 @@ self: { ]; description = "Client bindings for the DocuSign API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "docusign-example" = callPackage @@ -67133,6 +69320,7 @@ self: { description = "DocuSign examples"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "docvim" = callPackage @@ -67160,6 +69348,7 @@ self: { description = "Documentation generator for Vim plug-ins"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "doi" = callPackage @@ -67189,6 +69378,7 @@ self: { description = "Automatic Bibtex and fulltext of scientific articles"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dollaridoos" = callPackage @@ -67212,6 +69402,7 @@ self: { description = "The Lengauer-Tarjan graph dominators algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dom-parser" = callPackage @@ -67272,6 +69463,7 @@ self: { description = "Domain authentication library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dominion" = callPackage @@ -67304,20 +69496,20 @@ self: { description = "A simple templating library using HTML5 as its template language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dot" = callPackage - ({ mkDerivation, base, impure-containers, text }: + ({ mkDerivation, base, text }: mkDerivation { pname = "dot"; - version = "0.2.2"; - sha256 = "0j4v7vbmm6gfv1y4dp0r7ajiw7iinzflhw8sp867gyafszrpb0a3"; - revision = "1"; - editedCabalFile = "1dc8piglcvaxj0nq946xv185ynh1bk5ca0czrw25p4hji9iji0w1"; - libraryHaskellDepends = [ base impure-containers text ]; - description = "Data types and encoding for graphviz dot files"; + version = "0.3"; + sha256 = "10w45ssasprag42d59lln733swr7s7a15v64ys6qzzl6ina4s55n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + description = "Datatypes and encoding for graphviz dot files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dot-linker" = callPackage @@ -67345,6 +69537,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dot2graphml" = callPackage @@ -67387,6 +69580,7 @@ self: { description = "Loads environment variables from dotenv files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dotfs" = callPackage @@ -67419,6 +69613,7 @@ self: { description = "Filesystem to manage and parse dotfiles"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dotgen" = callPackage @@ -67499,6 +69694,7 @@ self: { description = "Doublify API toolkit for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dove" = callPackage @@ -67561,8 +69757,8 @@ self: { ({ mkDerivation, base, bytestring, feed, hspec, tagsoup, xml }: mkDerivation { pname = "download"; - version = "0.3.2.6"; - sha256 = "1wpf8kxq924482p7bm5l24nhmvrr75sjqinfjkj6x2x55hd40vd0"; + version = "0.3.2.7"; + sha256 = "1qg61d7z05dxpzfnv1gyf0dm2mpx23p29a9n5mx4pham5hfmfm3i"; libraryHaskellDepends = [ base bytestring feed tagsoup xml ]; testHaskellDepends = [ base hspec ]; description = "High-level file download based on URLs"; @@ -67598,6 +69794,7 @@ self: { description = "Simple tool to download images from RSS feeds (e.g. Flickr, Picasa)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dozenal" = callPackage @@ -67610,6 +69807,7 @@ self: { description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dozens" = callPackage @@ -67630,6 +69828,7 @@ self: { description = "dozens api library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dph-base" = callPackage @@ -67644,6 +69843,7 @@ self: { description = "Data Parallel Haskell common config and debugging functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dph-examples" = callPackage @@ -67663,6 +69863,7 @@ self: { description = "Data Parallel Haskell example programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dph-lifted-base" = callPackage @@ -67680,6 +69881,7 @@ self: { description = "Data Parallel Haskell common definitions used by other dph-lifted packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dph-lifted-copy" = callPackage @@ -67696,6 +69898,7 @@ self: { description = "Data Parallel Haskell lifted array combinators. (deprecated version)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dph-lifted-vseg" = callPackage @@ -67713,6 +69916,7 @@ self: { description = "Data Parallel Haskell lifted array combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dph-par" = callPackage @@ -67736,6 +69940,7 @@ self: { description = "Data Parallel Haskell segmented arrays. (abstract interface)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dph-prim-par" = callPackage @@ -67753,6 +69958,7 @@ self: { description = "Data Parallel Haskell segmented arrays. (production version)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dph-prim-seq" = callPackage @@ -67769,6 +69975,7 @@ self: { description = "Data Parallel Haskell segmented arrays. (sequential implementation)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dph-seq" = callPackage @@ -67801,6 +70008,7 @@ self: { description = "libdpkg bindings"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) dpkg; libdpkg = null;}; "dpor" = callPackage @@ -67815,6 +70023,7 @@ self: { description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "drClickOn" = callPackage @@ -67827,6 +70036,7 @@ self: { description = "Monadic FRP"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dragen" = callPackage @@ -67848,6 +70058,7 @@ self: { description = "Automatic derivation of optimized QuickCheck random generators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "draw-poker" = callPackage @@ -67880,6 +70091,7 @@ self: { description = "A port of asciimoo's drawille to haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dresdner-verkehrsbetriebe" = callPackage @@ -67903,6 +70115,7 @@ self: { description = "Library and program for querying DVB (Dresdner Verkehrsbetriebe AG)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "drifter" = callPackage @@ -67911,15 +70124,14 @@ self: { }: mkDerivation { pname = "drifter"; - version = "0.2.3"; - sha256 = "0f16v4v0ff27qk71a6fsrcwy02nc53g9q1qrfscn8q3swi3rslyz"; + version = "0.2.4"; + sha256 = "012x67lncwlrf2kjmfki4lz3sclpj1gjf7wyszagwm523grp1qly"; libraryHaskellDepends = [ base containers fgl text ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck text ]; description = "Simple schema management for arbitrary databases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "drifter-postgresql" = callPackage @@ -67941,6 +70153,7 @@ self: { description = "PostgreSQL support for the drifter schema migration tool"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "drifter-sqlite" = callPackage @@ -67960,7 +70173,6 @@ self: { ]; description = "SQLite support for the drifter schema migraiton tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "drinkery" = callPackage @@ -67986,6 +70198,7 @@ self: { description = "A Haskell bindings to the DRMAA C library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {drmaa = null;}; "dropbox-sdk" = callPackage @@ -68008,6 +70221,7 @@ self: { description = "A library to access the Dropbox HTTP API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dropsolve" = callPackage @@ -68027,6 +70241,7 @@ self: { description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ds-kanren" = callPackage @@ -68042,6 +70257,7 @@ self: { description = "A subset of the miniKanren language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dsc" = callPackage @@ -68089,6 +70305,7 @@ self: { description = "SQL backend for Database Supported Haskell (DSH)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dsmc" = callPackage @@ -68107,6 +70324,7 @@ self: { description = "DSMC library for rarefied gas dynamics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dsmc-tools" = callPackage @@ -68127,6 +70345,7 @@ self: { description = "DSMC toolkit for rarefied gas dynamics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dson" = callPackage @@ -68139,6 +70358,7 @@ self: { description = "Haskell DogeScript Object Notation Parser"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dson-parsec" = callPackage @@ -68151,6 +70371,7 @@ self: { description = "DSON parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dsp" = callPackage @@ -68177,6 +70398,7 @@ self: { description = "Difference strings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dtab" = callPackage @@ -68198,6 +70420,7 @@ self: { description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dtd" = callPackage @@ -68218,6 +70441,7 @@ self: { description = "Parse and render DTD files (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dtd-text" = callPackage @@ -68234,6 +70458,7 @@ self: { description = "Parse and render XML DTDs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dtd-types" = callPackage @@ -68276,6 +70501,7 @@ self: { description = "(Fast) Dynamic Time Warping"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dual" = callPackage @@ -68288,6 +70514,7 @@ self: { description = "Dual category"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dual-game" = callPackage @@ -68298,8 +70525,8 @@ self: { pname = "dual-game"; version = "0.1.0.1"; sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; - revision = "2"; - editedCabalFile = "077gbc640ab3846bijbiif89r3ska3aab7g2r9cd7dl9c7iy35w8"; + revision = "4"; + editedCabalFile = "1ln3lwx4h7yi3gf5r4ix92nvjcjjhphiqan1lnci81wn0frs9wrz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -68307,7 +70534,6 @@ self: { ]; description = "Network multiplayer 2D shooting game"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dual-tree" = callPackage @@ -68369,7 +70595,6 @@ self: { ]; description = "XML streaming parser/renderer for the Dublin Core standard elements"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "duckling" = callPackage @@ -68418,7 +70643,6 @@ self: { 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 @@ -68534,6 +70758,7 @@ self: { description = "Frontend development build tool"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "duration" = callPackage @@ -68595,6 +70820,7 @@ self: { description = "Efficient automatic differentiation and code generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dvdread" = callPackage @@ -68609,6 +70835,7 @@ self: { description = "A monadic interface to libdvdread"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {dvdread = null;}; "dvi-processing" = callPackage @@ -68621,6 +70848,7 @@ self: { description = "Read/write DVI and TFM file"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dvorak" = callPackage @@ -68680,6 +70908,7 @@ self: { description = "High-level wrapper around the dwarf library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dwergaz" = callPackage @@ -68703,7 +70932,7 @@ self: { libraryHaskellDepends = [ base Win32 ]; description = "Backend for a binding to the Microsoft DirectX 9 API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {}; "dx9d3d" = callPackage @@ -68716,7 +70945,7 @@ self: { librarySystemDepends = [ d3d9 ]; description = "A binding to the Microsoft DirectX 9 API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {d3d9 = null;}; "dx9d3dx" = callPackage @@ -68729,7 +70958,7 @@ self: { librarySystemDepends = [ d3dx9 ]; description = "A binding to the Microsoft DirectX 9 D3DX API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {d3dx9 = null;}; "dyckword" = callPackage @@ -68747,6 +70976,7 @@ self: { description = "A library for working with binary Dyck words"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dynamic-cabal" = callPackage @@ -68769,6 +70999,7 @@ self: { description = "Access the functions from the Cabal library without depending on it"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dynamic-graph" = callPackage @@ -68786,6 +71017,7 @@ self: { description = "Draw and update graphs in real time with OpenGL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dynamic-graphs" = callPackage @@ -68870,6 +71102,7 @@ self: { description = "Object-oriented programming with duck typing and singleton classes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dynamic-plot" = callPackage @@ -68897,6 +71130,7 @@ self: { description = "Interactive diagram windows"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dynamic-pp" = callPackage @@ -68918,6 +71152,7 @@ self: { description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dynamic-state" = callPackage @@ -68945,8 +71180,8 @@ self: { }: mkDerivation { pname = "dynamodb-simple"; - version = "0.6.0.0"; - sha256 = "0dshi4binsfjrlw7sl1jxa09a1s4qkp3g48x6hchaipk6b1nx960"; + version = "0.6.0.1"; + sha256 = "00966z61119p2qammdiaxnfc5by0b12pj95745i792kqw647vygj"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb base bytestring conduit containers double-conversion exceptions generics-sop @@ -68962,6 +71197,7 @@ self: { description = "Typesafe library for working with DynamoDB database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dynloader" = callPackage @@ -69006,6 +71242,7 @@ self: { description = "your dynamic optimization buddy"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dyre" = callPackage @@ -69034,6 +71271,7 @@ self: { description = "Bindings to the dywapitchtrack pitch tracking library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dzen-utils" = callPackage @@ -69046,6 +71284,7 @@ self: { description = "Utilities for creating inputs for dzen"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "each" = callPackage @@ -69106,6 +71345,7 @@ self: { description = "Ear Clipping Triangulation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ease" = callPackage @@ -69118,6 +71358,7 @@ self: { description = "Robert Penner's easing equations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "easy-api" = callPackage @@ -69134,6 +71375,7 @@ self: { description = "Utility code for building HTTP API bindings more quickly"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "easy-bitcoin" = callPackage @@ -69178,6 +71420,7 @@ self: { description = "Haskell JSON library with an emphasis on simplicity, minimal dependencies, and ease of use"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "easyplot" = callPackage @@ -69190,6 +71433,7 @@ self: { description = "A tiny plotting library, utilizes gnuplot for plotting"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "easyrender" = callPackage @@ -69215,6 +71459,7 @@ self: { description = "Pure, type-indexed haskell vector, matrix, and tensor library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "easytensor-vulkan" = callPackage @@ -69227,6 +71472,7 @@ self: { description = "Use easytensor with vulkan-api"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "easytest" = callPackage @@ -69245,6 +71491,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "easytest_0_3" = callPackage + ({ mkDerivation, base, call-stack, directory, hedgehog, mtl + , profunctors, split, stm, tagged, transformers, unix + }: + mkDerivation { + pname = "easytest"; + version = "0.3"; + sha256 = "0hvdbc7p1wzjpzxifg70sd2bzj9s7vfznal5y2594n6h6s8nj6yf"; + libraryHaskellDepends = [ + base call-stack hedgehog mtl profunctors split stm tagged + transformers + ]; + testHaskellDepends = [ + base directory hedgehog profunctors transformers unix + ]; + description = "Simple, expressive testing library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ebeats" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -69255,6 +71521,7 @@ self: { description = "Time in ebeats"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ebnf-bff" = callPackage @@ -69274,6 +71541,7 @@ self: { description = "Parser combinators & EBNF, BFFs!"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ec2-signature" = callPackage @@ -69315,19 +71583,21 @@ self: { }) {}; "eccrypto" = callPackage - ({ mkDerivation, base, bytestring, cereal, crypto-api, SHA, vector + ({ mkDerivation, base, base16-bytestring, bytestring, Cabal + , criterion, cryptohash-sha512, integer-gmp, random }: mkDerivation { pname = "eccrypto"; - version = "0.0.1"; - sha256 = "1jcwlwbcd77536ii0wxalbdslzbvv224b07g3801pgjvr38xljpx"; + version = "0.2.0"; + sha256 = "1ng9lin5cavmcrp60lrnqxfkhb5drhlk9nzrl8d6gr1g7zfj75qm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring cereal crypto-api SHA vector + base bytestring cryptohash-sha512 integer-gmp random ]; + testHaskellDepends = [ base base16-bytestring bytestring Cabal ]; + benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "Elliptic Curve Cryptography for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ecdsa" = callPackage @@ -69378,6 +71648,7 @@ self: { description = "A ECMA-262 interpreter library"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ecstasy" = callPackage @@ -69412,6 +71683,7 @@ self: { description = "Tools for automotive ECU development"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {canlib = null;}; "ed25519" = callPackage @@ -69460,6 +71732,7 @@ self: { description = "Command line file filtering with haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ede" = callPackage @@ -69498,6 +71771,7 @@ self: { description = "Semi-explicit parallel programming library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "edenskel" = callPackage @@ -69510,6 +71784,7 @@ self: { description = "Semi-explicit parallel programming skeleton library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "edentv" = callPackage @@ -69531,6 +71806,7 @@ self: { description = "A Tool to Visualize Parallel Functional Program Executions"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "edge" = callPackage @@ -69550,6 +71826,7 @@ self: { description = "Top view space combat arcade game"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "edges" = callPackage @@ -69578,6 +71855,7 @@ self: { description = "Tools for efficient immutable graphs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "edis" = callPackage @@ -69610,6 +71888,7 @@ self: { description = "A monad for rewriting things"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "edit-distance" = callPackage @@ -69661,6 +71940,7 @@ self: { description = "Symmetric, stateful edit lenses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "edit-lenses-demo" = callPackage @@ -69686,6 +71966,7 @@ self: { description = "Interactive editors for Generics"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "editline" = callPackage @@ -69698,6 +71979,7 @@ self: { description = "Bindings to the editline library (libedit)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "editor-open" = callPackage @@ -69756,6 +72038,7 @@ self: { description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "effect-monad" = callPackage @@ -69823,6 +72106,7 @@ self: { description = "Computational Effects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "effects-parser" = callPackage @@ -69835,6 +72119,7 @@ self: { description = "Parser Effect for the Control.Effects Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "effin" = callPackage @@ -69847,6 +72132,7 @@ self: { description = "A Typeable-free implementation of extensible effects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "egison" = callPackage @@ -69896,6 +72182,7 @@ self: { description = "A quasi quotes for using Egison expression in Haskell code"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "egison-tutorial" = callPackage @@ -69917,6 +72204,7 @@ self: { description = "A tutorial program for the Egison programming language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "egyptian-fractions" = callPackage @@ -69947,6 +72235,7 @@ self: { description = "like eruby, ehaskell is embedded haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ehs" = callPackage @@ -69968,6 +72257,7 @@ self: { description = "Embedded haskell template using quasiquotes"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eibd-client-simple" = callPackage @@ -69987,6 +72277,7 @@ self: { description = "EIBd Client"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {eibclient = null;}; "eigen" = callPackage @@ -70007,6 +72298,7 @@ self: { description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "either" = callPackage @@ -70052,6 +72344,7 @@ self: { description = "Functions involving lists of Either"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "either-unwrap" = callPackage @@ -70111,7 +72404,6 @@ self: { ]; description = "Send ekg metrics to a Bosun instance"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-carbon" = callPackage @@ -70178,6 +72470,7 @@ self: { description = "Push metrics to elastic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ekg-elasticsearch" = callPackage @@ -70196,6 +72489,7 @@ self: { description = "Push metrics to elasticsearch"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ekg-influxdb" = callPackage @@ -70213,6 +72507,7 @@ self: { description = "An EKG backend to send statistics to influxdb"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ekg-json" = callPackage @@ -70246,6 +72541,7 @@ self: { description = "Push metrics to a log file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ekg-prometheus-adapter" = callPackage @@ -70264,6 +72560,7 @@ self: { description = "Easily expose your EKG metrics to Prometheus"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ekg-push" = callPackage @@ -70282,6 +72579,7 @@ self: { description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ekg-rrd" = callPackage @@ -70303,6 +72601,7 @@ self: { description = "Passes ekg statistics to rrdtool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ekg-statsd" = callPackage @@ -70415,6 +72714,7 @@ self: { description = "Immediately lifts to a desired level"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "elf" = callPackage @@ -70473,6 +72773,7 @@ self: { description = "Arrows with holes"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "elm-bridge" = callPackage @@ -70775,6 +73076,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elm-street" = callPackage + ({ mkDerivation, aeson, base, directory, filepath, prettyprinter + , servant, servant-server, text, time, wai, warp + }: + mkDerivation { + pname = "elm-street"; + version = "0.0.0"; + sha256 = "0my3f08h019rhmyvcbf5xz87wnrd52fsqpiqj6jv1544psczc2sq"; + revision = "1"; + editedCabalFile = "1a6xx0an11kljw5l5y2mgpsll5515lz18nvpzxa0rc927nnpnf2y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base directory filepath prettyprinter text time + ]; + executableHaskellDepends = [ + base servant servant-server wai warp + ]; + testHaskellDepends = [ base ]; + doHaddock = false; + description = "Crossing the road between Haskell and Elm"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "elm-websocket" = callPackage ({ mkDerivation, aeson, base, bytestring, concurrent-extra , containers, directory, formatting, hspec, http-types, lens, mtl @@ -70803,6 +73128,7 @@ self: { description = "Generate ELM code from a Wai websocket application"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "elm-yesod" = callPackage @@ -70828,8 +73154,8 @@ self: { }: mkDerivation { pname = "elm2nix"; - version = "0.1.0"; - sha256 = "140qv6zvq4860fd5pglhwgd9pnxv6nha3ah3pmp4d2x3jkvg3hcy"; + version = "0.1.1"; + sha256 = "16b7vv7ndn8mpkg05rhljpmld2dazsgl9yqg8j3mza1f5x4f6jwp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70898,6 +73224,7 @@ self: { description = "A tiny language for understanding the lambda-calculus"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "emacs-keys" = callPackage @@ -70917,6 +73244,7 @@ self: { description = "library to parse emacs style keybinding into the modifiers and the chars"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "emacs-module" = callPackage @@ -70953,6 +73281,7 @@ self: { description = "Sending eMail in Haskell made easy"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "email-header" = callPackage @@ -70975,6 +73304,7 @@ self: { description = "Parsing and rendering of email and MIME headers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "email-postmark" = callPackage @@ -70991,6 +73321,7 @@ self: { description = "A simple wrapper to send emails via the api of the service postmark (http://postmarkapp.com/)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "email-validate" = callPackage @@ -71042,6 +73373,7 @@ self: { description = "Perform basic syntax and deliverability checks on email addresses"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "emailaddress" = callPackage @@ -71085,6 +73417,7 @@ self: { description = "An email parser that will parse everything"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "embeddock" = callPackage @@ -71102,6 +73435,7 @@ self: { description = "Embed the values in scope in the haddock documentation of the module"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "embeddock-example" = callPackage @@ -71114,6 +73448,7 @@ self: { description = "Example of using embeddock"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "embroidery" = callPackage @@ -71133,6 +73468,7 @@ self: { description = "support for embroidery formats in haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "emd" = callPackage @@ -71153,6 +73489,7 @@ self: { description = "Empirical Mode Decomposition and Hilbert-Huang Transform"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "emgm" = callPackage @@ -71166,6 +73503,7 @@ self: { description = "Extensible and Modular Generics for the Masses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "emoji" = callPackage @@ -71207,6 +73545,7 @@ self: { description = "A container that always has no values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "enchant" = callPackage @@ -71281,6 +73620,7 @@ self: { description = "A library for various character encodings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "encoding-io" = callPackage @@ -71295,6 +73635,7 @@ self: { description = "Encoding-aware file I/O"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "endo" = callPackage @@ -71370,6 +73711,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "engine-io-snap" = callPackage @@ -71387,6 +73729,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "engine-io-wai" = callPackage @@ -71406,6 +73749,7 @@ self: { description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "engine-io-yesod" = callPackage @@ -71423,6 +73767,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "engineering-units" = callPackage @@ -71451,6 +73796,7 @@ self: { description = "An application (and library) to convert quipper circuits into Qpmc models"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "entropy" = callPackage @@ -71461,6 +73807,8 @@ self: { pname = "entropy"; version = "0.4.1.4"; sha256 = "1fgf47l9klwn1xssbcbq6by651vikd8hlfxhiwd5bqzxr1jnlgrf"; + revision = "1"; + editedCabalFile = "0h9wvpq4hw5ipn15ni0qdsrssjil0m59wm4l5hl607l3w2lif864"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base bytestring unix ]; description = "A platform independent entropy source"; @@ -71495,6 +73843,7 @@ self: { description = "entwine - Concurrency tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "enum-subset-generate" = callPackage @@ -71513,17 +73862,49 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "enum-text" = callPackage + ({ mkDerivation, array, base, bytestring, fmt, hashable, possibly + , text, unordered-containers + }: + mkDerivation { + pname = "enum-text"; + version = "0.1.0.0"; + sha256 = "0n8h81czav7p5haav2imlg9wani0bggjn2kxk4zrrygi7665m9fi"; + libraryHaskellDepends = [ + array base bytestring fmt hashable possibly text + unordered-containers + ]; + description = "A text rendering and parsing toolkit for enumerated types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "enum-types" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "enum-types"; - version = "0.1.0.0"; - sha256 = "18qiq6nnnd1c5lkvjafsqd4ypa4xpmx99diq82dz5wy2h95ci2ri"; + version = "0.1.1.0"; + sha256 = "1m3f79acnrssz89490vwxp1dabqadzda3a95yg6gh6mpn7x0gkw5"; libraryHaskellDepends = [ base ]; description = "small enum types"; license = stdenv.lib.licenses.bsd3; }) {}; + "enum-utf8" = callPackage + ({ mkDerivation, array, base, bytestring, hashable, possibly + , render-utf8, unordered-containers + }: + mkDerivation { + pname = "enum-utf8"; + version = "0.1.0.0"; + sha256 = "0mlzlwvrii5dbkz5nqv49npfqqbgngzali2din4rz7f4im4g0bxp"; + libraryHaskellDepends = [ + array base bytestring hashable possibly render-utf8 + unordered-containers + ]; + description = "An experimental Utf8 parsing toolkit for enumerated types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "enumerable" = callPackage ({ mkDerivation, base, control-monad-omega, tagged }: mkDerivation { @@ -71553,6 +73934,7 @@ self: { description = "enumerate all the values in a finite type (automatically)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "enumerate-function" = callPackage @@ -71574,6 +73956,7 @@ self: { description = "simple package for inverting functions and testing totality, via brute enumeration of the domain"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "enumeration" = callPackage @@ -71593,6 +73976,7 @@ self: { description = "A practical API for building recursive enumeration procedures and enumerating datatypes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "enumerator" = callPackage @@ -71610,6 +73994,7 @@ self: { description = "Reliable, high-performance processing with left-fold enumerators"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "enumerator-fd" = callPackage @@ -71622,6 +74007,7 @@ self: { description = "Enumerator instances for monads-fd classes"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "enumerator-tf" = callPackage @@ -71634,6 +74020,7 @@ self: { description = "Enumerator instances for monads-tf classes"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "enumfun" = callPackage @@ -71646,6 +74033,7 @@ self: { description = "Finitely represented /total/ EnumMaps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "enummapmap" = callPackage @@ -71671,6 +74059,7 @@ self: { description = "Map of maps using Enum types as keys"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "enummapset" = callPackage @@ -71690,6 +74079,7 @@ self: { description = "IntMap and IntSet with Enum keys/elements"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "enummapset-th" = callPackage @@ -71704,6 +74094,7 @@ self: { description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "enumset" = callPackage @@ -71748,6 +74139,7 @@ self: { description = "Pull configuration information from the ENV"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "envelope" = callPackage @@ -71796,6 +74188,7 @@ self: { description = "Display efficiently the state of the local environment"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "envy" = callPackage @@ -71827,6 +74220,7 @@ self: { description = "Haskell binding for EPANET"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "epass" = callPackage @@ -71839,6 +74233,7 @@ self: { description = "Baisc, Erlang-like message passing supporting sockets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "epic" = callPackage @@ -71857,6 +74252,7 @@ self: { description = "Compiler for a simple functional language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "epoll" = callPackage @@ -71871,6 +74267,7 @@ self: { description = "epoll bindings"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eprocess" = callPackage @@ -71884,6 +74281,7 @@ self: { description = "Basic Erlang-like process support for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "epub" = callPackage @@ -71962,6 +74360,7 @@ self: { description = "Rename epub ebook files based on meta information"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eq" = callPackage @@ -72040,29 +74439,28 @@ self: { ]; description = "Application level triggered, and edge triggered event multiqueues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "equivalence" = callPackage - ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans - , template-haskell, test-framework, test-framework-quickcheck2 - , transformers, transformers-compat + ({ mkDerivation, base, containers, fail, mtl, QuickCheck + , STMonadTrans, template-haskell, test-framework + , test-framework-quickcheck2, transformers, transformers-compat }: mkDerivation { pname = "equivalence"; - version = "0.3.3"; - sha256 = "02jhn8z1aqyxp3krylhfnwr7zzjcd17q9qriyd9653i92b7di3gf"; + version = "0.3.4"; + sha256 = "02s24624xnwq790mip5pj6828an36j8jbdj5kvx9bv5a7ap3vzn1"; libraryHaskellDepends = [ - base containers mtl STMonadTrans transformers transformers-compat + base containers fail mtl STMonadTrans transformers + transformers-compat ]; testHaskellDepends = [ - base containers mtl QuickCheck STMonadTrans template-haskell + base containers fail mtl QuickCheck STMonadTrans template-haskell test-framework test-framework-quickcheck2 transformers transformers-compat ]; description = "Maintaining an equivalence relation implemented as union-find using STT"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "erd" = callPackage @@ -72081,6 +74479,7 @@ self: { description = "An entity-relationship diagram generator from a plain text description"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "erf" = callPackage @@ -72104,6 +74503,7 @@ self: { description = "Native Haskell implementation of the interface from the erf package"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "erlang" = callPackage @@ -72132,6 +74532,7 @@ self: { description = "A text censorship library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eros-client" = callPackage @@ -72151,6 +74552,7 @@ self: { description = "DEPRECATED in favor of eros-http"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eros-http" = callPackage @@ -72171,6 +74573,7 @@ self: { description = "JSON HTTP interface to Eros"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "errno" = callPackage @@ -72196,6 +74599,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "error-codes" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "error-codes"; + version = "0.1.0.0"; + sha256 = "1i78vxk5ldasbn0fs8nwjfsjzkxjmg05i6vgzs4jlj1ajsgwhhkj"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ base ]; + description = "Error code functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "error-context" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, katip , monad-logger, mtl, resourcet, safe-exceptions, tasty, tasty-hunit @@ -72217,6 +74632,7 @@ self: { description = "Provides API for enriching errors with contexts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "error-continuations" = callPackage @@ -72229,6 +74645,7 @@ self: { description = "Error Continuations"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "error-list" = callPackage @@ -72241,6 +74658,7 @@ self: { description = "A useful type for collecting error messages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "error-loc" = callPackage @@ -72253,6 +74671,7 @@ self: { description = "An error replacement with call-site metadata"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "error-location" = callPackage @@ -72280,6 +74699,7 @@ self: { description = "Composable error messages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "error-util" = callPackage @@ -72338,6 +74758,7 @@ self: { description = "`bracket`-like functions for `ExceptT` over `IO` monad"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ersaconcat" = callPackage @@ -72362,6 +74783,7 @@ self: { description = "A script to concatenate AIP ERSA"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ersatz" = callPackage @@ -72389,6 +74811,7 @@ self: { description = "A monad for expressing SAT or QSAT problems using observable sharing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ersatz-toysat" = callPackage @@ -72407,6 +74830,7 @@ self: { description = "toysat driver as backend for ersatz"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ert" = callPackage @@ -72430,6 +74854,7 @@ self: { description = "Easy Runtime Templates"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "escape-artist" = callPackage @@ -72447,6 +74872,7 @@ self: { description = "ANSI Escape Sequence Text Decoration Made Easy"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "escaped" = callPackage @@ -72495,6 +74921,7 @@ self: { description = "Terminal fuzzy selector"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "esotericbot" = callPackage @@ -72519,6 +74946,7 @@ self: { description = "Esotericbot is a sophisticated, lightweight IRC bot"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "espial" = callPackage @@ -72584,6 +75012,7 @@ self: { description = "Espial is an open-source, web-based bookmarking server"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "esqueleto" = callPackage @@ -72615,6 +75044,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "esqueleto_2_7_0" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, conduit, containers + , hspec, monad-logger, mysql, mysql-simple, persistent + , persistent-mysql, persistent-postgresql, persistent-sqlite + , persistent-template, postgresql-libpq, postgresql-simple + , resourcet, tagged, text, time, transformers, unliftio + , unordered-containers + }: + mkDerivation { + pname = "esqueleto"; + version = "2.7.0"; + sha256 = "1cxf26qfymsx578yzpmpdhs7w79s3xw5ar8d359cxbk04j0im2ib"; + libraryHaskellDepends = [ + base blaze-html bytestring conduit monad-logger persistent + resourcet tagged text time transformers unliftio + unordered-containers + ]; + testHaskellDepends = [ + base blaze-html bytestring conduit containers hspec monad-logger + mysql mysql-simple persistent persistent-mysql + persistent-postgresql persistent-sqlite persistent-template + postgresql-libpq postgresql-simple resourcet tagged text time + transformers unliftio unordered-containers + ]; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ess" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -72625,6 +75083,7 @@ self: { description = "The type-level S combinator in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "estimator" = callPackage @@ -72656,6 +75115,7 @@ self: { description = "Tool for managing probability estimation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "estreps" = callPackage @@ -72673,6 +75133,7 @@ self: { description = "Repeats from ESTs"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "etc" = callPackage @@ -72726,6 +75187,7 @@ self: { description = "everything breaking the Fairbairn threshold"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eternity" = callPackage @@ -72747,6 +75209,7 @@ self: { description = "Native event-sourcing database"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eternity-timestamped" = callPackage @@ -72765,6 +75228,7 @@ self: { description = "Automatic timestamping for Eternity"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ether" = callPackage @@ -72793,6 +75257,8 @@ self: { ]; description = "Monad transformers and classes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ethereum-analyzer" = callPackage @@ -72817,6 +75283,7 @@ self: { description = "A Ethereum contract analyzer"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ethereum-analyzer-cli" = callPackage @@ -72845,6 +75312,7 @@ self: { description = "A CLI frontend for ethereum-analyzer"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ethereum-analyzer-deps" = callPackage @@ -72891,6 +75359,7 @@ self: { description = "A web frontend for ethereum-analyzer"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ethereum-client-haskell" = callPackage @@ -72920,6 +75389,7 @@ self: { description = "A Haskell version of an Ethereum client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ethereum-merkle-patricia-db" = callPackage @@ -72945,6 +75415,7 @@ self: { description = "A modified Merkle Patricia DB"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ethereum-rlp" = callPackage @@ -72980,6 +75451,7 @@ self: { description = "Ethereum Recursive Length Prefix Encoding"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ety" = callPackage @@ -73041,7 +75513,6 @@ self: { ]; description = "Euler tour trees"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "euphoria" = callPackage @@ -73067,6 +75538,7 @@ self: { description = "Dynamic network FRP with events and continuous values"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eurofxref" = callPackage @@ -73085,6 +75557,7 @@ self: { description = "Free foreign exchange/currency feed from the European Central Bank"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eve" = callPackage @@ -73104,6 +75577,7 @@ self: { description = "An extensible event framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eve-cli" = callPackage @@ -73121,6 +75595,7 @@ self: { testHaskellDepends = [ base bytestring eve lens mtl text vty ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "event" = callPackage @@ -73135,6 +75610,7 @@ self: { description = "Monoidal, monadic and first-class events"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "event-driven" = callPackage @@ -73147,6 +75623,7 @@ self: { description = "library for event driven programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "event-handlers" = callPackage @@ -73194,6 +75671,7 @@ self: { description = "Event-graph simulation monad transformer"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "event-transformer" = callPackage @@ -73255,6 +75733,7 @@ self: { description = "Library for eventful DynamoDB event stores"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eventful-memory" = callPackage @@ -73297,6 +75776,7 @@ self: { description = "Postgres implementations for eventful"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eventful-sql-common" = callPackage @@ -73367,6 +75847,7 @@ self: { description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eventsource-api" = callPackage @@ -73411,6 +75892,7 @@ self: { description = "GetEventStore store implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "eventsource-store-specs" = callPackage @@ -73474,37 +75956,38 @@ self: { "eventstore" = callPackage ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring , cereal, clock, connection, containers, dns, dotnet-timespan - , ekg-core, exceptions, fast-logger, hashable, http-client - , interpolate, lifted-async, lifted-base, machines, monad-control - , monad-logger, mono-traversable, mtl, protobuf, random, safe - , safe-exceptions, semigroups, stm, stm-chans, streaming, tasty - , tasty-hspec, tasty-hunit, text, time, transformers-base - , unordered-containers, uuid + , ekg-core, exceptions, fast-logger, file-embed, hashable + , http-client, interpolate, lifted-async, lifted-base, machines + , monad-control, monad-logger, mono-traversable, mtl, protobuf + , random, safe, safe-exceptions, semigroups, stm, stm-chans + , streaming, tasty, tasty-hspec, tasty-hunit, text, time + , transformers-base, unordered-containers, uuid, vector }: mkDerivation { pname = "eventstore"; - version = "1.2.1"; - sha256 = "1yya52bk3sgfgrarf88a3n7i0jdwr1hd615a17ixxbb1vc9v44y8"; + version = "1.2.2"; + sha256 = "0p2qz8z44mdlswan9cp9xpxwbbq345g9r4kh777q18x1k5jbf61j"; libraryHaskellDepends = [ aeson array base bifunctors bytestring cereal clock connection containers dns dotnet-timespan ekg-core exceptions fast-logger hashable http-client interpolate lifted-async lifted-base machines monad-control monad-logger mono-traversable mtl protobuf random safe safe-exceptions semigroups stm stm-chans streaming text time - transformers-base unordered-containers uuid + transformers-base unordered-containers uuid vector ]; testHaskellDepends = [ aeson async base bytestring cereal connection containers - dotnet-timespan exceptions fast-logger hashable lifted-async - lifted-base monad-control mono-traversable protobuf safe - safe-exceptions semigroups stm stm-chans streaming tasty + dotnet-timespan exceptions fast-logger file-embed hashable + lifted-async lifted-base monad-control mono-traversable protobuf + safe safe-exceptions semigroups stm stm-chans streaming tasty tasty-hspec tasty-hunit text time transformers-base - unordered-containers uuid + unordered-containers uuid vector ]; description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "every" = callPackage @@ -73528,6 +76011,7 @@ self: { description = "A functional pearl on encoding and decoding using question-and-answer strategies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ewe" = callPackage @@ -73547,7 +76031,6 @@ self: { executableToolDepends = [ alex happy uuagc ]; description = "An interpreter for EWE programming language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ex-pool" = callPackage @@ -73589,6 +76072,7 @@ self: { description = "Efficient exact cover solver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exact-pi" = callPackage @@ -73599,13 +76083,14 @@ self: { pname = "exact-pi"; version = "0.5.0.1"; sha256 = "0q0qrkmpff835m3zz3w60i1y4sqicnzqb6vqmk13cjh4ign5d0ax"; + revision = "1"; + editedCabalFile = "1l55d7x61i2d5rlh7sh2nhn0af9cyp92gzdmqqnnjzg55d347qsm"; libraryHaskellDepends = [ base numtype-dk ]; testHaskellDepends = [ base numtype-dk QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Exact rational multiples of pi (and integer powers of pi)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exact-real" = callPackage @@ -73626,6 +76111,7 @@ self: { description = "Exact real arithmetic"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exact-real-positional" = callPackage @@ -73638,6 +76124,7 @@ self: { description = "Framework for Exact Real Arithmetic in the Positional Number System"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "except-exceptions" = callPackage @@ -73652,6 +76139,7 @@ self: { description = "Safely deal with exceptions in ExceptT"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exception-hierarchy" = callPackage @@ -73664,6 +76152,7 @@ self: { description = "Exception type hierarchy with TemplateHaskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exception-mailer" = callPackage @@ -73691,6 +76180,7 @@ self: { description = "Exception monad transformer instances for monads-fd classes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exception-monads-tf" = callPackage @@ -73803,6 +76293,7 @@ self: { description = "A Haskell client for https://exchangeratesapi.io/"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "execs" = callPackage @@ -73818,6 +76309,7 @@ self: { description = "Tool to run stack exec prj-exe more easy"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "executable-hash" = callPackage @@ -73866,6 +76358,7 @@ self: { description = "Shell helpers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exference" = callPackage @@ -73897,6 +76390,7 @@ self: { description = "Tool to search/generate (haskell) expressions with a given type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exhaustive" = callPackage @@ -73936,6 +76430,7 @@ self: { description = "Exheres generator for cabal packages"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exif" = callPackage @@ -73949,6 +76444,7 @@ self: { description = "A Haskell binding to a subset of libexif"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) exif;}; "exinst" = callPackage @@ -74039,6 +76535,7 @@ self: { description = "Derive instances for the `deepseq` library for your existential types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exinst-hashable" = callPackage @@ -74053,6 +76550,7 @@ self: { description = "Derive instances for the `hashable` library for your existential types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exinst-serialise" = callPackage @@ -74105,6 +76603,7 @@ self: { description = "Existential datatypes holding evidence of constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exit-codes" = callPackage @@ -74139,6 +76638,7 @@ self: { description = "Monad transformer for exit codes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exomizer" = callPackage @@ -74224,6 +76724,7 @@ self: { description = "Extensible Pandoc"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "expat-enumerator" = callPackage @@ -74240,6 +76741,7 @@ self: { description = "Enumerator-based API for Expat"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "expiring-cache-map" = callPackage @@ -74282,6 +76784,7 @@ self: { description = "Expiring containers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "expiring-mvar" = callPackage @@ -74309,6 +76812,7 @@ self: { description = "Show how expressions are parsed"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "explicit-constraint-lens" = callPackage @@ -74322,6 +76826,7 @@ self: { description = "Fully-flexible polymorphic lenses, without any bizarre profunctors"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "explicit-determinant" = callPackage @@ -74334,6 +76839,7 @@ self: { description = "explicit computation of determinant of small matrices"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "explicit-exception" = callPackage @@ -74359,6 +76865,7 @@ self: { description = "File handles with explicit IOModes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "explicit-iomodes-bytestring" = callPackage @@ -74371,6 +76878,7 @@ self: { description = "Extends explicit-iomodes with ByteString operations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "explicit-iomodes-text" = callPackage @@ -74383,6 +76891,7 @@ self: { description = "Extends explicit-iomodes with Text operations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "explicit-sharing" = callPackage @@ -74397,6 +76906,7 @@ self: { description = "Explicit Sharing of Monadic Effects"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "explore" = callPackage @@ -74411,6 +76921,7 @@ self: { description = "Experimental Plot data Reconstructor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exposed-containers" = callPackage @@ -74432,6 +76943,7 @@ self: { description = "A distribution of the 'containers' package, with all modules exposed"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "expression-parser" = callPackage @@ -74461,6 +76973,7 @@ self: { description = "Expressions and Formulae a la carte"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "expressions-z3" = callPackage @@ -74480,6 +76993,7 @@ self: { description = "Encode and Decode expressions from Z3 ASTs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "expresso" = callPackage @@ -74526,6 +77040,7 @@ self: { description = "Libraries for processing GHC Core"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "extemp" = callPackage @@ -74549,6 +77064,7 @@ self: { description = "automated printing for extemp speakers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "extended-categories" = callPackage @@ -74561,6 +77077,7 @@ self: { description = "Extended Categories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "extended-reals" = callPackage @@ -74619,6 +77136,7 @@ self: { description = "Sums/products/lists/trees which can be extended in other modules"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "extensible-effects" = callPackage @@ -74676,6 +77194,7 @@ self: { description = "Message passing concurrency as extensible-effect"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "extensible-exceptions" = callPackage @@ -74748,6 +77267,7 @@ self: { description = "Given a hackage package outputs the list of its dependencies"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "extractable-singleton" = callPackage @@ -74778,6 +77298,7 @@ self: { description = "Extract an ELF's metadata and sections into files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "extralife" = callPackage @@ -74831,6 +77352,7 @@ self: { description = "A high level static library for working with CouchDB"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ez3" = callPackage @@ -74860,6 +77382,7 @@ self: { description = "Spam"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "faceted" = callPackage @@ -74872,6 +77395,7 @@ self: { description = "Faceted computation for dynamic information flow security"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "factory" = callPackage @@ -74928,6 +77452,7 @@ self: { description = "A driver for the Factual API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fad" = callPackage @@ -74962,6 +77487,7 @@ self: { description = "Minimal library for music generation and notation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fadno-braids" = callPackage @@ -74979,6 +77505,7 @@ self: { description = "Braid representations in Haskell"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fadno-xml" = callPackage @@ -74994,6 +77521,7 @@ self: { description = "XML/XSD combinators/schemas/codegen"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fail" = callPackage @@ -75011,8 +77539,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "failable"; - version = "1.1.0.0"; - sha256 = "0fgvs1cs3big4771jy9svwg3pz58zplvnzrrgkqbwplhz6wilyq8"; + version = "1.2.0.0"; + sha256 = "0iihl34739aq8y1fbgimyksjlaqf3ggw7q13zihd1bsa7jy255y9"; libraryHaskellDepends = [ base mtl transformers ]; description = "A 'Failable' error monad class to unify failure across monads that can fail"; license = stdenv.lib.licenses.bsd3; @@ -75028,6 +77556,7 @@ self: { description = "A list-like type for lazy streams, which might terminate with an error"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "failure" = callPackage @@ -75056,6 +77585,7 @@ self: { description = "Failure Detectors implimented in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fair-predicates" = callPackage @@ -75087,6 +77617,7 @@ self: { description = "Randomly generated fake data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fake-type" = callPackage @@ -75100,8 +77631,32 @@ self: { description = "A crossplatform library to simulate keyboard input"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs.xorg) libXtst;}; + "fakedata" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , exceptions, filepath, hspec, hspec-discover, random + , template-haskell, text, time, vector, yaml + }: + mkDerivation { + pname = "fakedata"; + version = "0.2.0"; + sha256 = "0297bppk69gn4sv5m5w1wh4wbshiz9w3b81sr9ps309k7bb6va9j"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers directory exceptions filepath random + template-haskell text time vector yaml + ]; + testHaskellDepends = [ + base bytestring containers directory exceptions filepath hspec + hspec-discover random template-haskell text time vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "Library for producing fake data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "faker" = callPackage ({ mkDerivation, base, gimlh, random, split }: mkDerivation { @@ -75135,6 +77690,7 @@ self: { description = "Faktory Worker for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "falling-turnip" = callPackage @@ -75155,6 +77711,7 @@ self: { description = "Falling sand game/cellular automata simulation using regular parallel arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fallingblocks" = callPackage @@ -75174,6 +77731,7 @@ self: { description = "A fun falling blocks game"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "familiar-reflection" = callPackage @@ -75202,6 +77760,7 @@ self: { description = "A family tree library for the Haskell programming language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "farmhash" = callPackage @@ -75231,6 +77790,7 @@ self: { description = "Fast functions on integers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fast-builder" = callPackage @@ -75270,6 +77830,7 @@ self: { description = "Fast combinatorics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fast-digits" = callPackage @@ -75303,7 +77864,6 @@ self: { ]; description = "Solve classical planning problems (STRIPS/SAS+) using Haskell & Fast Downward"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-logger" = callPackage @@ -75355,6 +77915,7 @@ self: { description = "Natural Numbers with no overhead"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fast-tags" = callPackage @@ -75426,6 +77987,7 @@ self: { description = "A simple, mindless parser for fasta files"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fastbayes" = callPackage @@ -75438,6 +78000,7 @@ self: { description = "Bayesian modeling algorithms accelerated for particular model structures"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fastcgi" = callPackage @@ -75474,6 +78037,7 @@ self: { description = "find nearest neighbours by edit-distance"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fastirc" = callPackage @@ -75491,6 +78055,7 @@ self: { description = "Fast Internet Relay Chat (IRC) library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fastly" = callPackage @@ -75511,6 +78076,7 @@ self: { description = "A highly experimental Fastly API client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fastparser" = callPackage @@ -75530,6 +78096,7 @@ self: { description = "A fast, but bare bones, bytestring parser combinators library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fastpbkdf2" = callPackage @@ -75580,6 +78147,7 @@ self: { description = "Utilities for working with DuckDuckHack's FatHead Instant Answers"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fault-tree" = callPackage @@ -75592,6 +78160,7 @@ self: { description = "A fault tree analysis library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay" = callPackage @@ -75623,6 +78192,7 @@ self: { description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-base" = callPackage @@ -75636,6 +78206,7 @@ self: { description = "The base package for Fay"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-builder" = callPackage @@ -75654,6 +78225,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; + broken = true; }) {}; "fay-dom" = callPackage @@ -75669,6 +78241,7 @@ self: { description = "DOM FFI wrapper library for Fay"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-geoposition" = callPackage @@ -75682,6 +78255,7 @@ self: { description = "W3C compliant implementation of GeoPosition API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-hsx" = callPackage @@ -75695,6 +78269,7 @@ self: { description = "Clientside HTML generation for fay"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-jquery" = callPackage @@ -75708,6 +78283,7 @@ self: { description = "jQuery bindings for Fay"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-ref" = callPackage @@ -75721,6 +78297,7 @@ self: { description = "Like IORef but for Fay"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-simplejson" = callPackage @@ -75734,6 +78311,7 @@ self: { description = "SimpleJSON library for Fay"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-text" = callPackage @@ -75749,6 +78327,7 @@ self: { description = "Fay Text type represented as JavaScript strings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-uri" = callPackage @@ -75762,6 +78341,7 @@ self: { description = "Persistent FFI bindings for using jsUri in Fay"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fay-websockets" = callPackage @@ -75775,6 +78355,7 @@ self: { description = "Websockets FFI library for Fay"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fb" = callPackage @@ -75816,6 +78397,7 @@ self: { description = "Provides Persistent instances to Facebook types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fbmessenger-api" = callPackage @@ -75845,6 +78427,7 @@ self: { description = "High-level bindings to Facebook Messenger Platform API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fca" = callPackage @@ -75862,6 +78445,7 @@ self: { description = "Algo for Formal Concept Analysis"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fcache" = callPackage @@ -75879,6 +78463,7 @@ self: { description = "Cache a function (a -> b)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fcd" = callPackage @@ -75899,6 +78484,7 @@ self: { description = "A faster way to navigate directories using the command line"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fcg" = callPackage @@ -75912,6 +78498,7 @@ self: { description = "TBA"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fckeditor" = callPackage @@ -75924,6 +78511,7 @@ self: { description = "Server-Side Integration for FCKeditor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fclabels" = callPackage @@ -75955,6 +78543,7 @@ self: { description = "MonadLib monadic interface for the \"fclabels\" package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fcm-client" = callPackage @@ -76020,6 +78609,7 @@ self: { description = "Utilities related to freedesktop Trash standard"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "feature-flags" = callPackage @@ -76050,6 +78640,7 @@ self: { description = "A minimally obtrusive feature flag library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "feature-flipper-postgres" = callPackage @@ -76072,6 +78663,7 @@ self: { description = "A minimally obtrusive feature flag library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fec" = callPackage @@ -76089,8 +78681,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fedora-dists"; - version = "1.0.0.2"; - sha256 = "0jc7kv2zflxwfbidc4wm6wad8hpwfxw7w2ri1zghk3970dkl7lnl"; + version = "1.0.1"; + sha256 = "107ykp3f1f35ghlxfv53mxl0wmj1jyr7xnil16gyg6gcyi0shbll"; libraryHaskellDepends = [ base ]; description = "Library for Fedora distribution versions"; license = stdenv.lib.licenses.gpl3; @@ -76113,6 +78705,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "fedora-haskell-tools_0_7" = callPackage + ({ mkDerivation, base, csv, directory, fedora-dists, filepath, HTTP + , optparse-applicative, process, simple-cmd, simple-cmd-args, split + , time, unix + }: + mkDerivation { + pname = "fedora-haskell-tools"; + version = "0.7"; + sha256 = "1c6pn63jn2afbnr0ink4sblhh4ggvgan9h4fk8l6bpg7g6wm68kp"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base csv directory fedora-dists filepath HTTP optparse-applicative + process simple-cmd simple-cmd-args split time unix + ]; + description = "Building and maintenance tools for Fedora Haskell"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fedora-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hlint , HsOpenSSL, hspec, http-streams, io-streams, lens, text @@ -76134,6 +78746,7 @@ self: { description = "Haskell interface to the Fedora Packages webapp API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fee-estimate" = callPackage @@ -76194,6 +78807,7 @@ self: { description = "A simple command line interface for creating and updating feeds like RSS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "feed-collect" = callPackage @@ -76212,6 +78826,7 @@ self: { description = "Watch RSS/Atom feeds (and do with them whatever you like)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "feed-crawl" = callPackage @@ -76229,6 +78844,7 @@ self: { description = "Utility for fetching feeds with redirect info and HTML link detection"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "feed-gipeda" = callPackage @@ -76268,6 +78884,7 @@ self: { description = "CI service around gipeda"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "feed-translator" = callPackage @@ -76290,6 +78907,7 @@ self: { description = "Translate syndication feeds"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "feed2lj" = callPackage @@ -76309,6 +78927,7 @@ self: { description = "(unsupported)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "feed2twitter" = callPackage @@ -76326,6 +78945,7 @@ self: { description = "Send posts from a feed to Twitter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "feldspar-compiler" = callPackage @@ -76355,6 +78975,7 @@ self: { description = "Compiler for the Feldspar language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gcc_s = null;}; "feldspar-language" = callPackage @@ -76379,6 +79000,7 @@ self: { description = "A functional embedded language for DSP and parallelism"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "feldspar-signal" = callPackage @@ -76452,6 +79074,7 @@ self: { description = "Graph-based notetaking system"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {raptor = null;}; "fernet" = callPackage @@ -76478,6 +79101,7 @@ self: { description = "Generate and verify HMAC-based authentication tokens"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "festung" = callPackage @@ -76509,6 +79133,7 @@ self: { description = "Remote multi-db SQLCipher server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fez-conf" = callPackage @@ -76535,6 +79160,7 @@ self: { description = "Haskell binding to the FriendFeed API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fficxx" = callPackage @@ -76590,6 +79216,7 @@ self: { description = "Minimal bindings to the FFmpeg library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; libavformat = null; libswscale = null;}; @@ -76608,6 +79235,7 @@ self: { description = "Tutorials on ffmpeg usage to play video/audio"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fft" = callPackage @@ -76639,6 +79267,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) fftw;}; + "ffunctor" = callPackage + ({ mkDerivation, aeson, base, composition, http-client, mtl + , servant, servant-client, tasty, tasty-discover, tasty-hspec + , tasty-quickcheck, time + }: + mkDerivation { + pname = "ffunctor"; + version = "1.1.0"; + sha256 = "0y9x6xhpizg07d7nc3adk8x4ccy331w7if6jvq2p7hbyr57gbid7"; + revision = "1"; + editedCabalFile = "1x74grqgsjrbncpkz6iyyalfkhbs3vw0lfzv6s1bfd6zx0j4lggv"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base composition http-client mtl servant servant-client tasty + tasty-hspec tasty-quickcheck time + ]; + testToolDepends = [ tasty-discover ]; + description = "FFunctor typeclass"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "fgl" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers @@ -76678,6 +79329,7 @@ self: { description = "Graph decomposition algorithms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fgl-visualize" = callPackage @@ -76691,6 +79343,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fib" = callPackage + ({ mkDerivation, base-noprelude, integer-gmp, semirings }: + mkDerivation { + pname = "fib"; + version = "0.1"; + sha256 = "19ppp760993wz4d1w3i5s60k4yqcx40il7l0ak0ylcqqym619zlk"; + revision = "1"; + editedCabalFile = "1pi7hhil698v9yk17ncw7raw0sf20yj679jvs2d0p7q8ypl9b1lh"; + libraryHaskellDepends = [ base-noprelude integer-gmp semirings ]; + description = "fibonacci algebra"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "fibon" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-lexing , Cabal, cereal, containers, directory, filepath, hslogger, mtl @@ -76711,6 +79378,7 @@ self: { description = "Tools for running and analyzing Haskell benchmarks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fibonacci" = callPackage @@ -76743,6 +79411,7 @@ self: { description = "update statically hosted file in a push stule through socketed"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fields" = callPackage @@ -76759,6 +79428,7 @@ self: { description = "First-class record field combinators with infix record field syntax"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fields-json" = callPackage @@ -76787,6 +79457,7 @@ self: { description = "Provides Fieldwise typeclass for operations of fields of records treated as independent components"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fig" = callPackage @@ -76799,6 +79470,7 @@ self: { description = "Manipulation of FIG files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "file-collection" = callPackage @@ -76813,6 +79485,7 @@ self: { description = "Provide a uniform interface over file archives and directories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "file-command-qq" = callPackage @@ -76829,6 +79502,7 @@ self: { description = "Quasiquoter for system commands involving filepaths"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "file-embed" = callPackage @@ -76900,6 +79574,7 @@ self: { description = "common functions that show file location information"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "file-modules" = callPackage @@ -76981,6 +79656,7 @@ self: { description = "Diffing and patching module"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "filelock" = callPackage @@ -77020,6 +79696,7 @@ self: { description = "Block thread until a file stops being modified"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "filepath_1_4_2_1" = callPackage @@ -77064,6 +79741,7 @@ self: { description = "IO Access for filepath"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "filepather" = callPackage @@ -77081,6 +79759,7 @@ self: { description = "Functions on System.FilePath"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "filepattern" = callPackage @@ -77167,6 +79846,7 @@ self: { description = "Use system-filepath data types with conduits. (deprecated)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "filesystem-enumerator" = callPackage @@ -77183,6 +79863,7 @@ self: { description = "Enumerator-based API for manipulating the filesystem"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "filesystem-trees" = callPackage @@ -77200,6 +79881,7 @@ self: { description = "Recursively manipulate and traverse filesystems as lazy rose trees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fillit" = callPackage @@ -77217,6 +79899,7 @@ self: { description = "Flexible string substitution"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "filter-logger" = callPackage @@ -77238,7 +79921,6 @@ self: { testHaskellDepends = [ base bytestring HUnit ]; description = "Filterable request logging wai middleware. Change how data is logged and when."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "filtrable" = callPackage @@ -77267,6 +79949,7 @@ self: { description = "Nat and Fin: peano naturals and finite numbers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "final" = callPackage @@ -77294,6 +79977,7 @@ self: { description = "Extensible pretty printing with semantic annotations and proportional fonts"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "find-clumpiness" = callPackage @@ -77320,6 +80004,7 @@ self: { description = "Find the clumpiness of labels in a tree"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "find-conduit" = callPackage @@ -77355,6 +80040,7 @@ self: { description = "A file-finding conduit that allows user control over traversals"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "find-source-files" = callPackage @@ -77367,6 +80053,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fingertree" = callPackage @@ -77396,6 +80083,7 @@ self: { description = "Implementation of priority search queues as finger trees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fingertree-tf" = callPackage @@ -77408,6 +80096,7 @@ self: { description = "Generic finger-tree structure using type families"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "finite-field" = callPackage @@ -77503,6 +80192,7 @@ self: { description = "A simple example using Firefly"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "first-and-last" = callPackage @@ -77516,6 +80206,7 @@ self: { description = "First and Last generalized to return up to n values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "first-class-families" = callPackage @@ -77571,6 +80262,7 @@ self: { description = "Defunctionalisation for Yhc Core"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fishfood" = callPackage @@ -77614,6 +80306,7 @@ self: { description = "FIT file decoder"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fitsio" = callPackage @@ -77627,6 +80320,7 @@ self: { description = "A library for reading and writing data files in the FITS data format"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) cfitsio;}; "fitspec" = callPackage @@ -77678,6 +80372,7 @@ self: { description = "Simple fix-expression parser"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fix-symbols-gitit" = callPackage @@ -77690,6 +80385,7 @@ self: { description = "Gitit plugin: Turn some Haskell symbols into pretty math symbols"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixed" = callPackage @@ -77738,6 +80434,7 @@ self: { description = "Binary fixed-point arithmetic"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixed-point-vector" = callPackage @@ -77750,6 +80447,7 @@ self: { description = "Unbox instances for the fixed-point package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixed-point-vector-space" = callPackage @@ -77762,6 +80460,7 @@ self: { description = "vector-space instances for the fixed-point package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixed-precision" = callPackage @@ -77778,6 +80477,7 @@ self: { description = "Fixed Precision Arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixed-storable-array" = callPackage @@ -77790,6 +80490,18 @@ self: { description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "fixed-timestep" = callPackage + ({ mkDerivation, async, base, clock, time }: + mkDerivation { + pname = "fixed-timestep"; + version = "0.1.0.0"; + sha256 = "1zhqh6y4j5v8vwf417jjgix5z1z67zrxgdpcrsyk4i8pi69892hv"; + libraryHaskellDepends = [ async base clock time ]; + description = "Pure Haskell library to repeat an action at a specific frequency"; + license = stdenv.lib.licenses.mit; }) {}; "fixed-vector" = callPackage @@ -77819,6 +80531,7 @@ self: { description = "Binary instances for fixed-vector"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixed-vector-cborg" = callPackage @@ -77836,6 +80549,7 @@ self: { description = "Binary instances for fixed-vector"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixed-vector-cereal" = callPackage @@ -77853,6 +80567,7 @@ self: { description = "Cereal instances for fixed-vector"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixed-vector-hetero" = callPackage @@ -77876,6 +80591,7 @@ self: { description = "Fixed width subsets of an Int64/Word64"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixedprec" = callPackage @@ -77932,6 +80648,7 @@ self: { description = "A Haskell client for http://fixer.io/"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixfile" = callPackage @@ -77954,6 +80671,7 @@ self: { description = "File-backed recursive data structures"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixhs" = callPackage @@ -77979,6 +80697,7 @@ self: { description = "FIX (co)parser"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixie" = callPackage @@ -78001,6 +80720,7 @@ self: { description = "Opininated testing framework for mtl style (spies, stubs, and mocks)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fixplate" = callPackage @@ -78064,6 +80784,7 @@ self: { description = "test"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fizzbuzz-as-a-service" = callPackage @@ -78082,6 +80803,7 @@ self: { description = "FizzBuzz as a service"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flac" = callPackage @@ -78108,6 +80830,7 @@ self: { description = "Complete high-level binding to libFLAC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {FLAC = null;}; "flac_0_2_0" = callPackage @@ -78135,6 +80858,7 @@ self: { description = "Complete high-level binding to libFLAC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {FLAC = null;}; "flac-picture" = callPackage @@ -78154,6 +80878,7 @@ self: { description = "Support for writing picture to FLAC metadata blocks with JuicyPixels"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flaccuraterip" = callPackage @@ -78183,6 +80908,7 @@ self: { description = "A template engine for HTML"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flamingra" = callPackage @@ -78200,6 +80926,7 @@ self: { description = "FlameGraphs of profiling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flat" = callPackage @@ -78233,6 +80960,7 @@ self: { description = "Strict Maybe without space and indirection overhead"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flat-mcmc" = callPackage @@ -78259,12 +80987,12 @@ self: { ({ mkDerivation, base, directory, parsec }: mkDerivation { pname = "flat-tex"; - version = "0.3.1"; - sha256 = "1msf49m61lswj9nplxm22v7xl0vhbj7m3rz5k41mlzdcii28hksp"; + version = "0.6.1"; + sha256 = "1g116pdjlxx8mz3w2bapbcfd4jgk8jl24fg7fck3j2gyh8282zbm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory parsec ]; - description = "flatten a latex multi-file latex document"; + description = "flatten a latex multi-file latex document and remove all comments"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -78307,6 +81035,7 @@ self: { description = "simple extension of Data.UnixTime."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flexible-unlit" = callPackage @@ -78333,6 +81062,7 @@ self: { description = "Flexible wrappers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flexiwrap-smallcheck" = callPackage @@ -78347,6 +81077,7 @@ self: { description = "SmallCheck (Serial) instances for flexiwrap"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flick-duration" = callPackage @@ -78378,6 +81109,7 @@ self: { description = "Haskell binding to the Flickr API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flight-igc" = callPackage @@ -78455,6 +81187,7 @@ self: { description = "f-lite compiler, interpreter and libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flo" = callPackage @@ -78492,6 +81225,7 @@ self: { description = "C99 printf \"%a\" style formatting and parsing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "floating-bits" = callPackage @@ -78506,6 +81240,7 @@ self: { description = "Conversions between floating and integral values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "floatshow" = callPackage @@ -78548,8 +81283,8 @@ self: { pname = "floskell"; version = "0.9.0"; sha256 = "0zx61l6gggblb74ydsamjdvsdm8s8gzb8bmcl8sdhrq7bdbdmbav"; - revision = "1"; - editedCabalFile = "160g42ikrrlm9kw5fahv5gzhfd1kqf7rwqdf0q5fl070ngl5ia7w"; + revision = "2"; + editedCabalFile = "01ayyhmcj6jm4afwdgypd3p8xcrhrvc4g4rgpgi1vdbvwrw3jnb0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -78572,6 +81307,8 @@ self: { ]; description = "A flexible Haskell source code pretty printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flow" = callPackage @@ -78597,6 +81334,7 @@ self: { description = "More directional operators"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flow2dot" = callPackage @@ -78615,6 +81353,7 @@ self: { description = "Library and binary to generate sequence/flow diagrams from plain text source"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flowdock" = callPackage @@ -78635,6 +81374,7 @@ self: { description = "Flowdock client library for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flowdock-api" = callPackage @@ -78672,6 +81412,7 @@ self: { description = "API integration with Flowdock"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flowdock-rest" = callPackage @@ -78700,6 +81441,7 @@ self: { description = "Flowdock REST API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flower" = callPackage @@ -78718,6 +81460,7 @@ self: { description = "Analyze 454 flowgrams (.SFF files)"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flowlocks-framework" = callPackage @@ -78731,6 +81474,7 @@ self: { description = "Generalized Flow Locks Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flowsim" = callPackage @@ -78750,6 +81494,7 @@ self: { description = "Simulate 454 pyrosequencing"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fltkhs" = callPackage @@ -78759,8 +81504,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.6.0.0"; - sha256 = "1cbyp8rq9yzx6jrw68dbprkdyd8pkdqbxx08wajyg7bfks6j39cb"; + version = "0.7.0.4"; + sha256 = "1v130jcya7qhm29byfz8wazbi4yvv5pmmwp07fhpaffm1hq8v03k"; configureFlags = [ "-fopengl" ]; isLibrary = true; isExecutable = true; @@ -78820,6 +81565,7 @@ self: { description = "Fltkhs Fluid Examples"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fltkhs-hello-world" = callPackage @@ -78842,14 +81588,15 @@ self: { }: mkDerivation { pname = "fltkhs-themes"; - version = "0.1.0.1"; - sha256 = "03awhraincinrqr1zzb9c64mkb391isw3gb87csa1dkqk846wij6"; + version = "0.1.0.7"; + sha256 = "1x6250avaa14dqnhf6gzbgvxqvb1gpsx279aazgn7rjaz5r018d3"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring fltkhs load-font text vector ]; librarySystemDepends = [ fontconfig ]; + description = "A set of themed widgets that provides drop in replacements to the ones in FLTKHS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fontconfig;}; @@ -78877,6 +81624,7 @@ self: { description = "A structured logger for Fluentd (Haskell)"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fluent-logger-conduit" = callPackage @@ -78928,7 +81676,6 @@ self: { ]; description = "The parser for fluffy to parsec the question bank in .docx type"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fluid-idl" = callPackage @@ -78995,6 +81742,7 @@ self: { description = "Haskell bindings to FluidSynth"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) fluidsynth;}; "flux-monoid" = callPackage @@ -79007,6 +81755,7 @@ self: { description = "A monoid for tracking changes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fmark" = callPackage @@ -79025,6 +81774,7 @@ self: { description = "A Friendly Markup language without syntax"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fmlist" = callPackage @@ -79118,6 +81868,7 @@ self: { description = "Extras for Fn, a functional web framework"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "focus" = callPackage @@ -79155,7 +81906,6 @@ self: { ]; description = "Lists with a focused element"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fold-debounce" = callPackage @@ -79258,6 +82008,7 @@ self: { description = "incremental folds"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "foldl-statistics" = callPackage @@ -79283,6 +82034,7 @@ self: { description = "Statistical functions from the statistics package implemented as Folds"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "foldl-transduce" = callPackage @@ -79369,6 +82121,7 @@ self: { description = "A playground of common folds for folds"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "folgerhs" = callPackage @@ -79416,6 +82169,7 @@ self: { description = "Haskell library to follow content published on any subject"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "follow-file" = callPackage @@ -79459,6 +82213,7 @@ self: { description = "Follow Tweets anonymously"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "foma" = callPackage @@ -79472,6 +82227,7 @@ self: { description = "Simple Haskell bindings for Foma"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {foma = null;}; "font-awesome-type" = callPackage @@ -79498,6 +82254,7 @@ self: { description = "Basic4x6 font for OpenGL"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "foo" = callPackage @@ -79514,6 +82271,7 @@ self: { description = "Paper soccer, an OpenGL game"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "foobar" = callPackage @@ -79546,6 +82304,7 @@ self: { description = "Functor, Monad, MonadPlus, etc for free"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "forbidden-fruit" = callPackage @@ -79567,6 +82326,7 @@ self: { description = "A library accelerates imperative style programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "force-layout" = callPackage @@ -79597,6 +82357,7 @@ self: { description = "Run a command on files with magic substituion support (sequencing and regexp)"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "forecast-io" = callPackage @@ -79609,6 +82370,7 @@ self: { description = "A Haskell library for working with forecast.io data."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "foreign-storable-asymmetric" = callPackage @@ -79645,6 +82407,7 @@ self: { description = "Encapsulating mutatable state in external libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "forest" = callPackage @@ -79682,6 +82445,7 @@ self: { description = "Recursively delete CloudFormation stacks and their dependants"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "forger" = callPackage @@ -79697,6 +82461,7 @@ self: { description = "Library for generating fake placeholder data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "forkable-monad" = callPackage @@ -79747,6 +82512,7 @@ self: { description = "A statically typed, functional programming language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "format" = callPackage @@ -79760,6 +82526,7 @@ self: { description = "Rendering from and scanning to format strings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "format-numbers" = callPackage @@ -79790,6 +82557,7 @@ self: { description = "A utility for writing the date to dzen2"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "formattable" = callPackage @@ -79811,6 +82579,7 @@ self: { description = "Business-quality formatting of numbers, dates, and other things"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "formatting" = callPackage @@ -79854,6 +82623,7 @@ self: { description = "A statically typed, functional programming language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "formlets" = callPackage @@ -79871,6 +82641,7 @@ self: { description = "Formlets implemented in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "formlets-hsp" = callPackage @@ -79888,6 +82659,7 @@ self: { description = "HSP support for Formlets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "formura" = callPackage @@ -79910,6 +82682,7 @@ self: { description = "Formura is a simple language to describe stencil computation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "forsyde-deep" = callPackage @@ -79938,6 +82711,7 @@ self: { description = "ForSyDe's Haskell-embedded Domain Specific Language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "forsyde-shallow" = callPackage @@ -79966,6 +82740,7 @@ self: { description = "A simple eDSL for generating arrayForth code"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fortran-src" = callPackage @@ -79995,6 +82770,7 @@ self: { description = "Parser and anlyses for Fortran standards 66, 77, 90 and 95"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fortytwo" = callPackage @@ -80009,7 +82785,6 @@ self: { testHaskellDepends = [ base doctest hspec ]; description = "Interactive terminal prompt"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "forward-chan" = callPackage @@ -80041,6 +82816,7 @@ self: { description = "Foscam File format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "foscam-filename" = callPackage @@ -80061,6 +82837,7 @@ self: { description = "Foscam File format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "foscam-sort" = callPackage @@ -80088,6 +82865,7 @@ self: { description = "Foscam File format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "foundation" = callPackage @@ -80162,6 +82940,7 @@ self: { description = "Simple interface to the FP Complete IDE API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fpe" = callPackage @@ -80227,6 +83006,7 @@ self: { description = "Example implementations for FPNLA library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fptest" = callPackage @@ -80253,6 +83033,7 @@ self: { description = "IEEE754r floating point conformance tests"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fquery" = callPackage @@ -80297,6 +83078,7 @@ self: { description = "A collection of useful fractal curve encoders"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fraction" = callPackage @@ -80323,6 +83105,7 @@ self: { description = "A 3-D First Person Shooter Game"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "frame" = callPackage @@ -80371,6 +83154,7 @@ self: { description = "A package for configuring and building Haskell software"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fraxl" = callPackage @@ -80390,7 +83174,6 @@ self: { benchmarkHaskellDepends = [ base time ]; description = "Cached and parallel data fetching"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freddy" = callPackage @@ -80411,6 +83194,7 @@ self: { description = "RabbitMQ Messaging API supporting request-response"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "free" = callPackage @@ -80437,8 +83221,8 @@ self: { }: mkDerivation { pname = "free-algebras"; - version = "0.0.7.1"; - sha256 = "16hdc019x32azkhzag1d504ahdgqswim5cpgmacvdxj3r08havq3"; + version = "0.0.7.2"; + sha256 = "0hljd9wsv516jcqp7pkacmadjchkd9sxq42pj5j1my95hvc5apfd"; libraryHaskellDepends = [ base constraints containers data-fix dlist free groups kan-extensions mtl natural-numbers transformers @@ -80460,7 +83244,6 @@ self: { libraryHaskellDepends = [ base free-algebras ]; description = "Free category"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-concurrent" = callPackage @@ -80473,6 +83256,7 @@ self: { description = "Free monads suitable for concurrent computation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "free-er" = callPackage @@ -80525,6 +83309,7 @@ self: { description = "Create games for free"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "free-http" = callPackage @@ -80542,6 +83327,7 @@ self: { description = "An HTTP Client based on Free Monads"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "free-operational" = callPackage @@ -80558,6 +83344,7 @@ self: { description = "Operational Applicative, Alternative, Monad and MonadPlus from free types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "free-theorems" = callPackage @@ -80574,6 +83361,7 @@ self: { description = "Automatic generation of free theorems"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "free-theorems-counterexamples" = callPackage @@ -80593,6 +83381,7 @@ self: { description = "Automatically Generating Counterexamples to Naive Free Theorems"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "free-theorems-seq" = callPackage @@ -80611,6 +83400,7 @@ self: { description = "Taming Selective Strictness"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "free-theorems-seq-webui" = callPackage @@ -80630,6 +83420,7 @@ self: { description = "Taming Selective Strictness"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "free-theorems-webui" = callPackage @@ -80650,6 +83441,7 @@ self: { description = "CGI-based web interface for the free-theorems package"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "free-v-bucks-generator-no-survey" = callPackage @@ -80666,6 +83458,7 @@ self: { description = "Spam"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "free-v-bucks-generator-ps4-no-survey" = callPackage @@ -80682,6 +83475,7 @@ self: { description = "Spam"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "free-vector-spaces" = callPackage @@ -80700,6 +83494,7 @@ self: { description = "Instantiate the classes from the vector-space package with types from linear"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "free-vl" = callPackage @@ -80739,6 +83534,7 @@ self: { description = "A soccer game"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "freelude" = callPackage @@ -80759,6 +83555,7 @@ self: { description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "freenect" = callPackage @@ -80773,7 +83570,7 @@ self: { libraryPkgconfigDepends = [ libfreenect ]; description = "Interface to the Kinect device"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freenect; freenect_sync = null; libfreenect = null;}; @@ -80812,6 +83609,7 @@ self: { description = "Handle effects conversely using monadic conversation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "freer-effects" = callPackage @@ -80833,6 +83631,7 @@ self: { description = "Implementation of effect system for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "freer-simple" = callPackage @@ -80871,6 +83670,7 @@ self: { description = "Checked runtime exceptions with freer-simple"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "freer-simple-http" = callPackage @@ -80892,6 +83692,7 @@ self: { description = "Make HTTP requests with freer-simple!"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "freer-simple-profiling" = callPackage @@ -80905,6 +83706,7 @@ self: { description = "Automatic profling of freer-simple programs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "freer-simple-random" = callPackage @@ -80918,6 +83720,7 @@ self: { description = "Random number generators using freer-simple"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "freer-simple-time" = callPackage @@ -80931,6 +83734,7 @@ self: { description = "freer-simple interface to IO based time functions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "freesect" = callPackage @@ -80949,6 +83753,7 @@ self: { description = "A Haskell syntax extension for generalised sections"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "freesound" = callPackage @@ -80971,6 +83776,7 @@ self: { description = "Access the Freesound Project database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "freetype-simple" = callPackage @@ -80986,6 +83792,7 @@ self: { description = "Single line text rendering for OpenGL ES"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "freetype2" = callPackage @@ -81032,6 +83839,7 @@ self: { description = "Are you ready to get freaky?"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fresco-binding" = callPackage @@ -81060,6 +83868,7 @@ self: { description = "Introduce fresh variables into Haskell source code"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "friday" = callPackage @@ -81082,7 +83891,6 @@ self: { ]; description = "A functional image processing library for Haskell"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "friday-devil" = callPackage @@ -81100,6 +83908,7 @@ self: { description = "Uses the DevIL C library to read and write images from and to files and memory buffers"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libdevil;}; "friday-juicypixels" = callPackage @@ -81116,7 +83925,6 @@ self: { ]; description = "Converts between the Friday and JuicyPixels image types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "friday-scale-dct" = callPackage @@ -81133,6 +83941,7 @@ self: { description = "Scale Friday images with DCT"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "friendly" = callPackage @@ -81149,6 +83958,7 @@ self: { description = "Attempt to pretty-print any input"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "friendly-time" = callPackage @@ -81202,6 +84012,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "front" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, fay + , text + }: + mkDerivation { + pname = "front"; + version = "0.0.0.1"; + sha256 = "1iaabr2cfvgismar58w7nazi4mckcvxv37qrkjqnxm82zhnv2fgc"; + libraryHaskellDepends = [ + base blaze-html blaze-markup bytestring fay text + ]; + description = "A reactive frontend web framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "frontmatter" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec, QuickCheck , text, yaml @@ -81230,6 +84057,7 @@ self: { description = "LALR(k) parser generator"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "frp-arduino" = callPackage @@ -81242,6 +84070,7 @@ self: { description = "Arduino programming without the hassle of C"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "frpnow" = callPackage @@ -81255,6 +84084,7 @@ self: { description = "Principled practical FRP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "frpnow-gloss" = callPackage @@ -81271,6 +84101,7 @@ self: { description = "Program awesome stuff with Gloss and frpnow!"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "frpnow-gtk" = callPackage @@ -81288,6 +84119,7 @@ self: { description = "Program GUIs with GTK and frpnow!"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "frpnow-gtk3" = callPackage @@ -81302,6 +84134,7 @@ self: { description = "Program GUIs with GTK3 and frpnow!"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "frpnow-vty" = callPackage @@ -81317,6 +84150,7 @@ self: { description = "Program terminal applications with vty and frpnow!"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "frquotes" = callPackage @@ -81343,6 +84177,7 @@ self: { description = "A haskell binding to the FSEvents API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fsh-csv" = callPackage @@ -81355,6 +84190,7 @@ self: { description = "csv parser for fsh"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fsharp" = callPackage @@ -81382,6 +84218,7 @@ self: { description = "Finite state machines and FSM actions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fsnotify" = callPackage @@ -81455,6 +84292,7 @@ self: { description = "File system utilities for Haskell that are missing from built in libraries"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fswait" = callPackage @@ -81475,6 +84313,7 @@ self: { description = "Wait and observe events on the filesystem for a path, with a timeout"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fswatch" = callPackage @@ -81531,6 +84370,7 @@ self: { description = "A thin layer over USB to communicate with FTDI chips"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ftp-client" = callPackage @@ -81581,6 +84421,7 @@ self: { description = "FTP client package with conduit interface based off http-conduit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ftphs" = callPackage @@ -81609,7 +84450,6 @@ self: { libraryHaskellDepends = [ base ShowF type-unary ]; description = "Depth-typed functor-based trees, both top-down and bottom-up"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ftshell" = callPackage @@ -81629,6 +84469,7 @@ self: { description = "Shell interface to the FreeTheorems library"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fugue" = callPackage @@ -81652,6 +84493,7 @@ self: { description = "a monad for protocol-typed network programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "full-text-search" = callPackage @@ -81671,6 +84513,7 @@ self: { description = "In-memory full text search engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fullstop" = callPackage @@ -81691,6 +84534,7 @@ self: { description = "Simple sentence segmenter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "funbot" = callPackage @@ -81720,6 +84564,7 @@ self: { description = "IRC bot for fun, learning, creativity and collaboration"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "funbot-client" = callPackage @@ -81739,6 +84584,7 @@ self: { description = "Report events to FunBot over a JSON/HTTP API"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "funbot-ext-events" = callPackage @@ -81770,6 +84616,7 @@ self: { description = "Git hook which sends events to FunBot"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "funcmp" = callPackage @@ -81822,6 +84669,7 @@ self: { description = "call-by-value lambda-calculus with meta-programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "funcons-simple" = callPackage @@ -81837,7 +84685,6 @@ self: { executableHaskellDepends = [ base funcons-tools funcons-values ]; description = "A modular interpreter for executing SIMPLE funcons"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "funcons-tools" = callPackage @@ -81847,8 +84694,10 @@ self: { }: mkDerivation { pname = "funcons-tools"; - version = "0.2.0.7"; - sha256 = "132l3wzhr60xnp1zd3qh5yrz9y8fk0v6fz9i242vdvj1rbacfdhf"; + version = "0.2.0.9"; + sha256 = "0k3560521kf1krj5j1wgbcipqcnvjq3igb9fymfdsswwqr1wpx67"; + revision = "1"; + editedCabalFile = "0h68688dy1x2wj5m5gi5lc3xhskzpdnfqfk3i4bzkxvh87mak7l4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81861,21 +84710,21 @@ self: { ]; description = "A modular interpreter for executing funcons"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "funcons-values" = callPackage ({ mkDerivation, base, bv, containers, multiset, text, vector }: mkDerivation { pname = "funcons-values"; - version = "0.1.0.5"; - sha256 = "0wmkag1dlvk6lq2f17pvzwxlafd7hn69vxwrkr8ar02vb1yvnb2q"; + version = "0.1.0.7"; + sha256 = "0jdgwv44gs4zr8z5pg6lzikrgn3dzna8z0vriq71anlifjyci8yq"; + revision = "1"; + editedCabalFile = "1aam84wminmcy530vkv8g2qkag6gz45yyx5xks7gq1y7jifm1kkb"; libraryHaskellDepends = [ base bv containers multiset text vector ]; description = "Library providing values and operations on values in a fixed universe"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "function-builder" = callPackage @@ -81900,6 +84749,7 @@ self: { description = "Combining functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "function-instances-algebra" = callPackage @@ -81912,6 +84762,7 @@ self: { description = "Instances of the Algebra.* classes for functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "functional-arrow" = callPackage @@ -81924,6 +84775,7 @@ self: { description = "Combinators that allow for a more functional/monadic style of Arrow programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "functional-kmp" = callPackage @@ -81949,6 +84801,7 @@ self: { description = "Functors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "functor-apply" = callPackage @@ -82051,6 +84904,7 @@ self: { description = "Data.FunctorM (compatibility package)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "functors" = callPackage @@ -82101,6 +84955,7 @@ self: { description = "Workflows with arrows"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "funflow-nix" = callPackage @@ -82123,6 +84978,7 @@ self: { description = "Utility functions for using funflow with nix"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "funion" = callPackage @@ -82141,6 +84997,7 @@ self: { description = "A unioning file-system using HFuse"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "funnyprint" = callPackage @@ -82168,6 +85025,7 @@ self: { description = "A generalization of pattern matching"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "funsat" = callPackage @@ -82190,6 +85048,7 @@ self: { description = "A modern DPLL-style SAT solver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fused-effects" = callPackage @@ -82206,6 +85065,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fused-effects_0_2_0_1" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest, hspec + , MonadRandom, QuickCheck, random + }: + mkDerivation { + pname = "fused-effects"; + version = "0.2.0.1"; + sha256 = "1n5ywp07s4fhpjwnk15y72flwaxjd9dingr4xlrpkp00cgfh1ax8"; + libraryHaskellDepends = [ base deepseq MonadRandom random ]; + testHaskellDepends = [ base doctest hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "A fast, flexible, fused effect system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fused-effects-lens" = callPackage ({ mkDerivation, base, fused-effects, hspec, lens }: mkDerivation { @@ -82231,6 +85106,7 @@ self: { description = "Effectful streaming library based on shortcut fusion techniques"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "futhark" = callPackage @@ -82248,19 +85124,20 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.8.1"; - sha256 = "18qha0bai5zf4shcz2a6lixkhx6mk395njm81ds2zcp1iilwgih2"; + version = "0.9.1"; + sha256 = "1l7i4xxh9zb53qqzznqj6kkh6p67a11kkr5839c9kkjwnb6sc86k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal array base bifunctors binary blaze-html bytestring - containers data-binary-ieee754 directory directory-tree dlist extra - file-embed filepath free gitrev http-client http-client-tls - http-conduit language-c-quote mainland-pretty markdown megaparsec - mtl neat-interpolation parallel parser-combinators process - process-extras raw-strings-qq regex-tdfa srcloc template-haskell - text th-lift-instances time transformers vector - vector-binary-instances versions zip-archive zlib + aeson ansi-terminal array base bifunctors binary blaze-html + bytestring containers data-binary-ieee754 directory directory-tree + dlist extra file-embed filepath free gitrev haskeline http-client + http-client-tls http-conduit language-c-quote mainland-pretty + markdown megaparsec mtl neat-interpolation parallel + parser-combinators process process-extras random raw-strings-qq + regex-tdfa srcloc template-haskell temporary text th-lift-instances + time transformers vector vector-binary-instances versions + zip-archive zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ @@ -82275,19 +85152,18 @@ self: { zip-archive zlib ]; testHaskellDepends = [ - ansi-terminal array base bifunctors binary blaze-html bytestring - containers data-binary-ieee754 directory directory-tree dlist extra - file-embed filepath free gitrev http-client http-client-tls - http-conduit HUnit language-c-quote mainland-pretty markdown - megaparsec mtl neat-interpolation parallel parser-combinators - process process-extras QuickCheck raw-strings-qq regex-tdfa srcloc - tasty tasty-hunit tasty-quickcheck template-haskell text - th-lift-instances time transformers vector vector-binary-instances - versions zip-archive zlib + aeson ansi-terminal array base bifunctors binary blaze-html + bytestring containers data-binary-ieee754 directory directory-tree + dlist extra file-embed filepath free gitrev haskeline http-client + http-client-tls http-conduit HUnit language-c-quote mainland-pretty + markdown megaparsec mtl neat-interpolation parallel + parser-combinators process process-extras QuickCheck random + raw-strings-qq regex-tdfa srcloc tasty tasty-hunit tasty-quickcheck + template-haskell temporary text th-lift-instances time transformers + vector vector-binary-instances versions zip-archive zlib ]; description = "An optimising compiler for a functional, array-oriented language"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "futun" = callPackage @@ -82302,6 +85178,7 @@ self: { description = "Simple IP-over-UDP tunnel using TUNTAP"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "future" = callPackage @@ -82314,6 +85191,7 @@ self: { description = "Supposed to mimics and enhance proposed C++ \"future\" features"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "future-resource" = callPackage @@ -82399,6 +85277,7 @@ self: { description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fuzzyset" = callPackage @@ -82451,6 +85330,7 @@ self: { description = "Game engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fwgl-glfw" = callPackage @@ -82468,6 +85348,7 @@ self: { description = "FWGL GLFW backend"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fwgl-javascript" = callPackage @@ -82484,6 +85365,7 @@ self: { description = "FWGL GHCJS backend"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fx" = callPackage @@ -82509,6 +85391,7 @@ self: { description = "Generate Gentoo ebuilds from NodeJS/npm packages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "g4ip" = callPackage @@ -82522,6 +85405,7 @@ self: { description = "A theorem prover for propositional logic that uses G4ip"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "g4ip-prover" = callPackage @@ -82557,6 +85441,7 @@ self: { description = "General Alignment Clustering Tool"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "game-of-life" = callPackage @@ -82583,6 +85468,7 @@ self: { description = "Simple probability library for dice rolls, card games and similar"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "game-tree" = callPackage @@ -82608,6 +85494,7 @@ self: { description = "Game clock that shows two analog clock faces"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gamma" = callPackage @@ -82628,6 +85515,8 @@ self: { ]; description = "Gamma function and related functions"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gang-of-threads" = callPackage @@ -82654,6 +85543,7 @@ self: { description = "reverse prefix notation calculator and calculation library"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "garfield" = callPackage @@ -82681,6 +85571,7 @@ self: { description = "Automatically spin up and spin down local daemons"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gargoyle-postgresql" = callPackage @@ -82702,6 +85593,7 @@ self: { description = "Manage PostgreSQL servers with gargoyle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "garlic-bread" = callPackage @@ -82737,6 +85629,7 @@ self: { description = "Limit how many steps a program may take"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gasp" = callPackage @@ -82783,6 +85676,7 @@ self: { description = "planar graph embedding into a plane"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gc" = callPackage @@ -82817,6 +85711,7 @@ self: { description = "a wai application to show GHC.GCStats"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gcodehs" = callPackage @@ -82844,6 +85739,7 @@ self: { description = "GCode processor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gconf" = callPackage @@ -82860,7 +85756,6 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GNOME configuration database system"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) GConf;}; "gd" = callPackage @@ -82915,6 +85810,7 @@ self: { description = "API Wrapping for Coinbase's GDAX exchange"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gdiff" = callPackage @@ -82942,6 +85838,7 @@ self: { description = "Generic diff for the instant-generics library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gdiff-th" = callPackage @@ -82961,6 +85858,7 @@ self: { description = "Generate gdiff GADTs and Instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gdo" = callPackage @@ -83024,6 +85922,7 @@ self: { description = "Parser for the GEDCOM genealogy file format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "geek" = callPackage @@ -83045,6 +85944,7 @@ self: { description = "Geek blog engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "geek-server" = callPackage @@ -83069,6 +85969,7 @@ self: { description = "Geek blog engine server"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gegl" = callPackage @@ -83090,6 +85991,7 @@ self: { description = "Haskell bindings to GEGL library"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gegl;}; "gelatin" = callPackage @@ -83109,6 +86011,7 @@ self: { description = "A graphics description language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gelatin-freetype2" = callPackage @@ -83127,6 +86030,7 @@ self: { description = "FreeType2 based text rendering for the gelatin realtime rendering system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gelatin-fruity" = callPackage @@ -83139,6 +86043,7 @@ self: { description = "Gelatin's support for rendering TTF outlines, using FontyFruity"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gelatin-gl" = callPackage @@ -83161,6 +86066,7 @@ self: { description = "OpenGL rendering routines for the gelatin-picture graphics EDSL"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gelatin-sdl2" = callPackage @@ -83179,6 +86085,7 @@ self: { description = "An SDL2 backend for the gelatin renderer"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gelatin-shaders" = callPackage @@ -83192,6 +86099,7 @@ self: { description = "Gelatin's OpenGL shaders"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gemstone" = callPackage @@ -83210,6 +86118,7 @@ self: { description = "A simple library of helpers for SDL+GL games"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gen-imports" = callPackage @@ -83226,6 +86135,7 @@ self: { description = "Code to generate instances for the package \"ghc-instances\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gen-passwd" = callPackage @@ -83244,6 +86154,7 @@ self: { description = "Create wordlist-based passwords easily"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gencheck" = callPackage @@ -83261,6 +86172,7 @@ self: { description = "A testing framework inspired by QuickCheck and SmallCheck"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gender" = callPackage @@ -83277,6 +86189,7 @@ self: { description = "Identify a persons gender by their first name"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "genders" = callPackage @@ -83293,6 +86206,7 @@ self: { description = "Bindings to libgenders"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {genders = null;}; "gendocs" = callPackage @@ -83339,6 +86253,7 @@ self: { description = "Prelude replacement using generalized type classes where possible"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generator" = callPackage @@ -83362,6 +86277,7 @@ self: { description = "Actually useful monadic random value generators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generic-accessors" = callPackage @@ -83382,6 +86298,7 @@ self: { description = "stringly-named getters for generic data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generic-aeson" = callPackage @@ -83401,6 +86318,7 @@ self: { description = "Derivation of Aeson instances using GHC generics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generic-arbitrary" = callPackage @@ -83424,6 +86342,7 @@ self: { description = "Generic Data.Binary derivation using GHC generics."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generic-church" = callPackage @@ -83440,6 +86359,7 @@ self: { description = "Automatically convert Generic instances to and from church representations"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generic-data" = callPackage @@ -83546,6 +86466,7 @@ self: { description = "An Enum class that fixes some deficiences with Prelude's Enum"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generic-lens" = callPackage @@ -83565,7 +86486,6 @@ self: { ]; description = "Generically derive traversals, lenses and prisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-lens-labels" = callPackage @@ -83578,6 +86498,7 @@ self: { description = "GHC.OverloadedLabels.IsLabel instance for lenses from ghc-generics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generic-lucid-scaffold" = callPackage @@ -83590,6 +86511,7 @@ self: { description = "General-purpose web page scaffold for Lucid"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generic-maybe" = callPackage @@ -83612,6 +86534,7 @@ self: { description = "A generic version of Data.Maybe"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generic-monoid" = callPackage @@ -83642,6 +86565,7 @@ self: { description = "Pretty printing for Generic value"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generic-random" = callPackage @@ -83691,6 +86615,7 @@ self: { description = "Generic implementation of Storable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generic-tree" = callPackage @@ -83703,6 +86628,7 @@ self: { description = "Generic Tree data type"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generic-trie" = callPackage @@ -83731,6 +86657,7 @@ self: { description = "Marshalling Haskell values to/from XML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generic-xmlpickler" = callPackage @@ -83750,6 +86677,7 @@ self: { description = "Generic generation of HXT XmlPickler instances using GHC Generics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "generics-eot" = callPackage @@ -83758,8 +86686,8 @@ self: { }: mkDerivation { pname = "generics-eot"; - version = "0.4"; - sha256 = "16yfzv9aqyizm57r5m5ddwdnlh05fvlrxjn6m3vqz33kvy3drgjs"; + version = "0.4.0.1"; + sha256 = "0s6zhs6l1xcig66757664f1bchzlm4f1ijvg5dsnacq05jbdxrlv"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath hspec interpolate markdown-unlit @@ -83824,6 +86752,7 @@ self: { description = "Serialization library using Data.Generics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "genesis" = callPackage @@ -83852,6 +86781,7 @@ self: { description = "Opinionated bootstrapping for Haskell web services"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "genesis-test" = callPackage @@ -83876,6 +86806,7 @@ self: { description = "Opinionated bootstrapping for Haskell web services"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "genetics" = callPackage @@ -83890,6 +86821,7 @@ self: { description = "A Genetic Algorithm library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "geni-gui" = callPackage @@ -83914,6 +86846,7 @@ self: { description = "GenI graphical user interface"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "geni-util" = callPackage @@ -83938,6 +86871,7 @@ self: { description = "Companion tools for use with the GenI surface realiser"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "geniconvert" = callPackage @@ -83958,6 +86892,7 @@ self: { description = "Conversion utility for the GenI generator"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "genifunctors" = callPackage @@ -83982,6 +86917,7 @@ self: { description = "Use Template Haskell to generate Uniplate-like functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "geniplate-mirror" = callPackage @@ -84017,6 +86953,7 @@ self: { description = "Simple HTTP server for GenI results"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "genprog" = callPackage @@ -84029,6 +86966,7 @@ self: { description = "Genetic programming library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gentlemark" = callPackage @@ -84042,20 +86980,34 @@ self: { description = "Gentle markup language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "genvalidity" = callPackage ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.7.0.0"; - sha256 = "1bjsqqyr1n306icfdl8sh3amqq95zpr5hawwbv46nbf0rxci88w1"; + version = "0.7.0.2"; + sha256 = "1yjvbpf75xrllmn7kzfjysw6rdv190bvgclzs5lapa9cakbsigyv"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; license = stdenv.lib.licenses.mit; }) {}; + "genvalidity_0_8_0_0" = callPackage + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: + mkDerivation { + pname = "genvalidity"; + version = "0.8.0.0"; + sha256 = "0w38aq9hfyymidncgkrs6yvja7j573d9sap5qfg5rz910fhsij9a"; + libraryHaskellDepends = [ base QuickCheck validity ]; + testHaskellDepends = [ base hspec hspec-core QuickCheck ]; + description = "Testing utilities for the validity library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-aeson" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text @@ -84076,6 +87028,28 @@ self: { ]; description = "GenValidity support for aeson"; license = stdenv.lib.licenses.mit; + }) {}; + + "genvalidity-aeson_0_3_0_0" = 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.3.0.0"; + sha256 = "0l8n7k9v32izir9x0qrsnk4zkv3qhpghjzzpig4mk861cgycd42h"; + libraryHaskellDepends = [ + aeson base genvalidity genvalidity-scientific genvalidity-text + genvalidity-unordered-containers genvalidity-vector QuickCheck + validity validity-aeson + ]; + testHaskellDepends = [ + aeson base genvalidity genvalidity-hspec hspec + ]; + description = "GenValidity support for aeson"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -84097,6 +87071,26 @@ self: { ]; description = "GenValidity support for ByteString"; license = stdenv.lib.licenses.mit; + }) {}; + + "genvalidity-bytestring_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, genvalidity + , genvalidity-hspec, hspec, QuickCheck, validity + , validity-bytestring + }: + mkDerivation { + pname = "genvalidity-bytestring"; + version = "0.5.0.0"; + sha256 = "0lcgkq9dlf0k687ccg07jan9f1ba1iag6l8yc9xbnf7vignqz0ma"; + libraryHaskellDepends = [ + base bytestring genvalidity QuickCheck validity validity-bytestring + ]; + testHaskellDepends = [ + base bytestring deepseq genvalidity genvalidity-hspec hspec + QuickCheck validity + ]; + description = "GenValidity support for ByteString"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -84116,6 +87110,24 @@ self: { ]; description = "GenValidity support for containers"; license = stdenv.lib.licenses.mit; + }) {}; + + "genvalidity-containers_0_6_0_0" = callPackage + ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec + , hspec, QuickCheck, validity, validity-containers + }: + mkDerivation { + pname = "genvalidity-containers"; + version = "0.6.0.0"; + sha256 = "1ql8fmy6vpp0w52kkihfc3xzqsm4gdfm1j7mshirdw8vwa7y441q"; + libraryHaskellDepends = [ + base containers genvalidity QuickCheck validity validity-containers + ]; + testHaskellDepends = [ + base containers genvalidity genvalidity-hspec hspec validity + ]; + description = "GenValidity support for containers"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -84125,8 +87137,28 @@ self: { }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.2.2"; - sha256 = "1npy88slf7immafk1vgl6w9gp526xdlvhr96qnrc8phf7b7bfkrf"; + version = "0.6.2.3"; + sha256 = "12j603wz8g9vadh613amvqz45zg2w8lwlflf8c7gds8gp0x44b26"; + libraryHaskellDepends = [ + base genvalidity genvalidity-property hspec hspec-core QuickCheck + transformers validity + ]; + testHaskellDepends = [ + base doctest genvalidity genvalidity-property hspec hspec-core + QuickCheck validity + ]; + description = "Standard spec's for GenValidity instances"; + license = stdenv.lib.licenses.mit; + }) {}; + + "genvalidity-hspec_0_7_0_0" = callPackage + ({ mkDerivation, base, doctest, genvalidity, genvalidity-property + , hspec, hspec-core, QuickCheck, transformers, validity + }: + mkDerivation { + pname = "genvalidity-hspec"; + version = "0.7.0.0"; + sha256 = "0cp0scxrkqmpscndxa68a1ij26i86qvblvb5fipwwyky76xhjsgg"; libraryHaskellDepends = [ base genvalidity genvalidity-property hspec hspec-core QuickCheck transformers validity @@ -84160,6 +87192,28 @@ self: { ]; description = "Standard spec's for aeson-related instances"; license = stdenv.lib.licenses.mit; + }) {}; + + "genvalidity-hspec-aeson_0_3_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, doctest + , genvalidity, genvalidity-aeson, genvalidity-hspec + , genvalidity-property, genvalidity-text, hspec, QuickCheck, text + , validity + }: + mkDerivation { + pname = "genvalidity-hspec-aeson"; + version = "0.3.1.0"; + sha256 = "0ainmqs2i2q1bgcy8k3h2j4gm3730ll3b56p5pkydrgxhkdkxk9b"; + libraryHaskellDepends = [ + aeson base bytestring deepseq genvalidity genvalidity-hspec hspec + QuickCheck + ]; + testHaskellDepends = [ + aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec + genvalidity-property genvalidity-text hspec text validity + ]; + description = "Standard spec's for aeson-related instances"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -84180,7 +87234,6 @@ self: { ]; description = "Standard spec's for binary-related Instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-cereal" = callPackage @@ -84200,7 +87253,6 @@ self: { ]; description = "Standard spec's for cereal-related instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-hashable" = callPackage @@ -84222,7 +87274,6 @@ self: { ]; description = "Standard spec's for Hashable instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-optics" = callPackage @@ -84242,7 +87293,6 @@ self: { ]; description = "Standard spec's for optics"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-mergeless" = callPackage @@ -84286,7 +87336,6 @@ self: { ]; description = "GenValidity support for Path"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-property" = callPackage @@ -84305,6 +87354,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-property_0_4_0_0" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, genvalidity + , hspec, QuickCheck, validity + }: + mkDerivation { + pname = "genvalidity-property"; + version = "0.4.0.0"; + sha256 = "0zayycx62226w54rvkxwhvqhznsr33dk3ds55yyqrfqbnhvph1s9"; + libraryHaskellDepends = [ + base genvalidity hspec QuickCheck validity + ]; + testHaskellDepends = [ base directory doctest filepath ]; + description = "Standard properties for functions on `Validity` types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-scientific" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, scientific, validity, validity-scientific @@ -84321,7 +87387,6 @@ self: { ]; description = "GenValidity support for Scientific"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-text" = callPackage @@ -84340,6 +87405,24 @@ self: { ]; description = "GenValidity support for Text"; license = stdenv.lib.licenses.mit; + }) {}; + + "genvalidity-text_0_6_0_0" = callPackage + ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, text, validity, validity-text + }: + mkDerivation { + pname = "genvalidity-text"; + version = "0.6.0.0"; + sha256 = "01684mmf2vk4kvk4nanrlsa237jlx1713cqrsgrnwvb1n8x0z2ja"; + libraryHaskellDepends = [ + array base genvalidity QuickCheck text validity validity-text + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec QuickCheck text + ]; + description = "GenValidity support for Text"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -84357,7 +87440,6 @@ self: { testHaskellDepends = [ base genvalidity-hspec hspec time ]; description = "GenValidity support for time"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-unordered-containers" = callPackage @@ -84379,6 +87461,27 @@ self: { ]; description = "GenValidity support for unordered-containers"; license = stdenv.lib.licenses.mit; + }) {}; + + "genvalidity-unordered-containers_0_3_0_0" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable + , hspec, QuickCheck, unordered-containers, validity + , validity-unordered-containers + }: + mkDerivation { + pname = "genvalidity-unordered-containers"; + version = "0.3.0.0"; + sha256 = "0dln4mba85vi8dlw0l7qqvcayazs12jy4a8ri3brf3kz9vhvi9rh"; + libraryHaskellDepends = [ + base genvalidity hashable QuickCheck unordered-containers validity + validity-unordered-containers + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec unordered-containers + validity + ]; + description = "GenValidity support for unordered-containers"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -84398,7 +87501,6 @@ self: { ]; description = "GenValidity support for UUID"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-vector" = callPackage @@ -84417,6 +87519,24 @@ self: { ]; description = "GenValidity support for vector"; license = stdenv.lib.licenses.mit; + }) {}; + + "genvalidity-vector_0_3_0_0" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, validity, validity-vector, vector + }: + mkDerivation { + pname = "genvalidity-vector"; + version = "0.3.0.0"; + sha256 = "11qvacfhf60rdya2v5c7j94jgvyinz7ydhl5f8l0h1xrlw2n7w3h"; + libraryHaskellDepends = [ + base genvalidity QuickCheck validity validity-vector vector + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec vector + ]; + description = "GenValidity support for vector"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -84441,6 +87561,7 @@ self: { description = "Performs geo location lookups and parses the results"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "geo-uk" = callPackage @@ -84500,18 +87621,20 @@ self: { description = "Geodetic calculations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "geodetic-types" = callPackage ({ mkDerivation, base, dimensional, lens, semigroups }: mkDerivation { pname = "geodetic-types"; - version = "0.0.1"; - sha256 = "0sj82sz20zfys2h4g74wj9gwfyc2c4jkzazw882xrr18g8zx82p8"; + version = "0.0.4"; + sha256 = "1v7dl3nl9gp8pj469sk41k8nz34s1dngpinif06v8bbpms31i0bd"; libraryHaskellDepends = [ base dimensional lens semigroups ]; description = "Types for geodetic operations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "geodetics" = callPackage @@ -84531,7 +87654,6 @@ self: { ]; description = "Terrestrial coordinate systems and geodetic calculations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geohash" = callPackage @@ -84594,6 +87716,7 @@ self: { description = "GeoJSON data types including JSON/BSON conversion"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "geolite-csv" = callPackage @@ -84613,6 +87736,7 @@ self: { description = "Geolite CSV Parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "geom2d" = callPackage @@ -84626,6 +87750,7 @@ self: { description = "package for geometry in euklidean 2d space"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "geos" = callPackage @@ -84645,6 +87770,7 @@ self: { description = "Bindings for GEOS"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {geos_c = null;}; "getemx" = callPackage @@ -84664,6 +87790,7 @@ self: { description = "Fetch from emusic using .emx files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "getflag" = callPackage @@ -84676,6 +87803,7 @@ self: { description = "Command-line parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "getopt-generics" = callPackage @@ -84756,6 +87884,7 @@ self: { description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS)."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gh-labeler" = callPackage @@ -84773,7 +87902,6 @@ self: { ]; description = "Github Standard Labeler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gh-pocket-knife" = callPackage @@ -84915,6 +88043,7 @@ self: { description = "A small-step semantics for Core"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-datasize" = callPackage @@ -84927,6 +88056,7 @@ self: { description = "Determine the size of data structures in GHC's memory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-dump-core" = callPackage @@ -84942,6 +88072,7 @@ self: { description = "An AST and compiler plugin for dumping GHC's Core representation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-dump-tree" = callPackage @@ -84967,6 +88098,7 @@ self: { description = "Dump GHC's parsed, renamed, and type checked ASTs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-dump-util" = callPackage @@ -84991,6 +88123,7 @@ self: { description = "Handy tools for working with @ghc-dump@ dumps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-dup" = callPackage @@ -85003,6 +88136,7 @@ self: { description = "Explicitly prevent sharing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-events" = callPackage @@ -85046,6 +88180,7 @@ self: { description = "Analyze and visualize event logs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-events-parallel" = callPackage @@ -85070,6 +88205,7 @@ self: { description = "Library and tool for parsing .eventlog files from parallel GHC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-exactprint" = callPackage @@ -85095,6 +88231,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-exactprint_0_6" = 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.6"; + sha256 = "1m5ri5rn9inh9m70bpm695848pbwkjvk8gvvk8my0jpcba1wsnlq"; + 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 { @@ -85118,6 +88278,7 @@ self: { description = "Derived instances of GHC.Generic of the GHC AST"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-heap-view" = callPackage @@ -85137,6 +88298,7 @@ self: { description = "Extract the heap representation of Haskell values and thunks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-hotswap" = callPackage @@ -85186,6 +88348,7 @@ self: { description = "Find the Haddock documentation for a symbol"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-instances" = callPackage @@ -85208,6 +88371,7 @@ self: { description = "Easily import all instances contained in GHC distributed libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-justdoit" = callPackage @@ -85274,6 +88438,7 @@ self: { description = "Generate a bash completion from the GHC manpage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-mod" = callPackage @@ -85321,6 +88486,7 @@ self: { description = "Happy Haskell Hacking"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-mtl" = callPackage @@ -85385,6 +88551,7 @@ self: { description = "A parallel wrapper for 'ghc --make'"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-parser" = callPackage @@ -85398,6 +88565,7 @@ self: { description = "Haskell source parser from GHC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-paths" = callPackage @@ -85430,6 +88598,7 @@ self: { description = "Simple utility to fix BROKEN package dependencies for cabal-install"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-pkg-lib" = callPackage @@ -85445,6 +88614,7 @@ self: { description = "Provide library support for ghc-pkg information"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-prim_0_5_3" = callPackage @@ -85535,6 +88705,7 @@ self: { description = "GHC plugin to prove program equations by simplification"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-server" = callPackage @@ -85566,6 +88737,7 @@ self: { description = "Simplified GHC API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-simple" = callPackage @@ -85582,6 +88754,7 @@ self: { description = "Simplified interface to the GHC API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-srcspan-plugin" = callPackage @@ -85594,6 +88767,7 @@ self: { description = "Generic GHC Plugin for annotating Haskell code with source location data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-syb" = callPackage @@ -85606,6 +88780,7 @@ self: { description = "Data and Typeable instances for the GHC API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-syb-utils" = callPackage @@ -85618,6 +88793,7 @@ self: { description = "Scrap Your Boilerplate utilities for the GHC API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-syntax-highlighter" = callPackage @@ -85665,6 +88841,7 @@ self: { description = "Library for parsing GHC time and allocation profiling reports"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-timers" = callPackage @@ -85689,6 +88866,7 @@ self: { description = "Faster replacements for traceEvent and traceMarker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-typelits-extra" = callPackage @@ -85766,6 +88944,7 @@ self: { description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-usage" = callPackage @@ -85781,6 +88960,7 @@ self: { description = "Print minimal export lists"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-vis" = callPackage @@ -85800,6 +88980,7 @@ self: { description = "Live visualization of data structures in GHCi"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghci_8_6_1" = callPackage @@ -85820,6 +89001,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghci-dap" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , directory, filepath, ghc, ghc-boot, ghc-paths, ghci, haskeline + , haskell-dap, process, text, time, transformers, unix + }: + mkDerivation { + pname = "ghci-dap"; + version = "0.0.11.0"; + sha256 = "19skxwhv5lgm4vs53y7gckrdrqhcsp7p47gc3lxfkdjqrvskvzks"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base bytestring containers deepseq directory filepath ghc + ghc-boot ghc-paths ghci haskeline haskell-dap process text time + transformers unix + ]; + description = "ghci-dap is a GHCi having DAP interface"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghci-diagrams" = callPackage ({ mkDerivation, base, cairo, colour, diagrams, gtk }: mkDerivation { @@ -85830,6 +89031,7 @@ self: { description = "Display simple diagrams from ghci"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghci-haskeline" = callPackage @@ -85849,14 +89051,15 @@ self: { description = "An implementation of ghci using the Haskeline line-input library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghci-hexcalc" = callPackage ({ mkDerivation, base, doctest, QuickCheck }: mkDerivation { pname = "ghci-hexcalc"; - version = "0.1.0.1"; - sha256 = "1mwh4wz3ccmh0fi0k0y19bk33vn8p6ylmkklidpw5vg7k3v9d7s2"; + version = "0.1.0.2"; + sha256 = "134nby24044l0nxdss004325scca315dsa31101b9qcbwq2hd3fv"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck ]; description = "GHCi as a Hex Calculator interactive"; @@ -85874,6 +89077,7 @@ self: { description = "parse output of ghci \":history\" command"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghci-lib" = callPackage @@ -85886,6 +89090,7 @@ self: { description = "A library for interactively evaluating Haskell code"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghci-ng" = callPackage @@ -85908,6 +89113,7 @@ self: { description = "Next generation GHCi"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghci-pretty" = callPackage @@ -85928,8 +89134,8 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.7.1"; - sha256 = "06n37dv51i2905v8nwwv1ilm0zlx6zblrkfic1mp491ws2sijdx7"; + version = "0.7.2"; + sha256 = "1h50438brxazk6vx8ym3f8y83rijh0lnkf6ac2rwhxi07r016h7s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86004,6 +89210,7 @@ self: { description = "Allow GHCJS projects to compile under GHC and develop using intero"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghcjs-codemirror" = callPackage @@ -86030,7 +89237,6 @@ self: { 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 @@ -86065,7 +89271,6 @@ self: { 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 @@ -86077,6 +89282,7 @@ self: { description = "DOM library using JSFFI and GHCJS"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghcjs-dom-webkit" = callPackage @@ -86110,6 +89316,7 @@ self: { description = "GHCJS bindings for the JavaScript Fetch API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghcjs-hplay" = callPackage @@ -86127,6 +89334,7 @@ self: { description = "Client-side web EDSL for transient nodes running in the web browser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghcjs-perch" = callPackage @@ -86150,6 +89358,7 @@ self: { description = "Bidirectional bidings to javascript's promise"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghcjs-vdom" = callPackage @@ -86199,6 +89408,7 @@ self: { description = "XmlHttpRequest (\"AJAX\") bindings for GHCJS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghclive" = callPackage @@ -86226,6 +89436,7 @@ self: { description = "Interactive Haskell interpreter in a browser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghczdecode" = callPackage @@ -86275,6 +89486,7 @@ self: { description = "Trivial routines for inspecting git repositories"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-atk" = callPackage @@ -86334,6 +89546,8 @@ self: { ]; description = "Bridge between packages gi-* and cairo-core"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-cairo-connector" = callPackage @@ -86408,7 +89622,7 @@ self: { doHaddock = false; description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs) libdbusmenu-gtk3;}; + }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -86429,7 +89643,7 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {inherit (pkgs) gtk3;}; "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf @@ -86470,7 +89684,7 @@ self: { doHaddock = false; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {inherit (pkgs) gtk3;}; "gi-ggit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -86490,7 +89704,7 @@ self: { doHaddock = false; description = "libgit2-glib bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome3) libgit2-glib;}; + }) {inherit (pkgs) libgit2-glib;}; "gi-gio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -86499,8 +89713,8 @@ self: { }: mkDerivation { pname = "gi-gio"; - version = "2.0.18"; - sha256 = "0h7liqxf63wmhjzgbjshv7pa4fx743jpvkphn5yyjkc0bnfcvsqk"; + version = "2.0.19"; + sha256 = "1xyg1hmxp408npri8ydm5iaphfwdq7jdgdhbwgbxiyia2ymxfhqc"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -86529,7 +89743,7 @@ self: { doHaddock = false; description = "GIRepository (gobject-introspection) bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome3) gobject-introspection;}; + }) {inherit (pkgs) gobject-introspection;}; "gi-glib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib @@ -86651,6 +89865,7 @@ self: { description = "GStreamer Plugins Base Utils bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gstreamer-pbutils = null;}; "gi-gsttag" = callPackage @@ -86672,6 +89887,7 @@ self: { description = "GStreamer Tag bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gstreamer-tag = null;}; "gi-gstvideo" = callPackage @@ -86713,7 +89929,7 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {inherit (pkgs) gtk3;}; "gi-gtk-declarative" = callPackage ({ mkDerivation, base, criterion, gi-gdk, gi-glib, gi-gobject @@ -86789,6 +90005,7 @@ self: { description = "GtkosxApplication bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gtk-mac-integration-gtk3 = null;}; "gi-gtksource" = callPackage @@ -86811,7 +90028,7 @@ self: { doHaddock = false; description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; + }) {inherit (pkgs) gtksourceview3;}; "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -86832,7 +90049,7 @@ self: { description = "JavaScriptCore bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) webkitgtk;}; + }) {webkitgtk = null;}; "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf @@ -86853,6 +90070,7 @@ self: { description = "Libnotify bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libnotify;}; "gi-ostree" = callPackage @@ -86873,7 +90091,7 @@ self: { doHaddock = false; description = "OSTree bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ostree;}; "gi-pango" = callPackage @@ -86943,6 +90161,7 @@ self: { description = "Poppler bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) poppler;}; "gi-secret" = callPackage @@ -86963,7 +90182,7 @@ self: { doHaddock = false; description = "Libsecret bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome3) libsecret;}; + }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -87004,7 +90223,7 @@ self: { libraryPkgconfigDepends = [ vte_291 ]; description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; - }) {vte_291 = pkgs.gnome3.vte;}; + }) {vte_291 = pkgs.vte;}; "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -87050,13 +90269,13 @@ self: { description = "WebKit2 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) webkitgtk;}; + }) {webkitgtk = null;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-gobject, gi-gtk, gi-javascriptcore, gi-soup, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers - , webkitgtk-web-extension + , webkitgtk }: mkDerivation { pname = "gi-webkit2webextension"; @@ -87068,12 +90287,12 @@ self: { gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk-web-extension ]; + libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; description = "WebKit2-WebExtension bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkitgtk-web-extension = null;}; + }) {webkitgtk = null;}; "gi-wnck" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -87096,6 +90315,7 @@ self: { description = "Wnck bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs.gnome2) libwnck;}; "gi-xlib" = callPackage @@ -87136,6 +90356,7 @@ self: { description = "Fuzzy finder for cabal executables"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gimlh" = callPackage @@ -87224,6 +90445,7 @@ self: { description = "Ginsu Gale Client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) openssl;}; "gio" = callPackage @@ -87242,7 +90464,6 @@ self: { libraryPkgconfigDepends = [ system-glib ]; description = "Binding to GIO"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {system-glib = pkgs.glib;}; "gipeda" = callPackage @@ -87266,6 +90487,7 @@ self: { description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "giphy-api" = callPackage @@ -87291,7 +90513,6 @@ self: { ]; description = "Giphy HTTP API wrapper and CLI search tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gist" = callPackage @@ -87310,6 +90531,7 @@ self: { description = "A reliable command-line client for gist.github.com"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "git" = callPackage @@ -87334,7 +90556,6 @@ self: { doCheck = false; description = "Git operations in haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-all" = callPackage @@ -87377,12 +90598,12 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190129"; - sha256 = "0gsi1ymv7dmx429vhv58979hfh23zrfvrsam6saf16ckh5hd0n81"; + version = "7.20190219"; + sha256 = "0161jszid9nih31q55zh8dldyfz5q0v4m2gw9dbb2hb1x47w3ww2"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" - "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" "-fwebapp" - "-fwebdav" + "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" + "-fwebapp" "-fwebdav" ]; isLibrary = false; isExecutable = true; @@ -87420,7 +90641,7 @@ self: { ''; enableSharedExecutables = false; description = "manage files with git, without checking their contents into git"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.agpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; @@ -87444,6 +90665,7 @@ self: { description = "Maintain per-branch checklists in Git"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "git-config" = callPackage @@ -87466,6 +90688,7 @@ self: { description = "A simple parser for Git configuration files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "git-date" = callPackage @@ -87487,6 +90710,7 @@ self: { description = "Bindings to the date parsing from Git"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "git-embed" = callPackage @@ -87525,6 +90749,7 @@ self: { description = "Custom git command for formatting code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "git-freq" = callPackage @@ -87568,6 +90793,7 @@ self: { description = "More intelligent push-to-GitHub utility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "git-jump" = callPackage @@ -87582,6 +90808,7 @@ self: { description = "Move a git branch"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "git-mediate" = callPackage @@ -87624,6 +90851,7 @@ self: { description = "Passively snapshots working tree changes efficiently"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "git-object" = callPackage @@ -87641,6 +90869,7 @@ self: { description = "Git object and its parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "git-repair" = callPackage @@ -87669,6 +90898,7 @@ self: { description = "repairs a damanged git repisitory"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "git-sanity" = callPackage @@ -87689,6 +90919,7 @@ self: { description = "A sanity checker for your git history"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "git-vogue" = callPackage @@ -87719,6 +90950,7 @@ self: { description = "A framework for pre-commit checks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gitHUD" = callPackage @@ -87775,6 +91007,7 @@ self: { description = "Create Github issues out of TODO comments in code"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "githash" = callPackage @@ -87798,23 +91031,24 @@ self: { "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring - , binary, binary-orphans, byteable, bytestring, containers - , cryptohash, deepseq, deepseq-generics, exceptions, file-embed - , hashable, hspec, hspec-discover, http-client, http-client-tls + , binary, binary-orphans, bytestring, containers, cryptohash-sha1 + , deepseq, deepseq-generics, exceptions, file-embed, hashable + , hspec, hspec-discover, http-client, http-client-tls , http-link-header, http-types, iso8601-time, mtl, network-uri - , semigroups, text, time, tls, transformers, transformers-compat - , unordered-containers, vector, vector-instances + , semigroups, tagged, text, time, tls, transformers + , transformers-compat, unordered-containers, vector + , vector-instances }: mkDerivation { pname = "github"; - version = "0.20"; - sha256 = "0gyinmrdwbqd6h5bvlv5jkv2rfp48p11088w5ayms8h361ck3kdp"; + version = "0.21"; + sha256 = "1ck4mnvxzgbpzy1v7xgggfn69733hm2smhbivmcvdmxd104lzvsq"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-orphans - byteable bytestring containers cryptohash deepseq deepseq-generics + bytestring containers cryptohash-sha1 deepseq deepseq-generics exceptions hashable http-client http-client-tls http-link-header - http-types iso8601-time mtl network-uri semigroups text time tls - transformers transformers-compat unordered-containers vector + http-types iso8601-time mtl network-uri semigroups tagged text time + tls transformers transformers-compat unordered-containers vector vector-instances ]; testHaskellDepends = [ @@ -87824,7 +91058,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Access to the GitHub API, v3"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-backup" = callPackage @@ -87853,6 +91086,7 @@ self: { description = "backs up everything github knows about a repository, to the repository"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) git;}; "github-data" = callPackage @@ -87877,6 +91111,7 @@ self: { description = "Access to the GitHub API, v3"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "github-post-receive" = callPackage @@ -87936,6 +91171,7 @@ self: { description = "Various Github helper utilities"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "github-types" = callPackage @@ -87967,6 +91203,7 @@ self: { description = "Useful functions that use the GitHub API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "github-webhook-handler" = callPackage @@ -87986,6 +91223,7 @@ self: { description = "GitHub WebHook Handler"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "github-webhook-handler-snap" = callPackage @@ -88005,6 +91243,7 @@ self: { description = "GitHub WebHook Handler implementation for Snap"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "github-webhooks" = callPackage @@ -88061,6 +91300,7 @@ self: { description = "Apply GitHub .gitignore templates to already existing repositories."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gitit" = callPackage @@ -88096,7 +91336,6 @@ self: { ]; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlab-api" = callPackage @@ -88114,6 +91353,7 @@ self: { description = "Gitlab Web API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gitlib" = callPackage @@ -88181,6 +91421,7 @@ self: { description = "Run tests between repositories"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gitlib-libgit2" = callPackage @@ -88208,6 +91449,7 @@ self: { description = "Libgit2 backend for gitlib"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gitlib-s3" = callPackage @@ -88238,6 +91480,7 @@ self: { description = "Gitlib repository backend for storing Git objects in Amazon S3"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gitlib-sample" = callPackage @@ -88270,6 +91513,7 @@ self: { description = "Test library for confirming gitlib backend compliance"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gitlib-utils" = callPackage @@ -88289,6 +91533,7 @@ self: { description = "Generic utility functions for working with Git repositories"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gitrev" = callPackage @@ -88330,6 +91575,7 @@ self: { description = "A document store library for Git + JSON"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gitter" = callPackage @@ -88346,6 +91592,7 @@ self: { description = "Gitter.im API client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "givegif" = callPackage @@ -88373,7 +91620,6 @@ self: { ]; description = "CLI Giphy search tool with previews in iTerm 2"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gjk" = callPackage @@ -88451,6 +91697,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glabrous_2_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , cereal, cereal-text, directory, either, hspec, text + , unordered-containers + }: + mkDerivation { + pname = "glabrous"; + version = "2.0.0"; + sha256 = "001w81x2xmmd4vwp0m0142xgwyx60pr3mjx76czbc3by6iv41l5b"; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring cereal cereal-text + either text unordered-containers + ]; + testHaskellDepends = [ + base directory either hspec text unordered-containers + ]; + description = "A template DSL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "glade" = callPackage ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools , libglade @@ -88466,6 +91733,7 @@ self: { description = "Binding to the glade library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs.gnome2) libglade;}; "gladexml-accessor" = callPackage @@ -88478,6 +91746,7 @@ self: { description = "Automagically declares getters for widget handles in specified interface file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "glambda" = callPackage @@ -88519,6 +91788,7 @@ self: { description = "An OpenGL micro framework"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "glasso" = callPackage @@ -88580,6 +91850,7 @@ self: { description = "A threaded rendering framework using glaizer and pipes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "glazier-react" = callPackage @@ -88600,6 +91871,7 @@ self: { description = "ReactJS binding using Glazier.Command."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "glazier-react-examples" = callPackage @@ -88625,6 +91897,7 @@ self: { description = "Examples of using glazier-react"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "glazier-react-widget" = callPackage @@ -88645,6 +91918,7 @@ self: { description = "Generic widget library using glazier-react"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gli" = callPackage @@ -88670,6 +91944,7 @@ self: { description = "Tiny cli to fetch PR info from gitlab"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "glib" = callPackage @@ -88687,7 +91962,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "Binding to the GLIB library for Gtk2Hs"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "glicko" = callPackage @@ -88705,6 +91979,7 @@ self: { description = "Glicko-2 implementation in Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "glider-nlp" = callPackage @@ -88718,6 +91993,7 @@ self: { description = "Natural Language Processing library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "glintcollider" = callPackage @@ -88744,10 +92020,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.29"; - sha256 = "04i6dzb6fgvx1vxpn8syzc9pa4mq2m62mrgq4iraqwgkzl54ahgx"; - revision = "2"; - editedCabalFile = "0s37m39c3vnwskvbsiziysm9ck7l30bfkp2jg0l49dhi8v01q6cs"; + version = "2.30"; + sha256 = "1ky0xwspnfknbjyf0fa459f38nwqakwq6fh7ady4rch8ck22phql"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -88786,8 +92060,8 @@ self: { }: mkDerivation { pname = "glob-posix"; - version = "0.1.0.1"; - sha256 = "1brw6vd6k787z5n56sdz8c5f35iv0w6m2qpgb2lyxb7bfwn3hi9j"; + version = "0.2.0.1"; + sha256 = "1h9my41nhq0xxlwvajwijbgpranyn2ffabbjvx1pbr7vdb4zp8q3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory filepath tasty tasty-expected-failure tasty-hunit @@ -88797,6 +92071,7 @@ self: { description = "Haskell bindings for POSIX glob library"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "global" = callPackage @@ -88815,6 +92090,7 @@ self: { description = "Library enabling unique top-level declarations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "global-config" = callPackage @@ -88836,6 +92112,7 @@ self: { description = "Global mutable configuration"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "global-lock" = callPackage @@ -88859,6 +92136,7 @@ self: { description = "Namespaced, global, and top-level mutable variables without unsafePerformIO"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "glome-hs" = callPackage @@ -88883,6 +92161,7 @@ self: { description = "ray tracer"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gloss_1_9_2_1" = callPackage @@ -88928,6 +92207,7 @@ self: { description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gloss-algorithms" = callPackage @@ -88955,6 +92235,7 @@ self: { description = "An Interface for gloss in terms of a reactive-banana Behavior"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gloss-devil" = callPackage @@ -88967,6 +92248,7 @@ self: { description = "Display images in Gloss using libdevil for decoding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gloss-examples" = callPackage @@ -89006,6 +92288,7 @@ self: { description = "Export Gloss pictures to png, bmp, tga, tiff, gif and juicy-pixels-image"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gloss-game" = callPackage @@ -89018,6 +92301,7 @@ self: { description = "Gloss wrapper that simplifies writing games"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gloss-juicy" = callPackage @@ -89099,6 +92383,7 @@ self: { description = "A Sodium interface to the Gloss drawing package"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "glpk-hs" = callPackage @@ -89113,6 +92398,7 @@ self: { description = "Comprehensive GLPK linear programming bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) glpk;}; "glue" = callPackage @@ -89143,6 +92429,7 @@ self: { description = "Make better services"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "glue-common" = callPackage @@ -89168,6 +92455,7 @@ self: { description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "glue-core" = callPackage @@ -89193,6 +92481,7 @@ self: { description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "glue-ekg" = callPackage @@ -89218,6 +92507,7 @@ self: { description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "glue-example" = callPackage @@ -89239,6 +92529,7 @@ self: { description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gluturtle" = callPackage @@ -89268,6 +92559,7 @@ self: { description = "Composable maps and generic tries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gmndl" = callPackage @@ -89287,6 +92579,7 @@ self: { description = "Mandelbrot Set explorer using GTK"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gmpint" = callPackage @@ -89315,11 +92608,12 @@ self: { description = "Randomly set a picture as the GNOME desktop background"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gnome-keyring" = callPackage ({ mkDerivation, base, bytestring, c2hs, gnome-keyring - , libgnome_keyring, text, time + , libgnome-keyring, text, time }: mkDerivation { pname = "gnome-keyring"; @@ -89327,12 +92621,12 @@ self: { sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8"; libraryHaskellDepends = [ base bytestring text time ]; librarySystemDepends = [ gnome-keyring ]; - libraryPkgconfigDepends = [ libgnome_keyring ]; + libraryPkgconfigDepends = [ libgnome-keyring ]; libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = stdenv.lib.licenses.gpl3; }) {inherit (pkgs.gnome3) gnome-keyring; - inherit (pkgs) libgnome_keyring;}; + inherit (pkgs) libgnome-keyring;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome-vfs @@ -89350,6 +92644,7 @@ self: { description = "Binding to the GNOME Virtual File System library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gnome-vfs = null; gnome-vfs_module = null;}; "gnss-converters" = callPackage @@ -89378,6 +92673,7 @@ self: { description = "GNSS Converters"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gnuidn" = callPackage @@ -89401,30 +92697,10 @@ self: { description = "Bindings for GNU IDN"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libidn;}; "gnuplot" = callPackage - ({ mkDerivation, array, base, containers, data-accessor - , data-accessor-transformers, deepseq, filepath, process - , semigroups, temporary, time, transformers, utility-ht - }: - mkDerivation { - pname = "gnuplot"; - version = "0.5.5.3"; - sha256 = "0105ajc5szgrh091x5fxdcydc96rdh75gg2snyfr2y2rhf120x2g"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base containers data-accessor data-accessor-transformers - deepseq filepath process semigroups temporary time transformers - utility-ht - ]; - description = "2D and 3D plots using gnuplot"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gnuplot_0_5_6" = callPackage ({ mkDerivation, array, base, containers, data-accessor , data-accessor-transformers, deepseq, filepath, process , semigroups, temporary, time, transformers, utility-ht @@ -89443,7 +92719,6 @@ self: { ]; description = "2D and 3D plots using gnuplot"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gnutls" = callPackage @@ -89492,6 +92767,7 @@ self: { description = "Core imports for Geometric Optimization Libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "goal-geometry" = callPackage @@ -89507,6 +92783,7 @@ self: { description = "Scientific computing on geometric objects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "goal-probability" = callPackage @@ -89527,6 +92804,7 @@ self: { description = "Manifolds of probability distributions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "goal-simulation" = callPackage @@ -89551,6 +92829,7 @@ self: { description = "Mealy based simulation tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "goat" = callPackage @@ -89586,6 +92865,7 @@ self: { description = "A monadic take on a 2,500-year-old board game - library"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "goatee-gtk" = callPackage @@ -89607,6 +92887,7 @@ self: { description = "A monadic take on a 2,500-year-old board game - GTK+ UI"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gochan" = callPackage @@ -89629,6 +92910,7 @@ self: { description = "Go-style channels"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "godot-haskell" = callPackage @@ -89663,6 +92945,7 @@ self: { description = "The Gofer 2.30 standard prelude"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "goggles" = callPackage @@ -91812,6 +95095,7 @@ self: { description = "Graphical user interfaces that are renderable, change over time and eventually produce a value"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-cloud" = callPackage @@ -91832,6 +95116,7 @@ self: { description = "Client for the Google Cloud APIs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-dictionary" = callPackage @@ -91867,6 +95152,7 @@ self: { description = "Google Drive API access"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-html5-slide" = callPackage @@ -91886,6 +95172,7 @@ self: { description = "Google HTML5 Slide generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-isbn" = callPackage @@ -91917,6 +95204,7 @@ self: { description = "Write GMail filters and output to importable XML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-maps-geocoding" = callPackage @@ -91933,7 +95221,6 @@ self: { ]; description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-oauth2" = callPackage @@ -91955,6 +95242,7 @@ self: { description = "Google OAuth2 token negotiation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-oauth2-easy" = callPackage @@ -91975,6 +95263,7 @@ self: { description = "Opininated use of Google Authentication for ease"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-oauth2-for-cli" = callPackage @@ -92019,6 +95308,7 @@ self: { description = "EDSL for Google and GMail search expressions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-server-api" = callPackage @@ -92031,8 +95321,8 @@ self: { }: mkDerivation { pname = "google-server-api"; - version = "0.3.1.0"; - sha256 = "12n3cd4k515z8shi6klxa2s3cbccqk8h38y45h1lqk1j8ydp3r21"; + version = "0.3.1.1"; + sha256 = "0rkjwib59iz07pcjlq7b16i8zivf8wpy4p0l2i6wr13vfhkq75js"; libraryHaskellDepends = [ aeson aeson-casing base base64-bytestring bytestring HsOpenSSL http-api-data http-client http-client-tls mime-mail monad-control @@ -92041,7 +95331,6 @@ self: { ]; description = "Google APIs for server to server applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-static-maps" = callPackage @@ -92061,7 +95350,6 @@ self: { ]; description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-translate" = callPackage @@ -92079,6 +95367,7 @@ self: { description = "Google Translate API bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "googleplus" = callPackage @@ -92097,6 +95386,7 @@ self: { description = "Haskell implementation of the Google+ API v1"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "googlepolyline" = callPackage @@ -92116,6 +95406,7 @@ self: { description = "Google Polyline Encoder/Decoder"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gopher-proxy" = callPackage @@ -92137,6 +95428,7 @@ self: { description = "proxy gopher over http"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gopherbot" = callPackage @@ -92155,6 +95447,7 @@ self: { description = "Spidering robot to download files from Gopherspace"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gore-and-ash" = callPackage @@ -92174,6 +95467,7 @@ self: { description = "Core of FRP game engine called Gore&Ash"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gore-and-ash-actor" = callPackage @@ -92192,6 +95486,7 @@ self: { description = "Gore&Ash engine extension that implements actor style of programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gore-and-ash-async" = callPackage @@ -92215,6 +95510,7 @@ self: { description = "Core module for Gore&Ash engine that embeds async IO actions into game loop"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gore-and-ash-demo" = callPackage @@ -92241,6 +95537,7 @@ self: { description = "Demonstration game for Gore&Ash game engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gore-and-ash-glfw" = callPackage @@ -92258,6 +95555,7 @@ self: { description = "Core module for Gore&Ash engine for GLFW input events"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gore-and-ash-lambdacube" = callPackage @@ -92278,6 +95576,7 @@ self: { description = "Core module for Gore&Ash engine that do something"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gore-and-ash-logging" = callPackage @@ -92297,6 +95596,7 @@ self: { description = "Core module for gore-and-ash with logging utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gore-and-ash-network" = callPackage @@ -92319,6 +95619,7 @@ self: { description = "Core module for Gore&Ash engine with low level network API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gore-and-ash-sdl" = callPackage @@ -92338,6 +95639,7 @@ self: { description = "Gore&Ash core module for integration with SDL library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gore-and-ash-sync" = callPackage @@ -92358,6 +95660,7 @@ self: { description = "Gore&Ash module for high level network synchronization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gotta-go-fast" = callPackage @@ -92376,6 +95679,7 @@ self: { description = "A command line utility for practicing typing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gpah" = callPackage @@ -92397,6 +95701,7 @@ self: { description = "Generic Programming Use in Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gpcsets" = callPackage @@ -92460,6 +95765,7 @@ self: { description = "For manipulating GPS coordinates and trails"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gps2htmlReport" = callPackage @@ -92481,6 +95787,7 @@ self: { description = "GPS to HTML Summary Report"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gpx-conduit" = callPackage @@ -92498,6 +95805,7 @@ self: { description = "Read GPX files using conduits"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graceful" = callPackage @@ -92515,6 +95823,7 @@ self: { description = "Library to write graceful shutdown / upgrade service"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graflog" = callPackage @@ -92534,6 +95843,7 @@ self: { description = "Monadic correlated log events"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grakn" = callPackage @@ -92558,6 +95868,7 @@ self: { description = "A Haskell client for Grakn"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grammar-combinators" = callPackage @@ -92576,6 +95887,7 @@ self: { description = "A parsing library of context-free grammar combinators"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grammatical-parsers" = callPackage @@ -92608,6 +95920,7 @@ self: { description = "parsers that combine into grammars"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grapefruit-examples" = callPackage @@ -92625,6 +95938,7 @@ self: { description = "Examples using the Grapefruit library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grapefruit-frp" = callPackage @@ -92643,6 +95957,7 @@ self: { description = "Functional Reactive Programming core"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grapefruit-records" = callPackage @@ -92655,6 +95970,7 @@ self: { description = "A record system for Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grapefruit-ui" = callPackage @@ -92674,6 +95990,7 @@ self: { description = "Declarative user interface programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grapefruit-ui-gtk" = callPackage @@ -92694,6 +96011,7 @@ self: { description = "GTK+-based backend for declarative user interface programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graph" = callPackage @@ -92762,6 +96080,7 @@ self: { description = "An implementation of algorithms for matchings in graphs"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graph-rewriting" = callPackage @@ -92776,6 +96095,7 @@ self: { description = "Monadic graph rewriting of hypergraphs with ports and multiedges"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graph-rewriting-cl" = callPackage @@ -92796,6 +96116,7 @@ self: { description = "Interactive graph rewriting system implementing various well-known combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graph-rewriting-gl" = callPackage @@ -92813,6 +96134,7 @@ self: { description = "OpenGL interface for interactive port graph rewriting"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graph-rewriting-lambdascope" = callPackage @@ -92835,6 +96157,7 @@ self: { 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; + broken = true; }) {}; "graph-rewriting-layout" = callPackage @@ -92851,6 +96174,7 @@ self: { description = "Force-directed node placement intended for incremental graph drawing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graph-rewriting-ski" = callPackage @@ -92871,6 +96195,7 @@ self: { description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graph-rewriting-strategies" = callPackage @@ -92887,6 +96212,7 @@ self: { description = "Evaluation strategies for port-graph rewriting systems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graph-rewriting-trs" = callPackage @@ -92909,6 +96235,7 @@ self: { description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graph-rewriting-ww" = callPackage @@ -92930,6 +96257,7 @@ self: { 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; + broken = true; }) {}; "graph-serialize" = callPackage @@ -92942,6 +96270,7 @@ self: { description = "Serialization of data structures with references"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graph-utils" = callPackage @@ -92958,6 +96287,7 @@ self: { description = "A simple wrapper & quasi quoter for fgl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graph-visit" = callPackage @@ -92974,6 +96304,7 @@ self: { description = "Graph walk abstraction"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graph-wrapper" = callPackage @@ -93008,6 +96339,7 @@ self: { description = "A declarative, monadic graph construction language for small graphs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphene" = callPackage @@ -93025,6 +96357,7 @@ self: { description = "A minimal Graph Theory library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphics-drawingcombinators" = callPackage @@ -93043,6 +96376,7 @@ self: { description = "A functional interface to 2D drawing in OpenGL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphics-formats-collada" = callPackage @@ -93059,6 +96393,7 @@ self: { description = "Load 3D geometry in the COLLADA format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphicsFormats" = callPackage @@ -93071,6 +96406,7 @@ self: { description = "Classes for renderable objects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphicstools" = callPackage @@ -93090,6 +96426,7 @@ self: { description = "Tools for creating graphical UIs, based on wxHaskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphite" = callPackage @@ -93196,6 +96533,7 @@ self: { description = "Haskell GraphQL query parser-interpreter-data processor"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphs" = callPackage @@ -93242,6 +96580,7 @@ self: { description = "A simple tool to illustrate dependencies between Haskell types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphviz" = callPackage @@ -93286,6 +96625,7 @@ self: { description = "Execute Graql queries on a Grakn graph"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grasp" = callPackage @@ -93311,6 +96651,7 @@ self: { description = "GRASP implementation for the AMMM project"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gravatar" = callPackage @@ -93340,6 +96681,7 @@ self: { description = "Gray code encoder/decoder"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gray-extended" = callPackage @@ -93393,6 +96735,7 @@ self: { description = "GreenCard, a foreign function pre-processor for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "greencard-lib" = callPackage @@ -93406,6 +96749,7 @@ self: { description = "A foreign function interface pre-processor library for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "greenclip" = callPackage @@ -93426,7 +96770,6 @@ self: { executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ]; description = "Simple clipboard manager to be integrated with rofi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; inherit (pkgs) xlibsWrapper;}; @@ -93444,6 +96787,7 @@ self: { description = "A scalable distributed logger with a high-precision global time axis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gremlin-haskell" = callPackage @@ -93468,6 +96812,7 @@ self: { description = "Graph database client for TinkerPop3 Gremlin Server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grenade" = callPackage @@ -93492,6 +96837,7 @@ self: { description = "Practical Deep Learning in Haskell"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "greplicate" = callPackage @@ -93591,6 +96937,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "grid-proto" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, linear, sdl2 + , sdl2-fps, sdl2-gfx, sdl2-mixer, sdl2-ttf, StateVar, text, vector + }: + mkDerivation { + pname = "grid-proto"; + version = "0.1.0.0"; + sha256 = "0jwwgnzv27af5wcynfi2rm1xnp5lvqrnaqi1asw27ng4413y3jqk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers linear sdl2 sdl2-fps sdl2-gfx + sdl2-mixer sdl2-ttf StateVar text vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers linear sdl2 sdl2-fps sdl2-gfx + sdl2-mixer sdl2-ttf StateVar text vector + ]; + description = "Grid-based prototyping framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "gridbounds" = callPackage ({ mkDerivation, base, earclipper, gjk, gridbox, hspec }: mkDerivation { @@ -93602,6 +96972,7 @@ self: { description = "Collision detection for GridBox"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gridbox" = callPackage @@ -93651,6 +97022,7 @@ self: { description = "Grid-based multimedia engine"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grids" = callPackage @@ -93659,8 +97031,8 @@ self: { }: mkDerivation { pname = "grids"; - version = "0.3.0.0"; - sha256 = "01i6izwlgkv4pc6sfywn8fg2s01x15q0lwxag3kzzhb63nm20kli"; + version = "0.5.0.1"; + sha256 = "0ji1j40jriixli0l2gn74wnkbjkrdzmgrgn493vla92492i5rgzf"; libraryHaskellDepends = [ adjunctions base comonad deepseq distributive singletons vector ]; @@ -93673,7 +97045,6 @@ self: { vector ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grm" = callPackage @@ -93696,6 +97067,7 @@ self: { description = "grm grammar converter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "groom" = callPackage @@ -93760,6 +97132,7 @@ self: { description = "Command line utility to manage AWS ECS resources"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gross" = callPackage @@ -93775,6 +97148,7 @@ self: { description = "A spoof on gloss for terminal animation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "groundhog" = callPackage @@ -93813,6 +97187,7 @@ self: { description = "Extended Converter Library for groundhog embedded types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "groundhog-inspector" = callPackage @@ -93940,6 +97315,7 @@ self: { description = "Classify objects by key-generating function, like SQL GROUP BY"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "groupBy" = callPackage @@ -93973,6 +97349,7 @@ self: { description = "Grouped lists. Equal consecutive elements are grouped."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "groupoid" = callPackage @@ -94029,6 +97406,7 @@ self: { description = "A revised version of the scotty library that attempts to be simpler and more performant"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "grpc-api-etcd" = callPackage @@ -94057,6 +97435,7 @@ self: { description = "gRPC client for etcd"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gruff" = callPackage @@ -94079,6 +97458,7 @@ self: { description = "fractal explorer GUI using the ruff library"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gruff-examples" = callPackage @@ -94098,6 +97478,7 @@ self: { description = "Mandelbrot Set examples using ruff and gruff"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gsasl" = callPackage @@ -94122,6 +97503,7 @@ self: { description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gscholar-rss" = callPackage @@ -94139,6 +97521,7 @@ self: { description = "scrapes google scholar, provides RSS feed"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gsl-random" = callPackage @@ -94152,6 +97535,7 @@ self: { description = "Bindings the the GSL random number generation facilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gsl-random-fu" = callPackage @@ -94164,6 +97548,7 @@ self: { description = "Instances for using gsl-random with random-fu"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gsmenu" = callPackage @@ -94229,6 +97614,7 @@ self: { description = "Generic implementation of Storable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gstreamer" = callPackage @@ -94248,7 +97634,6 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage @@ -94283,6 +97668,7 @@ self: { description = "The General Transit Feed Specification format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gtfs-realtime" = callPackage @@ -94316,8 +97702,7 @@ self: { libraryPkgconfigDepends = [ gtk2 ]; description = "Binding to the Gtk+ graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk2 = pkgs.gnome2.gtk;}; + }) {inherit (pkgs) gtk2;}; "gtk-helpers" = callPackage ({ mkDerivation, array, base, gio, glib, gtk, mtl, process @@ -94332,7 +97717,6 @@ self: { ]; description = "A collection of auxiliary operations and widgets related to Gtk+"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-jsinput" = callPackage @@ -94344,7 +97728,6 @@ self: { libraryHaskellDepends = [ base gtk json transformers ]; description = "A simple custom form widget for gtk which allows inputing of JSON values"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-largeTreeStore" = callPackage @@ -94361,7 +97744,6 @@ self: { testHaskellDepends = [ base containers gtk3 hspec ]; description = "Large TreeStore support for gtk2hs"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-mac-integration" = callPackage @@ -94378,7 +97760,7 @@ self: { libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ]; description = "Bindings for the Gtk/OS X integration library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = [ "x86_64-darwin" ]; }) {inherit (pkgs) gtk-mac-integration-gtk2;}; "gtk-serialized-event" = callPackage @@ -94397,7 +97779,8 @@ self: { description = "GTK+ Serialized event"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk2 = pkgs.gnome2.gtk;}; + broken = true; + }) {inherit (pkgs) gtk2;}; "gtk-simple-list-view" = callPackage ({ mkDerivation, base, gtk }: @@ -94408,7 +97791,6 @@ self: { libraryHaskellDepends = [ base gtk ]; description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-sni-tray" = callPackage @@ -94439,8 +97821,7 @@ self: { ]; description = "A standalone StatusNotifierItem/AppIndicator tray"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {inherit (pkgs) gtk3;}; "gtk-strut" = callPackage ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }: @@ -94462,7 +97843,6 @@ self: { libraryHaskellDepends = [ base gtk ]; description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-toy" = callPackage @@ -94475,6 +97855,7 @@ self: { description = "Convenient Gtk canvas with mouse and keyboard input"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gtk-traymanager" = callPackage @@ -94487,7 +97868,6 @@ self: { libraryPkgconfigDepends = [ xlibsWrapper ]; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) xlibsWrapper;}; "gtk2hs-buildtools" = callPackage @@ -94509,7 +97889,6 @@ self: { executableHaskellDepends = [ base ]; description = "Tools to build the Gtk2Hs suite of User Interface libraries"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk2hs-cast-glade" = callPackage @@ -94629,6 +98008,7 @@ self: { description = "Gtk2Hs Hello World, an example package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gtk2hs-rpn" = callPackage @@ -94641,6 +98021,7 @@ self: { description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gtk3" = callPackage @@ -94661,7 +98042,6 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gtk3;}; "gtk3-mac-integration" = callPackage @@ -94679,6 +98059,7 @@ self: { description = "Bindings for the Gtk/OS X integration library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gtk-mac-integration-gtk3 = null;}; "gtkglext" = callPackage @@ -94698,6 +98079,7 @@ self: { description = "Binding to the GTK+ OpenGL Extension"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE; inherit (pkgs.xorg) libSM; inherit (pkgs.xorg) libXmu; @@ -94720,6 +98102,7 @@ self: { description = "Binding to the GtkImageView library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtkimageview;}; "gtkrsync" = callPackage @@ -94739,6 +98122,7 @@ self: { description = "Gnome rsync progress display"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gtksourceview2" = callPackage @@ -94759,7 +98143,8 @@ self: { description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) gtksourceview;}; + broken = true; + }) {inherit (pkgs) gtksourceview;}; "gtksourceview3" = callPackage ({ mkDerivation, array, base, Cabal, containers, glib @@ -94779,7 +98164,8 @@ self: { description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; + broken = true; + }) {inherit (pkgs) gtksourceview3;}; "guarded-allocation" = callPackage ({ mkDerivation, base }: @@ -94802,6 +98188,7 @@ self: { description = "Datatype-generic rewriting with preconditions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "guess-combinator" = callPackage @@ -94814,6 +98201,7 @@ self: { description = "Generate simple combinators given their type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "guid" = callPackage @@ -94827,6 +98215,7 @@ self: { description = "A simple wrapper around uuid"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gulcii" = callPackage @@ -94842,6 +98231,7 @@ self: { description = "graphical untyped lambda calculus interactive interpreter"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gutenberg-fibonaccis" = callPackage @@ -94867,6 +98257,7 @@ self: { description = "A binary version of GiveYouAHead"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gym-http-api" = callPackage @@ -94888,7 +98279,6 @@ self: { ]; description = "REST client to the gym-http-api project"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "h-booru" = callPackage @@ -94913,6 +98303,7 @@ self: { description = "Haskell library for retrieving data from various booru image sites"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "h-gpgme" = callPackage @@ -94937,6 +98328,7 @@ self: { description = "High Level Binding for GnuPG Made Easy (gpgme)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "h-reversi" = callPackage @@ -94961,6 +98353,7 @@ self: { description = "Reversi game in haskell/blank-canvas"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "h2048" = callPackage @@ -94983,6 +98376,7 @@ self: { description = "a haskell implementation of Game 2048"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "h2c" = callPackage @@ -94995,6 +98389,7 @@ self: { description = "Bindings to Linux I2C with support for repeated-start transactions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hArduino" = callPackage @@ -95011,6 +98406,7 @@ self: { description = "Control your Arduino board from Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hBDD" = callPackage @@ -95038,6 +98434,7 @@ self: { description = "An FFI binding to CMU/Long's BDD library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {bdd = null; mem = null;}; "hBDD-CUDD" = callPackage @@ -95054,6 +98451,7 @@ self: { description = "An FFI binding to the CUDD library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {cudd = null; epd = null; inherit (pkgs) mtr; inherit (pkgs) st; util = null;}; @@ -95086,6 +98484,7 @@ self: { description = "interface to CSound API"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {csound64 = null; inherit (pkgs) libsndfile;}; "hDFA" = callPackage @@ -95098,6 +98497,7 @@ self: { description = "A simple library for representing and minimising DFAs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hF2" = callPackage @@ -95111,6 +98511,7 @@ self: { description = "F(2^e) math for cryptography"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hGelf" = callPackage @@ -95170,6 +98571,7 @@ self: { description = "Library to interact with the @Mollom anti-spam service"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hOff-display" = callPackage @@ -95264,6 +98666,7 @@ self: { description = "Protein Databank file format library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hPDB-examples" = callPackage @@ -95291,6 +98694,7 @@ self: { description = "Examples for hPDB library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hPushover" = callPackage @@ -95307,6 +98711,7 @@ self: { description = "Pushover.net API functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hR" = callPackage @@ -95319,6 +98724,7 @@ self: { description = "R bindings and interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hRESP" = callPackage @@ -95366,6 +98772,7 @@ self: { description = "A Haskell library to scrape and crawl web-pages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hSimpleDB" = callPackage @@ -95383,6 +98790,7 @@ self: { description = "Interface to Amazon's SimpleDB service"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hTalos" = callPackage @@ -95397,6 +98805,7 @@ self: { description = "Parser, print and manipulate structures in PDB file format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hTensor" = callPackage @@ -95409,6 +98818,7 @@ self: { description = "Multidimensional arrays and simple tensor computations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hVOIDP" = callPackage @@ -95425,6 +98835,7 @@ self: { description = "Optimal variable selection in chain graphical model"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; "hXmixer" = callPackage @@ -95442,7 +98853,6 @@ self: { ]; description = "A Gtk mixer GUI application for FreeBSD"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haar" = callPackage @@ -95460,6 +98870,7 @@ self: { description = "Haar wavelet transforms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "habit" = callPackage @@ -95485,6 +98896,7 @@ self: { description = "Haskell message bot framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hable" = callPackage @@ -95518,7 +98930,6 @@ self: { executableHaskellDepends = [ base optparse-applicative text ]; description = "A blog system"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hacanon-light" = callPackage @@ -95562,6 +98973,7 @@ self: { description = "Hack contrib"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack-contrib-press" = callPackage @@ -95579,6 +98991,7 @@ self: { description = "Hack helper that renders Press templates"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack-frontend-happstack" = callPackage @@ -95597,6 +99010,7 @@ self: { description = "hack-frontend-happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack-frontend-monadcgi" = callPackage @@ -95620,6 +99034,7 @@ self: { description = "Hack handler using CGI protocol. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack-handler-epoll" = callPackage @@ -95639,6 +99054,7 @@ self: { description = "hack handler implementation using epoll"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack-handler-evhttp" = callPackage @@ -95658,6 +99074,7 @@ self: { description = "Hack EvHTTP (libevent) Handler"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {event = null;}; "hack-handler-fastcgi" = callPackage @@ -95671,6 +99088,7 @@ self: { description = "Hack handler direct to fastcgi (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) fcgi;}; "hack-handler-happstack" = callPackage @@ -95689,6 +99107,7 @@ self: { description = "Hack Happstack server handler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack-handler-hyena" = callPackage @@ -95706,6 +99125,7 @@ self: { description = "Hyena hack handler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack-handler-kibro" = callPackage @@ -95721,6 +99141,7 @@ self: { description = "Hack Kibro handler"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack-handler-simpleserver" = callPackage @@ -95737,6 +99158,7 @@ self: { description = "A simplistic HTTP server handler for Hack. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack-middleware-cleanpath" = callPackage @@ -95751,6 +99173,7 @@ self: { description = "Applies some basic redirect rules to get cleaner paths. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack-middleware-clientsession" = callPackage @@ -95767,6 +99190,7 @@ self: { description = "Middleware for easily keeping session data in client cookies. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack-middleware-gzip" = callPackage @@ -95794,6 +99218,7 @@ self: { description = "Automatic wrapping of JSON responses to convert into JSONP. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack2" = callPackage @@ -95857,6 +99282,7 @@ self: { description = "Hack2 Happstack server handler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack2-handler-mongrel2-http" = callPackage @@ -95878,6 +99304,7 @@ self: { description = "Hack2 Mongrel2 HTTP handler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack2-handler-snap-server" = callPackage @@ -95897,6 +99324,7 @@ self: { description = "Hack2 Snap server handler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack2-handler-warp" = callPackage @@ -95914,6 +99342,7 @@ self: { description = "Hack2 warp handler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hack2-interface-wai" = callPackage @@ -95969,6 +99398,7 @@ self: { description = "Compare the public API of different versions of a Hackage library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hackage-mirror" = callPackage @@ -95999,6 +99429,7 @@ self: { description = "Simple mirroring utility for Hackage"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hackage-plot" = callPackage @@ -96031,6 +99462,7 @@ self: { description = "Process 00-index.tar.gz from Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hackage-proxy" = callPackage @@ -96055,6 +99487,7 @@ self: { description = "Provide a proxy for Hackage which modifies responses in some way. (deprecated)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hackage-repo-tool" = callPackage @@ -96066,8 +99499,8 @@ self: { pname = "hackage-repo-tool"; version = "0.1.1.1"; sha256 = "05r4i7zhwbsv9ci4yid57fnb5lkx254pch9arq5a11dvwsvdzvzw"; - revision = "1"; - editedCabalFile = "1ay6b522lblmwy1439z9cb2y3p4rwzav2yz0pn9m5q4wqr8x7rxr"; + revision = "2"; + editedCabalFile = "04ghg9chkqj3s4g24jszcpb4m8fi9qbgs04bbb1kny3c6ihin93x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96077,6 +99510,7 @@ self: { description = "Utility to manage secure file-based package repositories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hackage-security" = callPackage @@ -96090,8 +99524,8 @@ self: { pname = "hackage-security"; version = "0.5.3.0"; sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; - revision = "3"; - editedCabalFile = "07h13j203wafvimfhswpjl2a43iaavy9579hm16z5m565m7f8hwy"; + revision = "4"; + editedCabalFile = "1mkk6vkq681rgq159rgr73vlkch0z5cj3vbmz0n6540y8i3zs3mp"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -96122,6 +99556,7 @@ self: { description = "Hackage security bindings against the HTTP library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hackage-server" = callPackage @@ -96161,6 +99596,7 @@ self: { description = "The Hackage web server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hackage-sparks" = callPackage @@ -96211,6 +99647,7 @@ self: { description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hackage2twitter" = callPackage @@ -96225,6 +99662,7 @@ self: { description = "Send new Hackage releases to Twitter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hackager" = callPackage @@ -96243,6 +99681,7 @@ self: { description = "Hackage testing tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hackernews" = callPackage @@ -96268,6 +99707,7 @@ self: { description = "API for Hacker News"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hackertyper" = callPackage @@ -96276,8 +99716,8 @@ self: { pname = "hackertyper"; version = "0.1.0.1"; sha256 = "17c77f687874bfwahmzcz2v6k8z9p4fv555r5r1f38snsdi825gf"; - revision = "1"; - editedCabalFile = "1slyp8ncpiv204yxb2p7z0kwz4xhqv8czfrx4p78cbbhrlkmgnpm"; + revision = "3"; + editedCabalFile = "0g8nw9sqya5ycamprc2wiq3ri90hp228csj235lg2mc56pllzpmv"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -96305,6 +99745,7 @@ self: { description = "Generate useful files for Haskell projects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hackport" = callPackage @@ -96318,8 +99759,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.5.6"; - sha256 = "0im76n8487q08rmw8bn536qncrdhz9pjir5cxlf2myh7prrrrczs"; + version = "0.6"; + sha256 = "1fi3f90jd7s10iw1lcqhy8vfv27794sfsp7bjlb9rgab7jqf3wqv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96337,7 +99778,6 @@ self: { ]; description = "Hackage and Portage integration tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hactor" = callPackage @@ -96355,6 +99795,7 @@ self: { description = "Lightweight Erlang-style actors for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hactors" = callPackage @@ -96367,6 +99808,7 @@ self: { description = "Practical actors for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haddock_2_16_1" = callPackage @@ -96386,6 +99828,7 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haddock_2_17_5" = callPackage @@ -96403,6 +99846,7 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haddock" = callPackage @@ -96420,6 +99864,7 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haddock-api_2_15_0_2" = callPackage @@ -96439,6 +99884,7 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haddock-api_2_16_1" = callPackage @@ -96458,6 +99904,7 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haddock-api_2_17_4" = callPackage @@ -96480,6 +99927,7 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haddock-api" = callPackage @@ -96506,6 +99954,7 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haddock-leksah" = callPackage @@ -96525,6 +99974,7 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haddock-library_1_2_1" = callPackage @@ -96595,6 +100045,7 @@ self: { description = "Test utilities for Haddock"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haddocset" = callPackage @@ -96617,6 +100068,7 @@ self: { description = "Generate docset of Dash by Haddock haskell documentation tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hadolint" = callPackage @@ -96626,8 +100078,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.15.0"; - sha256 = "13xpbwnh6xs3lj6vgqanww3ipz8bsfh3q305rkrb7kgl338nqgsm"; + version = "1.16.1"; + sha256 = "1g71s2bzj9w97nd3pjyk8ldi4kd5j4pnxy9rmvnwz645zl998fny"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96645,6 +100097,7 @@ self: { description = "Dockerfile Linter JavaScript API"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hadoop-formats" = callPackage @@ -96663,6 +100116,7 @@ self: { description = "Read/write file formats commonly used by Hadoop"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) snappy;}; "hadoop-rpc" = callPackage @@ -96684,6 +100138,7 @@ self: { description = "Use the Hadoop RPC interface from Haskell"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hadoop-tools" = callPackage @@ -96711,22 +100166,26 @@ self: { description = "Fast command line tools for working with Hadoop"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haeredes" = callPackage ({ mkDerivation, base, bytestring, cmdargs, dns, doctest, filemanip - , iproute, MissingH, parallel-io + , iproute, parallel-io, process }: mkDerivation { pname = "haeredes"; - version = "0.4.4"; - sha256 = "1b3455grm9dy6m4yf2y5mncrjdplq2kslljszgqd8l3c2xml9hmx"; + version = "0.5.1"; + sha256 = "1y4r487z2k6l7xi5bi1rb3rz0i7yki2j2mmpnpfdy2bba1s51a6n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring cmdargs dns iproute MissingH parallel-io + base bytestring cmdargs dns iproute parallel-io + ]; + testHaskellDepends = [ + base bytestring cmdargs dns doctest filemanip iproute parallel-io + process ]; - testHaskellDepends = [ base doctest filemanip ]; description = "Confirm delegation of NS and MX records"; license = stdenv.lib.licenses.agpl3; }) {}; @@ -96756,6 +100215,7 @@ self: { description = "A static site generator with blogging/comments support"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haha" = callPackage @@ -96788,6 +100248,7 @@ self: { description = "Analytic Hierarchy Process"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haiji" = callPackage @@ -96811,6 +100272,7 @@ self: { description = "A typed template engine, subset of jinja2"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hail" = callPackage @@ -96832,6 +100294,7 @@ self: { description = "A service for pull-based continuous deployment based on hydra"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hailgun" = callPackage @@ -96841,8 +100304,8 @@ self: { }: mkDerivation { pname = "hailgun"; - version = "0.4.1.8"; - sha256 = "1hyww94b0ndfypk47iffvfxm96m24ygrbm26a820arpcmxkp7k4x"; + version = "0.4.2"; + sha256 = "15sbg5dnpc6g3649zy4ndbama1535xpf7dnnqlv22rdvy40ch5kl"; libraryHaskellDepends = [ aeson base bytestring email-validate exceptions filepath http-client http-client-tls http-types tagsoup text time @@ -96866,6 +100329,7 @@ self: { description = "A program to send emails throught the Mailgun api"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hailgun-simple" = callPackage @@ -96971,6 +100435,7 @@ self: { description = "A JSON REST API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakaru" = callPackage @@ -97001,6 +100466,7 @@ self: { description = "A probabilistic programming embedded DSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hake" = callPackage @@ -97029,6 +100495,7 @@ self: { description = "Akismet spam protection library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakka" = callPackage @@ -97044,6 +100511,7 @@ self: { description = "Minimal akka-inspired actor library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hako" = callPackage @@ -97061,6 +100529,7 @@ self: { description = "A mako-like quasi-quoter template library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll" = callPackage @@ -97098,7 +100567,6 @@ self: { testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -97114,6 +100582,7 @@ self: { description = "A package allowing to write Hakyll blog posts in Rmd"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-agda" = callPackage @@ -97131,6 +100600,7 @@ self: { description = "Wrapper to integrate literate Agda files with Hakyll"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-blaze-templates" = callPackage @@ -97143,6 +100613,7 @@ self: { description = "Blaze templates for Hakyll"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-contrib" = callPackage @@ -97159,6 +100630,7 @@ self: { description = "Extra modules for the hakyll website compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-contrib-csv" = callPackage @@ -97176,6 +100648,7 @@ self: { description = "Generate Html tables from Csv files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-contrib-elm" = callPackage @@ -97195,6 +100668,7 @@ self: { description = "Compile Elm code for inclusion in Hakyll static site"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-contrib-hyphenation" = callPackage @@ -97207,6 +100681,7 @@ self: { description = "automatic hyphenation for Hakyll"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-contrib-links" = callPackage @@ -97227,6 +100702,7 @@ self: { description = "A hakyll library that helps maintain a separate links database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-convert" = callPackage @@ -97249,6 +100725,7 @@ self: { description = "Convert from other blog engines to Hakyll"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-dhall" = callPackage @@ -97269,7 +100746,6 @@ self: { executableHaskellDepends = [ base dhall hakyll ]; description = "Dhall compiler for Hakyll"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-dir-list" = callPackage @@ -97284,7 +100760,6 @@ self: { ]; description = "Allow Hakyll to create hierarchical menues from directories"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-elm" = callPackage @@ -97313,7 +100788,6 @@ self: { executableHaskellDepends = [ base hakyll ]; testHaskellDepends = [ base ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-filestore" = callPackage @@ -97329,6 +100803,7 @@ self: { description = "FileStore utilities for Hakyll"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-images" = callPackage @@ -97352,7 +100827,6 @@ self: { ]; description = "Hakyll utilities to work with images"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-ogmarkup" = callPackage @@ -97365,6 +100839,7 @@ self: { description = "Integrate ogmarkup document with Hakyll"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-sass" = callPackage @@ -97380,7 +100855,6 @@ self: { ]; description = "Hakyll SASS compiler over hsass"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-series" = callPackage @@ -97392,7 +100866,6 @@ self: { libraryHaskellDepends = [ base containers hakyll ]; description = "Adds series functionality to hakyll"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-shakespeare" = callPackage @@ -97410,7 +100883,6 @@ self: { ]; description = "Hakyll Hamlet compiler"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-shortcode" = callPackage @@ -97433,6 +100905,7 @@ self: { description = "A shortcode extension module for Hakyll"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hal" = callPackage @@ -97441,17 +100914,16 @@ self: { }: mkDerivation { pname = "hal"; - version = "0.1.2"; - sha256 = "0fflx0xism12cfdifwpiv0caxkm4f46yqhcwyrdwrdmq6q0pxdk2"; + version = "0.3.0"; + sha256 = "1mc7h9fnf75dw7ph4b2iqqvx23xw6wm0ls6c90804vdqcpjzapqh"; revision = "1"; - editedCabalFile = "09ng464s88dsfdwk4zdzi0yagy5mm41035p4glwiyhdqxc5n60yg"; + editedCabalFile = "08pfvlqvsslfrxfk7zmvqc3b2dzar2az9l8w5mwrxv7flskzr7ii"; libraryHaskellDepends = [ aeson base bytestring containers envy exceptions http-conduit http-types mtl text time ]; description = "A runtime environment for Haskell applications running on AWS Lambda"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "halberd" = callPackage @@ -97481,6 +100953,7 @@ self: { description = "A tool to generate missing import statements for Haskell modules"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "half" = callPackage @@ -97518,6 +100991,7 @@ self: { description = "The HAskelL File System (\"halfs\" -- intended for use on the HaLVM)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "halipeto" = callPackage @@ -97526,38 +101000,44 @@ self: { pname = "halipeto"; version = "2.4.1"; sha256 = "1anyf6mh13rmj5a0lsayrcxzvm3zk0a2943pzkgz06y3aqgmcbdb"; + revision = "1"; + editedCabalFile = "0x30z8l7kfxvw4qzva7qgqair76v2ml8lgmd7lh4pkihq11f678q"; libraryHaskellDepends = [ base directory HaXml pandoc ]; description = "Haskell Static Web Page Generator"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "halive" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, linear - , mtl, process, random, sdl2, signal, stm, text, time, transformers + , foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, hspec + , lens, linear, mtl, pretty-show, process, random, sdl2, signal + , stm, text, time, transformers }: mkDerivation { pname = "halive"; - version = "0.1.3"; - sha256 = "0rffds6m31b80vv2l2qpbzx3pfya4kz6nlp9w6frc6k94zdba378"; + version = "0.1.6"; + sha256 = "19mlbl8psb5gxw6xsgiw5kxw4fvmfl552acalj05s6h9gsl4hcnh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory filepath foreign-store fsnotify ghc - ghc-boot ghc-paths mtl process signal stm time transformers + ghc-boot ghc-paths mtl process signal stm text time transformers ]; executableHaskellDepends = [ base directory filepath fsnotify ghc ghc-paths process stm transformers ]; testHaskellDepends = [ - base bytestring containers filepath foreign-store gl linear mtl - random sdl2 stm text time + base bytestring containers directory filepath foreign-store ghc + ghc-paths gl hspec lens linear mtl pretty-show random sdl2 stm text + time ]; description = "A live recompiler"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hall-symbols" = callPackage @@ -97575,6 +101055,7 @@ self: { description = "Symmetry operations generater of Hall Symbols"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "halma" = callPackage @@ -97614,6 +101095,7 @@ self: { description = "GTK application for playing Halma"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "halma-telegram-bot" = callPackage @@ -97639,6 +101121,7 @@ self: { description = "Telegram bot for playing Halma"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haltavista" = callPackage @@ -97665,6 +101148,7 @@ self: { description = "Split or combine data structures to and from halves, quarters, eighths"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "halvm-web" = callPackage @@ -97753,6 +101237,7 @@ self: { description = "Haskell macro preprocessor"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hamsql" = callPackage @@ -97777,6 +101262,7 @@ self: { description = "Interpreter for SQL-structure definitions in YAML (YamSql)"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hamtmap" = callPackage @@ -97791,6 +101277,7 @@ self: { description = "A purely functional and persistent hash map"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hamtsolo" = callPackage @@ -97832,6 +101319,7 @@ self: { description = "Library to handle abstract music"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "han2zen" = callPackage @@ -97885,6 +101373,7 @@ self: { description = "Library and command-line utility for accessing Google services and APIs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "handa-geodata" = callPackage @@ -97932,6 +101421,7 @@ self: { description = "HandleLike class"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "handsy" = callPackage @@ -97953,6 +101443,7 @@ self: { description = "A DSL to describe common shell operations and interpeters for running them locally and remotely"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "handwriting" = callPackage @@ -98012,6 +101503,7 @@ self: { description = "Simple Continuous Integration/Deployment System"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hans" = callPackage @@ -98036,6 +101528,7 @@ self: { description = "Network Stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hans-pcap" = callPackage @@ -98048,6 +101541,7 @@ self: { description = "Driver for real ethernet devices for HaNS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hans-pfq" = callPackage @@ -98080,6 +101574,7 @@ self: { description = "Graphviz code generation with Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hapistrano" = callPackage @@ -98110,6 +101605,7 @@ self: { description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happindicator" = callPackage @@ -98129,6 +101625,7 @@ self: { description = "Binding to the appindicator library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libappindicator-gtk2;}; "happindicator3" = callPackage @@ -98144,6 +101641,7 @@ self: { description = "Binding to the appindicator library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libappindicator-gtk3;}; "happlets" = callPackage @@ -98162,6 +101660,7 @@ self: { description = "\"Haskell Applets\" provides an event handler and a canvas for building simple GUI apps"; license = "AGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happlets-lib-gtk" = callPackage @@ -98184,6 +101683,7 @@ self: { description = "The \"Haskell Applets\" Gtk+ ver. 2 back-end for \"happlets\"."; license = "AGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happraise" = callPackage @@ -98198,6 +101698,7 @@ self: { description = "A small program for counting the comments in haskell source"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happs-hsp" = callPackage @@ -98212,6 +101713,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happs-hsp-template" = callPackage @@ -98229,6 +101731,7 @@ self: { description = "Utilities for using HSP templates in HAppS applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happs-tutorial" = callPackage @@ -98254,6 +101757,7 @@ self: { description = "A Happstack Tutorial that is its own web 2.0-type demo."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack" = callPackage @@ -98269,6 +101773,7 @@ self: { description = "The haskell application server stack + code generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-auth" = callPackage @@ -98288,6 +101793,7 @@ self: { description = "A Happstack Authentication Suite"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-authenticate" = callPackage @@ -98318,6 +101824,7 @@ self: { description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-clientsession" = callPackage @@ -98335,6 +101842,7 @@ self: { description = "client-side session data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-contrib" = callPackage @@ -98356,6 +101864,7 @@ self: { description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-data" = callPackage @@ -98378,6 +101887,7 @@ self: { description = "Happstack data manipulation libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-dlg" = callPackage @@ -98396,6 +101906,7 @@ self: { description = "Cross-request user interactions for Happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-facebook" = callPackage @@ -98422,6 +101933,7 @@ self: { description = "A package for building Facebook applications using Happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-fastcgi" = callPackage @@ -98454,6 +101966,7 @@ self: { description = "Support for using Fay with Happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-fay-ajax" = callPackage @@ -98467,6 +101980,7 @@ self: { description = "Support for using Fay with Happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-foundation" = callPackage @@ -98487,6 +102001,8 @@ self: { ]; description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-hamlet" = callPackage @@ -98499,6 +102015,7 @@ self: { description = "Support for Hamlet HTML templates in Happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-heist" = callPackage @@ -98516,6 +102033,7 @@ self: { description = "Support for using Heist templates in Happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-helpers" = callPackage @@ -98540,6 +102058,7 @@ self: { description = "Convenience functions for Happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-hsp" = callPackage @@ -98572,6 +102091,7 @@ self: { description = "Support for using HStringTemplate in Happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-ixset" = callPackage @@ -98591,6 +102111,7 @@ self: { description = "Efficient relational queries on Haskell sets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-jmacro" = callPackage @@ -98609,6 +102130,7 @@ self: { description = "Support for using JMacro with Happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-lite" = callPackage @@ -98623,6 +102145,7 @@ self: { description = "Happstack minus the useless stuff"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-monad-peel" = callPackage @@ -98639,6 +102162,7 @@ self: { description = "monad-peel instances for Happstack types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-plugins" = callPackage @@ -98655,6 +102179,7 @@ self: { description = "The haskell application server stack + reload"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-server" = callPackage @@ -98719,6 +102244,7 @@ self: { description = "Extend happstack-server with native HTTPS support (TLS/SSL)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-state" = callPackage @@ -98740,6 +102266,7 @@ self: { description = "Event-based distributed state"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-static-routing" = callPackage @@ -98779,6 +102306,7 @@ self: { description = "Web framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happstack-yui" = callPackage @@ -98801,6 +102329,7 @@ self: { description = "Utilities for using YUI3 with Happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happy_1_19_5" = callPackage @@ -98859,6 +102388,7 @@ self: { description = "Quasi-quoter for Happy parsers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happybara" = callPackage @@ -98876,6 +102406,7 @@ self: { description = "Acceptance test framework for web applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happybara-webkit" = callPackage @@ -98896,6 +102427,7 @@ self: { description = "WebKit Happybara driver"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "happybara-webkit-server" = callPackage @@ -98908,6 +102440,7 @@ self: { description = "WebKit Server binary for Happybara (taken from capybara-webkit)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hapstone" = callPackage @@ -98927,6 +102460,7 @@ self: { description = "Capstone bindings for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) capstone;}; "haquery" = callPackage @@ -98943,6 +102477,7 @@ self: { description = "jQuery for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haquil" = callPackage @@ -98965,6 +102500,7 @@ self: { description = "A Haskell implementation of the Quil instruction set for quantum computing"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "har" = callPackage @@ -98998,6 +102534,7 @@ self: { description = "Networked content addressed backup and restore software"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;}; "hardware-edsl" = callPackage @@ -99016,6 +102553,7 @@ self: { description = "Deep embedding of hardware descriptions with code generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hark" = callPackage @@ -99035,6 +102573,7 @@ self: { description = "A Gentoo package query tool"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "harmony" = callPackage @@ -99061,6 +102600,7 @@ self: { description = "A web service specification compiler that generates implementation and tests"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haroonga" = callPackage @@ -99078,6 +102618,7 @@ self: { description = "Low level bindings for Groonga"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) groonga;}; "haroonga-httpd" = callPackage @@ -99097,6 +102638,7 @@ self: { description = "Yet another Groonga http server"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "harp" = callPackage @@ -99125,6 +102667,7 @@ self: { description = "Runtime code generation for x86 machine code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "harvest-api" = callPackage @@ -99146,6 +102689,7 @@ self: { description = "Bindings for Harvest API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "has" = callPackage @@ -99160,6 +102704,7 @@ self: { description = "Entity based records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "has-th" = callPackage @@ -99172,6 +102717,7 @@ self: { description = "Template Haskell function for Has records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasbolt" = callPackage @@ -99218,7 +102764,6 @@ self: { ]; description = "Extras for hasbolt library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hascal" = callPackage @@ -99282,6 +102827,7 @@ self: { description = "Cassandra driver for haskell"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hascat" = callPackage @@ -99377,6 +102923,7 @@ self: { description = "Hashing tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hash-store" = callPackage @@ -99458,6 +103005,7 @@ self: { description = "Higher-rank Hashable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hashable-generics" = callPackage @@ -99477,6 +103025,7 @@ self: { description = "Automatically generates Hashable instances with GHC.Generics."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hashable-orphans" = callPackage @@ -99490,7 +103039,6 @@ self: { libraryHaskellDepends = [ base hashable sorted-list time ]; description = "Provides instances missing from Hashable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashable-time" = callPackage @@ -99521,6 +103069,7 @@ self: { description = "Principled, portable & extensible hashing of data and types, including an implementation of the FNV-1a and SipHash algorithms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hashed-storage" = callPackage @@ -99540,6 +103089,7 @@ self: { description = "Hashed file storage support code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hashflare" = callPackage @@ -99554,6 +103104,7 @@ self: { description = "A library for working with HashFlare.io contracts and hashrates"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hashids" = callPackage @@ -99633,6 +103184,7 @@ self: { description = "Efficient consistent hashing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hashtable-benchmark" = callPackage @@ -99686,6 +103238,7 @@ self: { description = "Extensions for a \"hashtables\" library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasim" = callPackage @@ -99698,6 +103251,7 @@ self: { description = "Process-Based Discrete Event Simulation library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hask" = callPackage @@ -99716,6 +103270,7 @@ self: { description = "Categories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hask-home" = callPackage @@ -99735,6 +103290,7 @@ self: { description = "Generate homepages for cabal packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskades" = callPackage @@ -99815,6 +103371,7 @@ self: { description = "A dialect of haskell with order of execution based on dependency resolution"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskbot-core" = callPackage @@ -99836,6 +103393,7 @@ self: { description = "Easily-extensible chatbot for Slack messaging service"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskdeep" = callPackage @@ -99861,6 +103419,7 @@ self: { description = "Computes and audits file hashes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskdogs" = callPackage @@ -99898,6 +103457,7 @@ self: { description = "A small scheme interpreter"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskeline_0_7_5_0" = callPackage @@ -99928,6 +103488,7 @@ self: { description = "Class interface for working with Haskeline"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskeline-repl" = callPackage @@ -99952,6 +103513,7 @@ self: { description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-abci" = callPackage @@ -99978,6 +103540,7 @@ self: { description = "Haskell Application BlockChain Interface (ABCI) Server Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-aliyun" = callPackage @@ -100001,6 +103564,7 @@ self: { description = "haskell client of aliyun service"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-awk" = callPackage @@ -100034,6 +103598,7 @@ self: { description = "Transform text from the command-line using Haskell expressions"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-bcrypt" = callPackage @@ -100073,6 +103638,7 @@ self: { description = "Complete BitMEX Client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-bitmex-rest" = callPackage @@ -100101,6 +103667,7 @@ self: { description = "Auto-generated bitmex API Client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-brainfuck" = callPackage @@ -100121,30 +103688,34 @@ self: { description = "BrainFuck interpreter"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-ci" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers - , deepseq, Diff, directory, filepath, tasty, tasty-golden - , transformers + ({ mkDerivation, ansi-terminal, base, base-compat, bytestring + , Cabal, containers, deepseq, Diff, directory, filepath + , generic-lens, HsYAML, microlens, optparse-applicative, parsec + , pretty, ShellCheck, tasty, tasty-golden, text, transformers }: mkDerivation { pname = "haskell-ci"; - version = "0.1.0.0"; - sha256 = "1bfl9k0ypak7p39xkx0zslamd9cd5jvvxf57wqigbcpgcmsd7z40"; - isLibrary = true; + version = "0.2.1"; + sha256 = "07h99vq4bmphrpi1ggm7h06ard7hyxkmsxypicghvv24cgzl3c70"; + isLibrary = false; isExecutable = true; libraryHaskellDepends = [ - base Cabal containers deepseq directory filepath transformers + base base-compat bytestring Cabal containers deepseq directory + filepath generic-lens HsYAML microlens optparse-applicative parsec + pretty ShellCheck text transformers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ ansi-terminal base bytestring Diff directory filepath tasty tasty-golden transformers ]; + doHaddock = false; description = "Cabal package script generator for Travis-CI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-cnc" = callPackage @@ -100166,6 +103737,7 @@ self: { description = "Library for parallel programming in the Intel Concurrent Collections paradigm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-coffee" = callPackage @@ -100178,6 +103750,7 @@ self: { description = "Simple CoffeeScript API"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-compression" = callPackage @@ -100198,6 +103771,7 @@ self: { description = "compress files"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-conll" = callPackage @@ -100214,6 +103788,7 @@ self: { description = "Core Types for NLP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-course-preludes" = callPackage @@ -100226,6 +103801,7 @@ self: { description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-dap" = callPackage @@ -100235,21 +103811,52 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.10.1"; - sha256 = "187blp0s8grabi11qpv06ckrys84ia51chf9h01449jxcw53fa76"; - revision = "1"; - editedCabalFile = "16kxaa0b9law55c3v9m664wpb8zafldh2wpl0brznq5bjwg1pqz5"; + version = "0.0.12.0"; + sha256 = "0n1abvz7a03d3xgkykkk2ggm74lsh1kg0jv0z1k9874pncxx4li4"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ]; + libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ array base bytestring containers deepseq directory filepath ghc ghc-boot ghc-paths ghci haskeline process text time transformers unix ]; - description = "haskell-dap is a GHCi having DAP interface"; + description = "Haskell implementation of the DAP interface data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskell-debug-adapter" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal, clock + , cmdargs, conduit, conduit-extra, containers, data-default + , directory, filepath, fsnotify, haskell-dap, hslogger, hspec, lens + , MissingH, mtl, parsec, process, resourcet, safe-exceptions, text + }: + mkDerivation { + pname = "haskell-debug-adapter"; + version = "0.0.29.0"; + sha256 = "1m4lirrlgw1vavk1rnr22lcbzasa0sd90mn1ghzwhij86dmfxldr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring Cabal clock cmdargs conduit + conduit-extra containers data-default directory filepath fsnotify + haskell-dap hslogger lens MissingH mtl parsec process resourcet + safe-exceptions text + ]; + executableHaskellDepends = [ + aeson async base bytestring Cabal clock cmdargs conduit + conduit-extra containers data-default directory filepath fsnotify + haskell-dap hslogger lens MissingH mtl parsec process resourcet + safe-exceptions text + ]; + testHaskellDepends = [ + aeson async base bytestring Cabal clock cmdargs conduit + conduit-extra containers data-default directory filepath fsnotify + haskell-dap hslogger hspec lens MissingH mtl parsec process + resourcet safe-exceptions text + ]; + description = "Haskell Debug Adapter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-disque" = callPackage @@ -100267,6 +103874,7 @@ self: { description = "Client library for the Disque datastore"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-docs" = callPackage @@ -100290,6 +103898,7 @@ self: { description = "A program to find and display the docs and type of a name"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-eigen-util" = callPackage @@ -100303,6 +103912,7 @@ self: { description = "Some utility functions for haskell-eigen library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-exp-parser" = callPackage @@ -100356,6 +103966,7 @@ self: { description = "Haskell source code formatter"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-ftp" = callPackage @@ -100383,6 +103994,7 @@ self: { description = "A Haskell ftp server with configurable backend"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-generate" = callPackage @@ -100400,6 +104012,7 @@ self: { description = "Typesafe generation of haskell source code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-gettext" = callPackage @@ -100421,7 +104034,6 @@ self: { ]; description = "GetText runtime library implementation in pure Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-gi" = callPackage @@ -100443,8 +104055,7 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; - inherit (pkgs.gnome3) gobject-introspection;}; + }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: @@ -100493,6 +104104,7 @@ self: { description = "Go and Checkers game in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-google-trends" = callPackage @@ -100523,6 +104135,7 @@ self: { description = "Infer haskell code by given type"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-igraph" = callPackage @@ -100578,6 +104191,7 @@ self: { description = "'Asteroids' arcade games"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-kubernetes" = callPackage @@ -100598,6 +104212,7 @@ self: { description = "Haskell bindings to the Kubernetes API (via swagger-codegen)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-lexer" = callPackage @@ -100619,8 +104234,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.8.0.1"; - sha256 = "1lvrqxp6v5xvha88l8r6n86ydvlszzxmi7fazvjxz4bixy9zvw8q"; + version = "0.8.1.0"; + sha256 = "1imy96hhhs2fcbs34pln0l430j19n4nqsgir4hww95wbl0058kcx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100660,6 +104275,7 @@ self: { description = "A haskell package to build your own Language Server client"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-lsp-types" = callPackage @@ -100708,6 +104324,7 @@ self: { description = "Machine learning in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-modbus" = callPackage @@ -100732,6 +104349,7 @@ self: { description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-mpi" = callPackage @@ -100775,6 +104393,7 @@ self: { description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-names_0_9_6" = callPackage @@ -100799,6 +104418,7 @@ self: { description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-neo4j-client" = callPackage @@ -100831,6 +104451,7 @@ self: { description = "A Haskell neo4j client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-openflow" = callPackage @@ -100846,6 +104467,7 @@ self: { description = "OpenFlow protocol in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-overridez" = callPackage @@ -100868,6 +104490,7 @@ self: { description = "Manage nix overrides for haskell packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-packages" = callPackage @@ -100887,6 +104510,7 @@ self: { description = "Haskell suite library for package management and integration with Cabal"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-pdf-presenter" = callPackage @@ -100907,6 +104531,7 @@ self: { description = "Tool for presenting PDF-based presentations"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-platform-test" = callPackage @@ -100936,6 +104561,7 @@ self: { description = "A test system for the Haskell Platform environment"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-player" = callPackage @@ -100958,6 +104584,7 @@ self: { description = "A terminal music player based on afplay"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-plot" = callPackage @@ -100975,6 +104602,7 @@ self: { description = "A library for generating 2D plots painlessly"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-postal" = callPackage @@ -100991,6 +104619,7 @@ self: { description = "Haskell binding for the libpostal library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {libpostal = null;}; "haskell-proxy-list" = callPackage @@ -101034,6 +104663,7 @@ self: { description = "Opens a temporary file on the system's EDITOR and returns the resulting edits"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-reflect" = callPackage @@ -101051,6 +104681,7 @@ self: { description = "Reflect Haskell types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-rules" = callPackage @@ -101063,6 +104694,7 @@ self: { description = "A DSL for expressing natural deduction rules in Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-snake" = callPackage @@ -101189,6 +104821,7 @@ self: { description = "Observable orphan instances for haskell-src-exts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-src-exts-prisms" = callPackage @@ -101203,6 +104836,7 @@ self: { description = "Prisms with newtype wrappers for haskell-src-exts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-src-exts-qq" = callPackage @@ -101220,6 +104854,7 @@ self: { description = "A quasiquoter for haskell-src-exts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-src-exts-sc" = callPackage @@ -101234,6 +104869,7 @@ self: { description = "Pretty print haskell code with comments"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-src-exts-simple" = callPackage @@ -101264,22 +104900,20 @@ self: { }) {}; "haskell-src-meta" = callPackage - ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb - , template-haskell, test-framework, test-framework-hunit + ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty + , syb, template-haskell, test-framework, test-framework-hunit , th-orphans }: mkDerivation { pname = "haskell-src-meta"; - version = "0.8.0.3"; - sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4"; - revision = "2"; - editedCabalFile = "0dp5v0yd0wgijzaggr22glgjswpa65hy84h8awdzd9d78g2fjz6c"; + version = "0.8.2"; + sha256 = "0vqnq668c88x4amvbs34rxiwdpnxqxr40jy998fc4vd9z6gd4w3r"; libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; testHaskellDepends = [ - base haskell-src-exts HUnit pretty template-haskell test-framework - test-framework-hunit + base containers haskell-src-exts HUnit pretty syb template-haskell + test-framework test-framework-hunit ]; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; @@ -101300,6 +104934,7 @@ self: { description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-stack-trace-plugin" = callPackage @@ -101315,6 +104950,7 @@ self: { description = "haskell-stack-trace-plugin"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-time-range" = callPackage @@ -101351,6 +104987,7 @@ self: { description = "Utilities to tie up tokens to an AST"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-tools-ast" = callPackage @@ -101367,7 +105004,6 @@ self: { ]; description = "Haskell AST for efficient tooling"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-ast-fromghc" = callPackage @@ -101386,6 +105022,7 @@ self: { description = "Creating the Haskell-Tools AST from GHC's representations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-tools-ast-gen" = callPackage @@ -101403,6 +105040,7 @@ self: { description = "Facilities for generating new parts of the Haskell-Tools AST"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-tools-ast-trf" = callPackage @@ -101419,6 +105057,7 @@ self: { description = "Conversions on Haskell-Tools AST to prepare for refactorings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-tools-backend-ghc" = callPackage @@ -101436,7 +105075,6 @@ self: { ]; description = "Creating the Haskell-Tools AST from GHC's representations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-builtin-refactorings" = callPackage @@ -101469,6 +105107,7 @@ self: { description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-tools-cli" = callPackage @@ -101505,6 +105144,7 @@ self: { description = "Command-line frontend for Haskell-tools Refact"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-tools-daemon" = callPackage @@ -101539,6 +105179,7 @@ self: { description = "Background process for Haskell-tools that editors can connect to"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-tools-debug" = callPackage @@ -101564,6 +105205,7 @@ self: { description = "Debugging Tools for Haskell-tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-tools-demo" = callPackage @@ -101595,6 +105237,7 @@ self: { description = "A web-based demo for Haskell-tools Refactor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-tools-experimental-refactorings" = callPackage @@ -101626,6 +105269,7 @@ self: { description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-tools-prettyprint" = callPackage @@ -101642,7 +105286,6 @@ self: { ]; description = "Pretty printing of Haskell-Tools AST"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-refactor" = callPackage @@ -101673,6 +105316,7 @@ self: { description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-tools-rewrite" = callPackage @@ -101695,6 +105339,7 @@ self: { description = "Facilities for generating new parts of the Haskell-Tools AST"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-tor" = callPackage @@ -101729,6 +105374,7 @@ self: { description = "A Haskell Tor Node"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-type-exts" = callPackage @@ -101743,6 +105389,7 @@ self: { description = "A type checker for Haskell/haskell-src-exts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-typescript" = callPackage @@ -101755,6 +105402,7 @@ self: { description = "Simple TypeScript API"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-tyrant" = callPackage @@ -101767,6 +105415,7 @@ self: { description = "Haskell implementation of the Tokyo Tyrant binary protocol"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-updater" = callPackage @@ -101803,6 +105452,7 @@ self: { description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell2010" = callPackage @@ -101815,6 +105465,7 @@ self: { description = "Compatibility with Haskell 2010"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell2020" = callPackage @@ -101842,6 +105493,7 @@ self: { description = "Compatibility with Haskell 98"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell98libraries" = callPackage @@ -101858,6 +105510,7 @@ self: { description = "Compatibility with Haskell 98"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb" = callPackage @@ -101874,6 +105527,7 @@ self: { description = "A library of combinators for generating and executing SQL statements"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-connect-hdbc" = callPackage @@ -101886,6 +105540,7 @@ self: { description = "Bracketed HDBC session for HaskellDB"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-connect-hdbc-catchio-mtl" = callPackage @@ -101902,6 +105557,7 @@ self: { description = "Bracketed HaskellDB HDBC session using MonadCatchIO-mtl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-connect-hdbc-catchio-tf" = callPackage @@ -101919,6 +105575,7 @@ self: { description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-connect-hdbc-catchio-transformers" = callPackage @@ -101936,6 +105593,7 @@ self: { description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-connect-hdbc-lifted" = callPackage @@ -101953,6 +105611,7 @@ self: { description = "Bracketed HaskellDB HDBC session using lifted-base"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-dynamic" = callPackage @@ -101968,6 +105627,7 @@ self: { description = "HaskellDB support for the dynamically loaded drivers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-flat" = callPackage @@ -101986,6 +105646,7 @@ self: { description = "An experimental HaskellDB back-end in pure Haskell (no SQL)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-hdbc" = callPackage @@ -102002,6 +105663,7 @@ self: { description = "HaskellDB support for HDBC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-hdbc-mysql" = callPackage @@ -102020,6 +105682,7 @@ self: { description = "HaskellDB support for the HDBC MySQL driver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-hdbc-odbc" = callPackage @@ -102038,6 +105701,7 @@ self: { description = "HaskellDB support for the HDBC ODBC driver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-hdbc-postgresql" = callPackage @@ -102057,6 +105721,7 @@ self: { description = "HaskellDB support for the HDBC PostgreSQL driver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) postgresql;}; "haskelldb-hdbc-sqlite3" = callPackage @@ -102075,6 +105740,7 @@ self: { description = "HaskellDB support for the HDBC SQLite driver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-hsql" = callPackage @@ -102087,6 +105753,7 @@ self: { description = "HaskellDB support for HSQL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-hsql-mysql" = callPackage @@ -102105,6 +105772,7 @@ self: { description = "HaskellDB support for the HSQL MySQL driver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-hsql-odbc" = callPackage @@ -102123,6 +105791,7 @@ self: { description = "HaskellDB support for the HSQL ODBC driver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-hsql-oracle" = callPackage @@ -102160,6 +105829,7 @@ self: { description = "HaskellDB support for the HSQL PostgreSQL driver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-hsql-sqlite" = callPackage @@ -102197,6 +105867,7 @@ self: { description = "HaskellDB support for the HSQL SQLite3 driver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-th" = callPackage @@ -102209,6 +105880,7 @@ self: { description = "Template Haskell utilities for HaskellDB"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelldb-wx" = callPackage @@ -102220,6 +105892,7 @@ self: { description = "HaskellDB support for WXHaskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskellscrabble" = callPackage @@ -102244,6 +105917,7 @@ self: { description = "A scrabble library capturing the core game logic of scrabble"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskellscript" = callPackage @@ -102262,6 +105936,7 @@ self: { description = "Command line tool for running Haskell scripts with a hashbang"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskelm" = callPackage @@ -102311,6 +105986,7 @@ self: { description = "CP in Haskell through MiniZinc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskey" = callPackage @@ -102339,6 +106015,7 @@ self: { description = "A transactional, ACID compliant, embeddable key-value store"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskey-btree" = callPackage @@ -102383,6 +106060,7 @@ self: { description = "A monad transformer supporting Haskey transactions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskgame" = callPackage @@ -102395,6 +106073,7 @@ self: { description = "Haskell game library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskheap" = callPackage @@ -102412,6 +106091,7 @@ self: { description = "Haskell bindings to refheap"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskhol-core" = callPackage @@ -102432,6 +106112,7 @@ self: { description = "The core logical system of HaskHOL, an EDSL for HOL theorem proving"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskintex" = callPackage @@ -102452,7 +106133,6 @@ self: { executableHaskellDepends = [ base ]; description = "Haskell Evaluation inside of LaTeX code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskmon" = callPackage @@ -102470,6 +106150,7 @@ self: { description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoin" = callPackage @@ -102494,6 +106175,7 @@ self: { description = "Implementation of the Bitcoin protocol"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoin-bitcoind" = callPackage @@ -102512,6 +106194,7 @@ self: { description = "An adapter for haskoin to network-bitcoin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoin-core" = callPackage @@ -102561,6 +106244,7 @@ self: { description = "Implementation of Bitcoin cryptographic primitives"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoin-node" = callPackage @@ -102588,6 +106272,7 @@ self: { description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoin-protocol" = callPackage @@ -102609,6 +106294,7 @@ self: { description = "Implementation of the Bitcoin network protocol messages"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoin-script" = callPackage @@ -102632,6 +106318,7 @@ self: { description = "Implementation of Bitcoin script parsing and evaluation"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoin-store" = callPackage @@ -102644,8 +106331,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.10.1"; - sha256 = "0z9qsjnzkvzgf0asrdigyph4i3623hkq10542xh0kjq56hnglcn2"; + version = "0.11.2"; + sha256 = "0jjpr2a1p88dkz17q84yp7y2as2j0i5bj0x0prl1hd9yy4y3aql4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102667,6 +106354,7 @@ self: { description = "Storage and index for Bitcoin and Bitcoin Cash"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoin-util" = callPackage @@ -102688,6 +106376,7 @@ self: { description = "Utility functions for the Network.Haskoin project"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoin-wallet" = callPackage @@ -102731,6 +106420,7 @@ self: { description = "Implementation of a Bitcoin SPV Wallet with BIP32 and multisig support"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoon" = callPackage @@ -102749,6 +106439,7 @@ self: { description = "Web Application Abstraction"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoon-httpspec" = callPackage @@ -102765,6 +106456,7 @@ self: { description = "Integrating HttpSpec with Haskoon"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoon-salvia" = callPackage @@ -102783,6 +106475,7 @@ self: { description = "Integrating HttpSpec with Haskoon"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskore" = callPackage @@ -102808,6 +106501,7 @@ self: { description = "The Haskore Computer Music System"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskore-realtime" = callPackage @@ -102826,6 +106520,7 @@ self: { description = "Routines for realtime playback of Haskore songs"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskore-supercollider" = callPackage @@ -102848,6 +106543,7 @@ self: { description = "Haskore back-end for SuperCollider"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskore-synthesizer" = callPackage @@ -102868,6 +106564,7 @@ self: { description = "Music rendering coded in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskore-vintage" = callPackage @@ -102960,6 +106657,7 @@ self: { description = "Torch for tensors and neural networks in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasktorch-codegen" = callPackage @@ -103024,6 +106722,7 @@ self: { description = "Bindings to Torch"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {ATen = null;}; "hasktorch-ffi-thc" = callPackage @@ -103047,6 +106746,7 @@ self: { description = "Bindings to Cutorch"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {ATen = null;}; "hasktorch-indef" = callPackage @@ -103076,6 +106776,7 @@ self: { description = "Core Hasktorch abstractions wrapping FFI bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasktorch-signatures" = callPackage @@ -103102,6 +106803,7 @@ self: { description = "Backpack signatures for Tensor operations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasktorch-signatures-partial" = callPackage @@ -103118,6 +106820,7 @@ self: { description = "Functions to partially satisfy tensor signatures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasktorch-signatures-support" = callPackage @@ -103135,6 +106838,7 @@ self: { description = "Signatures for support tensors in hasktorch"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasktorch-signatures-types" = callPackage @@ -103196,20 +106900,21 @@ self: { description = "Neural architectures in hasktorch"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskus-binary" = callPackage ({ mkDerivation, base, bytestring, cereal, criterion, directory - , doctest, ghc-prim, haskus-utils, haskus-utils-data + , doctest, filepath, ghc-prim, haskus-utils, haskus-utils-data , haskus-utils-types, megaparsec, mtl, primitive, QuickCheck, tasty , tasty-quickcheck, template-haskell, transformers }: mkDerivation { pname = "haskus-binary"; - version = "1.3"; - sha256 = "06smbrvkpiz3rwmlsrxv6a5zh5952ivpl7wg85li6bc90dnz04rm"; + version = "1.4"; + sha256 = "0riqgfy9ai1vb7555l1w9rfcp10ylg7sbk46ph1f2y00pjbxsmv3"; libraryHaskellDepends = [ - base bytestring cereal directory ghc-prim haskus-utils + base bytestring cereal directory filepath ghc-prim haskus-utils haskus-utils-data haskus-utils-types megaparsec mtl primitive template-haskell transformers ]; @@ -103220,7 +106925,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Haskus binary format manipulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskus-system-build" = callPackage @@ -103230,8 +106934,8 @@ self: { }: mkDerivation { pname = "haskus-system-build"; - version = "1.0"; - sha256 = "1xzl5f8wilmdq9bg37zzdcv59cqp8kxnhbm6fd8pzqnj8w1pkwdk"; + version = "1.1"; + sha256 = "1krclfcv2hj7y9hapfm8xmc2q41v54r2pkh3rfhdnxffgcszad1z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103240,7 +106944,6 @@ self: { ]; description = "Haskus system build tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskus-utils" = callPackage @@ -103261,7 +106964,6 @@ self: { testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "Haskus utility modules"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskus-utils-compat" = callPackage @@ -103294,17 +106996,17 @@ self: { ]; description = "Haskus utility modules"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskus-utils-types" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, doctest }: mkDerivation { pname = "haskus-utils-types"; - version = "1.3.1"; - sha256 = "1qsji8pcncwqj7dgww7azlfk4vdjbalsspkj53cbwxfcib1nmcsw"; + version = "1.4.1"; + sha256 = "0nypn55fj86llpgdlsbr5qk7jkix5qazz03f8c5a8kn787n2bkpz"; libraryHaskellDepends = [ base ]; - description = "Haskus utility modules"; + testHaskellDepends = [ base doctest ]; + description = "Haskus types utility modules"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -103315,8 +107017,8 @@ self: { }: mkDerivation { pname = "haskus-utils-variant"; - version = "2.5"; - sha256 = "1nbaq2f33a2q2qpxalvq52sqn47bil41klkp84qdan3rfzh8a7rh"; + version = "2.6.1"; + sha256 = "1zq76dsp29warrr0ym4lp9lrgar7yairwp91qklf3k6qb8h41qw8"; libraryHaskellDepends = [ base deepseq exceptions haskus-utils-data haskus-utils-types template-haskell transformers @@ -103325,7 +107027,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ]; description = "Variant and EADT"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskus-web" = callPackage @@ -103342,6 +107043,8 @@ self: { ]; description = "Haskus web"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskyapi" = callPackage @@ -103388,6 +107091,7 @@ self: { description = "Loan calculator engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasloGUI" = callPackage @@ -103407,6 +107111,7 @@ self: { description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasmin" = callPackage @@ -103447,6 +107152,7 @@ self: { description = "This package enables to write SPARQL queries to remote endpoints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haspell" = callPackage @@ -103506,6 +107212,7 @@ self: { description = "API for backends of \"hasql\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-class" = callPackage @@ -103529,6 +107236,7 @@ self: { description = "Encodable and Decodable classes for hasql"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-cursor-query" = callPackage @@ -103552,6 +107260,7 @@ self: { description = "A declarative abstraction over PostgreSQL Cursor"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-cursor-transaction" = callPackage @@ -103588,6 +107297,7 @@ self: { description = "Generic encoder and decoder deriving for Hasql"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-migration" = callPackage @@ -103609,6 +107319,7 @@ self: { description = "PostgreSQL Schema Migrations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-optparse-applicative" = callPackage @@ -103625,6 +107336,7 @@ self: { description = "\"optparse-applicative\" parsers for \"hasql\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-pool" = callPackage @@ -103638,6 +107350,7 @@ self: { description = "A pool of connections for Hasql"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-postgres" = callPackage @@ -103674,6 +107387,7 @@ self: { description = "A \"PostgreSQL\" backend for the \"hasql\" library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-postgres-options" = callPackage @@ -103689,6 +107403,7 @@ self: { description = "An \"optparse-applicative\" parser for \"hasql-postgres\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-simple" = callPackage @@ -103706,6 +107421,7 @@ self: { description = "A somewhat opinionated \"simpler\" API to hasql"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-th" = callPackage @@ -103767,6 +107483,7 @@ self: { description = "Haskell implementation of Mustache templates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hastache-aeson" = callPackage @@ -103784,6 +107501,7 @@ self: { description = "render hastache templates using aeson values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haste" = callPackage @@ -103798,6 +107516,7 @@ self: { description = "A universal pastebin tool, written in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haste-app" = callPackage @@ -103818,6 +107537,7 @@ self: { description = "Framework for type-safe, distributed web applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haste-compiler" = callPackage @@ -103881,6 +107601,7 @@ self: { description = "Base libraries for haste-compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haste-markup" = callPackage @@ -103896,6 +107617,7 @@ self: { description = "A port of blaze-markup and blaze-html to Haste"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haste-perch" = callPackage @@ -103920,6 +107642,7 @@ self: { description = "Low level primitives for the Haste compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hastily" = callPackage @@ -104003,6 +107726,7 @@ self: { description = "HaTeX User's Guide"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hath" = callPackage @@ -104011,8 +107735,8 @@ self: { }: mkDerivation { pname = "hath"; - version = "0.4.2"; - sha256 = "1x8xmrsircrpk19jz2w5n2nq29qq576ci4pq1vx0ps3w1pkzh9ds"; + version = "0.5.0"; + sha256 = "16597w35xbv0hq14bdz4g8w52iy7z54wrqfmd929xrzbxbnc41r6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104054,6 +107778,7 @@ self: { description = "Haskell client for the NATS messaging system"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hatt" = callPackage @@ -104077,6 +107802,7 @@ self: { description = "A truth table generator for classical propositional logic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haven" = callPackage @@ -104097,6 +107823,7 @@ self: { description = "Recursively retrieve maven dependencies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haverer" = callPackage @@ -104122,6 +107849,7 @@ self: { description = "Implementation of the rules of Love Letter"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hawitter" = callPackage @@ -104144,6 +107872,7 @@ self: { description = "A twitter client for GTK+. Beta version."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hax" = callPackage @@ -104170,6 +107899,7 @@ self: { description = "Haskell cash-flow and tax simulation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haxl" = callPackage @@ -104213,6 +107943,7 @@ self: { description = "Haxl data source for accessing AWS services through amazonka"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haxl-facebook" = callPackage @@ -104236,6 +107967,7 @@ self: { description = "An example Haxl data source for accessing the Facebook Graph API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haxparse" = callPackage @@ -104261,6 +107993,7 @@ self: { description = "Readable HaxBall replays"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haxr" = callPackage @@ -104283,7 +108016,6 @@ self: { ]; description = "XML-RPC client and server library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haxr-th" = callPackage @@ -104296,6 +108028,7 @@ self: { description = "Automatic deriving of XML-RPC structs for Haskell records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haxy" = callPackage @@ -104313,6 +108046,7 @@ self: { description = "A simple HTTP proxy server library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hayland" = callPackage @@ -104334,6 +108068,7 @@ self: { description = "Haskell bindings for the C Wayland library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libGL; inherit (pkgs) wayland;}; "hayoo-cli" = callPackage @@ -104353,6 +108088,7 @@ self: { description = "Hayoo CLI"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hback" = callPackage @@ -104372,6 +108108,7 @@ self: { description = "N-back memory game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hbayes" = callPackage @@ -104402,6 +108139,7 @@ self: { description = "Bayesian Networks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hbb" = callPackage @@ -104419,6 +108157,7 @@ self: { description = "Haskell Busy Bee, a backend for text editors"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hbcd" = callPackage @@ -104464,6 +108203,7 @@ self: { description = "A simple step sequencer GUI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) SDL_mixer;}; "hbf" = callPackage @@ -104501,6 +108241,7 @@ self: { description = "An optimizing Brainfuck compiler and evaluator"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hblas" = callPackage @@ -104517,6 +108258,7 @@ self: { description = "Human friendly BLAS and Lapack bindings for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; "hblock" = callPackage @@ -104537,6 +108279,7 @@ self: { description = "A mutable vector that provides indexation on the datatype fields it stores"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hbro" = callPackage @@ -104625,6 +108368,7 @@ self: { description = "Haskell Bottom Up Rewrite Generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hcc" = callPackage @@ -104639,6 +108383,7 @@ self: { description = "A toy C compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hcg-minus" = callPackage @@ -104652,6 +108397,7 @@ self: { description = "haskell cg (minus)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hcg-minus-cairo" = callPackage @@ -104668,6 +108414,7 @@ self: { description = "haskell cg (minus) (cairo rendering)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hcheat" = callPackage @@ -104681,6 +108428,41 @@ self: { description = "A collection of code cheatsheet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "hcheckers" = callPackage + ({ mkDerivation, aeson, array, base, binary, bits, bytes + , bytestring, clock, concurrent-extra, containers, data-default + , directory, ekg, ekg-core, exceptions, fast-logger, filepath + , hashable, hashtables, heavy-logger, hsyslog, http-types + , megaparsec, microlens, monad-metrics, mtl, mwc-random + , optparse-applicative, psqueues, random, random-access-file + , scotty, stm, stm-containers, store, template-haskell, text + , text-format-heavy, unix, unix-bytestring, unordered-containers + , yaml + }: + mkDerivation { + pname = "hcheckers"; + version = "0.1.0.0"; + sha256 = "17px41lgaqxpwmmj315s49hnchq5pn017k58wcla8cmw4n3a2aw0"; + revision = "1"; + editedCabalFile = "1bfm9wndgwz18gxws456h4faw3fa6d1020kxjc7b3rzb9c0nr2vq"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson array base binary bits bytes bytestring clock + concurrent-extra containers data-default directory ekg ekg-core + exceptions fast-logger filepath hashable hashtables heavy-logger + hsyslog http-types megaparsec microlens monad-metrics mtl + mwc-random optparse-applicative psqueues random random-access-file + scotty stm stm-containers store template-haskell text + text-format-heavy unix unix-bytestring unordered-containers yaml + ]; + description = "Implementation of checkers (\"draughts\") board game - server application"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hchesslib" = callPackage @@ -104698,6 +108480,7 @@ self: { description = "Chess library"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hcltest" = callPackage @@ -104719,6 +108502,7 @@ self: { description = "A testing library for command line applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hcoap" = callPackage @@ -104742,6 +108526,7 @@ self: { description = "CoAP implementation for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hcobs" = callPackage @@ -104777,6 +108562,7 @@ self: { description = "Haskell COM support library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hcoord" = callPackage @@ -104795,6 +108581,7 @@ self: { description = "Easily convert between latitude/longitude, UTM and OSGB"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hcron" = callPackage @@ -104812,6 +108599,7 @@ self: { description = "A simple job scheduler, which just runs some IO action at a given time"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hcube" = callPackage @@ -104833,6 +108621,7 @@ self: { description = "Virtual Rubik's cube of arbitrary size"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hcwiid" = callPackage @@ -104845,7 +108634,7 @@ self: { librarySystemDepends = [ bluetooth cwiid ]; description = "Library to interface with the wiimote"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {bluetooth = null; inherit (pkgs) cwiid;}; "hdaemonize" = callPackage @@ -104877,6 +108666,7 @@ self: { description = "Library to handle the details of writing daemons for UNIX"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdbc-aeson" = callPackage @@ -104894,6 +108684,7 @@ self: { description = "Deserialize from HDBC rows to FromJSON instances"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdbc-postgresql-hstore" = callPackage @@ -104906,6 +108697,7 @@ self: { description = "Manipulate data in PostgreSQL \"hstore\" columns"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdbc-tuple" = callPackage @@ -104945,6 +108737,7 @@ self: { description = "Haskell Database Independent interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdbi-conduit" = callPackage @@ -104966,6 +108759,7 @@ self: { description = "Conduit glue for HDBI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdbi-postgresql" = callPackage @@ -104994,6 +108788,7 @@ self: { description = "PostgreSQL driver for hdbi"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdbi-sqlite" = callPackage @@ -105014,6 +108809,7 @@ self: { description = "SQlite driver for HDBI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdbi-tests" = callPackage @@ -105034,6 +108830,7 @@ self: { description = "test suite for testing HDBI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdevtools" = callPackage @@ -105043,8 +108840,8 @@ self: { }: mkDerivation { pname = "hdevtools"; - version = "0.1.7.0"; - sha256 = "188ayzn8yvlr3jl478ff1fadj766mq06fgb4xr4szpilppg8l3kg"; + version = "0.1.8.0"; + sha256 = "161wq1l7kxr9wbikfvi2szicfg02s4ihcjdhjxwh95zvqfjqarif"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105053,7 +108850,6 @@ self: { ]; description = "Persistent GHC powered background server for FAST haskell development tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdf" = callPackage @@ -105072,6 +108868,7 @@ self: { description = "HDF: Uniform Rate Audio Signal Processing in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdf5-lite" = callPackage @@ -105107,6 +108904,7 @@ self: { description = "Server-side HTTP Digest (RFC2617) in the CGI monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdirect" = callPackage @@ -105126,6 +108924,7 @@ self: { description = "An IDL compiler for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdis86" = callPackage @@ -105138,6 +108937,7 @@ self: { description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdiscount" = callPackage @@ -105151,6 +108951,7 @@ self: { description = "Haskell bindings to the Discount markdown library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {markdown = null;}; "hdm" = callPackage @@ -105165,6 +108966,7 @@ self: { description = "a small display manager"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdo" = callPackage @@ -105193,6 +108995,7 @@ self: { description = "A Digital Ocean client in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdocs" = callPackage @@ -105218,6 +109021,7 @@ self: { description = "Haskell docs tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdph" = callPackage @@ -105245,6 +109049,7 @@ self: { description = "Haskell distributed parallel Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdph-closure" = callPackage @@ -105261,6 +109066,7 @@ self: { description = "Explicit closures in Haskell distributed parallel Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hdr-histogram" = callPackage @@ -105281,6 +109087,7 @@ self: { description = "Haskell implementation of High Dynamic Range (HDR) Histograms"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "headergen" = callPackage @@ -105301,6 +109108,7 @@ self: { description = "Creates a header for a haskell source file"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heap" = callPackage @@ -105314,6 +109122,7 @@ self: { description = "Heaps in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heaps" = callPackage @@ -105350,6 +109159,7 @@ self: { description = "Heartbeats for io-streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heatitup" = callPackage @@ -105380,6 +109190,7 @@ self: { description = "Find and annotate ITDs"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heatitup-complete" = callPackage @@ -105404,6 +109215,7 @@ self: { description = "Find and annotate ITDs with assembly or read pair joining"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heatshrink" = callPackage @@ -105481,23 +109293,6 @@ self: { }) {}; "hebrew-time" = callPackage - ({ mkDerivation, base, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, time - }: - mkDerivation { - pname = "hebrew-time"; - version = "0.1.1"; - sha256 = "0ckridxf4rvhhp0k1mckbbbpzfs32l4mwg7n9mrmsggldpl7x6f7"; - libraryHaskellDepends = [ base time ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 time - ]; - description = "Hebrew dates and prayer times"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hebrew-time_0_1_2" = callPackage ({ mkDerivation, base, hspec, QuickCheck, time }: mkDerivation { pname = "hebrew-time"; @@ -105507,7 +109302,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck time ]; description = "Hebrew dates and prayer times"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hecc" = callPackage @@ -105521,6 +109315,7 @@ self: { description = "Elliptic Curve Cryptography for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heckle" = callPackage @@ -105541,6 +109336,7 @@ self: { description = "Jekyll in Haskell (feat. LaTeX)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedgehog" = callPackage @@ -105585,6 +109381,7 @@ self: { testHaskellDepends = [ base either hedgehog ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedgehog-checkers-lens" = callPackage @@ -105597,6 +109394,7 @@ self: { testHaskellDepends = [ base hedgehog hedgehog-checkers lens ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedgehog-classes" = callPackage @@ -105669,6 +109467,7 @@ self: { description = "JSON generators for Hedgehog"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedgehog-quickcheck" = callPackage @@ -105747,6 +109546,7 @@ self: { description = "Easy trivial configuration for Redis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedis-monadic" = callPackage @@ -105800,6 +109600,7 @@ self: { description = "Caching mandatory data with Redis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedis-simple" = callPackage @@ -105812,6 +109613,7 @@ self: { description = "A simplified API for hedis"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedis-tags" = callPackage @@ -105830,30 +109632,10 @@ self: { description = "Tags for hedis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedn" = callPackage - ({ mkDerivation, base, containers, deepseq, deriving-compat - , hedgehog, megaparsec, parser-combinators, prettyprinter - , scientific, template-haskell, text, time, uuid, vector - }: - mkDerivation { - pname = "hedn"; - version = "0.2.0.0"; - sha256 = "1yi7j2ikpd1lv32hzgv38v1r4wzh7ffq71js2648d4j1v9jhq1sj"; - libraryHaskellDepends = [ - base containers deepseq deriving-compat megaparsec - parser-combinators prettyprinter scientific template-haskell text - time uuid vector - ]; - testHaskellDepends = [ - base containers hedgehog megaparsec text time uuid vector - ]; - description = "EDN parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedn_0_2_0_1" = callPackage ({ mkDerivation, base, containers, deepseq, deriving-compat , hedgehog, megaparsec, parser-combinators, prettyprinter , scientific, template-haskell, text, time, uuid-types, vector @@ -105872,7 +109654,6 @@ self: { ]; description = "EDN parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedra" = callPackage @@ -105907,6 +109688,7 @@ self: { description = "An extensible build helper for haskell, in the vein of leiningen"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heist" = callPackage @@ -105948,6 +109730,7 @@ self: { description = "An Haskell template system supporting both HTML5 and XML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heist-aeson" = callPackage @@ -105965,6 +109748,7 @@ self: { description = "Use JSON directly from Heist templates"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heist-async" = callPackage @@ -105979,6 +109763,7 @@ self: { description = "Adding support for asynchronous updates (\"AJAX\") with heist"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "helf" = callPackage @@ -106025,6 +109810,7 @@ self: { description = "New Relic® agent SDK wrapper for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {newrelic-collector-client = null; newrelic-common = null; newrelic-transaction = null;}; @@ -106044,6 +109830,7 @@ self: { description = "New Relic® agent SDK wrapper for wai"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "helisp" = callPackage @@ -106058,6 +109845,7 @@ self: { description = "An incomplete Elisp compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "helium" = callPackage @@ -106082,6 +109870,7 @@ self: { description = "The Helium Compiler"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "helium-overture" = callPackage @@ -106122,6 +109911,7 @@ self: { description = "Web development micro framework for haskell with typesafe URLs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hell" = callPackage @@ -106147,6 +109937,7 @@ self: { description = "A Haskell shell based on shell-conduit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hellage" = callPackage @@ -106167,6 +109958,7 @@ self: { description = "Distributed hackage mirror"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hellnet" = callPackage @@ -106192,6 +109984,7 @@ self: { description = "Simple, distributed, anonymous data sharing network"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hello" = callPackage @@ -106227,7 +110020,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "A functionally reactive game engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "help-esb" = callPackage @@ -106245,6 +110037,7 @@ self: { description = "A Haskell client for the Help.com team's ESB."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hemkay" = callPackage @@ -106263,6 +110056,7 @@ self: { description = "A module music mixer and player"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hemkay-core" = callPackage @@ -106304,6 +110098,7 @@ self: { description = "Haskell port of the Emokit EEG project"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hen" = callPackage @@ -106325,6 +110120,7 @@ self: { description = "Haskell bindings to Xen hypervisor interface"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {xenctrl = null;}; "henet" = callPackage @@ -106340,6 +110136,7 @@ self: { description = "Bindings and high level interface for to ENet v1.3.9"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hepevt" = callPackage @@ -106352,6 +110149,7 @@ self: { description = "HEPEVT parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "her-lexer" = callPackage @@ -106364,6 +110162,7 @@ self: { description = "A lexer for Haskell source code"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "her-lexer-parsec" = callPackage @@ -106376,6 +110175,7 @@ self: { description = "Parsec frontend to \"her-lexer\" for Haskell source code"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "herbalizer" = callPackage @@ -106394,6 +110194,7 @@ self: { description = "HAML to ERB translator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "here" = callPackage @@ -106437,6 +110238,7 @@ self: { description = "heredocument"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "herf-time" = callPackage @@ -106479,6 +110281,7 @@ self: { description = "Haskell Equational Reasoning Model-to-Implementation Tunnel"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hermit-syb" = callPackage @@ -106495,6 +110298,7 @@ self: { description = "HERMIT plugin for optimizing Scrap-Your-Boilerplate traversals"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "herms" = callPackage @@ -106516,6 +110320,7 @@ self: { description = "A command-line manager for delicious kitchen recipes"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hero-club-five-tenets" = callPackage @@ -106578,6 +110383,7 @@ self: { description = "A library for compiling and serving static web assets"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "herringbone-embed" = callPackage @@ -106595,6 +110401,7 @@ self: { description = "Embed preprocessed web assets in your executable with Template Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "herringbone-wai" = callPackage @@ -106612,6 +110419,7 @@ self: { description = "Wai adapter for the Herringbone web asset preprocessor"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hesh" = callPackage @@ -106639,6 +110447,7 @@ self: { description = "the Haskell Extensible Shell: Haskell for Bash-style scripts"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hesql" = callPackage @@ -106657,6 +110466,7 @@ self: { description = "Haskell's embedded SQL"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hetero-dict" = callPackage @@ -106678,6 +110488,7 @@ self: { description = "Fast heterogeneous data structures"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hetero-map" = callPackage @@ -106720,6 +110531,7 @@ self: { description = "Allows the use of tuples as literals for Heterogeneous collections"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heterolist" = callPackage @@ -106738,6 +110550,7 @@ self: { description = "A heterogeneous list type"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hetris" = callPackage @@ -106755,6 +110568,7 @@ self: { description = "Text Tetris"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ncurses;}; "heukarya" = callPackage @@ -106770,6 +110584,7 @@ self: { description = "A genetic programming based on tree structure"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hevm" = callPackage @@ -106818,6 +110633,7 @@ self: { description = "Ethereum virtual machine evaluator"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) secp256k1;}; "hevolisa" = callPackage @@ -106835,6 +110651,7 @@ self: { description = "Genetic Mona Lisa problem in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hevolisa-dph" = callPackage @@ -106854,6 +110671,7 @@ self: { description = "Genetic Mona Lisa problem in Haskell - using Data Parallel Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hex" = callPackage @@ -106890,6 +110708,7 @@ self: { description = "Haskell scripting interface for HexChat"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hexdump" = callPackage @@ -106914,6 +110733,7 @@ self: { description = "Reading Exif data form a JPEG file with Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hexmino" = callPackage @@ -106933,6 +110753,7 @@ self: { description = "A small game based on domino-like hexagonal tiles"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hexml" = callPackage @@ -106966,6 +110787,7 @@ self: { description = "Lenses for the hexml package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hexpat" = callPackage @@ -107001,6 +110823,7 @@ self: { description = "Chunked XML parsing using iteratees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hexpat-lens" = callPackage @@ -107016,7 +110839,6 @@ self: { ]; description = "Lenses for Hexpat"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpat-pickle" = callPackage @@ -107051,6 +110873,7 @@ self: { description = "Picklers for de/serialising Generic data types to and from XML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hexpat-tagsoup" = callPackage @@ -107077,6 +110900,7 @@ self: { description = "A framework for symbolic, homoiconic languages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hexpress" = callPackage @@ -107095,6 +110919,7 @@ self: { description = "An express-like http framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hexquote" = callPackage @@ -107111,6 +110936,7 @@ self: { description = "Hexadecimal ByteString literals, with placeholders that bind variables"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hexstring" = callPackage @@ -107145,6 +110971,7 @@ self: { description = "a text classification library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heyefi" = callPackage @@ -107177,6 +111004,7 @@ self: { description = "A server for Eye-Fi SD cards"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "heyting-algebras" = callPackage @@ -107199,6 +111027,7 @@ self: { description = "Heyting and Boolean algebras"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hfann" = callPackage @@ -107215,6 +111044,7 @@ self: { description = "Haskell binding to the FANN library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {doublefann = null; fann = null;}; "hfd" = callPackage @@ -107234,6 +111064,7 @@ self: { description = "Flash debugger"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hfiar" = callPackage @@ -107250,6 +111081,7 @@ self: { description = "Four in a Row in Haskell!!"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hflags" = callPackage @@ -107291,6 +111123,7 @@ self: { description = "Haskell source code formatter"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hfoil" = callPackage @@ -107311,6 +111144,7 @@ self: { description = "Hess-Smith panel code for inviscid 2-d airfoil analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hformat" = callPackage @@ -107339,6 +111173,7 @@ self: { description = "Field-of-view calculation for low-resolution 2D raster grids"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hfractal" = callPackage @@ -107358,6 +111193,7 @@ self: { description = "OpenGL fractal renderer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hfsevents" = callPackage @@ -107374,7 +111210,6 @@ self: { description = "File/folder watching for OS X"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" ]; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;}; @@ -107390,6 +111225,7 @@ self: { description = "A library for fusing a subset of Haskell programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hg-buildpackage" = callPackage @@ -107409,6 +111245,7 @@ self: { description = "Tools to help manage Debian packages with Mercurial"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgal" = callPackage @@ -107432,6 +111269,7 @@ self: { description = "Haskell Genetic Algorithm Library"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgdbmi" = callPackage @@ -107451,6 +111289,7 @@ self: { description = "GDB Machine Interface: program-driven control of GDB"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgearman" = callPackage @@ -107469,6 +111308,7 @@ self: { description = "A Gearman client for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgen" = callPackage @@ -107485,6 +111325,7 @@ self: { description = "Random generation of modal and hybrid logic formulas"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgeometric" = callPackage @@ -107497,6 +111338,7 @@ self: { description = "A geometric library with bindings to GPC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgeometry" = callPackage @@ -107536,6 +111378,7 @@ self: { description = "Geometric Algorithms, Data structures, and Data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgeos" = callPackage @@ -107551,6 +111394,7 @@ self: { description = "Simple Haskell bindings to GEOS C API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {geos_c = null;}; "hgettext" = callPackage @@ -107574,6 +111418,7 @@ self: { description = "Bindings to libintl.h (gettext, bindtextdomain)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgis" = callPackage @@ -107596,6 +111441,7 @@ self: { description = "Library and for GIS with Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgithub" = callPackage @@ -107617,6 +111463,7 @@ self: { description = "Haskell bindings to the GitHub API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgl-example" = callPackage @@ -107667,6 +111514,7 @@ self: { description = "An haskell port of the java version of gom"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgopher" = callPackage @@ -107679,6 +111527,7 @@ self: { description = "Gopher server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgrep" = callPackage @@ -107702,6 +111551,7 @@ self: { description = "Search Haskell source code from the command line"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgrev" = callPackage @@ -107718,6 +111568,7 @@ self: { description = "Compile Mercurial (hg) version info into Haskell code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hgrib" = callPackage @@ -107737,6 +111588,7 @@ self: { description = "Unofficial bindings for GRIB API"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {grib_api = null;}; "hharp" = callPackage @@ -107750,6 +111602,7 @@ self: { description = "Binding to libharp"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {harp = null;}; "hhp" = callPackage @@ -107827,6 +111680,7 @@ self: { description = "Status line for i3bar"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hiccup" = callPackage @@ -107847,6 +111701,7 @@ self: { description = "Relatively efficient Tcl interpreter with support for basic operations"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hichi" = callPackage @@ -107861,6 +111716,7 @@ self: { description = "haskell robot for IChat protocol"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hid" = callPackage @@ -107908,6 +111764,7 @@ self: { description = "Examples to accompany the book \"Haskell in Depth\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hidapi" = callPackage @@ -107950,6 +111807,7 @@ self: { description = "Automated clustering of arbitrary elements in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hierarchical-clustering" = callPackage @@ -107964,6 +111822,7 @@ self: { description = "Fast algorithms for single, average/UPGMA and complete linkage clustering"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hierarchical-clustering-diagrams" = callPackage @@ -107984,6 +111843,7 @@ self: { description = "Draw diagrams of dendrograms made by hierarchical-clustering"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hierarchical-exceptions" = callPackage @@ -107996,11 +111856,12 @@ self: { description = "Template Haskell functions to easily create exception hierarchies"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hierarchical-spectral-clustering" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava - , clustering, containers, eigen, fgl, filepath + , clustering, containers, directory, eigen, fgl, filepath , hierarchical-clustering, hmatrix, lens, managed, modularity, mtl , optparse-generic, safe, sparse-linear-algebra , spectral-clustering, streaming, streaming-bytestring @@ -108009,8 +111870,8 @@ self: { }: mkDerivation { pname = "hierarchical-spectral-clustering"; - version = "0.3.0.0"; - sha256 = "0n4rs9s7gavzm9ms2rgxw4jri0n10x5y9jg1vkcmkkklp8n04w70"; + version = "0.4.0.0"; + sha256 = "1mw546dvyzrhcw7a61zb0anfgxk3s5r3bjrj7iry36shh1ancs1s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108021,12 +111882,13 @@ self: { vector ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring cassava containers filepath - hmatrix lens optparse-generic safe text text-show vector + aeson aeson-pretty base bytestring cassava containers directory + filepath hmatrix lens optparse-generic safe text text-show vector ]; description = "Hierarchical spectral clustering of a graph"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hierarchy" = callPackage @@ -108050,6 +111912,7 @@ self: { description = "Predicated traversal of generated trees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hiernotify" = callPackage @@ -108066,6 +111929,7 @@ self: { description = "Notification library for a filesystem hierarchy"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hifi" = callPackage @@ -108101,6 +111965,7 @@ self: { description = "Memory usage statistics"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "higher-leveldb" = callPackage @@ -108136,6 +112001,7 @@ self: { description = "Some higher order functions for Bool and []"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "highjson" = callPackage @@ -108154,6 +112020,7 @@ self: { description = "Spec based JSON parsing/serialisation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "highjson-swagger" = callPackage @@ -108173,6 +112040,7 @@ self: { description = "Derive swagger instances from highjson specs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "highjson-th" = callPackage @@ -108194,6 +112062,7 @@ self: { description = "Template Haskell helpers for highjson specs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "highlight" = callPackage @@ -108242,6 +112111,7 @@ self: { description = "Highlight package versions which differ from the latest version on Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "highlighter" = callPackage @@ -108360,6 +112230,7 @@ self: { description = "Simple gtk2hs image viewer. Point it at an image and fire away."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "himpy" = callPackage @@ -108382,6 +112253,7 @@ self: { description = "multithreaded snmp poller for riemann"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hindent" = callPackage @@ -108433,6 +112305,7 @@ self: { description = "Template for Hindley-Milner based languages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hinduce-associations-apriori" = callPackage @@ -108460,6 +112333,7 @@ self: { description = "Interface and utilities for classifiers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hinduce-classifier-decisiontree" = callPackage @@ -108478,6 +112352,7 @@ self: { description = "Decision Tree Classifiers for hInduce"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hinduce-examples" = callPackage @@ -108498,6 +112373,7 @@ self: { description = "Example data for hInduce"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hinduce-missingh" = callPackage @@ -108596,6 +112472,7 @@ self: { description = "Generate armet style query strings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hinstaller" = callPackage @@ -108612,6 +112489,7 @@ self: { description = "Installer wrapper for Haskell applications"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hint" = callPackage @@ -108648,6 +112526,7 @@ self: { description = "A server process that runs hint"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hinter" = callPackage @@ -108668,6 +112547,7 @@ self: { description = "Runtime Haskell interpreter (GHC API wrapper)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hinterface" = callPackage @@ -108693,7 +112573,6 @@ self: { ]; description = "Haskell / Erlang interoperability library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hinvaders" = callPackage @@ -108709,6 +112588,7 @@ self: { description = "Space Invaders"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hinze-streams" = callPackage @@ -108721,6 +112601,7 @@ self: { description = "Streams and Unique Fixed Points"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hip" = callPackage @@ -108744,6 +112625,7 @@ self: { description = "Haskell Image Processing (HIP) Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hipbot" = callPackage @@ -108769,6 +112651,7 @@ self: { description = "A library for building HipChat Bots"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hipchat-hs" = callPackage @@ -108788,6 +112671,7 @@ self: { description = "Hipchat API bindings in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hipe" = callPackage @@ -108804,6 +112688,7 @@ self: { description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hips" = callPackage @@ -108838,6 +112723,7 @@ self: { description = "IRC client"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hirt" = callPackage @@ -108859,6 +112745,7 @@ self: { description = "Calculates IRT 2PL and 3PL models"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hissmetrics" = callPackage @@ -108875,6 +112762,7 @@ self: { description = "Unofficial API bindings to KISSmetrics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hist-pl" = callPackage @@ -108899,6 +112787,7 @@ self: { description = "Umbrella package for the historical dictionary of Polish"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hist-pl-dawg" = callPackage @@ -108914,6 +112803,7 @@ self: { description = "A generic, DAWG-based dictionary"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hist-pl-fusion" = callPackage @@ -108931,6 +112821,7 @@ self: { description = "Merging historical dictionary with PoliMorf"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hist-pl-lexicon" = callPackage @@ -108948,6 +112839,7 @@ self: { description = "A binary representation of the historical dictionary of Polish"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hist-pl-lmf" = callPackage @@ -108960,6 +112852,7 @@ self: { description = "LMF parsing for the historical dictionary of Polish"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hist-pl-transliter" = callPackage @@ -108983,6 +112876,7 @@ self: { description = "Types in the historical dictionary of Polish"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "histogram-fill" = callPackage @@ -109037,6 +112931,7 @@ self: { description = "Extract the interesting bits from shell history"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hit" = callPackage @@ -109055,7 +112950,6 @@ self: { ]; description = "Git like program in haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hit-graph" = callPackage @@ -109072,6 +112966,7 @@ self: { description = "Use graph algorithms to access and manipulate Git repos"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hjcase" = callPackage @@ -109089,6 +112984,7 @@ self: { description = "Jcase library for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hjpath" = callPackage @@ -109119,6 +113015,7 @@ self: { description = "JavaScript Parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hjsmin" = callPackage @@ -109163,6 +113060,7 @@ self: { description = "library for querying from JSON"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hjsonpointer" = callPackage @@ -109185,6 +113083,7 @@ self: { description = "JSON Pointer library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hjsonschema" = callPackage @@ -109214,6 +113113,7 @@ self: { description = "JSON Schema library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hjugement" = callPackage @@ -109223,8 +113123,8 @@ self: { }: mkDerivation { pname = "hjugement"; - version = "2.0.0.20181030"; - sha256 = "063d484ns520prgvb2b1szq33wx569fgbgrzvfrgpfcznra638fi"; + version = "2.0.1.20190208"; + sha256 = "10921dk9y460dmgy5dhkfxcsc96cxkw2xxziykizp8zhmzrdlwz6"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -109281,6 +113181,7 @@ self: { description = "A library to build valid LaTeX files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hlbfgsb" = callPackage @@ -109300,6 +113201,7 @@ self: { description = "Haskell binding to L-BFGS-B version 3.0"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gfortran;}; "hlcm" = callPackage @@ -109322,6 +113224,7 @@ self: { description = "Fast algorithm for mining closed frequent itemsets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hleap" = callPackage @@ -109330,8 +113233,8 @@ self: { }: mkDerivation { pname = "hleap"; - version = "0.1.2.7"; - sha256 = "1qpfwg69dzwzaf09q3pzkzwanzc9kb5zx733ck27g5xdsi79slsf"; + version = "0.2.0.0"; + sha256 = "0hh9r884kjw8gi7mcg74kzixzxxwzs1h67mg9z108kmlmnb742ry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109344,7 +113247,6 @@ self: { ]; description = "Web Socket interface to Leap Motion controller"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger" = callPackage @@ -109360,8 +113262,10 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.13.2"; - sha256 = "0dxw5zhynhdhangib5awcciz7qlgmnx9km4dph7nrw2ikj6ffmwv"; + version = "1.14.1"; + sha256 = "139iqa7kpnn2r9r3awbpmhbgn7nvybppmx648fjk6hgsivggjpay"; + revision = "1"; + editedCabalFile = "1ivk3hdzhlb5xdkmiqvbnhj7hjfv7kx4h70q14xrxp0wl8jpiqvd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109410,8 +113314,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.13"; - sha256 = "1pkim0qxgakbngnslw04lhlmv2ad195lw60hxz5iyrxywizkiwp3"; + version = "1.14"; + sha256 = "18zpclm3nh2zq6cqa10vm232ndg22r8s4h3ffmn2m4fg05172ymd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109422,7 +113326,6 @@ self: { ]; description = "Web API server for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-chart" = callPackage @@ -109442,6 +113345,7 @@ self: { description = "A pie chart image generator for the hledger accounting tool"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hledger-diff" = callPackage @@ -109466,8 +113370,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.8"; - sha256 = "02dfi6drhipj1an2smalhgjp52scmcy6ndixakjk5y0zpvkxzzbx"; + version = "1.3.9"; + sha256 = "07g48w4099m4vm7z5hrg9zzd2v2yhy7kcv40902njz6v8cklgdgq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109497,6 +113401,8 @@ self: { pname = "hledger-interest"; version = "1.5.3"; sha256 = "1ff113z2ir07ihdvfa5fca4x326zwm2jd7sjy6hjpr4qgi1mszvs"; + revision = "1"; + editedCabalFile = "1myqv7hci32hvm98d4fn2zqdvkxsdx1g821n1fwr6814yn89kwjj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109523,6 +113429,7 @@ self: { description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hledger-lib" = callPackage @@ -109536,8 +113443,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.13.1"; - sha256 = "1g98gikpvx002zjc1smj21lz4x9ghfa2965rb0vlnqmwcz5pqak7"; + version = "1.14"; + sha256 = "0nj8qrqkvmxmq0sqhq1z5i3zfivb7glsnv37g9k5ag6vcr48r7i8"; libraryHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers @@ -109568,8 +113475,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.13.1"; - sha256 = "0jafgvnc88r24zab8kijj1v0jj8y2481ybsya3gnf3bfcb7p7xyp"; + version = "1.14"; + sha256 = "1pnzbc4myyqlz4rc1lm1acyynvkhxwdd82fl2rrwc31phj1b46jk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109600,30 +113507,32 @@ self: { description = "A curses-style console interface for the hledger accounting tool"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hledger-web" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , case-insensitive, clientsession, cmdargs, conduit, conduit-extra - , data-default, directory, filepath, hjsmin, hledger, hledger-lib - , http-client, http-conduit, json, megaparsec, mtl, semigroups - , shakespeare, template-haskell, text, time, transformers, wai - , wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core - , yesod-form, yesod-static + , containers, data-default, Decimal, directory, filepath, hjsmin + , hledger, hledger-lib, http-client, http-conduit, http-types, json + , megaparsec, mtl, semigroups, shakespeare, template-haskell, text + , time, transformers, wai, wai-extra, wai-handler-launch, warp + , yaml, yesod, yesod-core, yesod-form, yesod-static }: mkDerivation { pname = "hledger-web"; - version = "1.13"; - sha256 = "045bhllvxs92r96hx9aaipc9hpaqhv7b3dm2nxc1912iq761wqnp"; + version = "1.14"; + sha256 = "15ajph5cmc1a44lqw42020pb4znkrpgx3wk5dl26pbynilm5247b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring case-insensitive - clientsession cmdargs conduit conduit-extra data-default directory - filepath hjsmin hledger hledger-lib http-client http-conduit json - megaparsec mtl semigroups shakespeare template-haskell text time - transformers wai wai-extra wai-handler-launch warp yaml yesod - yesod-core yesod-form yesod-static + aeson base blaze-html blaze-markup bytestring case-insensitive + clientsession cmdargs conduit conduit-extra containers data-default + Decimal directory filepath hjsmin hledger hledger-lib http-client + http-conduit http-types json megaparsec mtl semigroups shakespeare + template-haskell text time transformers wai wai-extra + wai-handler-launch warp yaml yesod yesod-core yesod-form + yesod-static ]; executableHaskellDepends = [ base ]; description = "Web interface for the hledger accounting tool"; @@ -109644,6 +113553,7 @@ self: { description = "Haskell binding to libBladeRF SDR library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libbladeRF;}; "hlibev" = callPackage @@ -109657,6 +113567,7 @@ self: { description = "FFI interface to libev"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {ev = null;}; "hlibfam" = callPackage @@ -109670,6 +113581,7 @@ self: { description = "FFI interface to libFAM"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) fam;}; "hlibgit2" = callPackage @@ -109710,8 +113622,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.14"; - sha256 = "0arz6x0r4pji37papdrc6brybcd2a2sackvhzmhy89ycgy0k04kk"; + version = "2.1.15"; + sha256 = "0xvr9b0ys0il0g0z145pxwyr3vq6fj571gad4858mpmqdvjh4b0i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -109778,6 +113690,7 @@ self: { description = "Simple, concurrent, extendable and easy-to-use logging library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hlongurl" = callPackage @@ -109797,6 +113710,7 @@ self: { description = "Library and utility interfacing to longurl.org"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hlrdb" = callPackage @@ -109816,7 +113730,6 @@ self: { ]; description = "High-level Redis Database"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hlrdb-core" = callPackage @@ -109833,7 +113746,6 @@ self: { ]; description = "High-level Redis Database Core API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hls" = callPackage @@ -109847,6 +113759,7 @@ self: { description = "Haskell Lindenmayer Systems"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hlwm" = callPackage @@ -109863,6 +113776,7 @@ self: { description = "Bindings to the herbstluftwm window manager"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hly" = callPackage @@ -109878,6 +113792,7 @@ self: { description = "Haskell LilyPond"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmark" = callPackage @@ -109897,6 +113812,7 @@ self: { description = "A tool and library for Markov chains based text generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmarkup" = callPackage @@ -109911,6 +113827,7 @@ self: { description = "Simple wikitext-like markup format implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmatrix" = callPackage @@ -109955,6 +113872,7 @@ self: { description = "hmatrix operations lifted for backprop"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmatrix-banded" = callPackage @@ -109968,6 +113886,7 @@ self: { description = "HMatrix interface to LAPACK functions for banded matrices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) liblapack;}; "hmatrix-csv" = callPackage @@ -110034,6 +113953,7 @@ self: { description = "Memory map Vector from disk into memory efficiently"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmatrix-morpheus" = callPackage @@ -110055,6 +113975,7 @@ self: { description = "Low-level machine learning auxiliary functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; "hmatrix-nipals" = callPackage @@ -110069,6 +113990,7 @@ self: { description = "NIPALS method for Principal Components Analysis on large data-sets"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmatrix-nlopt" = callPackage @@ -110118,6 +114040,7 @@ self: { description = "Sparse linear solver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;}; "hmatrix-special" = callPackage @@ -110145,6 +114068,7 @@ self: { description = "hmatrix with vector and matrix sizes encoded in types"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmatrix-sundials" = callPackage @@ -110170,6 +114094,7 @@ self: { description = "hmatrix interface to sundials"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {sundials_arkode = null; sundials_cvode = null;}; "hmatrix-svdlibc" = callPackage @@ -110201,6 +114126,7 @@ self: { description = "MATLAB-like syntax for hmatrix vectors and matrices"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmatrix-tests" = callPackage @@ -110219,6 +114145,7 @@ self: { description = "Tests for hmatrix"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmatrix-vector-sized" = callPackage @@ -110251,6 +114178,7 @@ self: { description = "Haskell Meapsoft Parser"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmeap-utils" = callPackage @@ -110271,6 +114199,7 @@ self: { description = "Haskell Meapsoft Parser Utilities"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmemdb" = callPackage @@ -110300,6 +114229,7 @@ self: { description = "CLI fuzzy finder and launcher"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmep" = callPackage @@ -110319,6 +114249,8 @@ self: { testHaskellDepends = [ base HUnit vector ]; description = "HMEP Multi Expression Programming – a genetic programming variant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmidi" = callPackage @@ -110350,6 +114282,7 @@ self: { description = "A make alternative based on Plan9's mk"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmm" = callPackage @@ -110366,6 +114299,7 @@ self: { description = "A hidden markov model library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmm-hmatrix" = callPackage @@ -110385,6 +114319,7 @@ self: { description = "Hidden Markov Models using HMatrix primitives"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmm-lapack" = callPackage @@ -110395,8 +114330,8 @@ self: { }: mkDerivation { pname = "hmm-lapack"; - version = "0.3.0.2"; - sha256 = "1rwxp4gjk2z8k42k7l1g3sy07jl2rhc7xgypjripb3chmfkp6zvn"; + version = "0.3.0.3"; + sha256 = "0ng5nayyqcjd10ai1bgksavsy2ndmr3qyv32qpvz9yslds8d73xk"; libraryHaskellDepends = [ base boxes comfort-array containers deepseq explicit-exception fixed-length lapack lazy-csv netlib-ffi non-empty prelude-compat @@ -110406,6 +114341,7 @@ self: { description = "Hidden Markov Models using LAPACK primitives"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmp3" = callPackage @@ -110427,6 +114363,7 @@ self: { description = "An ncurses mp3 player written in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ncurses;}; "hmpfr" = callPackage @@ -110462,7 +114399,6 @@ self: { ]; description = "Haskell Music Theory"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmt-diagrams" = callPackage @@ -110481,6 +114417,7 @@ self: { description = "Haskell Music Theory Diagrams"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hmumps" = callPackage @@ -110500,6 +114437,7 @@ self: { description = "Interpreter for the MUMPS langugae"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hnetcdf" = callPackage @@ -110529,7 +114467,6 @@ self: { testSystemDepends = [ netcdf ]; description = "Haskell NetCDF library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) netcdf;}; "hnix" = callPackage @@ -110591,6 +114528,7 @@ self: { description = "Haskell implementation of the Nix language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hnn" = callPackage @@ -110662,6 +114600,7 @@ self: { description = "Log message normalisation tool producing structured JSON messages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ho-rewriting" = callPackage @@ -110678,6 +114617,7 @@ self: { description = "Generic rewrite rules with safe treatment of variables and binders"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoauth" = callPackage @@ -110696,6 +114636,7 @@ self: { description = "A Haskell implementation of OAuth 1.0a protocol."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoauth2" = callPackage @@ -110715,7 +114656,6 @@ self: { ]; description = "Haskell OAuth2 authentication client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hob" = callPackage @@ -110744,6 +114684,7 @@ self: { description = "A source code editor aiming for the convenience of use"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hobbes" = callPackage @@ -110762,6 +114703,7 @@ self: { description = "A small file watcher for OSX"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hobbits" = callPackage @@ -110779,6 +114721,7 @@ self: { description = "A library for canonically representing terms with binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hocilib" = callPackage @@ -110799,6 +114742,7 @@ self: { description = "FFI binding to OCILIB"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {ocilib = null;}; "hocker" = callPackage @@ -110841,6 +114785,7 @@ self: { description = "Interact with the docker registry and generate nix build instructions"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hodatime" = callPackage @@ -110863,6 +114808,7 @@ self: { description = "A fully featured date/time library based on Nodatime"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoe" = callPackage @@ -110911,6 +114857,7 @@ self: { description = "Simple IRC logger bot"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hogg" = callPackage @@ -110929,6 +114876,7 @@ self: { description = "Library and tools to manipulate the Ogg container format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoggl" = callPackage @@ -110955,6 +114903,7 @@ self: { description = "Bindings to the Toggl.com REST API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hogre" = callPackage @@ -110971,6 +114920,7 @@ self: { description = "Haskell binding to a subset of OGRE"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {OGRE = null; OgreMain = null; cgen-hs = null; grgen = null;}; "hogre-examples" = callPackage @@ -110987,6 +114937,7 @@ self: { description = "Examples for using Hogre"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {OgreMain = null;}; "hois" = callPackage @@ -111003,6 +114954,7 @@ self: { description = "OIS bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {OIS = null;}; "hoist-error" = callPackage @@ -111047,6 +114999,7 @@ self: { description = "Higher order logic"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hold-em" = callPackage @@ -111059,6 +115012,7 @@ self: { description = "An engine for Texas hold'em Poker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hole" = callPackage @@ -111071,6 +115025,7 @@ self: { description = "Higher kinded type removal"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "holey-format" = callPackage @@ -111117,6 +115072,7 @@ self: { description = "Start your Haskell project with cabal, git and tests"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "homeomorphic" = callPackage @@ -111129,6 +115085,7 @@ self: { description = "Homeomorphic Embedding Test"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hommage" = callPackage @@ -111143,6 +115100,7 @@ self: { description = "Haskell Offline Music Manipulation And Generation EDSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hommage-ds" = callPackage @@ -111156,7 +115114,7 @@ self: { ]; description = "DirectSound extension (Windows) for the Hommage sound library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {}; "homoiconic" = callPackage @@ -111170,6 +115128,7 @@ self: { description = "Constructs FAlgebras from typeclasses, making Haskell functions homoiconic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "homplexity" = callPackage @@ -111199,6 +115158,7 @@ self: { description = "Haskell code quality tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "honi" = callPackage @@ -111216,6 +115176,7 @@ self: { description = "OpenNI 2 binding"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {OpenNI2 = null; inherit (pkgs) freenect;}; "honk" = callPackage @@ -111246,6 +115207,7 @@ self: { description = "Simple tool for fetching and merging hoogle data"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hood" = callPackage @@ -111259,6 +115221,7 @@ self: { description = "Debugging by observing in place"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hood-off" = callPackage @@ -111271,6 +115234,7 @@ self: { description = "Dummy package to disable Hood without having to remove all the calls to observe"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hood2" = callPackage @@ -111283,6 +115247,7 @@ self: { description = "Debugging by observing in place"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoodie" = callPackage @@ -111301,6 +115266,7 @@ self: { description = "A small, toy roguelike"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoodle" = callPackage @@ -111322,6 +115288,7 @@ self: { description = "Executable for hoodle"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoodle-builder" = callPackage @@ -111339,6 +115306,7 @@ self: { description = "text builder for hoodle file format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoodle-core" = callPackage @@ -111372,6 +115340,7 @@ self: { description = "Core library for hoodle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;}; "hoodle-extra" = callPackage @@ -111398,6 +115367,7 @@ self: { description = "extra hoodle tools"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoodle-parser" = callPackage @@ -111416,6 +115386,7 @@ self: { description = "Hoodle file parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoodle-publish" = callPackage @@ -111443,6 +115414,7 @@ self: { description = "publish hoodle files as a static web site"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoodle-render" = callPackage @@ -111464,6 +115436,7 @@ self: { description = "Hoodle file renderer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoodle-types" = callPackage @@ -111481,6 +115454,7 @@ self: { description = "Data types for programs for hoodle file format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoogle_5_0_14" = callPackage @@ -111565,6 +115539,7 @@ self: { description = "Easily generate Hoogle indices for installed packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hooks-dir" = callPackage @@ -111577,6 +115552,7 @@ self: { description = "run executables in a directory as hooks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hookup" = callPackage @@ -111615,6 +115591,7 @@ self: { description = "A library to support dataflow analysis and optimization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoovie" = callPackage @@ -111639,6 +115616,7 @@ self: { description = "Haskell Media Server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hopencc" = callPackage @@ -111656,6 +115634,7 @@ self: { description = "Haskell binding to libopencc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) opencc;}; "hopencl" = callPackage @@ -111676,6 +115655,7 @@ self: { description = "Haskell bindings for OpenCL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {OpenCL = null;}; "hopenpgp-tools" = callPackage @@ -111716,6 +115696,8 @@ self: { pname = "hopenssl"; version = "2.2.4"; sha256 = "0wbnibaffpmk453jbvh95r1d1scz1ivkj59ddrbd3hf4iwr6rx4x"; + revision = "1"; + editedCabalFile = "14bs0wjrqnnn1v8c4yznfzggvmgypm2lssgl0cr498kmp54if0lf"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring HUnit ]; @@ -111754,6 +115736,7 @@ self: { description = "Hopfield Networks, Boltzmann Machines and Clusters"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {MagickCore = null; inherit (pkgs) imagemagick;}; "hopfield-networks" = callPackage @@ -111805,6 +115788,7 @@ self: { description = "C++ FFI generator - Documentation"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoppy-generator" = callPackage @@ -111821,6 +115805,7 @@ self: { description = "C++ FFI generator - Code generator"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoppy-runtime" = callPackage @@ -111835,6 +115820,7 @@ self: { description = "C++ FFI generator - Runtime support"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoppy-std" = callPackage @@ -111850,6 +115836,7 @@ self: { description = "C++ FFI generator - Standard library bindings"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hops" = callPackage @@ -111883,6 +115870,7 @@ self: { description = "Handy Operations on Power Series"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hoq" = callPackage @@ -111903,6 +115891,7 @@ self: { description = "A language based on homotopy type theory with an interval type"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hora" = callPackage @@ -111920,7 +115909,6 @@ self: { ]; description = "date time"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "horizon" = callPackage @@ -111933,6 +115921,7 @@ self: { description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "horname" = callPackage @@ -111954,6 +115943,7 @@ self: { description = "Rename function definitions returned by SMT solvers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hosc" = callPackage @@ -111990,6 +115980,7 @@ self: { description = "Haskell Open Sound Control JSON Serialisation"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hosc-utils" = callPackage @@ -112052,6 +116043,7 @@ self: { description = "An dns server which is extremely easy to config"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hothasktags" = callPackage @@ -112071,6 +116063,7 @@ self: { description = "Generates ctags for Haskell, incorporating import lists and qualified imports"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hotswap" = callPackage @@ -112083,6 +116076,7 @@ self: { description = "Simple code hotswapping"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hourglass" = callPackage @@ -112114,6 +116108,7 @@ self: { description = "A small library for parsing more human friendly date/time formats"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hourglass-orphans" = callPackage @@ -112160,6 +116155,7 @@ self: { description = "A Haskell implementation of Foreman"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hp2any-core" = callPackage @@ -112177,6 +116173,7 @@ self: { description = "Heap profiling helper library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hp2any-graph" = callPackage @@ -112199,6 +116196,7 @@ self: { description = "Real-time heap graphing utility and profile stream server with a reusable graphing module"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; inherit (pkgs) libGLU;}; @@ -112221,6 +116219,7 @@ self: { description = "A utility to visualise and compare heap profiles"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hp2html" = callPackage @@ -112265,8 +116264,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.31.1"; - sha256 = "0fipbmmj4x588z7vh635mizhym9krydfxr49bgaf7xir4fsb4fmc"; + version = "0.31.2"; + sha256 = "1l2d6185lawwhsj70swxkvcacm0hvcn9qsrlx4ph4gs6k578603g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112323,6 +116322,7 @@ self: { description = "Convert Cabal manifests into hpack's package.yamls"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpack-dhall" = callPackage @@ -112333,8 +116333,8 @@ self: { }: mkDerivation { pname = "hpack-dhall"; - version = "0.5.1"; - sha256 = "0rgdk1jiczl4rwa66irbfcif4rvkrcyzk29lmpwr2kkqjz0zi7kk"; + version = "0.5.2"; + sha256 = "16mnh9hwp0224cn3rlpbjgqklgvbaffbzjskyksakpgxc0phk1zi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112371,6 +116371,7 @@ self: { description = "Modular template compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpaco-lib" = callPackage @@ -112389,6 +116390,7 @@ self: { description = "Modular template compiler library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpage" = callPackage @@ -112411,6 +116413,7 @@ self: { description = "A scrapbook for Haskell developers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpapi" = callPackage @@ -112424,6 +116427,7 @@ self: { description = "Binding for the PAPI library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) papi;}; "hpaste" = callPackage @@ -112452,6 +116456,7 @@ self: { description = "Haskell paste web site"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpasteit" = callPackage @@ -112472,6 +116477,7 @@ self: { description = "A command-line client for hpaste.org"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpath" = callPackage @@ -112534,7 +116540,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Coveralls.io support for Haskell."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpc-strobe" = callPackage @@ -112582,6 +116587,7 @@ self: { description = "Tracer with AJAX interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpdft" = callPackage @@ -112600,6 +116606,7 @@ self: { description = "A tool for looking through PDF file using Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpg" = callPackage @@ -112614,6 +116621,7 @@ self: { description = "a simple password generator"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpio" = callPackage @@ -112643,7 +116651,6 @@ self: { ]; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hplayground" = callPackage @@ -112676,6 +116683,7 @@ self: { description = "Application for managing playlist files on a music player"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpodder" = callPackage @@ -112696,6 +116704,7 @@ self: { description = "Podcast Aggregator (downloader)"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpp" = callPackage @@ -112746,6 +116755,7 @@ self: { description = "Haskell bindings to libpqtypes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) postgresql;}; "hpqtypes-extras" = callPackage @@ -112770,6 +116780,7 @@ self: { description = "Extra utilities for hpqtypes library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hprotoc" = callPackage @@ -112826,6 +116837,7 @@ self: { description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hps" = callPackage @@ -112839,6 +116851,7 @@ self: { description = "Haskell Postscript"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hps-cairo" = callPackage @@ -112855,6 +116868,7 @@ self: { description = "Cairo rendering for the haskell postscript library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hps-kmeans" = callPackage @@ -112867,6 +116881,7 @@ self: { description = "A nice implementation of the k-Means algorithm"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpuz" = callPackage @@ -112896,6 +116911,7 @@ self: { description = "Highlight source code using Pygments"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpylos" = callPackage @@ -112912,6 +116928,7 @@ self: { description = "AI of Pylos game with GLUT interface"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpyrg" = callPackage @@ -112928,6 +116945,7 @@ self: { description = "pyrg utility done right"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hpython" = callPackage @@ -112958,6 +116976,7 @@ self: { description = "Python language tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hquantlib" = callPackage @@ -112988,6 +117007,7 @@ self: { description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hquantlib-time" = callPackage @@ -113030,6 +117050,7 @@ self: { description = "Basic utility for ranking a list of items"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hreader" = callPackage @@ -113078,6 +117099,7 @@ self: { description = "A Cricket scoring application"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hriemann" = callPackage @@ -113104,6 +117126,7 @@ self: { description = "A Riemann Client for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hruby" = callPackage @@ -113171,6 +117194,7 @@ self: { description = "A cryptohash-inspired library for blake2"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libb2;}; "hs-brotli" = callPackage @@ -113235,6 +117259,7 @@ self: { description = "Example Monte Carlo simulations implemented with Carbon"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-cdb" = callPackage @@ -113251,6 +117276,7 @@ self: { description = "A library for reading CDB (Constant Database) files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-conllu" = callPackage @@ -113272,6 +117298,7 @@ self: { description = "Conllu validating parser and utils"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-di" = callPackage @@ -113302,6 +117329,7 @@ self: { description = "Dependency Injection library for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-dotnet" = callPackage @@ -113315,23 +117343,26 @@ self: { description = "Pragmatic .NET interop for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {ole32 = null; oleaut32 = null;}; "hs-duktape" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec - , hspec-expectations-pretty-diff, raw-strings-qq, template-haskell - , text, transformers, unordered-containers, vector + ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal + , directory, hspec, hspec-expectations-pretty-diff, process + , raw-strings-qq, template-haskell, text, time, transformers + , unordered-containers, vector }: mkDerivation { pname = "hs-duktape"; - version = "0.1.5"; - sha256 = "1x430rj39j33v98dbn0nz7ic0a8zgpsdqyib7p868k21lzwa2vki"; + version = "1.0.0"; + sha256 = "1bbxp7285vw39jbqpl80jqg46vwycva5fzn4prk3a2fs419xdxzm"; + setupHaskellDepends = [ base Cabal directory process ]; libraryHaskellDepends = [ aeson base bytestring text transformers unordered-containers vector ]; testHaskellDepends = [ aeson aeson-qq base bytestring hspec hspec-expectations-pretty-diff - raw-strings-qq template-haskell text + raw-strings-qq template-haskell text time ]; description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine"; license = stdenv.lib.licenses.mit; @@ -113351,6 +117382,7 @@ self: { description = "HS-Excelx provides basic read-only access to Excel 2007 and 2010 documents in XLSX format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-ffmpeg" = callPackage @@ -113363,6 +117395,7 @@ self: { description = "Bindings to FFMPEG library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-fltk" = callPackage @@ -113377,6 +117410,7 @@ self: { description = "Binding to GUI library FLTK"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) fltk; fltk_images = null;}; "hs-functors" = callPackage @@ -113401,6 +117435,7 @@ self: { description = "Haskell wrapper for the Google Chart API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-gen-iface" = callPackage @@ -113420,6 +117455,7 @@ self: { description = "Utility to generate haskell-names interface files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-gizapp" = callPackage @@ -113436,6 +117472,7 @@ self: { description = "Haskell wrapper around the GIZA++ toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-inspector" = callPackage @@ -113468,6 +117505,7 @@ self: { description = "Java .class files assembler/disassembler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-json-rpc" = callPackage @@ -113482,6 +117520,7 @@ self: { description = "JSON-RPC client library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-logo" = callPackage @@ -113509,6 +117548,7 @@ self: { description = "Logo interpreter written in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-mesos" = callPackage @@ -113534,6 +117574,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;}; "hs-multiaddr" = callPackage @@ -113568,6 +117609,7 @@ self: { description = "Name generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-pgms" = callPackage @@ -113588,6 +117630,7 @@ self: { description = "Programmer's Mine Sweeper in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-php-session" = callPackage @@ -113613,6 +117656,7 @@ self: { description = "Create pkg-config configuration files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-pkpass" = callPackage @@ -113634,6 +117678,7 @@ self: { description = "A library for Passbook pass creation & signing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-popen" = callPackage @@ -113660,6 +117705,7 @@ self: { description = "Easy to use Regex"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-rs-notify" = callPackage @@ -113681,6 +117727,7 @@ self: { description = "Experimental! Wraps this awesome rust library so you can use it in haskell. https://docs.rs/crate/notify"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {notifier = null;}; "hs-scrape" = callPackage @@ -113702,6 +117749,7 @@ self: { description = "Simple and easy web scraping and automation in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-server-starter" = callPackage @@ -113709,15 +117757,14 @@ self: { }: mkDerivation { pname = "hs-server-starter"; - version = "0.1.0.1"; - sha256 = "03rqiq40r8vh1kp8fbpj77q1p71h1jh53awsc9v1l28z3680h4kf"; + version = "0.1.0.2"; + sha256 = "1fykxrhh6s2w722jknz87in3ni3a9spjhbbrqm1vw5r5mcsv29gh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory network ]; testHaskellDepends = [ base HUnit network temporary unix ]; description = "Write a server supporting Server::Starter's protocol in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-snowtify" = callPackage @@ -113735,6 +117782,7 @@ self: { description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-twitter" = callPackage @@ -113745,12 +117793,15 @@ self: { pname = "hs-twitter"; version = "0.2.8"; sha256 = "1r8bd5q7d5mxmd6012mpp1yx353wzib174xd9v0mvkbb009b4mph"; + revision = "1"; + editedCabalFile = "05cd5qcmjgaddi4999lr20i0qkdc5c8i3b1hxfl3kbvl6309fm70"; libraryHaskellDepends = [ base HTTP json mime network old-locale old-time random utf8-string ]; description = "Haskell binding to the Twitter API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-twitterarchiver" = callPackage @@ -113766,6 +117817,7 @@ self: { description = "Commandline Twitter feed archiver"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-vcard" = callPackage @@ -113778,6 +117830,7 @@ self: { description = "Implements the RFC 2426 vCard 3.0 spec"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-watchman" = callPackage @@ -113798,6 +117851,7 @@ self: { description = "Client library for Facebook's Watchman tool"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs2048" = callPackage @@ -113866,6 +117920,7 @@ self: { description = "Haskell to Brainfuck compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs2dot" = callPackage @@ -113909,6 +117964,7 @@ self: { description = "I2C access for Haskell and Linux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsPID" = callPackage @@ -113938,6 +117994,7 @@ self: { description = "Sqlite3 bindings"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsXenCtrl" = callPackage @@ -113951,6 +118008,7 @@ self: { description = "FFI bindings to the Xen Control library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {xenctrl = null;}; "hsakamai" = callPackage @@ -113961,8 +118019,8 @@ self: { }: mkDerivation { pname = "hsakamai"; - version = "0.1.0.0"; - sha256 = "1wg0jw7m0hvvv6b5xz0y012kgnx4zxfms53gvryw0zk6ll841h3i"; + version = "0.1.0.1"; + sha256 = "1a4qz14b5z72nvvcnrymlqw6nwfxyl0y76lr3a93qqwi5zkah94s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114009,6 +118067,7 @@ self: { description = "OASIS Security Assertion Markup Language (SAML) V2.0"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libxml2;}; "hsass" = callPackage @@ -114046,6 +118105,7 @@ self: { description = "(ab)Use Google Translate as a speech synthesiser"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsb2hs" = callPackage @@ -114082,6 +118142,7 @@ self: { description = "simple utility for rolling filesystem backups"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsbc" = callPackage @@ -114096,6 +118157,7 @@ self: { description = "A command line calculator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsbencher" = callPackage @@ -114119,6 +118181,7 @@ self: { description = "Launch and gather data from Haskell and non-Haskell benchmarks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsbencher-codespeed" = callPackage @@ -114138,6 +118201,7 @@ self: { description = "Backend for uploading benchmark data to CodeSpeed"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsbencher-fusion" = callPackage @@ -114162,6 +118226,7 @@ self: { description = "Backend for uploading benchmark data to Google Fusion Tables"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc2hs" = callPackage @@ -114218,6 +118283,7 @@ self: { description = "Haskell SuperCollider Auditor"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-cairo" = callPackage @@ -114231,6 +118297,7 @@ self: { description = "haskell supercollider cairo drawing"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-data" = callPackage @@ -114249,6 +118316,7 @@ self: { description = "haskell supercollider data"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-db" = callPackage @@ -114262,6 +118330,7 @@ self: { description = "Haskell SuperCollider Unit Generator Database"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-dot" = callPackage @@ -114275,6 +118344,7 @@ self: { description = "haskell supercollider graph drawing"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-forth" = callPackage @@ -114295,6 +118365,7 @@ self: { description = "FORTH SUPERCOLLIDER"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-graphs" = callPackage @@ -114320,6 +118391,7 @@ self: { description = "Haskell SuperCollider Graphs"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-lang" = callPackage @@ -114341,6 +118413,7 @@ self: { description = "Haskell SuperCollider Language"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-lisp" = callPackage @@ -114361,6 +118434,7 @@ self: { description = "LISP SUPERCOLLIDER"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-plot" = callPackage @@ -114379,6 +118453,7 @@ self: { description = "Haskell SuperCollider Plotting"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-process" = callPackage @@ -114399,6 +118474,7 @@ self: { description = "Create and control scsynth processes"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-rec" = callPackage @@ -114412,6 +118488,7 @@ self: { description = "Haskell SuperCollider Record Variants"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-rw" = callPackage @@ -114430,6 +118507,7 @@ self: { description = "hsc3 re-writing"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-server" = callPackage @@ -114457,6 +118535,7 @@ self: { description = "SuperCollider server resource management and synchronization"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-sf" = callPackage @@ -114470,6 +118549,7 @@ self: { description = "Haskell SuperCollider SoundFile"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-sf-hsndfile" = callPackage @@ -114487,6 +118567,7 @@ self: { description = "Haskell SuperCollider SoundFile"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-unsafe" = callPackage @@ -114500,6 +118581,7 @@ self: { description = "Unsafe Haskell SuperCollider"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-utils" = callPackage @@ -114522,6 +118604,7 @@ self: { description = "Haskell SuperCollider Utilities"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hscaffold" = callPackage @@ -114549,6 +118632,7 @@ self: { description = "Very simple file/directory structure scaffolding writer monad EDSL"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hscamwire" = callPackage @@ -114564,6 +118648,7 @@ self: { description = "Haskell bindings to IIDC1394 cameras, via Camwire"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {camwire_1394 = null; dc1394_control = null; raw1394 = null;}; "hscassandra" = callPackage @@ -114581,6 +118666,7 @@ self: { description = "cassandra database interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hscd" = callPackage @@ -114596,6 +118682,7 @@ self: { description = "Command line client and library for SoundCloud.com"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hscharm" = callPackage @@ -114705,6 +118792,7 @@ self: { description = "An elegant analog clock using Haskell, GTK and Cairo"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hscolour" = callPackage @@ -114743,6 +118831,7 @@ self: { description = "cscope like browser for Haskell code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hscrtmpl" = callPackage @@ -114778,6 +118867,7 @@ self: { description = "Collision-resistant IDs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hscurses" = callPackage @@ -114851,9 +118941,10 @@ self: { description = "Haskell development library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "hsdev_0_3_3_0" = callPackage + "hsdev_0_3_3_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec , base, bytestring, Cabal, containers, cpphs, data-default, deepseq , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc @@ -114867,8 +118958,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.3.3.0"; - sha256 = "17pylby88xmr8hibhpiyygzdnjwznh1zss4969z6w2dk2489lkrz"; + version = "0.3.3.1"; + sha256 = "09i1m3xkvjzq69mpzf73g3jxf3g5md8lfrxjwza6ns8ii9m4xcqh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114894,6 +118985,7 @@ self: { description = "Haskell development library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsdif" = callPackage @@ -114907,6 +118999,7 @@ self: { description = "Haskell SDIF"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsdip" = callPackage @@ -114922,6 +119015,7 @@ self: { description = "hsdip - a Diplomacy parser/renderer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsdns" = callPackage @@ -114947,6 +119041,8 @@ self: { pname = "hsdns"; version = "1.8"; sha256 = "0jxnfgzsshhaf3n8ywhxy84l6ldhz5cdwaayr61v26iqgm3c3qk0"; + revision = "1"; + editedCabalFile = "09ixj0xywmbigfhqmq58dwqns8l3w6wprykafg52fx69bvhg9yph"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers network ]; @@ -114971,6 +119067,7 @@ self: { description = "Caching asynchronous DNS resolver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hse-cpp" = callPackage @@ -115044,6 +119141,7 @@ self: { description = "Virtual Haskell Environment builder"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hserv" = callPackage @@ -115101,6 +119199,7 @@ self: { description = "A small and ugly library that emulates the output of the puppet facter program"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsfcsh" = callPackage @@ -115117,6 +119216,7 @@ self: { description = "Incremental builder for flash"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsfilt" = callPackage @@ -115131,6 +119231,30 @@ self: { description = "Z-decoder"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "hsforce" = callPackage + ({ mkDerivation, aeson, base, bytestring, fast-tagsoup, HaXml + , http-conduit, network-uri, regex-posix, tagsoup, template-haskell + , text, unordered-containers, uri-encode + }: + mkDerivation { + pname = "hsforce"; + version = "0.1.0.1"; + sha256 = "1n4zg3g0287j7z7vmmafv4gjwjl6f5dljl5gbhm9kr0ailsr1dr3"; + libraryHaskellDepends = [ + aeson base bytestring fast-tagsoup HaXml http-conduit network-uri + regex-posix tagsoup template-haskell text unordered-containers + uri-encode + ]; + testHaskellDepends = [ + aeson base bytestring fast-tagsoup HaXml http-conduit network-uri + regex-posix tagsoup template-haskell text unordered-containers + uri-encode + ]; + description = "Salesforce API Client"; + license = stdenv.lib.licenses.bsd3; }) {}; "hsgnutls" = callPackage @@ -115144,6 +119268,7 @@ self: { description = "Library wrapping the GnuTLS API"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gcrypt = null; inherit (pkgs) gnutls;}; "hsgnutls-yj" = callPackage @@ -115157,6 +119282,7 @@ self: { description = "Library wrapping the GnuTLS API"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gcrypt = null; inherit (pkgs) gnutls;}; "hsgsom" = callPackage @@ -115170,6 +119296,7 @@ self: { description = "An implementation of the GSOM clustering algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsgtd" = callPackage @@ -115218,6 +119345,7 @@ self: { description = "Signal processing and EEG data analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) blas; inherit (pkgs) gsl; inherit (pkgs) liblapack;}; @@ -115259,6 +119387,7 @@ self: { description = "A command line program for extending the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsini" = callPackage @@ -115306,6 +119435,7 @@ self: { description = "Skeleton for new Haskell programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hslackbuilder" = callPackage @@ -115322,6 +119452,7 @@ self: { description = "HSlackBuilder automatically generates slackBuild scripts from a cabal package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hslibsvm" = callPackage @@ -115336,6 +119467,7 @@ self: { description = "A FFI binding to libsvm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {svm = null;}; "hslinks" = callPackage @@ -115353,6 +119485,7 @@ self: { description = "Resolves links to Haskell identifiers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hslogger" = callPackage @@ -115389,6 +119522,7 @@ self: { description = "Parsing hslogger-produced logs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hslogger-template" = callPackage @@ -115439,6 +119573,7 @@ self: { description = "A library to work with, or as, a logstash server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hslua" = callPackage @@ -115509,6 +119644,7 @@ self: { description = "HSLuv conversion utility"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsmagick" = callPackage @@ -115533,6 +119669,7 @@ self: { description = "FFI bindings for the GraphicsMagick library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; inherit (pkgs) jasper; inherit (pkgs) lcms; inherit (pkgs) libjpeg; inherit (pkgs) libpng; @@ -115571,6 +119708,7 @@ self: { description = "Tool for generating .dir-locals.el for intero"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsmtpclient" = callPackage @@ -115583,6 +119721,7 @@ self: { description = "Simple SMTP Client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsndfile" = callPackage @@ -115640,6 +119779,7 @@ self: { description = "Nock 5K interpreter"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsnoise" = callPackage @@ -115665,6 +119805,7 @@ self: { description = "a miniature network sniffer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsnsq" = callPackage @@ -115684,6 +119825,7 @@ self: { description = "Haskell NSQ client"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsntp" = callPackage @@ -115701,6 +119843,7 @@ self: { description = "Libraries to use SNTP protocol and small client/server implementations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsoptions" = callPackage @@ -115726,6 +119869,7 @@ self: { description = "Haskell library that supports command-line flag processing"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsoz" = callPackage @@ -115765,6 +119909,7 @@ self: { description = "Iron, Hawk, Oz: Web auth protocols"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsp" = callPackage @@ -115788,6 +119933,7 @@ self: { description = "Facilitates running Haskell Server Pages web pages as CGI programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsparklines" = callPackage @@ -115821,6 +119967,7 @@ self: { description = "A SPARQL query generator and DSL, and a client to query a SPARQL server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspear" = callPackage @@ -115837,6 +119984,7 @@ self: { description = "Haskell Spear Parser"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspec" = callPackage @@ -116080,6 +120228,7 @@ self: { description = "An hspec expectation that asserts a value matches a pattern"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspec-expectations-pretty" = callPackage @@ -116096,6 +120245,7 @@ self: { description = "hspec-expectations with pretty printing on failure"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspec-expectations-pretty-diff" = callPackage @@ -116125,6 +120275,7 @@ self: { description = "An experimental DSL for testing on top of Hspec"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspec-golden-aeson" = callPackage @@ -116175,6 +120326,7 @@ self: { description = "Hedgehog support for the Hspec testing framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspec-jenkins" = callPackage @@ -116187,6 +120339,7 @@ self: { description = "Jenkins-friendly XML formatter for Hspec"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspec-laws" = callPackage @@ -116274,6 +120427,7 @@ self: { description = "Orphan instances of MonadBase and MonadBaseControl for SpecM"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspec-multicheck" = callPackage @@ -116321,6 +120475,7 @@ self: { description = "Helpers for creating database tests with hspec and pg-transact"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspec-server" = callPackage @@ -116369,6 +120524,7 @@ self: { description = "Add an hspec test-suite in one command"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspec-shouldbe" = callPackage @@ -116381,6 +120537,7 @@ self: { description = "Convenience wrapper and utilities for hspec"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspec-slow" = callPackage @@ -116436,6 +120593,7 @@ self: { description = "A library for testing with Hspec and the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspec-stack-rerun" = callPackage @@ -116458,6 +120616,7 @@ self: { libraryHaskellDepends = [ base hspec ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspec-test-framework" = callPackage @@ -116559,6 +120718,7 @@ self: { description = "Write end2end web application tests using webdriver and hspec"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspec2" = callPackage @@ -116573,6 +120733,7 @@ self: { description = "Alpha version of Hspec 2.0"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspecVariant" = callPackage @@ -116585,6 +120746,7 @@ self: { description = "Spec for testing properties for variant types"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspkcs11" = callPackage @@ -116604,6 +120766,7 @@ self: { description = "Wrapper for PKCS #11 interface"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspr-sh" = callPackage @@ -116631,6 +120794,7 @@ self: { description = "A client library for the spread toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hspresent" = callPackage @@ -116646,6 +120810,7 @@ self: { description = "A terminal presentation tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsprocess" = callPackage @@ -116672,6 +120837,7 @@ self: { description = "The Haskell Stream Processor command line utility"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsql" = callPackage @@ -116684,6 +120850,7 @@ self: { description = "Database access from Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsql-mysql" = callPackage @@ -116699,6 +120866,7 @@ self: { description = "MySQL driver for HSQL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {mysqlclient = null;}; "hsql-odbc" = callPackage @@ -116712,6 +120880,7 @@ self: { description = "A Haskell Interface to ODBC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) unixODBC;}; "hsql-postgresql" = callPackage @@ -116725,6 +120894,7 @@ self: { description = "A Haskell Interface to PostgreSQL via the PQ library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) postgresql;}; "hsql-sqlite3" = callPackage @@ -116738,6 +120908,7 @@ self: { description = "SQLite3 driver for HSQL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) sqlite;}; "hsqml" = callPackage @@ -116760,6 +120931,7 @@ self: { description = "Haskell binding for Qt Quick"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {qt5 = null;}; "hsqml-datamodel" = callPackage @@ -116773,6 +120945,7 @@ self: { description = "HsQML (Qt5) data model"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {qt5 = null;}; "hsqml-datamodel-vinyl" = callPackage @@ -116789,6 +120962,7 @@ self: { description = "HsQML DataModel instances for Vinyl Rec"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsqml-demo-manic" = callPackage @@ -116806,6 +120980,7 @@ self: { description = "HsQML-based clone of Pipe Mania"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsqml-demo-morris" = callPackage @@ -116825,6 +121000,7 @@ self: { description = "HsQML-based implementation of Nine Men's Morris"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsqml-demo-notes" = callPackage @@ -116844,6 +121020,7 @@ self: { description = "Sticky notes example program implemented in HsQML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsqml-demo-samples" = callPackage @@ -116859,6 +121036,7 @@ self: { description = "HsQML sample programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsqml-morris" = callPackage @@ -116878,6 +121056,7 @@ self: { description = "HsQML-based implementation of Nine Men's Morris"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsreadability" = callPackage @@ -116902,6 +121081,7 @@ self: { description = "Access to the Readability API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsrelp" = callPackage @@ -116930,6 +121110,7 @@ self: { description = "Haskell bindings to libseccomp"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {seccomp = null;}; "hssh" = callPackage @@ -117002,6 +121183,7 @@ self: { description = "SQL parser and type checker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hssqlppp-th" = callPackage @@ -117021,6 +121203,7 @@ self: { description = "hssqlppp extras which need template-haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hstatistics" = callPackage @@ -117039,6 +121222,7 @@ self: { description = "Statistics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hstats" = callPackage @@ -117051,6 +121235,7 @@ self: { description = "Statistical Computing in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hstatsd" = callPackage @@ -117080,6 +121265,7 @@ self: { description = "Runs tests via QuickCheck1 and HUnit; like quickCheck-script but uses GHC api"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hstidy" = callPackage @@ -117094,6 +121280,7 @@ self: { description = "Takes haskell source on stdin, parses it, then prettyprints it to stdout"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hstorchat" = callPackage @@ -117123,6 +121310,7 @@ self: { description = "Distributed instant messaging over Tor"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hstox" = callPackage @@ -117151,6 +121339,7 @@ self: { description = "A Tox protocol implementation in Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hstradeking" = callPackage @@ -117176,6 +121365,7 @@ self: { description = "Tradeking API bindings for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hstyle" = callPackage @@ -117194,6 +121384,7 @@ self: { description = "Checks Haskell source code for style compliance"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hstzaar" = callPackage @@ -117215,6 +121406,7 @@ self: { description = "A two player abstract strategy game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsubconvert" = callPackage @@ -117237,6 +121429,7 @@ self: { description = "One-time, faithful conversion of Subversion repositories to Git"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsudoku" = callPackage @@ -117266,6 +121459,7 @@ self: { description = "Sudoku game with a GTK3 interface"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsverilog" = callPackage @@ -117298,6 +121492,7 @@ self: { description = "embedding prolog in haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ncurses; inherit (pkgs) readline; swipl = null;}; @@ -117315,6 +121510,7 @@ self: { description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsx-jmacro" = callPackage @@ -117329,6 +121525,7 @@ self: { description = "hsp+jmacro support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsx-xhtml" = callPackage @@ -117341,6 +121538,7 @@ self: { description = "XHTML utilities to use together with HSX"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsx2hs" = callPackage @@ -117371,6 +121569,7 @@ self: { description = "FFI to syscalls"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsyslog" = callPackage @@ -117379,6 +121578,8 @@ self: { pname = "hsyslog"; version = "5.0.2"; sha256 = "1kkypn0dd92aqv8dr112bhkr9k9r9mchnyyvy41kvhj2zg447v1y"; + revision = "1"; + editedCabalFile = "0k1j46nk3z64zw4bqmvw5lgy16ih200m66rv4b6ygjqv7nglqq0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -117401,6 +121602,7 @@ self: { description = "syslog over TCP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsyslog-udp" = callPackage @@ -117418,6 +121620,7 @@ self: { description = "Log to syslog over a network via UDP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hszephyr" = callPackage @@ -117431,6 +121634,7 @@ self: { description = "Simple libzephyr bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {com_err = null; zephyr = null;}; "htaglib" = callPackage @@ -117481,6 +121685,7 @@ self: { description = "Command-line tar archive utility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "htaut" = callPackage @@ -117508,6 +121713,7 @@ self: { description = "A library for testing correctness of pseudo random number generators in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gcc;}; "htiled" = callPackage @@ -117525,6 +121731,7 @@ self: { description = "Import from the Tiled map editor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "htime" = callPackage @@ -117566,6 +121773,7 @@ self: { description = "Heterogenous Set"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "html" = callPackage @@ -117602,6 +121810,7 @@ self: { description = "Determine character encoding of HTML documents/fragments"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "html-conduit_1_2_1_2" = callPackage @@ -117668,14 +121877,13 @@ self: { }: mkDerivation { pname = "html-entities"; - version = "1.1.4.2"; - sha256 = "1ryfslp60s0d0ygmnxfgw9p8s7l2xq1i5kmj86g2ghdljf8hq6hn"; + version = "1.1.4.3"; + sha256 = "0mjmmnh3mfi0ccl5wi5b65afi66wj5xdvva13qw22naa31ibbsnf"; libraryHaskellDepends = [ attoparsec base base-prelude text unordered-containers ]; description = "A codec library for HTML-escaped text and HTML-entities"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "html-entity" = callPackage @@ -117724,6 +121932,7 @@ self: { description = "HTML rewrite engine, using KURE"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "html-minimalist" = callPackage @@ -117772,6 +121981,7 @@ self: { description = "Perform traversals of HTML structures using sets of rules"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "html-tokenizer" = callPackage @@ -117795,6 +122005,7 @@ self: { description = "An \"attoparsec\"-based HTML tokenizer"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "html-truncate" = callPackage @@ -117964,6 +122175,7 @@ self: { description = "Haskell Music Typesetting"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "htsn" = callPackage @@ -117988,6 +122200,7 @@ self: { description = "Parse XML files from The Sports Network feed"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "htsn-common" = callPackage @@ -118031,6 +122244,7 @@ self: { description = "Import XML files from The Sports Network into an RDBMS"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "htssets" = callPackage @@ -118093,6 +122307,7 @@ self: { description = "Attoparsec parsers for http-types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-client" = callPackage @@ -118124,7 +122339,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_6_1" = callPackage + "http-client_0_6_2" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , case-insensitive, containers, cookie, deepseq, directory , exceptions, filepath, ghc-prim, hspec, http-types, memory @@ -118133,10 +122348,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.6.1"; - sha256 = "0ryj5far7744c297ji9aaqcm56rpm2fyma8mbghli086nq4xiryl"; - revision = "1"; - editedCabalFile = "10fihwn9vvk4mdjppmzhxz7iacm8av03xv8hshiwnz3wg6bfh813"; + version = "0.6.2"; + sha256 = "1w22n2jqbwwzgljaw9frhhmkm7bq6xzdcmd4z6mhx35n3a4nshlv"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -118171,6 +122384,7 @@ self: { description = "HTTP authorization (both basic and digest) done right"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-client-conduit" = callPackage @@ -118218,6 +122432,7 @@ self: { description = "Optics for http-client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-client-multipart" = callPackage @@ -118268,6 +122483,7 @@ self: { description = "Convenient monadic HTTP request modifiers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-client-restricted" = callPackage @@ -118300,6 +122516,7 @@ self: { description = "A simple abstraction over the \"http-client\" connection manager"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-client-streams" = callPackage @@ -118317,6 +122534,7 @@ self: { description = "http-client for io-streams supporting openssl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-client-tls" = callPackage @@ -118402,10 +122620,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.3.5"; - sha256 = "0hbdsp5x7mwxcjkshkf0hqfgkjcsy1g34m4im5v078izhv3fzad9"; - revision = "1"; - editedCabalFile = "03yfl2n04blmmqca18b18jwplmcz7qjzqjgzrrzbd1nr290ivqjz"; + version = "2.3.6.1"; + sha256 = "0rjrs6kx9dzgln5k0rfjlrwvrk7ixfppmq1qaq574kxw3ry3snj4"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra http-client http-client-tls http-types mtl resourcet transformers unliftio-core @@ -118447,6 +122663,7 @@ self: { description = "Browser interface to the http-conduit package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-conduit-downloader" = callPackage @@ -118456,8 +122673,8 @@ self: { }: mkDerivation { pname = "http-conduit-downloader"; - version = "1.0.31"; - sha256 = "1ng41s2y176223blzxdywlv7hmbdh7i5nwr63la7jfnd9rcdr83c"; + version = "1.0.33"; + sha256 = "07pn2p143rfmvax3zx53hlgh0rfynn60g0z6cw6vazrxap4v3pr3"; libraryHaskellDepends = [ base bytestring conduit connection data-default HsOpenSSL http-client http-conduit http-types mtl network network-uri @@ -118465,6 +122682,8 @@ self: { ]; description = "HTTP downloader tailored for web-crawler needs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-date" = callPackage @@ -118499,6 +122718,7 @@ self: { description = "High level HTTP client for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-encodings" = callPackage @@ -118541,6 +122761,7 @@ self: { description = "HTTP client package with enumerator interface and HTTPS support. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-grammar" = callPackage @@ -118553,6 +122774,7 @@ self: { description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-io-streams" = callPackage @@ -118574,7 +122796,6 @@ self: { ]; description = "HTTP client based on io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-kinder" = callPackage @@ -118598,6 +122819,7 @@ self: { description = "Generic kinds and types for working with HTTP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-kit" = callPackage @@ -118697,6 +122919,7 @@ self: { description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-pony" = callPackage @@ -118733,6 +122956,7 @@ self: { description = "Serve a WAI application with http-pony"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-pony-transformer-case-insensitive" = callPackage @@ -118800,6 +123024,7 @@ self: { description = "A library for writing HTTP and HTTPS proxies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-querystring" = callPackage @@ -118817,6 +123042,7 @@ self: { description = "The HTTP query builder"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-response-decoder" = callPackage @@ -118837,6 +123063,7 @@ self: { description = "Declarative DSL for parsing an HTTP response"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-reverse-proxy" = callPackage @@ -118890,6 +123117,7 @@ self: { description = "A simple websever with an interact style API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-streams" = callPackage @@ -118968,8 +123196,8 @@ self: { }: mkDerivation { pname = "http-types"; - version = "0.12.2"; - sha256 = "01ck5wmzvl5cqd3w2kwkrmp18n78474a3lngk6ry28w9pbbh4caj"; + version = "0.12.3"; + sha256 = "05j00b9nqmwh9zaq9y9x50k81v2pd3j7a71kd91zlnbl8xk4m2jf"; libraryHaskellDepends = [ array base bytestring case-insensitive text ]; @@ -118990,6 +123218,7 @@ self: { description = "Provide a simple HTTP client interface by wrapping the wget command line tool. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http2" = callPackage @@ -119073,6 +123302,7 @@ self: { description = "Implement gRPC-over-HTTP2 clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http2-grpc-types" = callPackage @@ -119129,6 +123359,7 @@ self: { description = "High-level access to HTTPS Everywhere rulesets"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "https-everywhere-rules-raw" = callPackage @@ -119144,6 +123375,7 @@ self: { description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets."; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "httpspec" = callPackage @@ -119162,6 +123394,7 @@ self: { description = "Specification of HTTP request/response generators and parsers"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "htune" = callPackage @@ -119176,6 +123409,7 @@ self: { description = "harmonic analyser and tuner for musical instruments"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "htvm" = callPackage @@ -119204,6 +123438,7 @@ self: { description = "Bindings for TVM machine learning framework"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {tvm_runtime = null;}; "htzaar" = callPackage @@ -119218,6 +123453,7 @@ self: { description = "A two player abstract strategy game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hub" = callPackage @@ -119248,7 +123484,6 @@ self: { libraryHaskellDepends = [ base containers haxr mtl ]; description = "A haskell wrap for Ubigraph"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hubris" = callPackage @@ -119295,6 +123530,7 @@ self: { description = "huck"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "huckleberry" = callPackage @@ -119327,6 +123563,7 @@ self: { description = "A fast-foward-based planner"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "huffman" = callPackage @@ -119339,6 +123576,7 @@ self: { description = "Pure Haskell implementation of the Huffman encoding algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hugs2yc" = callPackage @@ -119356,6 +123594,7 @@ self: { description = "Hugs Front-end to Yhc Core"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hulk" = callPackage @@ -119383,6 +123622,7 @@ self: { description = "IRC server written in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "human-parse" = callPackage @@ -119395,6 +123635,7 @@ self: { description = "A lawless typeclass for parsing text entered by humans"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "human-readable-duration" = callPackage @@ -119420,6 +123661,7 @@ self: { description = "A lawless typeclass for converting values to human-friendly text"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hums" = callPackage @@ -119445,6 +123687,7 @@ self: { description = "Haskell UPnP Media Server"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hunch" = callPackage @@ -119506,6 +123749,7 @@ self: { description = "A GUI testrunner for HUnit"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hunit-parsec" = callPackage @@ -119530,6 +123774,7 @@ self: { description = "HUnit support for rematch"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hunp" = callPackage @@ -119549,6 +123794,7 @@ self: { description = "Unpacker tool with DWIM"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hunspell-hs" = callPackage @@ -119566,6 +123812,7 @@ self: { description = "Hunspell thread-safe FFI bindings for spell checking"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) hunspell;}; "hunt-searchengine" = callPackage @@ -119598,6 +123845,7 @@ self: { description = "A search and indexing engine"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hunt-server" = callPackage @@ -119622,6 +123870,7 @@ self: { description = "A search and indexing engine server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hunt-server-cli" = callPackage @@ -119678,6 +123927,7 @@ self: { description = "Upload packages or documentation to a hackage server"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hurdle" = callPackage @@ -119694,6 +123944,7 @@ self: { description = "Extract function names from Windows DLLs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hurriyet" = callPackage @@ -119713,6 +123964,7 @@ self: { description = "Haskell bindings for Hurriyet API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "husk-scheme" = callPackage @@ -119738,6 +123990,7 @@ self: { description = "R5RS Scheme interpreter, compiler, and library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "husk-scheme-libs" = callPackage @@ -119754,6 +124007,7 @@ self: { description = "Extra libraries for the husk Scheme platform"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "husky" = callPackage @@ -119772,6 +124026,7 @@ self: { description = "A simple command line calculator"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hutton" = callPackage @@ -119793,6 +124048,7 @@ self: { description = "A program for the button on Reddit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "huttons-razor" = callPackage @@ -119807,6 +124063,7 @@ self: { description = "Quick implemention of Hutton's Razor"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "huzzy" = callPackage @@ -119819,6 +124076,7 @@ self: { description = "Fuzzy logic library with support for T1, IT2, GT2"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hvect" = callPackage @@ -119876,6 +124134,7 @@ self: { description = "Balanced parentheses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-bits" = callPackage @@ -119898,6 +124157,7 @@ self: { description = "Bit manipulation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-conduit" = callPackage @@ -119985,6 +124245,7 @@ self: { description = "Unbelievably fast streaming DSV file parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-dump" = callPackage @@ -120015,6 +124276,7 @@ self: { description = "File Dump"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-eliasfano" = callPackage @@ -120034,6 +124296,7 @@ self: { description = "Elias-Fano"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-excess" = callPackage @@ -120053,6 +124316,7 @@ self: { description = "Excess"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-fingertree" = callPackage @@ -120164,6 +124428,7 @@ self: { description = "Library for manipulating IP addresses and CIDR blocks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-json" = callPackage @@ -120200,6 +124465,7 @@ self: { description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-json_1_0_0_1" = callPackage @@ -120238,6 +124504,7 @@ self: { description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-json-lens" = callPackage @@ -120257,6 +124524,7 @@ self: { description = "Lens for hw-json"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-json-simd" = callPackage @@ -120278,6 +124546,7 @@ self: { description = "SIMD-based JSON semi-indexer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-kafka-avro" = callPackage @@ -120417,6 +124686,7 @@ self: { description = "Packed Vector"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-parser" = callPackage @@ -120431,6 +124701,7 @@ self: { description = "Simple parser support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-prim" = callPackage @@ -120455,6 +124726,7 @@ self: { description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-prim-bits" = callPackage @@ -120475,6 +124747,8 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Primitive support for bit manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-rankselect" = callPackage @@ -120509,6 +124783,7 @@ self: { description = "Rank-select"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-rankselect-base" = callPackage @@ -120533,6 +124808,7 @@ self: { description = "Rank-select base"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-simd" = callPackage @@ -120563,6 +124839,7 @@ self: { description = "SIMD library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-streams" = callPackage @@ -120592,6 +124869,7 @@ self: { description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-string-parse" = callPackage @@ -120623,6 +124901,7 @@ self: { description = "Succint datastructures"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-vector" = callPackage @@ -120638,6 +124917,7 @@ self: { description = "Vector type with convenient typeclass instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-xml" = callPackage @@ -120678,6 +124958,7 @@ self: { description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hwall-auth-iitk" = callPackage @@ -120697,6 +124978,7 @@ self: { description = "Initial version of firewall Authentication for IITK network"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hweblib" = callPackage @@ -120720,6 +125002,7 @@ self: { description = "Haskell Web Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hwhile" = callPackage @@ -120728,8 +125011,8 @@ self: { }: mkDerivation { pname = "hwhile"; - version = "0.1.1.3"; - sha256 = "1cd5a6szangr456dsw6j4zf8cgg30lw4dkhsjhw02lag9ips6v7s"; + version = "0.1.1.6"; + sha256 = "1cbb4djd0dnawbvjxnnsw6k7kz6gv79gkywvvvdbzri0krzb9isk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120741,6 +125024,7 @@ self: { description = "An implementation of Neil D. Jones' While language"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hworker" = callPackage @@ -120763,6 +125047,7 @@ self: { description = "A reliable at-least-once job queue built on top of redis"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hworker-ses" = callPackage @@ -120780,6 +125065,7 @@ self: { description = "Library for sending email with Amazon's SES and hworker"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hwormhole" = callPackage @@ -120814,6 +125100,7 @@ self: { description = "magic-wormhole client"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hws" = callPackage @@ -120833,6 +125120,7 @@ self: { description = "Simple Haskell Web Server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hwsl2" = callPackage @@ -120853,6 +125141,7 @@ self: { description = "Hashing with SL2"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hwsl2-bytevector" = callPackage @@ -120865,6 +125154,7 @@ self: { description = "A hashed byte-vector based on algebraic hashes and finger trees"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hwsl2-reducers" = callPackage @@ -120879,6 +125169,7 @@ self: { description = "Semigroup and Reducer instances for Data.Hash.SL2"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hx" = callPackage @@ -120909,6 +125200,7 @@ self: { description = "Haskell XMPP (Jabber Client) Command Line Interface (CLI)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hxournal" = callPackage @@ -120936,6 +125228,7 @@ self: { description = "A pen notetaking program written in haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hxt" = callPackage @@ -121092,6 +125385,7 @@ self: { description = "Utility functions for using HXT picklers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hxt-regex-xmlschema" = callPackage @@ -121197,6 +125491,7 @@ self: { description = "Helper functions for HXT"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hxweb" = callPackage @@ -121209,6 +125504,7 @@ self: { description = "Minimal webframework using fastcgi, libxml2 and libxslt"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hyahtzee" = callPackage @@ -121223,6 +125519,7 @@ self: { description = "A Yahtzee game implementation in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hyakko" = callPackage @@ -121245,6 +125542,7 @@ self: { description = "Literate-style Documentation Generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hybrid" = callPackage @@ -121262,6 +125560,7 @@ self: { description = "A implementation of a type-checker for Lambda-H"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hybrid-vectors" = callPackage @@ -121289,6 +125588,7 @@ self: { description = "Haskell binding to the Sixense SDK for the Razer Hydra"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {sixense_x64 = null;}; "hydra-print" = callPackage @@ -121321,6 +125621,7 @@ self: { description = "NCurses interface to view multiple ByteString streams in parallel"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hydrogen" = callPackage @@ -121338,6 +125639,7 @@ self: { description = "An alternate Prelude"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hydrogen-cli" = callPackage @@ -121359,6 +125661,7 @@ self: { description = "Hydrogen Data"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hydrogen-cli-args" = callPackage @@ -121375,6 +125678,7 @@ self: { description = "Hydrogen Command Line Arguments Parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hydrogen-data" = callPackage @@ -121387,6 +125691,7 @@ self: { description = "Hydrogen Data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hydrogen-multimap" = callPackage @@ -121399,6 +125704,7 @@ self: { description = "Hydrogen Multimap"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hydrogen-parsing" = callPackage @@ -121413,6 +125719,7 @@ self: { description = "Hydrogen Parsing Utilities"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hydrogen-prelude" = callPackage @@ -121433,6 +125740,7 @@ self: { description = "Hydrogen Prelude"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hydrogen-prelude-parsec" = callPackage @@ -121445,6 +125753,7 @@ self: { description = "Hydrogen Prelude /w Parsec"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hydrogen-syntax" = callPackage @@ -121462,6 +125771,7 @@ self: { description = "Hydrogen Syntax"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hydrogen-util" = callPackage @@ -121477,6 +125787,7 @@ self: { description = "Hydrogen Tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hydrogen-version" = callPackage @@ -121506,6 +125817,7 @@ self: { description = "Simple web application server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hylide" = callPackage @@ -121528,6 +125840,7 @@ self: { description = "WebGL live-coding environment for writing shaders with Hylogen"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hylogen" = callPackage @@ -121555,6 +125868,7 @@ self: { description = "Tools for hybrid logics related programs"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hylotab" = callPackage @@ -121570,6 +125884,7 @@ self: { description = "Tableau based theorem prover for hybrid logics"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hyloutils" = callPackage @@ -121586,6 +125901,7 @@ self: { description = "Very small programs for hybrid logics"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hyper" = callPackage @@ -121631,6 +125947,7 @@ self: { description = "Server back-end for the HyperHaskell graphical Haskell interpreter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hyperdrive" = callPackage @@ -121650,6 +125967,7 @@ self: { description = "a fast, trustworthy HTTP(s) server built"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hyperfunctions" = callPackage @@ -121666,6 +125984,7 @@ self: { description = "Hyperfunctions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hyperion" = callPackage @@ -121694,6 +126013,7 @@ self: { description = "Reliable performance measurement with robust data export"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hyperloglog" = callPackage @@ -121736,6 +126056,7 @@ self: { description = "Approximate cardinality estimation using constant space"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hyperpublic" = callPackage @@ -121752,6 +126073,7 @@ self: { description = "A thin wrapper for the Hyperpublic API"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hyphenate" = callPackage @@ -121815,6 +126137,7 @@ self: { description = "A Haskell neo4j client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hyraxAbif" = callPackage @@ -121925,6 +126248,7 @@ self: { description = "A haskell wrapper for the Zulip API"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "i18n" = callPackage @@ -121946,6 +126270,26 @@ self: { description = "Internationalization for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "i3ipc" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers, hspec + , network, text, typed-process, vector + }: + mkDerivation { + pname = "i3ipc"; + version = "0.1.0.0"; + sha256 = "05bpp6gz4hdjifs2q3m5b5i45438b82mxf3yq4dp100ypg6pa705"; + libraryHaskellDepends = [ + aeson base binary bytestring containers network text typed-process + vector + ]; + testHaskellDepends = [ aeson base bytestring hspec ]; + description = "A type-safe wrapper around i3's IPC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iCalendar" = callPackage @@ -121965,6 +126309,7 @@ self: { description = "iCalendar data types, parser, and printer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iException" = callPackage @@ -121994,6 +126339,7 @@ self: { description = "A simple wrapper of In-App-Purchase receipt validate APIs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ib-api" = callPackage @@ -122011,6 +126357,7 @@ self: { description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iban" = callPackage @@ -122030,6 +126377,7 @@ self: { description = "Validate and generate IBANs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ibus-hs" = callPackage @@ -122063,6 +126411,7 @@ self: { description = "iCalendar format parser and org-mode converter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "icon-fonts" = callPackage @@ -122101,7 +126450,6 @@ self: { testHaskellDepends = [ base ]; description = "Type safe iconv wrapper"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ide-backend" = callPackage @@ -122149,6 +126497,7 @@ self: { description = "An IDE backend library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ide-backend-common" = callPackage @@ -122174,6 +126523,7 @@ self: { description = "Shared library used be ide-backend and ide-backend-server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ide-backend-rts" = callPackage @@ -122209,6 +126559,7 @@ self: { description = "An IDE backend server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ideas" = callPackage @@ -122229,6 +126580,7 @@ self: { description = "Feedback services for intelligent tutoring systems"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ideas-math" = callPackage @@ -122247,6 +126599,7 @@ self: { description = "Interactive domain reasoner for logic and mathematics"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "idempotent" = callPackage @@ -122260,6 +126613,7 @@ self: { description = "Idempotent monoids"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "identicon" = callPackage @@ -122292,6 +126646,8 @@ self: { pname = "identicon-style-squares"; version = "0.1.0.1"; sha256 = "1x456v7fb211f7ciipp2bfn9fvh5w4i34bl5mjw7bkn7hgsaa3x6"; + revision = "2"; + editedCabalFile = "1bi5sn62z23j9n7bxlaz5qiwk52v7sfr70bk0by9vk6nlylli8r1"; libraryHaskellDepends = [ base identicon JuicyPixels polyvariadic ]; @@ -122325,6 +126681,7 @@ self: { description = "Numeric identifiers for values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "idiii" = callPackage @@ -122351,6 +126708,7 @@ self: { description = "ID3v2 (tagging standard for MP3 files) library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "idna" = callPackage @@ -122374,6 +126732,7 @@ self: { description = "Converts Unicode hostnames into ASCII"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "idringen" = callPackage @@ -122437,7 +126796,6 @@ self: { ]; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp;}; "ieee" = callPackage @@ -122461,6 +126819,7 @@ self: { description = "ieee-utils"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ieee-utils-tempfix" = callPackage @@ -122519,6 +126878,7 @@ self: { description = "put if statements within type constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iff" = callPackage @@ -122568,6 +126928,7 @@ self: { description = "Bindings to Instagram's API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ige" = callPackage @@ -122591,6 +126952,7 @@ self: { description = "An keyboard-driven interactive graph editor"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ige-mac-integration" = callPackage @@ -122610,6 +126972,7 @@ self: { description = "Bindings for the Gtk/OS X integration library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {ige-mac-integration = null;}; "ignore" = callPackage @@ -122630,6 +126993,7 @@ self: { description = "Handle ignore files of different VCSes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "igraph" = callPackage @@ -122648,6 +127012,7 @@ self: { description = "Bindings to the igraph C library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) igraph;}; "igrf" = callPackage @@ -122662,6 +127027,7 @@ self: { description = "International Geomagnetic Reference Field"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell" = callPackage @@ -122698,6 +127064,7 @@ self: { description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-aeson" = callPackage @@ -122714,6 +127081,7 @@ self: { description = "IHaskell display instances for Aeson"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-basic" = callPackage @@ -122726,6 +127094,7 @@ self: { description = "IHaskell display instances for basic types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-blaze" = callPackage @@ -122738,6 +127107,7 @@ self: { description = "IHaskell display instances for blaze-html types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-charts" = callPackage @@ -122755,6 +127125,7 @@ self: { description = "IHaskell display instances for charts types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-diagrams" = callPackage @@ -122772,6 +127143,7 @@ self: { description = "IHaskell display instances for diagram types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-display" = callPackage @@ -122784,6 +127156,7 @@ self: { description = "IHaskell display instances for basic types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-gnuplot" = callPackage @@ -122796,6 +127169,7 @@ self: { description = "IHaskell display instance for Gnuplot (from gnuplot package)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-hatex" = callPackage @@ -122808,6 +127182,7 @@ self: { description = "IHaskell display instances for hatex"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-hvega" = callPackage @@ -122820,6 +127195,7 @@ self: { description = "IHaskell display instance for hvega types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-inline-r" = callPackage @@ -122838,6 +127214,7 @@ self: { description = "Embed R quasiquotes and plots in IHaskell notebooks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-juicypixels" = callPackage @@ -122853,6 +127230,7 @@ self: { description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-magic" = callPackage @@ -122870,6 +127248,7 @@ self: { description = "IHaskell display instances for bytestrings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-parsec" = callPackage @@ -122886,6 +127265,7 @@ self: { description = "IHaskell display instances for Parsec"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-plot" = callPackage @@ -122898,6 +127278,7 @@ self: { description = "IHaskell display instance for Plot (from plot package)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-rlangqq" = callPackage @@ -122916,6 +127297,7 @@ self: { description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-widgets" = callPackage @@ -122934,6 +127316,7 @@ self: { description = "IPython standard widgets for IHaskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihs" = callPackage @@ -122966,6 +127349,7 @@ self: { description = "Incremental HTTP iteratee"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ilist" = callPackage @@ -123004,6 +127388,7 @@ self: { description = "A fast syntax highlighting library built with alex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "image-type" = callPackage @@ -123073,6 +127458,7 @@ self: { description = "Command-line image paste utility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "imagesize-conduit" = callPackage @@ -123120,6 +127506,7 @@ self: { description = "An efficient IMAP client library, with SSL and streaming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "imapget" = callPackage @@ -123138,6 +127525,7 @@ self: { description = "Downloads email from imap SSL servers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "imbib" = callPackage @@ -123160,6 +127548,7 @@ self: { description = "Minimalistic reference manager"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "imgurder" = callPackage @@ -123181,6 +127570,7 @@ self: { description = "Uploader for Imgur"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "imj-animation" = callPackage @@ -123194,6 +127584,7 @@ self: { description = "Animation Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "imj-base" = callPackage @@ -123219,6 +127610,7 @@ self: { description = "Game engine with geometry, easing, animated text, delta rendering"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "imj-game-hamazed" = callPackage @@ -123240,6 +127632,7 @@ self: { description = "A game with flying numbers and 8-bit color animations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "imj-measure-stdout" = callPackage @@ -123256,6 +127649,7 @@ self: { description = "An application to determine the maximum capacity of stdout buffer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "imj-prelude" = callPackage @@ -123268,6 +127662,7 @@ self: { description = "Prelude library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "imm" = callPackage @@ -123304,6 +127699,7 @@ self: { description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "immortal" = callPackage @@ -123342,6 +127738,7 @@ self: { description = "Multi-platform parser analyzer and generator"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "imperative-edsl" = callPackage @@ -123368,6 +127765,7 @@ self: { description = "Deep embedding of imperative programs with code generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "imperative-edsl-vhdl" = callPackage @@ -123385,6 +127783,7 @@ self: { description = "Deep embedding of VHDL programs with code generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "impl" = callPackage @@ -123444,6 +127843,7 @@ self: { description = "A logging framework built around implicit parameters"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "implicit-params" = callPackage @@ -123456,6 +127856,7 @@ self: { description = "Named and unnamed implicit parameters with defaults"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "importify" = callPackage @@ -123489,6 +127890,7 @@ self: { description = "Tool for haskell imports refactoring"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "imports" = callPackage @@ -123502,6 +127904,7 @@ self: { description = "Generate code for importing directories automatically"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "impossible" = callPackage @@ -123582,6 +127985,7 @@ self: { description = "An imperative, verifiable programming language for high assurance applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "impure-containers" = callPackage @@ -123594,6 +127998,8 @@ self: { pname = "impure-containers"; version = "0.5.0"; sha256 = "0rwk7wsymga61192mmjj42079v209dj9gdcjpwjmji1ivxwzy13p"; + revision = "1"; + editedCabalFile = "1lazk77rxrbmkyyrlwvbr25n47n5ncl5r32aiafkjfhv90nl4y2g"; libraryHaskellDepends = [ base containers ghc-prim hashable primitive vector ]; @@ -123605,6 +128011,7 @@ self: { description = "Mutable containers in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "inc-ref" = callPackage @@ -123639,6 +128046,7 @@ self: { description = "A type-checker for Haskell with integer constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "inchworm" = callPackage @@ -123651,6 +128059,7 @@ self: { description = "Simple parser combinators for lexical analysis"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "include-file" = callPackage @@ -123669,7 +128078,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Inclusion of files in executables at compile-time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental" = callPackage @@ -123703,6 +128111,7 @@ self: { description = "Incremental computing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "incremental-maps" = callPackage @@ -123727,6 +128136,7 @@ self: { description = "Package for doing incremental computations on maps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "incremental-parser" = callPackage @@ -123777,6 +128187,7 @@ self: { description = "type classes for incremental updates to data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "indentation" = callPackage @@ -123860,6 +128271,7 @@ self: { description = "indentation sensitive parser-combinators for parsec"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "index-core" = callPackage @@ -123893,6 +128305,7 @@ self: { description = "Tools for entity indexation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "indexed" = callPackage @@ -123967,6 +128380,7 @@ self: { description = "A series of type families and constraints for \"indexable\" types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "indian-language-font-converter" = callPackage @@ -123978,7 +128392,6 @@ self: { libraryHaskellDepends = [ base gtk HDBC HDBC-sqlite3 ]; description = "Indian Language Font Converter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "indices" = callPackage @@ -123995,6 +128408,7 @@ self: { description = "Multi-dimensional statically bounded indices"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "indieweb-algorithms" = callPackage @@ -124021,6 +128435,7 @@ self: { description = "A collection of implementations of IndieWeb algorithms"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "inf-interval" = callPackage @@ -124034,6 +128449,7 @@ self: { description = "Non-contiguous interval data types with potentially infinite ranges"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "infer-license" = callPackage @@ -124070,6 +128486,7 @@ self: { description = "Find the repository from where a given repo was forked"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "infernu" = callPackage @@ -124091,6 +128508,7 @@ self: { description = "Type inference and checker for JavaScript (experimental)"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "infinite-search" = callPackage @@ -124118,6 +128536,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "infix" = callPackage @@ -124130,6 +128549,7 @@ self: { description = "Infix expression re-parsing (for HsParser library)"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "inflections" = callPackage @@ -124162,6 +128582,7 @@ self: { description = "An infinite list type and operations thereon"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "influxdb" = callPackage @@ -124213,6 +128634,7 @@ self: { description = "A yesod subsite serving a wiki"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ini" = callPackage @@ -124279,6 +128701,7 @@ self: { description = "Processing for .ini files with duplicate sections and options"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "initialize" = callPackage @@ -124342,6 +128765,7 @@ self: { description = "Monadic functions with injected parameters"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "inline-c_0_5_6_1" = callPackage @@ -124459,6 +128883,7 @@ self: { description = "Java interop via inline Java code in Haskell modules"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "inline-r" = callPackage @@ -124472,10 +128897,8 @@ self: { }: mkDerivation { pname = "inline-r"; - version = "0.9.2"; - sha256 = "1h2gwrh8kzx3przx29gcl4wffni3bxy1yrfabf88bdxjwj79s7z0"; - revision = "1"; - editedCabalFile = "01cxsjdxy5brdnw966928bcdivc8ab7kq91vdqkg2q801jf5jj9g"; + version = "0.10.1"; + sha256 = "15hiql8i7jp76a1csiry6zzsmdzm0wbvlgikai7g0zdgyylqw6hg"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq exceptions inline-c mtl pretty primitive process reflection setenv @@ -124495,7 +128918,6 @@ self: { ]; 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 @@ -124555,7 +128977,6 @@ self: { ]; description = "Associative containers retaining insertion order for traversals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inserts" = callPackage @@ -124568,6 +128989,7 @@ self: { description = "Stupid simple bytestring templates"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "inspection-proxy" = callPackage @@ -124593,8 +129015,8 @@ self: { }: mkDerivation { pname = "inspection-testing"; - version = "0.4.1.1"; - sha256 = "1liysxim5lhf0a09asvv7j9hin60bljhp1p642j5j1j0hh2jax4l"; + version = "0.4.1.2"; + sha256 = "1rh744nswl7i6wk2gv9qx5rbz74ndd1j5ynmfzdhw3i4jjr99q4v"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -124624,6 +129046,7 @@ self: { description = "Create benchmarks from the HAR files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "instana-haskell-trace-sdk" = callPackage @@ -124657,6 +129080,8 @@ self: { ]; description = "SDK for adding custom Instana tracing support to Haskell applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "instance-control" = callPackage @@ -124701,6 +129126,7 @@ self: { description = "Generic Aeson instances through instant-generics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "instant-bytes" = callPackage @@ -124718,6 +129144,7 @@ self: { description = "Generic Serial instances through instant-generics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "instant-deepseq" = callPackage @@ -124730,6 +129157,7 @@ self: { description = "Generic NFData instances through instant-generics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "instant-generics" = callPackage @@ -124744,6 +129172,7 @@ self: { description = "Generic programming library with a sum of products view"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "instant-hashable" = callPackage @@ -124756,6 +129185,7 @@ self: { description = "Generic Hashable instances through instant-generics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "instant-zipper" = callPackage @@ -124770,6 +129200,7 @@ self: { description = "Heterogenous Zipper in Instant Generics"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "instapaper-sender" = callPackage @@ -124790,6 +129221,7 @@ self: { description = "Basic HTTP gateway to save articles to Instapaper"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "instinct" = callPackage @@ -124802,14 +129234,15 @@ self: { description = "Fast artifical neural networks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "instrument-chord" = callPackage ({ mkDerivation, array, base, containers, music-diatonic }: mkDerivation { pname = "instrument-chord"; - version = "0.1.0.10"; - sha256 = "1bbpjxr8ya46zrhx3nkxkmylbhzkmkav9a7gydz3g2j9ynp4l2fn"; + version = "0.1.0.11"; + sha256 = "1fc3vgxxzk6rw0y6d40jiyrc66fd1ig7nk4bdmfn1q595q5iwnz3"; libraryHaskellDepends = [ array base containers music-diatonic ]; description = "Render Instrument Chords"; license = stdenv.lib.licenses.gpl3; @@ -124853,6 +129286,7 @@ self: { description = "A data structure that associates each Int key with a set of values"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "integer-gmp_1_0_2_0" = callPackage @@ -124896,6 +129330,7 @@ self: { description = "A pure-Haskell implementation of arbitrary-precision Integers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "integer-simple" = callPackage @@ -124945,6 +129380,7 @@ self: { description = "Integrate different assays"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "intel-aes" = callPackage @@ -124964,6 +129400,7 @@ self: { description = "Hardware accelerated AES encryption and Random Number Generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {intel_aes = null;}; "interchangeable" = callPackage @@ -125075,6 +129512,7 @@ self: { description = "Shell command for constructing custom stamps for German Post"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "intero" = callPackage @@ -125085,8 +129523,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.38"; - sha256 = "1s7si6rw6xlgczismyj9wh40ym39fcskpbyf1ldab6krwxykf65v"; + version = "0.1.39"; + sha256 = "0qfns2rwgkmd1i28p5pgvcp0yza8lrpi9xlq3zpl7jqrawbxbp3v"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -125102,6 +129540,38 @@ self: { description = "Complete interactive development program for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "interp" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , megaparsec, mtl, optparse-applicative, parser-combinators + , random-fu, rvar, semigroups, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "interp"; + version = "1.0.0.2"; + sha256 = "036j44vrvgvxvnlj57mkg4h8cc6dycxfrszmgai70mybr3bxvhd5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers hspec megaparsec mtl + optparse-applicative parser-combinators random-fu rvar semigroups + text transformers unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers hspec megaparsec mtl + optparse-applicative parser-combinators random-fu rvar semigroups + text transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec megaparsec mtl + optparse-applicative parser-combinators random-fu rvar semigroups + text transformers unordered-containers vector + ]; + description = "Tracery-like randomized text interpolation"; + license = stdenv.lib.licenses.bsd3; }) {}; "interpol" = callPackage @@ -125126,6 +129596,7 @@ self: { description = "GHC preprocessor and library to enable variable interpolation in strings"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "interpolate" = callPackage @@ -125176,6 +129647,7 @@ self: { description = "QuasiQuoter for Ruby-style multi-line interpolated strings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "interpolatedstring-qq-mwotton" = callPackage @@ -125192,25 +129664,10 @@ self: { description = "DO NOT USE THIS. interpolatedstring-qq works now."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "interpolation" = callPackage - ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: - mkDerivation { - pname = "interpolation"; - version = "0.1.0.3"; - sha256 = "0j9hdzi59lqq92773f8h17awrm9ghr45k876qc7krq87pgbr95z2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base utility-ht ]; - testHaskellDepends = [ - array base containers QuickCheck utility-ht - ]; - description = "piecewise linear and cubic Hermite interpolation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "interpolation_0_1_1" = callPackage ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: mkDerivation { pname = "interpolation"; @@ -125224,7 +129681,6 @@ self: { ]; description = "piecewise linear and cubic Hermite interpolation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interpolator" = callPackage @@ -125279,6 +129735,7 @@ self: { description = "Monad transformers that can be run and resumed later, conserving their context"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "interspersed" = callPackage @@ -125305,6 +129762,7 @@ self: { description = "Intervals with adherences"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "intervals" = callPackage @@ -125348,7 +129806,6 @@ self: { ]; description = "A game of competitive puzzle-design"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intrinsic-superclasses" = callPackage @@ -125402,6 +129859,7 @@ self: { description = "Intro reexported as Prelude"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "introduction" = callPackage @@ -125423,6 +129881,7 @@ self: { description = "A prelude for safe new projects"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "introduction-test" = callPackage @@ -125443,6 +129902,7 @@ self: { description = "A prelude for the tests of safe new projects"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "intset" = callPackage @@ -125455,6 +129915,7 @@ self: { description = "Pure, mergeable, succinct Int sets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "intset-imperative" = callPackage @@ -125536,7 +129997,6 @@ self: { ]; description = "Invertible parsing combinators framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible-hlist" = callPackage @@ -125549,6 +130009,7 @@ self: { description = "invertible functions and instances for HList"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "invertible-hxt" = callPackage @@ -125592,6 +130053,7 @@ self: { description = "Capture IO actions' stdout and stderr"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "io-choice" = callPackage @@ -125663,6 +130125,7 @@ self: { description = "An API for generating TIMBER style reactive objects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "io-region" = callPackage @@ -125806,6 +130269,7 @@ self: { description = "EDSL for concurrent, realtime, embedded programming on top of Ivory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ioref-stable" = callPackage @@ -125829,6 +130293,7 @@ self: { description = "A class of strings that can be involved in IO"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iothread" = callPackage @@ -125841,6 +130306,7 @@ self: { description = "run IOs in a single thread"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iotransaction" = callPackage @@ -125853,18 +130319,19 @@ self: { description = "Supports the automatic undoing of IO operations when an exception is thrown"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ip" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , deepseq, doctest, hashable, hspec, HUnit, primitive, QuickCheck - , quickcheck-classes, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, vector + , deepseq, doctest, hashable, hspec, hspec-discover, HUnit + , primitive, QuickCheck, quickcheck-classes, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, vector }: mkDerivation { pname = "ip"; - version = "1.4.1"; - sha256 = "0nzc2xb6xha2sql3aiwhchl2hhfzndlvdm1hc8pbrjw27jcz3hpi"; + version = "1.4.2"; + sha256 = "0r1ipv6mcbxpzwkfhr6hm2srr01wr5np20axgvqvplaskai9cj87"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq hashable primitive text vector @@ -125874,12 +130341,14 @@ self: { quickcheck-classes test-framework test-framework-hunit test-framework-quickcheck2 text ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ attoparsec base bytestring criterion text ]; description = "Library for IP and MAC addresses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ip-quoter" = callPackage @@ -125906,6 +130375,7 @@ self: { description = "IP2Location Haskell package for IP geolocation"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ip2proxy" = callPackage @@ -125918,6 +130388,7 @@ self: { description = "IP2Proxy Haskell package for proxy detection"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ip6addr" = callPackage @@ -125950,6 +130421,7 @@ self: { description = "interactive patch editor"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ipc" = callPackage @@ -125966,6 +130438,7 @@ self: { description = "High level inter-process communication library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ipcvar" = callPackage @@ -126004,6 +130477,7 @@ self: { description = "haskell binding to ipopt and nlopt including automatic differentiation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ipopt; inherit (pkgs) nlopt;}; "ipprint" = callPackage @@ -126053,6 +130527,7 @@ self: { description = "iptables rules parser/printer library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iptadmin" = callPackage @@ -126078,6 +130553,7 @@ self: { description = "web-interface for iptables"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ipynb" = callPackage @@ -126123,6 +130599,7 @@ self: { description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "irc" = callPackage @@ -126208,10 +130685,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.5.0"; - sha256 = "124zfp6s8hj7z3m873145bnr0z8xlkbr1qgj2hvasd2qs2zrb8y8"; - revision = "1"; - editedCabalFile = "06n7shnd8ij4wlzm5xhxdqv26b3am8mgbqfcvsqppk6hgmmyvggq"; + version = "2.6.0"; + sha256 = "07w8nyvscc2d643dq02bl533c2kwx8zw8j1b1dizfwhixwnzgphq"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -126255,6 +130730,7 @@ self: { description = "A DCC message parsing and helper library for IRC clients"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "irc-fun-bot" = callPackage @@ -126276,6 +130752,7 @@ self: { description = "Library for writing fun IRC bots"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "irc-fun-client" = callPackage @@ -126295,6 +130772,7 @@ self: { description = "Another library for writing IRC clients"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "irc-fun-color" = callPackage @@ -126312,6 +130790,7 @@ self: { description = "Add color and style decorations to IRC messages"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "irc-fun-messages" = callPackage @@ -126326,6 +130805,7 @@ self: { description = "Types and functions for working with the IRC protocol"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "irc-fun-types" = callPackage @@ -126338,6 +130818,7 @@ self: { description = "Common types for IRC related packages"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ircbot" = callPackage @@ -126361,6 +130842,7 @@ self: { description = "A library for writing IRC bots"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ircbouncer" = callPackage @@ -126410,6 +130892,7 @@ self: { description = "RFC-based resource identifier library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iridium" = callPackage @@ -126438,6 +130921,7 @@ self: { description = "Automated Local Cabal Package Testing and Uploading"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iron-mq" = callPackage @@ -126450,6 +130934,7 @@ self: { description = "Iron.IO message queueing client library"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ironforge" = callPackage @@ -126471,6 +130956,7 @@ self: { description = "A technical demo for Antisplice"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "irt" = callPackage @@ -126483,6 +130969,7 @@ self: { description = "Item Response Theory functions for use in computerized adaptive testing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "is" = callPackage @@ -126515,6 +131002,7 @@ self: { description = "An executable and library to determine if a file is a DICOM file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "isevaluated" = callPackage @@ -126527,6 +131015,7 @@ self: { description = "Check whether a value has been evaluated"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "isiz" = callPackage @@ -126540,7 +131029,6 @@ self: { executableHaskellDepends = [ base gtk3 ]; description = "A program to show the size of image and whether suitable for wallpaper"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "islink" = callPackage @@ -126569,6 +131057,7 @@ self: { description = "Advanced ESMTP library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iso3166-country-codes" = callPackage @@ -126629,6 +131118,7 @@ self: { description = "Types and parser for ISO8601 durations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iso8601-time" = callPackage @@ -126691,6 +131181,7 @@ self: { description = "A (bytestring-) builder for the ISO-14496-12 base media file format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "isohunt" = callPackage @@ -126708,6 +131199,7 @@ self: { description = "Bindings to the isoHunt torrent search API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "isotope" = callPackage @@ -126727,6 +131219,7 @@ self: { description = "Isotopic masses and relative abundances"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ispositive" = callPackage @@ -126776,6 +131269,7 @@ self: { description = "Issue Tracker for the CLI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "itemfield" = callPackage @@ -126804,6 +131298,7 @@ self: { description = "A brick Widget for selectable summary of many elements on a terminal"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iter-stats" = callPackage @@ -126823,6 +131318,7 @@ self: { description = "iteratees for statistical processing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iterIO" = callPackage @@ -126842,6 +131338,7 @@ self: { description = "Iteratee-based IO with pipe operators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) zlib;}; "iterable" = callPackage @@ -126886,6 +131383,7 @@ self: { description = "Iteratee-based I/O"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iteratee-compress" = callPackage @@ -126899,6 +131397,7 @@ self: { description = "Enumeratees for compressing and decompressing streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) bzip2; inherit (pkgs) zlib;}; "iteratee-mtl" = callPackage @@ -126917,6 +131416,7 @@ self: { description = "Iteratee-based I/O"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iteratee-parsec" = callPackage @@ -126933,6 +131433,7 @@ self: { description = "Package allowing parsec parser initeratee"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iteratee-stm" = callPackage @@ -126947,6 +131448,7 @@ self: { description = "Concurrent iteratees using STM"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iterio-server" = callPackage @@ -126964,6 +131466,7 @@ self: { description = "Library for building servers with IterIO"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iterm-show" = callPackage @@ -127012,6 +131515,8 @@ self: { pname = "ival"; version = "0.2.0.0"; sha256 = "1djgkxz6npymkzf5802hdcvr40jlc16pmyxd3qpi98f1c1h4rg5x"; + revision = "1"; + editedCabalFile = "0hgvsmjkblbawwv7kfa3imnbjvv330gccv2n245nd0vhfgsbpvxa"; libraryHaskellDepends = [ alg base ]; testHaskellDepends = [ alg base smallcheck tasty tasty-smallcheck @@ -127048,6 +131553,7 @@ self: { description = "Theorem proving library based on dependent type theory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory" = callPackage @@ -127067,6 +131573,7 @@ self: { description = "Safe embedded C programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-artifact" = callPackage @@ -127103,6 +131610,7 @@ self: { description = "Ivory C backend"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-bitdata" = callPackage @@ -127122,6 +131630,7 @@ self: { description = "Ivory bit-data support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-eval" = callPackage @@ -127141,6 +131650,7 @@ self: { description = "Simple concrete evaluator for Ivory programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-examples" = callPackage @@ -127164,6 +131674,7 @@ self: { description = "Ivory examples"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-hw" = callPackage @@ -127177,6 +131688,7 @@ self: { description = "Ivory hardware model (STM32F4)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-opts" = callPackage @@ -127194,6 +131706,7 @@ self: { description = "Ivory compiler optimizations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-quickcheck" = callPackage @@ -127216,6 +131729,7 @@ self: { description = "QuickCheck driver for Ivory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-serialize" = callPackage @@ -127233,6 +131747,7 @@ self: { description = "Serialization library for Ivory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivory-stdlib" = callPackage @@ -127246,6 +131761,7 @@ self: { description = "Ivory standard library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ivy-web" = callPackage @@ -127262,6 +131778,7 @@ self: { description = "A lightweight web framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iwlib" = callPackage @@ -127299,6 +131816,7 @@ self: { description = "A preprocessor for expanding \"ixdo\" notation for indexed monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ixmonad" = callPackage @@ -127313,6 +131831,7 @@ self: { description = "Embeds effect systems into Haskell using parameteric effect monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ixset" = callPackage @@ -127367,6 +131886,7 @@ self: { description = "A shallow embedding of the OpenGL Shading Language in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "iyql" = callPackage @@ -127387,6 +131907,7 @@ self: { description = "CLI (command line interface) to YQL"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "j2hs" = callPackage @@ -127408,6 +131929,7 @@ self: { description = "j2hs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ja-base-extra" = callPackage @@ -127453,6 +131975,7 @@ self: { description = "DEPRECATED Bindings to the JACK Audio Connection Kit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libjack2;}; "jackminimix" = callPackage @@ -127465,6 +131988,7 @@ self: { description = "control JackMiniMix"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jacobi-roots" = callPackage @@ -127478,6 +132002,7 @@ self: { description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jaeger-flamegraph" = callPackage @@ -127501,6 +132026,7 @@ self: { description = "Generate flamegraphs from Jaeger .json dumps."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jail" = callPackage @@ -127517,6 +132043,7 @@ self: { description = "Jailed IO monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jailbreak-cabal" = callPackage @@ -127545,6 +132072,7 @@ self: { description = "Convert Jalaali and Gregorian calendar systems to each other"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jalla" = callPackage @@ -127568,6 +132096,7 @@ self: { description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) blas; cblas = null; lapacke = null;}; "jammittools" = callPackage @@ -127590,6 +132119,7 @@ self: { description = "Export sheet music and audio from Windows/Mac app Jammit"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "japanese-calendar" = callPackage @@ -127639,6 +132169,7 @@ self: { description = "Tool for searching java classes, members and fields in classfiles and JAR archives"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jarify" = callPackage @@ -127661,6 +132192,7 @@ self: { description = "Jarification of Haskell sources"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jason" = callPackage @@ -127681,6 +132213,7 @@ self: { description = "A fast JASONETTE-iOS JSON combinator library for haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "java-adt" = callPackage @@ -127721,6 +132254,7 @@ self: { description = "Bindings to the JNI and a high level interface generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "java-bridge-extras" = callPackage @@ -127733,6 +132267,7 @@ self: { description = "Utilities for working with the java-bridge package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "java-character" = callPackage @@ -127745,6 +132280,7 @@ self: { description = "Functions to simulate Java's Character class"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "java-poker" = callPackage @@ -127771,6 +132307,7 @@ self: { description = "Tools for reflecting on Java classes"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "javaclass" = callPackage @@ -127813,6 +132350,7 @@ self: { description = "Extra javascript functions when using GHCJS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "javasf" = callPackage @@ -127834,6 +132372,7 @@ self: { description = "A utility to print the SourceFile attribute of one or more Java class files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "javav" = callPackage @@ -127851,6 +132390,7 @@ self: { description = "A utility to print the target version of Java class files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jbi" = callPackage @@ -127873,6 +132413,7 @@ self: { description = "Just Build It - a \"do what I mean\" abstraction for Haskell build tools"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jcdecaux-vls" = callPackage @@ -127889,6 +132430,7 @@ self: { description = "JCDecaux self-service bicycles API client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jdi" = callPackage @@ -127908,6 +132450,7 @@ self: { description = "Implementation of Java Debug Interface"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jenga" = callPackage @@ -127930,6 +132473,7 @@ self: { description = "Generate a cabal freeze file from a stack.yaml"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jenkinsPlugins2nix" = callPackage @@ -127954,6 +132498,7 @@ self: { description = "Generate nix for Jenkins plugins"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jespresso" = callPackage @@ -127984,6 +132529,7 @@ self: { description = "Extract all JavaScript from an HTML page and consolidate it in one script"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jinquantities" = callPackage @@ -128007,6 +132553,7 @@ self: { description = "Unit conversion and manipulation library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jmacro" = callPackage @@ -128034,6 +132581,7 @@ self: { description = "QuasiQuotation library for programmatic generation of Javascript code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jmacro-rpc" = callPackage @@ -128053,6 +132601,7 @@ self: { description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jmacro-rpc-happstack" = callPackage @@ -128070,6 +132619,7 @@ self: { description = "Happstack backend for jmacro-rpc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jmacro-rpc-snap" = callPackage @@ -128086,6 +132636,7 @@ self: { description = "Snap backend for jmacro-rpc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jml-web-service" = callPackage @@ -128107,6 +132658,7 @@ self: { description = "Common utilities for running a web service"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jmonkey" = callPackage @@ -128120,6 +132672,7 @@ self: { description = "Jmonkey is very restricted but handy EDSL for JavaScript"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jni" = callPackage @@ -128139,6 +132692,7 @@ self: { description = "Complete JNI raw bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) jdk;}; "jobqueue" = callPackage @@ -128165,6 +132719,7 @@ self: { description = "A job queue library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "join" = callPackage @@ -128178,6 +132733,7 @@ self: { description = "Parallel Join Patterns with Guards and Propagation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "join-api" = callPackage @@ -128192,6 +132748,7 @@ self: { description = "Bindings for Join push notifications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "joinlist" = callPackage @@ -128204,6 +132761,7 @@ self: { description = "Join list - symmetric list type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jonathanscard" = callPackage @@ -128220,6 +132778,7 @@ self: { description = "An implementation of the Jonathan's Card API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jord" = callPackage @@ -128337,6 +132896,7 @@ self: { description = "A library for decoding JPEG files written in pure Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jps" = callPackage @@ -128350,6 +132910,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "js-dgtable" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "js-dgtable"; + version = "0.5.2"; + sha256 = "1b10kx703kbkb5q1ggdpqcrxqjb33kh24khk21rb30w0xrdxd3g2"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Obtain minified jquery.dgtable code"; + license = stdenv.lib.licenses.mit; + }) {}; + "js-flot" = callPackage ({ mkDerivation, base, HTTP }: mkDerivation { @@ -128373,6 +132946,7 @@ self: { description = "Javascript: The Good Parts -- AST & Pretty Printer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "js-jquery" = callPackage @@ -128408,7 +132982,6 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-clib" = callPackage @@ -128424,7 +132997,6 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-dom" = callPackage @@ -128440,7 +133012,6 @@ self: { ]; 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 @@ -128455,6 +133026,7 @@ self: { description = "JSaddle Hello World, an example package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jsaddle-warp" = callPackage @@ -128482,6 +133054,7 @@ self: { description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jsaddle-webkit2gtk" = callPackage @@ -128538,6 +133111,7 @@ self: { description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jsc" = callPackage @@ -128567,6 +133141,7 @@ self: { description = "Javascript Monadic Writer base package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json" = callPackage @@ -128615,6 +133190,7 @@ self: { description = "Utilities for generating JSON-API payloads"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-assertions" = callPackage @@ -128663,6 +133239,7 @@ self: { description = "Encoders of JSON AST"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-ast-quickcheck" = callPackage @@ -128678,6 +133255,7 @@ self: { description = "Compatibility layer for \"json-ast\" and \"QuickCheck\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-autotype" = callPackage @@ -128735,6 +133313,7 @@ self: { description = "JSON parser that uses byte strings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-builder" = callPackage @@ -128754,6 +133333,7 @@ self: { description = "Data structure agnostic JSON serialization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-bytes-builder" = callPackage @@ -128772,6 +133352,7 @@ self: { description = "Direct-to-bytes JSON Builder"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-encoder" = callPackage @@ -128807,6 +133388,7 @@ self: { description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-extra" = callPackage @@ -128824,6 +133406,7 @@ self: { description = "Utility functions to extend Aeson"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-feed" = callPackage @@ -128865,6 +133448,7 @@ self: { description = "Generic JSON serialization / deserialization"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-incremental-decoder" = callPackage @@ -128890,6 +133474,7 @@ self: { description = "Incremental JSON parser with early termination and a declarative DSL"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-litobj" = callPackage @@ -128903,6 +133488,7 @@ self: { description = "Extends Text.JSON to handle literal JS objects."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-pointer" = callPackage @@ -128916,7 +133502,6 @@ self: { libraryHaskellDepends = [ attoparsec base base-prelude text ]; description = "JSON Pointer parsing and interpretation utilities"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-pointer-aeson" = callPackage @@ -128932,7 +133517,6 @@ self: { ]; description = "Integration layer for \"json-pointer\" and \"aeson\""; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-pointer-hasql" = callPackage @@ -128950,6 +133534,7 @@ self: { description = "JSON Pointer extensions for Hasql"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-python" = callPackage @@ -128967,6 +133552,7 @@ self: { description = "Call python inline from haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) python;}; "json-qq" = callPackage @@ -129112,6 +133698,7 @@ self: { description = "Types and type classes for defining JSON schemas"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-sop" = callPackage @@ -129183,6 +133770,7 @@ self: { description = "Effectful parsing of JSON documents"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-tools" = callPackage @@ -129202,6 +133790,7 @@ self: { description = "A collection of JSON tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-tracer" = callPackage @@ -129226,6 +133815,7 @@ self: { description = "A polymorphic, type-safe, json-structured tracing library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-types" = callPackage @@ -129254,6 +133844,7 @@ self: { description = "Library provides support for JSON"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json2-hdbc" = callPackage @@ -129270,6 +133861,7 @@ self: { description = "Support JSON for SQL Database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json2-types" = callPackage @@ -129315,6 +133907,7 @@ self: { description = "Filter select values in JSON objects to unix programs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jsonresume" = callPackage @@ -129331,6 +133924,7 @@ self: { description = "Parser and datatypes for the JSON Resume format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jsonrpc-conduit" = callPackage @@ -129352,6 +133946,7 @@ self: { description = "JSON-RPC 2.0 server over a Conduit."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jsons-to-schema" = callPackage @@ -129384,6 +133979,7 @@ self: { description = "JSON to JSON Schema"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jsonschema-gen" = callPackage @@ -129404,6 +134000,7 @@ self: { description = "JSON Schema generator from Algebraic data type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jsonsql" = callPackage @@ -129425,6 +134022,7 @@ self: { description = "Interpolate JSON object values into SQL strings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jsontsv" = callPackage @@ -129446,6 +134044,7 @@ self: { description = "JSON to TSV transformer"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jsonxlsx" = callPackage @@ -129467,6 +134066,7 @@ self: { description = "json to xlsx converter"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jspath" = callPackage @@ -129483,6 +134083,7 @@ self: { description = "Extract substructures from JSON by following a path"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "juandelacosa" = callPackage @@ -129507,7 +134108,6 @@ self: { ]; description = "Manage users in MariaDB >= 10.1.1"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "judge" = callPackage @@ -129535,6 +134135,7 @@ self: { description = "Tableau-based theorem prover for justification logic"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "judy" = callPackage @@ -129551,6 +134152,7 @@ self: { description = "Fast, scalable, mutable dynamic arrays, maps and hashes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {Judy = null;}; "juicy-draw" = callPackage @@ -129586,6 +134188,7 @@ self: { description = "SVG to G-Code converter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jukebox" = callPackage @@ -129661,6 +134264,7 @@ self: { description = "A library for creating and using Jupyter kernels"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "justified-containers" = callPackage @@ -129699,6 +134303,7 @@ self: { description = "Call JVM methods from Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jvm-batching" = callPackage @@ -129724,6 +134329,7 @@ self: { description = "Provides batched marshalling of values between Java and Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jvm-binary" = callPackage @@ -129757,6 +134363,7 @@ self: { description = "A library for reading Java class-files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jvm-parser" = callPackage @@ -129774,6 +134381,7 @@ self: { description = "A parser for JVM bytecode files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jvm-streaming" = callPackage @@ -129797,6 +134405,7 @@ self: { description = "Expose Java iterators as streams from the streaming package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jwt" = callPackage @@ -129847,6 +134456,7 @@ self: { description = "An implementation of the Kademlia DHT Protocol"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kafka" = callPackage @@ -129878,6 +134488,7 @@ self: { description = "Low-level Haskell client library for Apache Kafka 0.7."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kafka-device" = callPackage @@ -129886,8 +134497,8 @@ self: { }: mkDerivation { pname = "kafka-device"; - version = "0.2.1.2"; - sha256 = "0fs6k04cchlsmrcn2sm9sdq07waia4ff8hhhqx24yjjab5ai2798"; + version = "1.0.2.1"; + sha256 = "1ig1qbb1yrizff4f807pw2lqqy0nvn5hy89xf4v20p02zvy0w673"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129898,22 +134509,20 @@ self: { ]; description = "UI device events via a Kafka message broker"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kafka-device-glut" = callPackage ({ mkDerivation, base, GLUT, kafka-device, OpenGL }: mkDerivation { pname = "kafka-device-glut"; - version = "0.2.1.2"; - sha256 = "0in1hwmhbj41cvcwysbzbda7idbdpnlq2zggw2smlxjv078zp939"; + version = "1.0.2.1"; + sha256 = "0rz2xlrvhpqafb7m3svfykr1aa2fwrz0qpwzdxjfhpnd85ccfmzi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base GLUT kafka-device OpenGL ]; executableHaskellDepends = [ base GLUT kafka-device OpenGL ]; description = "GLUT events via a Kafka message broker"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kafka-device-joystick" = callPackage @@ -129922,8 +134531,8 @@ self: { }: mkDerivation { pname = "kafka-device-joystick"; - version = "0.2.1.2"; - sha256 = "17plqjbl2jh185yjbphgw1viim7w52ib8sjv1g93i460ggpwsyp0"; + version = "1.0.2.1"; + sha256 = "053whqf4yh3gjhamjfh383ijsw2brajid2q0wsyf0qbsd2y6pikl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129934,15 +134543,14 @@ self: { ]; description = "Linux joystick events via a Kafka message broker"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kafka-device-leap" = callPackage ({ mkDerivation, aeson, base, hleap, kafka-device, websockets }: mkDerivation { pname = "kafka-device-leap"; - version = "0.2.1.2"; - sha256 = "14wn3ywa462nf4snjl78bnxjf9jfqj39zkiay2z594yplqp2qsy1"; + version = "1.0.2.1"; + sha256 = "1dm49kwk4nyvfzz6aj9h80pj510xnczfd15yamajfwwszalrj432"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129953,7 +134561,6 @@ self: { ]; description = "Leap Motion events via a Kafka message broker"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kafka-device-spacenav" = callPackage @@ -129962,8 +134569,8 @@ self: { }: mkDerivation { pname = "kafka-device-spacenav"; - version = "0.2.1.2"; - sha256 = "0drpf4frlnf17qa92rppjdnxpsks8v3q0h3jad5lyvcvmpssrw1r"; + version = "1.0.2.1"; + sha256 = "0x8fwawlzzwip7v950d1m613h0p57lyy8qa2ps29alk4fj31rcik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129974,22 +134581,20 @@ self: { ]; description = "Linux SpaceNavigator events via a Kafka message broker"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kafka-device-vrpn" = callPackage ({ mkDerivation, base, kafka-device, vrpn }: mkDerivation { pname = "kafka-device-vrpn"; - version = "0.2.1.2"; - sha256 = "0zmiyfvdn16rd2jg44xvdpfm08fi8ivv0af6hdhc46l5q4zd9p4s"; + version = "1.0.2.1"; + sha256 = "1jy9qqhj4yq2ry42yab7c8d9ipczv9rd09l8ixzqx4yclswzgi0x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base kafka-device vrpn ]; executableHaskellDepends = [ base kafka-device vrpn ]; description = "VRPN events via a Kafka message broker"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kaleidoscope" = callPackage @@ -130013,6 +134618,7 @@ self: { description = "Haskell Kaleidoscope tutorial"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kalman" = callPackage @@ -130033,6 +134639,7 @@ self: { description = "Kalman and particle filters and smoothers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kan-extensions" = callPackage @@ -130063,6 +134670,7 @@ self: { description = "Binary parsing with random access"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kanji" = callPackage @@ -130092,6 +134700,7 @@ self: { description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kansas-comet" = callPackage @@ -130111,7 +134720,6 @@ self: { ]; description = "A JavaScript push mechanism based on the comet idiom"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kansas-lava" = callPackage @@ -130135,6 +134743,7 @@ self: { description = "Kansas Lava is a hardware simulator and VHDL generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kansas-lava-cores" = callPackage @@ -130155,6 +134764,7 @@ self: { description = "FPGA Cores Written in Kansas Lava"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kansas-lava-papilio" = callPackage @@ -130174,6 +134784,7 @@ self: { description = "Kansas Lava support files for the Papilio FPGA board"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kansas-lava-shake" = callPackage @@ -130191,6 +134802,7 @@ self: { description = "Shake rules for building Kansas Lava projects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "karakuri" = callPackage @@ -130207,6 +134819,7 @@ self: { description = "Good stateful automata"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "karps" = callPackage @@ -130235,6 +134848,7 @@ self: { description = "Haskell bindings for Spark Dataframes and Datasets"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "karver" = callPackage @@ -130292,7 +134906,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "katip_0_8_0_0" = callPackage + "katip_0_8_1_0" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , bytestring, containers, criterion, deepseq, directory, either , filepath, hostname, microlens, microlens-th, monad-control, mtl @@ -130304,8 +134918,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.8.0.0"; - sha256 = "0964vw38cws9fn22r4zgkd9m97rfzxbb5m8l46bym81izh56fy6s"; + version = "0.8.1.0"; + sha256 = "1x03k700c59icr049685y0lpyqjg27mpm1z5g69zy3gh3b87sb0j"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -130348,6 +134962,8 @@ self: { ]; description = "Datadog scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "katip-elasticsearch" = callPackage @@ -130380,6 +134996,7 @@ self: { description = "ElasticSearch scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "katip-kafka" = callPackage @@ -130398,18 +135015,18 @@ self: { "katip-logzio" = callPackage ({ mkDerivation, aeson, async, base, bytestring, errors, hedgehog , hostname, http-client, http-client-tls, http-types, katip, retry - , safe-exceptions, scientific, scotty, stm, tasty, tasty-hedgehog - , tasty-hunit, template-haskell, text, time, unix + , safe-exceptions, scientific, scotty, stm, stm-chans, tasty + , tasty-hedgehog, tasty-hunit, template-haskell, text, time, unix , unordered-containers, uri-bytestring, vector, warp }: mkDerivation { pname = "katip-logzio"; - version = "0.1.0.0"; - sha256 = "09i11zk9rdhq60d8sllc9w971mkc65lngn02rwfa89m7h95sm8wc"; + version = "0.1.1.0"; + sha256 = "1br8phxjf7w2pa6wiig8n054w3qrp2yvsm2vhnkf2syi50mziin0"; libraryHaskellDepends = [ aeson async base bytestring errors http-client http-client-tls - http-types katip retry safe-exceptions scientific stm text time - unix unordered-containers uri-bytestring + http-types katip retry safe-exceptions scientific stm stm-chans + text time unix unordered-containers uri-bytestring ]; testHaskellDepends = [ aeson async base bytestring hedgehog hostname http-types katip @@ -130419,6 +135036,8 @@ self: { ]; description = "Logz.IO scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "katip-rollbar" = callPackage @@ -130436,6 +135055,7 @@ self: { description = "Katip scribe that logs to Rollbar"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "katip-scalyr-scribe" = callPackage @@ -130455,6 +135075,7 @@ self: { description = "A katip scribe for logging to json"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "katip-syslog" = callPackage @@ -130472,6 +135093,7 @@ self: { description = "Syslog Katip Scribe"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "katt" = callPackage @@ -130494,6 +135116,7 @@ self: { description = "Client for the Kattis judge system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "katydid" = callPackage @@ -130574,6 +135197,7 @@ self: { description = "Utilities for serving static sites and blogs with Wai/Warp"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kawhi" = callPackage @@ -130618,7 +135242,6 @@ self: { ]; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kbq-gu" = callPackage @@ -130667,6 +135290,7 @@ self: { description = "A simple k-d tree implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kdesrc-build-extra" = callPackage @@ -130686,6 +135310,7 @@ self: { description = "Build profiles for kdesrc-build"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kdt" = callPackage @@ -130705,6 +135330,7 @@ self: { description = "Fast and flexible k-d trees for various types of point queries"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keccak" = callPackage @@ -130732,6 +135358,7 @@ self: { description = "cryptographic functions based on the sponge construction"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keenser" = callPackage @@ -130787,6 +135414,7 @@ self: { description = "Rapid Gtk Application Development - I18N"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keera-hails-mvc-controller" = callPackage @@ -130815,6 +135443,7 @@ self: { description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keera-hails-mvc-model-lightmodel" = callPackage @@ -130832,6 +135461,7 @@ self: { description = "Rapid Gtk Application Development - Reactive Protected Light Models"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keera-hails-mvc-model-protectedmodel" = callPackage @@ -130849,6 +135479,7 @@ self: { description = "Rapid Gtk Application Development - Protected Reactive Models"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keera-hails-mvc-solutions-config" = callPackage @@ -130860,7 +135491,6 @@ self: { libraryHaskellDepends = [ base directory filepath MissingK ]; description = "Haskell on Gtk rails - Easy handling of configuration files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keera-hails-mvc-solutions-gtk" = callPackage @@ -130883,6 +135513,7 @@ self: { description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keera-hails-mvc-view" = callPackage @@ -130907,7 +135538,6 @@ self: { ]; description = "Haskell on Gtk rails - Gtk-based View for MVC applications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keera-hails-reactive-fs" = callPackage @@ -130924,6 +135554,7 @@ self: { description = "Haskell on Rails - Files as Reactive Values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keera-hails-reactive-gtk" = callPackage @@ -130941,6 +135572,7 @@ self: { description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keera-hails-reactive-network" = callPackage @@ -130955,6 +135587,7 @@ self: { description = "Haskell on Rails - Sockets as Reactive Values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keera-hails-reactive-polling" = callPackage @@ -130970,6 +135603,7 @@ self: { description = "Haskell on Rails - Polling based Readable RVs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keera-hails-reactive-wx" = callPackage @@ -130984,6 +135618,7 @@ self: { description = "Haskell on Rails - Reactive Fields for WX widgets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keera-hails-reactive-yampa" = callPackage @@ -131000,6 +135635,7 @@ self: { description = "Haskell on Rails - FRP Yampa Signal Functions as RVs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keera-hails-reactivelenses" = callPackage @@ -131012,6 +135648,7 @@ self: { description = "Reactive Haskell on Rails - Lenses applied to Reactive Values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keera-hails-reactivevalues" = callPackage @@ -131031,6 +135668,7 @@ self: { description = "Haskell on Rails - Reactive Values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keera-posture" = callPackage @@ -131122,6 +135760,7 @@ self: { description = "Web application deployment manager, focusing on Haskell web frameworks"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kevin" = callPackage @@ -131143,6 +135782,7 @@ self: { description = "a dAmn ↔ IRC proxy"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "key-state" = callPackage @@ -131201,6 +135841,7 @@ self: { description = "Generic indexing for many data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keyring" = callPackage @@ -131215,6 +135856,7 @@ self: { description = "Keyring access"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keys" = callPackage @@ -131263,6 +135905,7 @@ self: { description = "back up a secret key securely to the cloud"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keystore" = callPackage @@ -131295,6 +135938,7 @@ self: { description = "Managing stores of secret things"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keyvaluehash" = callPackage @@ -131311,7 +135955,6 @@ self: { ]; description = "Pure Haskell key/value store implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keyword-args" = callPackage @@ -131334,6 +135977,7 @@ self: { description = "Extract data from a keyword-args config file format"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "khph" = callPackage @@ -131354,6 +135998,7 @@ self: { description = "Command-line file tagging and organization tool"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kibro" = callPackage @@ -131387,6 +136032,7 @@ self: { description = "Parser and writer for KiCad files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kickass-torrents-dump-parser" = callPackage @@ -131405,6 +136051,7 @@ self: { description = "Parses kat.ph torrent dumps"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kickchan" = callPackage @@ -131424,6 +136071,7 @@ self: { description = "Kick Channels: bounded channels with non-blocking writes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kif-parser" = callPackage @@ -131443,6 +136091,7 @@ self: { description = "Process KIF iOS test logs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kind-apply" = callPackage @@ -131513,6 +136162,7 @@ self: { description = "A dependency manager for Xcode (Objective-C) projects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kleene" = callPackage @@ -131533,6 +136183,7 @@ self: { description = "Kleene algebra"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kmeans" = callPackage @@ -131566,6 +136217,7 @@ self: { description = "Sequential and parallel implementations of Lloyd's algorithm"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kmeans-vector" = callPackage @@ -131583,6 +136235,7 @@ self: { description = "An implementation of the kmeans clustering algorithm based on the vector package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kmp-dfa" = callPackage @@ -131596,6 +136249,7 @@ self: { description = "KMP algorithm implementation, based on Deterministic Finite State Automata"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "knead" = callPackage @@ -131613,6 +136267,7 @@ self: { description = "Repa-like array processing using LLVM JIT"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "knead-arithmetic" = callPackage @@ -131627,6 +136282,7 @@ self: { description = "Linear algebra and interpolation using LLVM JIT"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "knob" = callPackage @@ -131657,6 +136313,7 @@ self: { description = "Khovanov homology computations"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "koellner-phonetic" = callPackage @@ -131671,6 +136328,7 @@ self: { description = "\"map German words to code representing pronunciation\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kontra-config" = callPackage @@ -131746,6 +136404,7 @@ self: { description = "The Korfu ORF Utility"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kqueue" = callPackage @@ -131762,6 +136421,7 @@ self: { description = "A binding to the kqueue event library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kraken" = callPackage @@ -131805,6 +136465,7 @@ self: { description = "Haskell bindings for Spark Dataframes and Datasets"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "krpc" = callPackage @@ -131831,6 +136492,7 @@ self: { description = "KRPC protocol implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ks-test" = callPackage @@ -131842,6 +136504,8 @@ self: { libraryHaskellDepends = [ base gamma random-fu roots vector ]; description = "Kolmogorov distribution and Kolmogorov-Smirnov test"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ksystools" = callPackage @@ -131866,6 +136530,7 @@ self: { description = "A binding for libktx from Khronos"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {egl = null; inherit (pkgs) glew;}; "kure" = callPackage @@ -131880,6 +136545,7 @@ self: { description = "Combinators for Strategic Programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kure-your-boilerplate" = callPackage @@ -131892,6 +136558,7 @@ self: { description = "Generator for Boilerplate KURE Combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kyotocabinet" = callPackage @@ -131917,6 +136584,7 @@ self: { description = "Bindings to L-BFGS-B, Fortran code for limited-memory quasi-Newton bound-constrained optimization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {lbfgsb = null;}; "l10n" = callPackage @@ -131940,6 +136608,7 @@ self: { description = "Labeled graph structure"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "labeled-tree" = callPackage @@ -131986,6 +136655,7 @@ self: { description = "an experiment management framework"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "labsat" = callPackage @@ -132010,6 +136680,7 @@ self: { description = "LabSat TCP Interface Wrapper"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "labyrinth" = callPackage @@ -132032,6 +136703,7 @@ self: { description = "A complicated turn-based game"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "labyrinth-server" = callPackage @@ -132066,14 +136738,15 @@ self: { description = "A complicated turn-based game - Web server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lackey" = callPackage ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "1.0.8"; - sha256 = "0nryr2bsl7wn80nfwpvs45nyf02micq422b95dhw8ln79knpa4vm"; + version = "1.0.9"; + sha256 = "0prkaxa9f03m5a333zsl75jdv2hi48w9ghv1ff1r68gnqf4hbvlr"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; @@ -132110,6 +136783,7 @@ self: { description = "Solve Lagrange multiplier problems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "laika" = callPackage @@ -132130,6 +136804,7 @@ self: { description = "Minimalistic type-checked compile-time template engine"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambda-ast" = callPackage @@ -132156,6 +136831,7 @@ self: { description = "A bridge from Haskell (on a CPU) to VHDL on a FPGA"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambda-calculator" = callPackage @@ -132176,6 +136852,7 @@ self: { description = "A lambda calculus interpreter"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambda-calculus-interpreter" = callPackage @@ -132203,6 +136880,7 @@ self: { description = "Educational drawing canvas for FP explorers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambda-devs" = callPackage @@ -132230,6 +136908,7 @@ self: { description = "a Paralell-DEVS implementaion based on distributed-process"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambda-options" = callPackage @@ -132242,6 +136921,7 @@ self: { description = "Declarative command line parser using type-driven pattern matching"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambda-placeholders" = callPackage @@ -132283,6 +136963,7 @@ self: { description = "An application to work with the lambda calculus (for learning)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambda2js" = callPackage @@ -132297,6 +136978,7 @@ self: { description = "Untyped Lambda calculus to JavaScript compiler"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdaBase" = callPackage @@ -132309,6 +136991,7 @@ self: { testHaskellDepends = [ base parsec ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdaFeed" = callPackage @@ -132323,6 +137006,7 @@ self: { description = "RSS 2.0 feed generator"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdaLit" = callPackage @@ -132341,6 +137025,7 @@ self: { description = "..."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdabot" = callPackage @@ -132364,6 +137049,7 @@ self: { description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdabot-core" = callPackage @@ -132416,6 +137102,7 @@ self: { description = "Lambdabot Haskell plugins"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdabot-irc-plugins" = callPackage @@ -132537,6 +137224,7 @@ self: { description = "Utility libraries for the advanced IRC bot, Lambdabot"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdabot-xmpp" = callPackage @@ -132584,6 +137272,7 @@ self: { description = "Lambdabot for Zulip Chat"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdacat" = callPackage @@ -132628,6 +137317,7 @@ self: { description = "LambdaCms 'core' subsite for Yesod apps"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdacms-media" = callPackage @@ -132645,6 +137335,7 @@ self: { description = "LambdaCms \"media\" extension"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdacube" = callPackage @@ -132659,6 +137350,7 @@ self: { description = "A simple lambda cube type checker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdacube-bullet" = callPackage @@ -132673,6 +137365,7 @@ self: { description = "Example for combining LambdaCube and Bullet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdacube-compiler" = callPackage @@ -132698,6 +137391,7 @@ self: { description = "LambdaCube 3D is a DSL to program GPUs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdacube-core" = callPackage @@ -132714,6 +137408,7 @@ self: { description = "LambdaCube 3D IR"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdacube-edsl" = callPackage @@ -132731,6 +137426,7 @@ self: { description = "LambdaCube 3D EDSL definition"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdacube-engine" = callPackage @@ -132751,6 +137447,7 @@ self: { description = "3D rendering engine written entirely in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdacube-examples" = callPackage @@ -132768,6 +137465,7 @@ self: { description = "Examples for LambdaCube"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdacube-gl" = callPackage @@ -132787,6 +137485,7 @@ self: { description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdacube-ir" = callPackage @@ -132799,6 +137498,7 @@ self: { description = "LambdaCube 3D intermediate representation of 3D graphics pipelines"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdacube-samples" = callPackage @@ -132821,6 +137521,7 @@ self: { description = "Samples for LambdaCube 3D"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdatex" = callPackage @@ -132842,6 +137543,7 @@ self: { description = "Type-Safe LaTeX EDSL"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdatwit" = callPackage @@ -132868,6 +137570,7 @@ self: { description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdaya-bus" = callPackage @@ -132882,6 +137585,7 @@ self: { description = "Fpga bus core and serialization for RedPitaya"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambdiff" = callPackage @@ -132900,6 +137604,7 @@ self: { description = "Diff Viewer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lame" = callPackage @@ -132926,6 +137631,7 @@ self: { description = "Fairly complete high-level binding to LAME encoder"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {mp3lame = null;}; "lame_0_2_0" = callPackage @@ -132950,6 +137656,7 @@ self: { description = "Fairly complete high-level binding to LAME encoder"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {mp3lame = null;}; "lame-tester" = callPackage @@ -132967,6 +137674,7 @@ self: { description = "A strange and unnecessary selective test-running library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lang" = callPackage @@ -132979,6 +137687,22 @@ self: { description = "A Lisp"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "language-asn" = callPackage + ({ mkDerivation, base, bytestring, contravariant, hashable, pretty + , primitive, text, vector + }: + mkDerivation { + pname = "language-asn"; + version = "0.1.0.0"; + sha256 = "0pjzcnw5d9j8nif0w8ibh3rnsgpv710ng8w8hsrcsbq7qm02sp7f"; + libraryHaskellDepends = [ + base bytestring contravariant hashable pretty primitive text vector + ]; + description = "ASN.1 encoding and decoding"; + license = stdenv.lib.licenses.bsd3; }) {}; "language-asn1" = callPackage @@ -133002,8 +137726,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.7.0.5"; - sha256 = "1vdn1f5bx395jynacmpsvfsyyr29jgpg1y25i1jmbkzjdzkb0h2b"; + version = "1.7.0.6"; + sha256 = "0d2bjha52jph49jiac045igpxarrksihvv46s047qigs435linck"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -133035,6 +137759,7 @@ self: { description = "Parsing and pretty-printing Bash shell scripts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-boogie" = callPackage @@ -133058,6 +137783,7 @@ self: { description = "Interpreter and language infrastructure for Boogie"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-c" = callPackage @@ -133092,6 +137818,7 @@ self: { description = "Extracting comments from C code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-c-inline" = callPackage @@ -133109,6 +137836,7 @@ self: { description = "Inline C & Objective-C code in Haskell for language interoperability"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-c-quote" = callPackage @@ -133170,6 +137898,7 @@ self: { description = "Conf parsers and pretty-printers for the Haskell programming language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-css" = callPackage @@ -133182,6 +137911,7 @@ self: { description = "CSS 2.1 syntax"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-dart" = callPackage @@ -133195,6 +137925,7 @@ self: { description = "Manipulating Dart source: abstract syntax and pretty-printer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-docker" = callPackage @@ -133204,10 +137935,8 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "8.0.0"; - sha256 = "00zryknsc0717ysq8g1ip5dm70v8b33lfrscbzpdcw5dd2j32k7n"; - revision = "1"; - editedCabalFile = "0pzlrc2rgsr6533spij42kpr8kgsvi6sc3c1yzs06n47lsxzjb1f"; + version = "8.0.1"; + sha256 = "0wmnwsf2avdygd3mnz9bd53hlmasgh6cbmzxir2b2ycnp21a1ily"; libraryHaskellDepends = [ base bytestring containers free megaparsec mtl prettyprinter split template-haskell text th-lift time @@ -133248,6 +137977,7 @@ self: { description = "Dockerfile linter, parser, pretty-printer and embedded DSL"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-dot" = callPackage @@ -133264,6 +137994,7 @@ self: { description = "A library for the analysis and creation of Graphviz DOT files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-ecmascript" = callPackage @@ -133305,6 +138036,7 @@ self: { description = "JavaScript static analysis library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-eiffel" = callPackage @@ -133324,6 +138056,7 @@ self: { description = "Parser and pretty printer for the Eiffel language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-elm" = callPackage @@ -133342,6 +138075,7 @@ self: { description = "Generate elm code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-fortran" = callPackage @@ -133367,6 +138101,7 @@ self: { description = "Something similar to Dijkstra's guarded command language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-glsl" = callPackage @@ -133400,6 +138135,7 @@ self: { description = "A library for analysis and synthesis of Go code"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-guess" = callPackage @@ -133413,6 +138149,7 @@ self: { description = "Guess at which language a text is written in using trigrams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-haskell-extract" = callPackage @@ -133449,6 +138186,7 @@ self: { description = "HCL parsers and pretty-printers for the Haskell programming language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-java" = callPackage @@ -133486,6 +138224,7 @@ self: { description = "Parser for Java .class files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-javascript" = callPackage @@ -133543,6 +138282,7 @@ self: { description = "Parser and serializer for the Kort information language"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-lua" = callPackage @@ -133568,6 +138308,7 @@ self: { description = "Lua parser and pretty-printer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-lua-qq" = callPackage @@ -133585,6 +138326,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-lua2" = callPackage @@ -133611,6 +138353,7 @@ self: { description = "Lua parser and pretty printer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-mixal" = callPackage @@ -133626,6 +138369,7 @@ self: { description = "Parser, pretty-printer, and AST types for the MIXAL assembly language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-ninja" = callPackage @@ -133665,6 +138409,7 @@ self: { description = "A library for dealing with the Ninja build language"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-nix" = callPackage @@ -133716,6 +138461,7 @@ self: { description = "Parser, pretty-printer, and type checker for the Oberon programming language"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-objc" = callPackage @@ -133734,6 +138480,7 @@ self: { description = "Analysis and generation of Objective C code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-ocaml" = callPackage @@ -133760,6 +138507,7 @@ self: { description = "Language tools for manipulating OCaml programs in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) zlib;}; "language-openscad" = callPackage @@ -133777,6 +138525,7 @@ self: { description = "A simple parser for OpenSCAD"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-pig" = callPackage @@ -133798,6 +138547,7 @@ self: { description = "Pig parser in haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-puppet" = callPackage @@ -133814,8 +138564,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.4.2"; - sha256 = "0bdi51cjl8m48clkqj6lb9vyxdagx2a4q6f48a1q4b50mpinx5qq"; + version = "1.4.3"; + sha256 = "1sh0i487w7mz5c0scly1s11xzha4dbp2wdiwdks3203c5yrjdfq7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -133841,7 +138591,6 @@ self: { ]; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-python" = callPackage @@ -133861,6 +138610,7 @@ self: { description = "Parsing and pretty printing of Python code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-python-colour" = callPackage @@ -133877,6 +138627,7 @@ self: { description = "Generate coloured XHTML for Python code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-python-test" = callPackage @@ -133891,6 +138642,7 @@ self: { description = "testing code for the language-python library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-qux" = callPackage @@ -133908,6 +138660,7 @@ self: { description = "Utilities for working with the Qux language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-rust" = callPackage @@ -133966,6 +138719,7 @@ self: { description = "A package for parsing shell scripts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-slice" = callPackage @@ -134005,6 +138759,7 @@ self: { description = "Various tools to detect/correct mistakes in words"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-sqlite" = callPackage @@ -134021,6 +138776,7 @@ self: { description = "Full parser and generator for SQL as implemented by SQLite3"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-thrift" = callPackage @@ -134044,6 +138800,7 @@ self: { description = "Parser and pretty printer for the Thrift IDL format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-typescript" = callPackage @@ -134056,6 +138813,7 @@ self: { description = "A library for working with TypeScript Definition files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-vhdl" = callPackage @@ -134068,6 +138826,7 @@ self: { description = "VHDL AST and pretty printer in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "language-webidl" = callPackage @@ -134081,6 +138840,7 @@ self: { description = "Parser and Pretty Printer for WebIDL"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lapack" = callPackage @@ -134109,6 +138869,7 @@ self: { description = "Numerical Linear Algebra using LAPACK"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lapack-carray" = callPackage @@ -134240,6 +139001,7 @@ self: { description = "Tool to track security alerts on LWN"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "latest-npm-version" = callPackage @@ -134271,6 +139033,7 @@ self: { description = "Find the latest version of a package on npm"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "latex" = callPackage @@ -134299,6 +139062,7 @@ self: { description = "Use actual LaTeX to render formulae inside Hakyll pages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "latex-formulae-image" = callPackage @@ -134316,6 +139080,7 @@ self: { description = "A library for rendering LaTeX formulae as images using an actual LaTeX installation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "latex-formulae-pandoc" = callPackage @@ -134338,6 +139103,7 @@ self: { description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "latex-function-tables" = callPackage @@ -134360,7 +139126,6 @@ self: { testHaskellDepends = [ base ]; description = "Function table specifications in latex"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "latex-live-snippets" = callPackage @@ -134403,6 +139168,7 @@ self: { description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "launchpad-control" = callPackage @@ -134421,6 +139187,7 @@ self: { description = "High and low-level interface to the Novation Launchpad midi controller"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lawful" = callPackage @@ -134454,6 +139221,7 @@ self: { description = "Concurrent networked stream transducers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lax" = callPackage @@ -134499,6 +139267,7 @@ self: { description = "Modular type class machinery for monad transformer stacks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "layers-game" = callPackage @@ -134519,6 +139288,7 @@ self: { description = "A prototypical 2d platform game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "layout" = callPackage @@ -134531,6 +139301,7 @@ self: { description = "Turn values into pretty text or markup"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "layout-bootstrap" = callPackage @@ -134543,6 +139314,7 @@ self: { description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "layout-rules" = callPackage @@ -134557,6 +139329,7 @@ self: { description = "A collection of different layout implementations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "layouting" = callPackage @@ -134573,6 +139346,7 @@ self: { description = "General layouting library. Currently supports layouting 2D areas and can be used as a backend for text pretty printing or automatic windows layouting managers."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lazy" = callPackage @@ -134617,6 +139391,7 @@ self: { description = "Identifiers for not-yet-computed values"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lazy-hash-cache" = callPackage @@ -134636,6 +139411,7 @@ self: { description = "Storing computed values for re-use when the same program runs again"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lazy-io" = callPackage @@ -134659,6 +139435,7 @@ self: { description = "Get lazy with your io-streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lazy-search" = callPackage @@ -134682,6 +139459,7 @@ self: { description = "Efficient implementation of lazy monolithic arrays (lazy in indexes)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lazyio" = callPackage @@ -134713,6 +139491,7 @@ self: { description = "Set and Map from lazy/infinite lists"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lazysmallcheck" = callPackage @@ -134735,7 +139514,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Differential solving with lazy splines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lbfgs" = callPackage @@ -134785,6 +139563,7 @@ self: { description = "Data structures for representing arbitrary intervals"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lda" = callPackage @@ -134801,6 +139580,7 @@ self: { description = "Online Latent Dirichlet Allocation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ldap-client" = callPackage @@ -134820,6 +139600,7 @@ self: { description = "Pure Haskell LDAP Client Library"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ldapply" = callPackage @@ -134839,6 +139620,7 @@ self: { description = "LDIF idempotent apply tool"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ldif" = callPackage @@ -134862,6 +139644,7 @@ self: { description = "The LDAP Data Interchange Format (LDIF) tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "leaf" = callPackage @@ -134881,6 +139664,7 @@ self: { description = "A simple portfolio generator"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "leaky" = callPackage @@ -134900,6 +139684,7 @@ self: { description = "Robust space leak, and its strictification"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "leancheck" = callPackage @@ -134995,6 +139780,8 @@ self: { ]; description = "Use the Leanpub API via Wreq"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "leapseconds" = callPackage @@ -135009,6 +139796,7 @@ self: { testHaskellDepends = [ base tasty tasty-hunit time ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "leapseconds-announced" = callPackage @@ -135033,6 +139821,7 @@ self: { description = "Learning Algorithms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "learn-physics" = callPackage @@ -135054,6 +139843,7 @@ self: { description = "Haskell code for learning physics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "learn-physics-examples" = callPackage @@ -135072,6 +139862,7 @@ self: { description = "examples for learn-physics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "learning-hmm" = callPackage @@ -135102,6 +139893,7 @@ self: { description = "Leetify text"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "left4deadrl" = callPackage @@ -135137,6 +139929,7 @@ self: { description = "Distributed, stateful, homogeneous microservice framework"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "legion-discovery" = callPackage @@ -135163,6 +139956,7 @@ self: { description = "A discovery service based on Legion"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "legion-discovery-client" = callPackage @@ -135183,6 +139977,7 @@ self: { description = "Client library for communicating with legion-discovery"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "legion-extra" = callPackage @@ -135205,6 +140000,7 @@ self: { description = "Extra non-essential utilities for building legion applications"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "leksah" = callPackage @@ -135243,7 +140039,7 @@ self: { description = "Haskell IDE written in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {inherit (pkgs) gtk3;}; "leksah-server" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, binary @@ -135281,6 +140077,7 @@ self: { description = "Metadata collection for leksah"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lendingclub" = callPackage @@ -135298,6 +140095,7 @@ self: { description = "Bindings for the LendingClub marketplace API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lens" = callPackage @@ -135352,6 +140150,7 @@ self: { description = "Instances to mix lens with accelerate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lens-action" = callPackage @@ -135506,6 +140305,7 @@ self: { description = "Alternate prelude that exports lens combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lens-properties" = callPackage @@ -135581,6 +140381,7 @@ self: { description = "Isomorphisms and prisms for text <=> bytestring conversions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lens-time" = callPackage @@ -135593,6 +140394,7 @@ self: { description = "lens for Data.Time"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lens-toml-parser" = callPackage @@ -135622,6 +140424,7 @@ self: { description = "Tutorial for the lens library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lens-typelevel" = callPackage @@ -135687,6 +140490,7 @@ self: { description = "References which can be joined and on which lenses can be applied"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lentil" = callPackage @@ -135715,7 +140519,6 @@ self: { ]; description = "frugal issue tracker"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lenz" = callPackage @@ -135761,6 +140564,7 @@ self: { description = "Non-Determinism Monad for Level-Wise Search"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "leveldb-haskell" = callPackage @@ -135820,6 +140624,7 @@ self: { description = "An implementation of the Levenberg-Marquardt algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "levmar-chart" = callPackage @@ -135834,6 +140639,7 @@ self: { description = "Plots the results of the Levenberg-Marquardt algorithm in a chart"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lexer-applicative" = callPackage @@ -135863,6 +140669,7 @@ self: { description = "L-Fuzzy Set Theory implementation in Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lgtk" = callPackage @@ -135891,6 +140698,7 @@ self: { description = "Lens GUI Toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lha" = callPackage @@ -135903,6 +140711,7 @@ self: { description = "Data structures for the Les Houches Accord"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lhae" = callPackage @@ -135923,6 +140732,7 @@ self: { description = "Simple spreadsheet program"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lhc" = callPackage @@ -135937,6 +140747,7 @@ self: { description = "LHC Haskell Compiler"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lhe" = callPackage @@ -135949,6 +140760,7 @@ self: { description = "Parser and writer for Les-Houches event files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lhs2TeX-hl" = callPackage @@ -135968,6 +140780,7 @@ self: { description = "Literate highlighter preprocessor for lhs2tex"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lhs2html" = callPackage @@ -136018,6 +140831,7 @@ self: { description = "Tool for using pdflatex with .lhs files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "libGenI" = callPackage @@ -136035,17 +140849,18 @@ self: { description = "A natural language generator (specifically, an FB-LTAG surface realiser)"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "libarchive" = callPackage ({ mkDerivation, base, bytestring, filepath, libarchive }: mkDerivation { pname = "libarchive"; - version = "0.2.0.0"; - sha256 = "14kad23r22bx65h2iq0n0cbxhzzwj56gwpi73vciycjg0i5w04yd"; + version = "0.2.1.2"; + sha256 = "1fwiwfqknndfnq55psdbj2swf1y5cm971lah4dgayg8vn76n961x"; libraryHaskellDepends = [ base bytestring filepath ]; libraryPkgconfigDepends = [ libarchive ]; - description = "Haskell bindings for libarchive"; + description = "Haskell interface to libarchive"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libarchive;}; @@ -136084,6 +140899,7 @@ self: { description = "Haskell bindings to libconfig"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libconfig;}; "libcspm" = callPackage @@ -136105,6 +140921,7 @@ self: { description = "A library providing a parser, type checker and evaluator for CSPM"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "libexpect" = callPackage @@ -136118,6 +140935,7 @@ self: { description = "Library for interacting with console applications via pseudoterminals"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) expect; inherit (pkgs) tcl;}; "libffi" = callPackage @@ -136183,6 +141001,7 @@ self: { description = "Backend for text editors to provide better Haskell editing support"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "libinfluxdb" = callPackage @@ -136202,6 +141021,7 @@ self: { description = "libinfluxdb"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "libjenkins" = callPackage @@ -136231,6 +141051,7 @@ self: { description = "Jenkins API interface"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "liblastfm" = callPackage @@ -136258,6 +141079,7 @@ self: { description = "Lastfm API interface"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "liblawless" = callPackage @@ -136294,6 +141116,7 @@ self: { description = "Prelude based on protolude for GHC 8 and beyond"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "liblinear-enumerator" = callPackage @@ -136308,6 +141131,7 @@ self: { description = "liblinear iteratee"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "libltdl" = callPackage @@ -136322,6 +141146,7 @@ self: { description = "FFI interface to libltdl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "libmolude" = callPackage @@ -136355,6 +141180,7 @@ self: { description = "Prelude based on protolude for GHC 8 and beyond"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "libmpd" = callPackage @@ -136406,7 +141232,6 @@ self: { librarySystemDepends = [ libnotify ]; description = "Bindings to libnotify library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libnotify;}; "libnvvm" = callPackage @@ -136434,8 +141259,8 @@ self: { }: mkDerivation { pname = "liboath-hs"; - version = "0.0.1.0"; - sha256 = "1cmgr9075li4r6p8ljklqh1zi6phynj9yhim5rz78n9vsiijfang"; + version = "0.0.1.1"; + sha256 = "0ikh4rch2zdv9xan70qkf68m9hdz8k86ji7jw9xci1cvg318zd1k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136448,6 +141273,7 @@ self: { description = "Bindings to liboath"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {liboath = null; oath = null;}; "liboleg" = callPackage @@ -136464,6 +141290,7 @@ self: { description = "An evolving collection of Oleg Kiselyov's Haskell modules"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "libpafe" = callPackage @@ -136478,6 +141305,7 @@ self: { description = "Wrapper for libpafe"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {pafe = null;}; "libpq" = callPackage @@ -136491,6 +141319,7 @@ self: { description = "libpq binding for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) postgresql;}; "libraft" = callPackage @@ -136531,7 +141360,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "libraft_0_3_0_0" = callPackage + "libraft_0_4_1_0" = callPackage ({ mkDerivation, async, atomic-write, attoparsec, base , base16-bytestring, bytestring, cereal, concurrency, containers , cryptohash-sha256, dejafu, directory, exceptions, file-embed @@ -136544,8 +141373,8 @@ self: { }: mkDerivation { pname = "libraft"; - version = "0.3.0.0"; - sha256 = "0mfp5m4kz3hfj96c2056wpm9rgn3frrry5jfvswq9bch3092bm2l"; + version = "0.4.1.0"; + sha256 = "03f76ysn1r8nvxzd21lrnhg1dy1fikq0jwbjz0x6z4w8q8vik38i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136588,6 +141417,7 @@ self: { description = "Wrapper to Random.org API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "librato" = callPackage @@ -136609,6 +141439,7 @@ self: { description = "Bindings to the Librato API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "libravatar" = callPackage @@ -136627,7 +141458,6 @@ self: { ]; description = "Use Libravatar, the decentralized avatar delivery service"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libretls" = callPackage @@ -136732,6 +141562,7 @@ self: { description = "Haskell bindings for libsystemd-daemon"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {libsystemd-daemon = null; systemd-daemon = null;}; "libsystemd-journal" = callPackage @@ -136752,6 +141583,7 @@ self: { description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) systemd;}; "libtagc" = callPackage @@ -136767,6 +141599,7 @@ self: { description = "Binding to TagLib C library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) taglib;}; "libtelnet" = callPackage @@ -136817,6 +141650,7 @@ self: { description = "Bindings to libxls"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "libxml" = callPackage @@ -136848,6 +141682,7 @@ self: { description = "Enumerator-based API for libXML's SAX interface"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "libxml-sax" = callPackage @@ -136874,20 +141709,10 @@ self: { description = "Binding to libxslt"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {xslt = null;}; "libyaml" = callPackage - ({ mkDerivation, base, bytestring, conduit, resourcet }: - mkDerivation { - pname = "libyaml"; - version = "0.1.0.0"; - sha256 = "01vgzf05ad1v8h65n12fwd2whldnqhlv7cbcaf08m3ck2viqimlw"; - libraryHaskellDepends = [ base bytestring conduit resourcet ]; - description = "Low-level, streaming YAML interface"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "libyaml_0_1_1_0" = callPackage ({ mkDerivation, base, bytestring, conduit, resourcet }: mkDerivation { pname = "libyaml"; @@ -136896,7 +141721,6 @@ self: { libraryHaskellDepends = [ base bytestring conduit resourcet ]; description = "Low-level, streaming YAML interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libzfs" = callPackage @@ -136936,6 +141760,7 @@ self: { description = "A license compatibility helper"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "life" = callPackage @@ -136978,6 +141803,7 @@ self: { testToolDepends = [ tasty-discover ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lift-generics" = callPackage @@ -137073,6 +141899,7 @@ self: { description = "lifted IO operations from the base library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lifted-protolude" = callPackage @@ -137091,6 +141918,7 @@ self: { description = "A sensible set of defaults for writing lifted custom Preludes"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lifted-stm" = callPackage @@ -137141,6 +141969,7 @@ self: { description = "A boulderdash-like game and solution validator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ligature" = callPackage @@ -137153,6 +141982,7 @@ self: { description = "Expand ligatures in unicode text"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ligd" = callPackage @@ -137200,6 +142030,7 @@ self: { description = "Haskell client for lightning-viz REST API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lighttpd-conf" = callPackage @@ -137217,6 +142048,7 @@ self: { description = "Lighttpd configuration file tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lighttpd-conf-qq" = callPackage @@ -137234,6 +142066,7 @@ self: { description = "A QuasiQuoter for lighttpd configuration files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lilypond" = callPackage @@ -137251,6 +142084,7 @@ self: { description = "Bindings to Lilypond"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "limp" = callPackage @@ -137285,6 +142119,7 @@ self: { description = "bindings for integer linear programming solver Coin/CBC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lin-alg" = callPackage @@ -137308,6 +142143,7 @@ self: { description = "LINear Discriminant Analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linden" = callPackage @@ -137338,6 +142174,7 @@ self: { description = "Zen gardening, based on l-systems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lindenmayer" = callPackage @@ -137372,7 +142209,40 @@ self: { ]; description = "Haskell SDK for the LINE API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "line-bot-sdk" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base64-bytestring + , bytestring, cryptohash-sha256, errors, hspec, hspec-expectations + , hspec-wai, http-api-data, http-client, http-client-tls + , http-types, scientific, servant, servant-client + , servant-client-core, servant-server, string-conversions, text + , time, transformers, wai, wai-extra, warp + }: + mkDerivation { + pname = "line-bot-sdk"; + version = "0.4.0.0"; + sha256 = "0gi3k6wlcp6q01nxwrsamqkwqfl42sa11nf7bg37kdw0xqsam68s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptohash-sha256 errors + http-api-data http-client http-client-tls http-types scientific + servant servant-client servant-client-core servant-server + string-conversions text time transformers wai wai-extra + ]; + executableHaskellDepends = [ + base servant servant-client servant-server time transformers wai + wai-extra warp + ]; + testHaskellDepends = [ + aeson aeson-qq base base64-bytestring bytestring cryptohash-sha256 + hspec hspec-expectations hspec-wai http-client http-types servant + servant-client servant-client-core servant-server text transformers + wai warp + ]; + description = "Haskell SDK for LINE Messaging API"; + license = stdenv.lib.licenses.bsd3; }) {}; "line-break" = callPackage @@ -137461,6 +142331,7 @@ self: { description = "Lifting linear vector spaces into Accelerate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linear-algebra-cblas" = callPackage @@ -137482,6 +142353,7 @@ self: { description = "A linear algebra library with bindings to BLAS and LAPACK"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linear-circuit" = callPackage @@ -137504,6 +142376,7 @@ self: { description = "Compute resistance of linear electrical circuits"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linear-code" = callPackage @@ -137530,6 +142403,7 @@ self: { description = "A simple library for linear codes (coding theory, error correction)"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linear-grammar" = callPackage @@ -137557,6 +142431,7 @@ self: { description = "Finite maps for linear use"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linear-opengl" = callPackage @@ -137573,6 +142448,7 @@ self: { description = "Isomorphisms between linear and OpenGL types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linear-socket" = callPackage @@ -137597,6 +142473,7 @@ self: { description = "A low-dimensional linear algebra library, operating on the Num typeclass"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linearEqSolver" = callPackage @@ -137630,6 +142507,7 @@ self: { description = "Native, complete, matrix-free linear algebra"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linearscan" = callPackage @@ -137644,6 +142522,7 @@ self: { description = "Linear scan register allocator, formally verified in Coq"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linearscan-hoopl" = callPackage @@ -137665,6 +142544,7 @@ self: { description = "Makes it easy to use the linearscan register allocator with Hoopl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linebreak" = callPackage @@ -137688,6 +142568,7 @@ self: { description = "Lines of Action, 2-player strategy board game"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linguistic-ordinals" = callPackage @@ -137714,7 +142595,6 @@ self: { ]; description = "Use web link relation types (RFC 5988) in Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linkchk" = callPackage @@ -137733,6 +142613,7 @@ self: { description = "linkchk is a network interface link ping monitor"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linkcore" = callPackage @@ -137750,6 +142631,7 @@ self: { description = "Combines multiple GHC Core modules into a single module"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linked-list-with-iterator" = callPackage @@ -137763,6 +142645,7 @@ self: { description = "A pure linked list which is mutable through iterators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linkedhashmap" = callPackage @@ -137786,6 +142669,7 @@ self: { description = "Persistent LinkedHashMap data structure"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linklater" = callPackage @@ -137808,7 +142692,6 @@ self: { ]; description = "A Haskell library for the Slack API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linode" = callPackage @@ -137847,6 +142730,7 @@ self: { description = "Haskell wrapper for the Linode v4 API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linux-blkid" = callPackage @@ -137864,6 +142748,7 @@ self: { description = "Linux libblkid"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {blkid = null;}; "linux-cgroup" = callPackage @@ -137876,6 +142761,7 @@ self: { description = "Very basic interface to the Linux CGroup Virtual Filesystem"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linux-evdev" = callPackage @@ -137914,6 +142800,7 @@ self: { description = "Thinner binding to the Linux Kernel's inotify interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linux-kmod" = callPackage @@ -137927,6 +142814,7 @@ self: { description = "Linux kernel modules support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {libkmod = null;}; "linux-mount" = callPackage @@ -137972,6 +142860,7 @@ self: { description = "Read files generated by perf on Linux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linux-ptrace" = callPackage @@ -137990,6 +142879,7 @@ self: { description = "Wrapping of Linux' ptrace(2)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "linux-xattr" = callPackage @@ -138022,6 +142912,7 @@ self: { description = "Implementation of the Enea LINX gateway protocol"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lio" = callPackage @@ -138034,6 +142925,7 @@ self: { description = "Labeled IO Information Flow Control Library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lio-eci11" = callPackage @@ -138051,6 +142943,7 @@ self: { description = "Labeled IO library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lio-fs" = callPackage @@ -138066,7 +142959,9 @@ self: { ]; description = "Labeled File System interface for LIO"; license = "GPL"; + platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lio-simple" = callPackage @@ -138092,6 +142987,7 @@ self: { description = "LIO support for the Simple web framework"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lipsum-gen" = callPackage @@ -138104,6 +143000,7 @@ self: { description = "Generators for random sequences of English-like nonsense text"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "liquid" = callPackage @@ -138129,6 +143026,7 @@ self: { description = "Liquid template language library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "liquid-fixpoint" = callPackage @@ -138166,6 +143064,7 @@ self: { description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) git; inherit (pkgs) nettools; inherit (pkgs) ocaml; inherit (pkgs) z3;}; @@ -138209,6 +143108,7 @@ self: { description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -138221,6 +143121,7 @@ self: { description = "Liquid Haskell integration for Cabal and stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "liquidhaskell-cabal-demo" = callPackage @@ -138236,6 +143137,7 @@ self: { description = "Demo of Liquid Haskell integration for Cabal and stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lispparser" = callPackage @@ -138271,6 +143173,7 @@ self: { description = "testing list fusion for success"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "list-grouping" = callPackage @@ -138294,6 +143197,7 @@ self: { description = "List Multiplexing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "list-prompt" = callPackage @@ -138315,6 +143219,7 @@ self: { description = "A simple list prompt UI for the terminal"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "list-remote-forwards" = callPackage @@ -138342,6 +143247,7 @@ self: { description = "List all remote forwards for mail accounts stored in a SQL database"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "list-t" = callPackage @@ -138377,6 +143283,7 @@ self: { description = "An \"attoparsec\" adapter for \"list-t\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "list-t-html-parser" = callPackage @@ -138401,6 +143308,7 @@ self: { description = "Streaming HTML parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "list-t-http-client" = callPackage @@ -138417,6 +143325,7 @@ self: { description = "A streaming HTTP client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "list-t-libcurl" = callPackage @@ -138453,6 +143362,7 @@ self: { description = "A streaming text codec"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "list-transformer" = callPackage @@ -138485,6 +143395,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "list-witnesses" = callPackage + ({ mkDerivation, base, decidable, profunctors, singletons, vinyl }: + mkDerivation { + pname = "list-witnesses"; + version = "0.1.1.0"; + sha256 = "16dlyk9hxz5fbsj726w1sgindryhyhsgvhs37zqygwmfzvqdbasd"; + libraryHaskellDepends = [ + base decidable profunctors singletons vinyl + ]; + description = "Witnesses for working with type-level lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "list-zip-def" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -138517,6 +143440,7 @@ self: { description = "A list zipper"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "listenbrainz-client" = callPackage @@ -138535,6 +143459,7 @@ self: { description = "A client library to the ListenBrainz project"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "listlike-instances" = callPackage @@ -138547,6 +143472,7 @@ self: { description = "Extra instances of the ListLike class"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lists" = callPackage @@ -138624,6 +143550,7 @@ self: { description = "A simple tool for literate programming"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "literals" = callPackage @@ -138636,6 +143563,7 @@ self: { description = "Non-overloaded functions for concrete literals"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "live-sequencer" = callPackage @@ -138664,6 +143592,7 @@ self: { description = "Live coding of MIDI music"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "liveplot" = callPackage @@ -138700,6 +143629,7 @@ self: { librarySystemDepends = [ picosat ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) picosat;}; "llrbtree" = callPackage @@ -138732,6 +143662,7 @@ self: { description = "An implementation of the LLSD data system"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm" = callPackage @@ -138749,6 +143680,7 @@ self: { description = "Bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-analysis" = callPackage @@ -138777,6 +143709,7 @@ self: { description = "A Haskell library for analyzing LLVM bitcode"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-base" = callPackage @@ -138789,6 +143722,7 @@ self: { description = "FFI bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-base-types" = callPackage @@ -138810,6 +143744,7 @@ self: { description = "The base types for a mostly pure Haskell LLVM analysis library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-base-util" = callPackage @@ -138822,6 +143757,7 @@ self: { description = "Utilities for bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-data-interop" = callPackage @@ -138843,6 +143779,7 @@ self: { description = "A low-level data interoperability binding for LLVM"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-extra" = callPackage @@ -138862,6 +143799,7 @@ self: { description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-ffi" = callPackage @@ -138877,6 +143815,7 @@ self: { description = "FFI bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (self.llvmPackages) llvm;}; "llvm-ffi-tools" = callPackage @@ -138921,6 +143860,7 @@ self: { description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {llvm-config = null;}; "llvm-general-pure" = callPackage @@ -138942,6 +143882,7 @@ self: { description = "Pure Haskell LLVM functionality (no FFI)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-general-quote" = callPackage @@ -138966,6 +143907,7 @@ self: { description = "QuasiQuoting llvm code for llvm-general"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-hs" = callPackage @@ -138977,10 +143919,8 @@ self: { }: mkDerivation { pname = "llvm-hs"; - version = "7.0.1"; - sha256 = "1ghgmmks22ra6ivhwhy65yj9ihr51lbhwdghm52pna5f14brhlyy"; - revision = "1"; - editedCabalFile = "0nxyjcnsph4mlyxqy47m67ayd4mnpxx3agy5vx7f4v74bg4xx44a"; + version = "8.0.0"; + sha256 = "15ykcxxdvrwyb9jqqr4z3wxhy9r1py1k1hvb9icphzjknpx9z66h"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure @@ -138995,6 +143935,7 @@ self: { description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {llvm-config = null;}; "llvm-hs-pretty" = callPackage @@ -139016,6 +143957,7 @@ self: { description = "A pretty printer for LLVM IR"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-hs-pure" = callPackage @@ -139038,6 +143980,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "llvm-hs-pure_8_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, fail + , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , transformers, unordered-containers + }: + mkDerivation { + pname = "llvm-hs-pure"; + version = "8.0.0"; + sha256 = "1srlac1vdpxddvbf560npxhldkq27hkxwb2lg4qdwvks55l38nfc"; + libraryHaskellDepends = [ + attoparsec base bytestring containers fail mtl template-haskell + transformers unordered-containers + ]; + testHaskellDepends = [ + base containers mtl tasty tasty-hunit tasty-quickcheck transformers + ]; + description = "Pure Haskell LLVM functionality (no FFI)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "llvm-ht" = callPackage ({ mkDerivation, base, bytestring, directory, mtl, process , type-level @@ -139052,6 +144015,7 @@ self: { description = "Bindings to the LLVM compiler toolkit with some custom extensions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-pkg-config" = callPackage @@ -139071,6 +144035,7 @@ self: { description = "Generate Pkg-Config configuration file for LLVM"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-pretty" = callPackage @@ -139083,6 +144048,7 @@ self: { description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-pretty-bc-parser" = callPackage @@ -139110,6 +144076,7 @@ self: { description = "LLVM bitcode parsing library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-tf" = callPackage @@ -139130,6 +144097,7 @@ self: { description = "Bindings to the LLVM compiler toolkit using type families"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "llvm-tools" = callPackage @@ -139158,6 +144126,7 @@ self: { description = "Useful tools built on llvm-analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lmdb" = callPackage @@ -139228,6 +144197,7 @@ self: { description = "LMonad is an Information Flow Control (IFC) framework for Haskell applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lmonad-yesod" = callPackage @@ -139249,6 +144219,7 @@ self: { description = "LMonad for Yesod integrates LMonad's IFC with Yesod web applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "load-balancing" = callPackage @@ -139261,6 +144232,7 @@ self: { description = "Client-side load balancing utilities"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "load-env" = callPackage @@ -139294,6 +144266,7 @@ self: { description = "A cross platform library for loading bundled fonts into your application"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "loadavg" = callPackage @@ -139356,6 +144329,7 @@ self: { description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "localization" = callPackage @@ -139385,7 +144359,6 @@ self: { ]; description = "GNU Gettext-based messages localization library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "located" = callPackage @@ -139398,6 +144371,7 @@ self: { description = "Source location helpers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "located-base" = callPackage @@ -139423,6 +144397,7 @@ self: { description = "Location-aware logging without Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "locators" = callPackage @@ -139454,6 +144429,7 @@ self: { description = "Support for precise error locations in source files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "loch-th" = callPackage @@ -139507,6 +144483,7 @@ self: { description = "Very simple poll lock"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lockfree-queue" = callPackage @@ -139565,6 +144542,7 @@ self: { description = "Structured logging solution with multiple backends"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "log-base" = callPackage @@ -139614,15 +144592,20 @@ self: { }: mkDerivation { pname = "log-effect"; - version = "1.1.1"; - sha256 = "10fd3xnkybca8pi7nw2hq1ggk5g89z8b2ml3avqi1x91chqdqi85"; + version = "1.2.0"; + sha256 = "0d9vwwvbf9dkwppv5hz5g2lp96807adn5kjifmx3pqm0kf59bzfn"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring extensible-effects monad-control text transformers-base ]; + executableHaskellDepends = [ + base bytestring extensible-effects monad-control text + transformers-base + ]; description = "An extensible log effect using extensible-effects"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-effect-syslog" = callPackage @@ -139631,15 +144614,14 @@ self: { }: mkDerivation { pname = "log-effect-syslog"; - version = "0.1.0"; - sha256 = "0db4pgl0np1yyl9arq5cvdp3njdlw62dnbldggjc9p0q6dh3hspc"; + version = "0.2.0"; + sha256 = "04r96hpngw4p0k3g3fcm7dpc69ncsmi9varm7rp3agg4d4zcxkhm"; libraryHaskellDepends = [ base bytestring extensible-effects hsyslog log-effect monad-control transformers-base ]; description = "Syslog functions for log-effect"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-elasticsearch" = callPackage @@ -139660,6 +144642,7 @@ self: { description = "Structured logging solution (Elasticsearch back end)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "log-postgres" = callPackage @@ -139682,6 +144665,7 @@ self: { description = "Structured logging solution (PostgreSQL back end)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "log-utils" = callPackage @@ -139705,6 +144689,7 @@ self: { description = "Utils for working with logs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "log-warper" = callPackage @@ -139741,6 +144726,7 @@ self: { description = "Flexible, configurable, monadic and pretty logging"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "log2json" = callPackage @@ -139755,6 +144741,7 @@ self: { description = "Turn log file records into JSON"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logentries" = callPackage @@ -139775,6 +144762,7 @@ self: { description = "Request logger middleware for Logentries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logfloat" = callPackage @@ -139804,6 +144792,7 @@ self: { description = "Fast & extensible logging framework"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logger-thread" = callPackage @@ -139883,6 +144872,7 @@ self: { description = "Supplemental packages for `logging-effect`"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logging-effect-extra-file" = callPackage @@ -139902,6 +144892,7 @@ self: { description = "TH splices to augment log messages with file info"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logging-effect-extra-handler" = callPackage @@ -139921,6 +144912,7 @@ self: { description = "Handy logging handler combinators"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logging-facade" = callPackage @@ -139953,6 +144945,7 @@ self: { description = "Journald back-end for logging-facade"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logging-facade-syslog" = callPackage @@ -139984,6 +144977,7 @@ self: { description = "Import, export etc. for TPTP, a syntax for first-order logic"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logic-classes" = callPackage @@ -140006,6 +145000,7 @@ self: { description = "Framework for propositional and first order logic, theorem proving"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logicst" = callPackage @@ -140064,6 +145059,7 @@ self: { description = "Parse Heroku application/logplex documents"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logsink" = callPackage @@ -140099,6 +145095,7 @@ self: { description = "Useful utilities for the Lojban language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lojbanParser" = callPackage @@ -140114,6 +145111,7 @@ self: { description = "lojban parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lojbanXiragan" = callPackage @@ -140129,6 +145127,7 @@ self: { description = "lojban to xiragan"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lojysamban" = callPackage @@ -140143,6 +145142,7 @@ self: { description = "Prolog with lojban"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lol" = callPackage @@ -140169,6 +145169,7 @@ self: { description = "A library for lattice cryptography"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lol-apps" = callPackage @@ -140202,6 +145203,7 @@ self: { description = "Lattice-based cryptographic applications using ."; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lol-benches" = callPackage @@ -140219,6 +145221,7 @@ self: { description = "A library for benchmarking ."; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lol-calculus" = callPackage @@ -140241,6 +145244,7 @@ self: { description = "Calculus for LOL (λω language)"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lol-cpp" = callPackage @@ -140260,6 +145264,7 @@ self: { description = "A fast C++ backend for ."; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lol-repa" = callPackage @@ -140280,6 +145285,7 @@ self: { description = "A repa backend for ."; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lol-tests" = callPackage @@ -140300,6 +145306,7 @@ self: { description = "A library for testing ."; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lol-typing" = callPackage @@ -140325,6 +145332,7 @@ self: { description = "Type inferencer for LOL (λω language)"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "loli" = callPackage @@ -140343,6 +145351,7 @@ self: { description = "A minimum web dev DSL in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "long-double" = callPackage @@ -140368,6 +145377,7 @@ self: { description = "Dependently-typed linked list implementation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lookup-tables" = callPackage @@ -140383,6 +145393,7 @@ self: { description = "Statically generate lookup tables using Template Haskell"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "loop" = callPackage @@ -140411,6 +145422,7 @@ self: { description = "control-monad-loop port for effin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "loop-while" = callPackage @@ -140423,6 +145435,7 @@ self: { description = "A monad transformer supporting various styles of while loop"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "loops" = callPackage @@ -140441,6 +145454,7 @@ self: { description = "Fast imperative-style loops"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "loopy" = callPackage @@ -140460,6 +145474,7 @@ self: { description = "Find all biological feedback loops within an ecosystem graph"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lord" = callPackage @@ -140501,6 +145516,7 @@ self: { description = "A command line interface to online radios"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lorem" = callPackage @@ -140516,6 +145532,7 @@ self: { description = "Library for generating filler text"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "loris" = callPackage @@ -140530,6 +145547,7 @@ self: { description = "interface to Loris API"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {loris = null;}; "loshadka" = callPackage @@ -140549,6 +145567,7 @@ self: { description = "Minecraft 1.7 server proxy that answers to queries when the server is offline"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lostcities" = callPackage @@ -140567,6 +145586,7 @@ self: { description = "An implementation of an adictive two-player card game"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "loup" = callPackage @@ -140588,6 +145608,7 @@ self: { description = "Amazon Simple Workflow Service Wrapper for Work Pools"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lowgl" = callPackage @@ -140600,6 +145621,7 @@ self: { description = "Basic gl wrapper and reference"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lp-diagrams" = callPackage @@ -140619,6 +145641,7 @@ self: { description = "An EDSL for diagrams based based on linear constraints"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lp-diagrams-svg" = callPackage @@ -140639,6 +145662,7 @@ self: { description = "SVG Backend for lp-diagrams"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lrucache" = callPackage @@ -140689,6 +145713,7 @@ self: { description = "List USB devices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lscabal" = callPackage @@ -140707,6 +145732,7 @@ self: { description = "List exported modules from a set of .cabal files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lsp-test" = callPackage @@ -140733,6 +145759,7 @@ self: { description = "Functional test framework for LSP servers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lss" = callPackage @@ -140771,6 +145798,7 @@ self: { description = "Paint an L-System Grammar"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ltext" = callPackage @@ -140842,7 +145870,8 @@ self: { description = "Leksah tool kit"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + broken = true; + }) {inherit (pkgs) gtk3;}; "ltl" = callPackage ({ mkDerivation, base, vcd }: @@ -140872,6 +145901,7 @@ self: { description = "Lua bytecode parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lua-bytecode" = callPackage @@ -140905,6 +145935,7 @@ self: { description = "Library functions for reading and writing Lua chunks"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "luautils" = callPackage @@ -140927,6 +145958,7 @@ self: { description = "Helpers for Haskell integration with Lua"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lub" = callPackage @@ -140992,6 +146024,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lucid-extras_0_2_2" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, directory + , lucid, text + }: + mkDerivation { + pname = "lucid-extras"; + version = "0.2.2"; + sha256 = "0zi48ly2729rs3rsbnwj3z5zk9zgzmva0d3dvp448726r62ryfc3"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring lucid text + ]; + testHaskellDepends = [ base directory lucid ]; + description = "Generate more HTML with Lucid - Bootstrap, Rdash, Vega-Lite, Leaflet JS, Email"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lucid-foundation" = callPackage ({ mkDerivation, base, hspec, lucid, QuickCheck , quickcheck-instances, text @@ -141020,6 +146069,7 @@ self: { description = "DSL for SVG using lucid for HTML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lucienne" = callPackage @@ -141042,6 +146092,7 @@ self: { description = "Server side feed aggregator/reader"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "luhn" = callPackage @@ -141069,6 +146120,7 @@ self: { description = "Purely FunctionaL User Interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "luis-client" = callPackage @@ -141084,6 +146136,7 @@ self: { description = "An unofficial client for the LUIS NLP service"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "luka" = callPackage @@ -141098,6 +146151,7 @@ self: { description = "Simple ObjectiveC runtime binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {objc = null;}; "luminance" = callPackage @@ -141115,6 +146169,7 @@ self: { description = "Type-safe, type-level and stateless graphics framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "luminance-samples" = callPackage @@ -141134,6 +146189,7 @@ self: { description = "Luminance samples"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lushtags" = callPackage @@ -141148,6 +146204,7 @@ self: { description = "Create ctags compatible tags files for Haskell programs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "luthor" = callPackage @@ -141161,6 +146218,7 @@ self: { description = "Tools for lexing and utilizing lexemes that integrate with Parsec"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lvish" = callPackage @@ -141189,6 +146247,7 @@ self: { description = "Parallel scheduler, LVar data structures, and infrastructure to build more"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lvmlib" = callPackage @@ -141212,6 +146271,7 @@ self: { description = "The Lazy Virtual Machine (LVM)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lvmrun" = callPackage @@ -141236,6 +146296,7 @@ self: { description = "High level Haskell bindings to LXC (Linux containers)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lxd-client" = callPackage @@ -141266,6 +146327,7 @@ self: { description = "LXD client written in Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lxd-client-config" = callPackage @@ -141304,6 +146366,7 @@ self: { description = "A Lilypond-compiling music box"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lz4" = callPackage @@ -141345,6 +146408,7 @@ self: { description = "LZ4 compression for conduits"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lzma" = callPackage @@ -141418,6 +146482,7 @@ self: { description = "Enumerator interface for lzma/xz compression"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) lzma;}; "lzma-streams" = callPackage @@ -141439,6 +146504,7 @@ self: { description = "IO-Streams interface for lzma/xz compression"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mDNSResponder-client" = callPackage @@ -141456,6 +146522,7 @@ self: { description = "Library for talking to the mDNSResponder daemon"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "maam" = callPackage @@ -141473,6 +146540,7 @@ self: { description = "Monadic Abstracting Abstract Machines (MAAM) built on Galois Transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mac" = callPackage @@ -141510,6 +146578,7 @@ self: { description = "Macbeth - A beautiful and minimalistic FICS client"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "maccatcher" = callPackage @@ -141542,6 +146611,7 @@ self: { description = "Arrow based stream transducers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "machines" = callPackage @@ -141588,6 +146658,7 @@ self: { description = "Machine transducers for Amazonka calls"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "machines-attoparsec" = callPackage @@ -141684,6 +146755,7 @@ self: { description = "Process (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "machines-zlib" = callPackage @@ -141699,6 +146771,7 @@ self: { description = "Decompression support for machines"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "macho" = callPackage @@ -141759,6 +146832,7 @@ self: { description = "Control screen and keyboard backlights on MACs under Linux"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "macos-corelibs" = callPackage @@ -141775,6 +146849,7 @@ self: { description = "Haskell bindings to C-based Mac OS SDK frameworks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "macosx-make-standalone" = callPackage @@ -141795,6 +146870,7 @@ self: { description = "Make a macosx app standalone deployable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "madlang" = callPackage @@ -141807,8 +146883,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "4.0.2.14"; - sha256 = "1fpqs3cyb0iwld53gljkzsz7xhwamkd4g2irk7j3z6pxvn36bhin"; + version = "4.0.2.15"; + sha256 = "0fv2p6f6gj9jg72kmlf56nymvs3sf6hn98jh4q0ighn6k5dkhbf3"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -141826,6 +146902,7 @@ self: { description = "Randomized templating language DSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mage" = callPackage @@ -141842,6 +146919,7 @@ self: { description = "Rogue-like"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ncurses;}; "magic" = callPackage @@ -141885,6 +146963,7 @@ self: { description = "Interact with Magic Wormhole"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "magicbane" = callPackage @@ -141916,6 +146995,7 @@ self: { description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "magico" = callPackage @@ -141934,6 +147014,7 @@ self: { description = "Compute solutions for Magico puzzle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "magma" = callPackage @@ -141946,6 +147027,7 @@ self: { description = "magma is an algebraic structure consisting a set together with an binary operation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mahoro" = callPackage @@ -141967,6 +147049,7 @@ self: { description = "ImageBoards to XMPP gate"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "maid" = callPackage @@ -141989,6 +147072,7 @@ self: { description = "A simple static web server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mailbox-count" = callPackage @@ -142014,6 +147098,7 @@ self: { description = "Count mailboxes in a SQL database"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mailchimp" = callPackage @@ -142033,6 +147118,7 @@ self: { description = "Bindings for the MailChimp API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mailchimp-subscribe" = callPackage @@ -142052,6 +147138,7 @@ self: { description = "MailChimp subscription request handler"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mailgun" = callPackage @@ -142074,6 +147161,7 @@ self: { description = "Connector to Rackspace's Mailgun Service"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "main-tester" = callPackage @@ -142140,6 +147228,7 @@ self: { description = "Majordomo protocol for ZeroMQ"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "majority" = callPackage @@ -142152,6 +147241,7 @@ self: { description = "Boyer-Moore Majority Vote Algorithm"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "make-hard-links" = callPackage @@ -142170,6 +147260,7 @@ self: { description = "Change duplicated files into hard-links"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "make-monofoldable-foldable" = callPackage @@ -142182,6 +147273,7 @@ self: { description = "Make a MonoFoldable type into an ordinary Foldable type"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "make-package" = callPackage @@ -142203,6 +147295,7 @@ self: { description = "Make a cabalized package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "makedo" = callPackage @@ -142215,6 +147308,7 @@ self: { description = "Helper for writing redo scripts in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "makefile" = callPackage @@ -142233,6 +147327,7 @@ self: { description = "Simple Makefile parser and generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mallard" = callPackage @@ -142261,6 +147356,7 @@ self: { description = "Database migration and testing as a library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mameya" = callPackage @@ -142308,6 +147404,7 @@ self: { description = "The Haskell/Gtk+ Integrated Live Environment"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manatee-all" = callPackage @@ -142355,6 +147452,7 @@ self: { description = "Multithread interactive input/search framework for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manatee-browser" = callPackage @@ -142399,6 +147497,7 @@ self: { description = "The core of Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manatee-curl" = callPackage @@ -142422,6 +147521,7 @@ self: { description = "Download Manager extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manatee-editor" = callPackage @@ -142443,6 +147543,7 @@ self: { description = "Editor extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manatee-filemanager" = callPackage @@ -142464,6 +147565,7 @@ self: { description = "File manager extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manatee-imageviewer" = callPackage @@ -142485,6 +147587,7 @@ self: { description = "Image viewer extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manatee-ircclient" = callPackage @@ -142510,6 +147613,7 @@ self: { description = "IRC client extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manatee-mplayer" = callPackage @@ -142532,6 +147636,7 @@ self: { description = "Mplayer client extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manatee-pdfviewer" = callPackage @@ -142553,6 +147658,7 @@ self: { description = "PDF viewer extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manatee-processmanager" = callPackage @@ -142573,6 +147679,7 @@ self: { description = "Process manager extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manatee-reader" = callPackage @@ -142614,6 +147721,7 @@ self: { description = "Template code to create Manatee application"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manatee-terminal" = callPackage @@ -142634,6 +147742,7 @@ self: { description = "Terminal Emulator extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manatee-welcome" = callPackage @@ -142654,6 +147763,7 @@ self: { description = "Welcome module to help user play Manatee quickly"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mancala" = callPackage @@ -142692,6 +147802,7 @@ self: { description = "Library for interfacing with the Mandrill JSON API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mandulia" = callPackage @@ -142711,6 +147822,7 @@ self: { description = "A zooming visualisation of the Mandelbrot Set as many Julia Sets"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mangopay" = callPackage @@ -142750,6 +147862,7 @@ self: { description = "Bindings to the MangoPay API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manifold-random" = callPackage @@ -142767,6 +147880,7 @@ self: { description = "Sampling random points on general manifolds"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manifolds" = callPackage @@ -142797,6 +147911,7 @@ self: { description = "Coordinate-free hypersurfaces"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "manifolds-core" = callPackage @@ -142809,6 +147924,7 @@ self: { description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "map-classes" = callPackage @@ -142840,6 +147956,7 @@ self: { description = "Extensions to Data.Map"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "map-syntax" = callPackage @@ -142859,6 +147976,7 @@ self: { description = "Syntax sugar for defining maps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mapalgebra" = callPackage @@ -142906,6 +148024,7 @@ self: { description = "A functional programming language focused around maps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mapquest-api" = callPackage @@ -142955,6 +148074,7 @@ self: { description = "A study of marionetta movements"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "markdown" = callPackage @@ -143001,6 +148121,7 @@ self: { description = "Convert Markdown to HTML, with XSS protection"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "markdown-pap" = callPackage @@ -143013,6 +148134,7 @@ self: { description = "markdown parser with papillon"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "markdown-unlit" = callPackage @@ -143052,6 +148174,7 @@ self: { description = "markdown to svg converter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "marked-pretty" = callPackage @@ -143065,6 +148188,7 @@ self: { description = "Pretty-printing library, with scoping, based on pretty"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "markov" = callPackage @@ -143104,6 +148228,7 @@ self: { description = "Hidden Markov processes"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "markup" = callPackage @@ -143123,6 +148248,7 @@ self: { description = "Abstraction for HTML-embedded content"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "markup-preview" = callPackage @@ -143172,6 +148298,7 @@ self: { description = "Upload packages to Marmalade"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "marquise" = callPackage @@ -143207,6 +148334,7 @@ self: { description = "Client library for Vaultaire"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mars" = callPackage @@ -143223,6 +148351,7 @@ self: { description = "Generates mountainous terrain using a random walk algorithm"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "marvin" = callPackage @@ -143258,6 +148387,7 @@ self: { description = "A framework for modular, portable chat bots"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "marvin-interpolate" = callPackage @@ -143275,6 +148405,7 @@ self: { description = "Compile time string interpolation a la Scala and CoffeeScript"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "marxup" = callPackage @@ -143299,6 +148430,7 @@ self: { description = "Markup language preprocessor for Haskell"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "masakazu-bot" = callPackage @@ -143322,6 +148454,7 @@ self: { description = "@minamiyama1994_bot on haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "massiv" = callPackage @@ -143331,8 +148464,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.2.7.0"; - sha256 = "080pdghb6yf08addkysdpgdgzf60lc90z580vk2igjfc23w9xwc7"; + version = "0.2.8.0"; + sha256 = "01z57p6byvrrbl9hhr1jq90kpb823kjfbq0inhvmjjbcnbngqrf3"; libraryHaskellDepends = [ base bytestring data-default-class deepseq ghc-prim primitive vector @@ -143384,6 +148517,7 @@ self: { description = "The project management tool for hackers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mastermind" = callPackage @@ -143457,6 +148591,7 @@ self: { description = "Text matchers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) pcre;}; "math-functions" = callPackage @@ -143494,6 +148629,8 @@ self: { testHaskellDepends = [ array base containers hspec random ]; description = "Library containing graph data structures and graph algorithms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mathblog" = callPackage @@ -143521,6 +148658,7 @@ self: { description = "A program for creating and managing a static weblog with LaTeX math and diagrams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mathexpr" = callPackage @@ -143552,6 +148690,7 @@ self: { description = "Dependently typed tensorflow modeler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mathgenealogy" = callPackage @@ -143611,6 +148750,7 @@ self: { description = "Write Mathematica packages in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "matlab" = callPackage @@ -143646,6 +148786,7 @@ self: { description = "Bindings to Matplotlib; a Python plotting library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "matrices" = callPackage @@ -143716,6 +148857,7 @@ self: { description = "Read and Display representation of matrix like \"x,y,z\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "matrix-market" = callPackage @@ -143797,6 +148939,7 @@ self: { description = "ncurses XMPP client"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "matterhorn" = callPackage @@ -143814,8 +148957,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.1.1"; - sha256 = "1s022iyid3msyvpimd88bs7684nvlxmalhwsp7bjxv4mlx3fz0zp"; + version = "50200.2.0"; + sha256 = "04nw298cv880svk211gf5lzbv2wmr5cz01h0qwzdgjg4v43s49kp"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -143839,7 +148982,6 @@ self: { ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mattermost-api" = callPackage @@ -143851,8 +148993,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.1.0"; - sha256 = "1adqh3s34zw74x4idjy1ln8qq9qlqq146kb9b4gd2lijrr8zrjn7"; + version = "50200.1.2"; + sha256 = "130cv44ajyraxxf41llydmnfzybl747ly1gip31xsrkicrzm20bs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143875,8 +149017,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.1.0"; - sha256 = "1rlzq0dqpqqnwzz1sknf8zfnsbqpz1w51ik9k4hi8qydkpbf3sdz"; + version = "50200.1.2"; + sha256 = "1r11n7zkqi6ph58zhgcrxjjapawmhlk4dcg4ixs420qkdpr45q11"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -143898,6 +149040,7 @@ self: { description = "An interface to the Maude rewriting system"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "maxent" = callPackage @@ -143920,6 +149063,7 @@ self: { description = "Compute Maximum Entropy Distributions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "maxent-learner-hw" = callPackage @@ -143944,6 +149088,7 @@ self: { description = "Hayes and Wilson's maxent learning algorithm for phonotactic grammars"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "maxent-learner-hw-gui" = callPackage @@ -143966,6 +149111,7 @@ self: { description = "GUI for maxent-learner-hw"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "maximal-cliques" = callPackage @@ -143999,6 +149145,7 @@ self: { description = "Maximal sharing of terms in the lambda calculus with letrec"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "maybe-justify" = callPackage @@ -144030,6 +149177,7 @@ self: { description = "Automated benchmarking tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mbox" = callPackage @@ -144062,6 +149210,7 @@ self: { description = "A collection of tools to process mbox files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mbox-utility" = callPackage @@ -144150,6 +149299,7 @@ self: { description = "Bindings to mcl, a generic and fast pairing-based cryptography library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gmpxx; mcl = null; inherit (pkgs) openssl;}; "mcm" = callPackage @@ -144170,6 +149320,7 @@ self: { description = "Machine Configuration Manager"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mcmaster-gloss-examples" = callPackage @@ -144183,6 +149334,7 @@ self: { executableHaskellDepends = [ base gloss ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mcmc-samplers" = callPackage @@ -144199,6 +149351,7 @@ self: { description = "Combinators for MCMC sampling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mcmc-synthesis" = callPackage @@ -144211,6 +149364,7 @@ self: { description = "MCMC applied to probabilistic program synthesis"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mcmc-types" = callPackage @@ -144239,6 +149393,7 @@ self: { description = "Connect to MineCraft running on a Raspberry PI"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mdapi" = callPackage @@ -144258,6 +149413,7 @@ self: { description = "Haskell interface to Fedora's mdapi"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mdcat" = callPackage @@ -144278,6 +149434,7 @@ self: { description = "Markdown viewer in your terminal"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mdo" = callPackage @@ -144308,6 +149465,7 @@ self: { description = "Tools for solving Markov Decision Processes"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mealstrom" = callPackage @@ -144330,6 +149488,7 @@ self: { description = "Manipulate FSMs and store them in PostgreSQL"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "means" = callPackage @@ -144354,6 +149513,7 @@ self: { description = "A Haskell binding to MeCab"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) mecab;}; "mech" = callPackage @@ -144366,6 +149526,7 @@ self: { description = "mecha are the most complex composite machines known to humanity, lets build them well!"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mecha" = callPackage @@ -144391,6 +149552,7 @@ self: { description = "mecha are the most complex composite machines known to humanity, lets build them well!"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "med-module" = callPackage @@ -144409,6 +149571,7 @@ self: { description = "Parse song module files from Amiga MED and OctaMED"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mediabus" = callPackage @@ -144440,6 +149603,7 @@ self: { description = "Multimedia streaming on top of Conduit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mediabus-fdk-aac" = callPackage @@ -144468,6 +149632,7 @@ self: { description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {fdk-aac = null;}; "mediabus-rtp" = callPackage @@ -144506,6 +149671,7 @@ self: { description = "Receive and Send RTP Packets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "median-stream" = callPackage @@ -144519,6 +149685,7 @@ self: { description = "Constant-time queries for the median of a stream of numeric data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mediawiki" = callPackage @@ -144538,6 +149705,7 @@ self: { description = "Interfacing with the MediaWiki API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mediawiki2latex" = callPackage @@ -144565,7 +149733,6 @@ self: { ]; description = "Convert MediaWiki text to LaTeX"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "medium-sdk-haskell" = callPackage @@ -144583,6 +149750,7 @@ self: { description = "Haskell SDK for communicating with the Medium API"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "meep" = callPackage @@ -144709,6 +149877,7 @@ self: { description = "Control physical access devices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mellon-gpio" = callPackage @@ -144721,6 +149890,7 @@ self: { description = "GPIO support for mellon"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mellon-web" = callPackage @@ -144763,6 +149933,7 @@ self: { description = "A REST web service for Mellon controllers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "melody" = callPackage @@ -144785,6 +149956,7 @@ self: { description = "A functional scripting language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "memcache" = callPackage @@ -144826,6 +149998,7 @@ self: { description = "Conduit library for memcache procotol"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "memcache-haskell" = callPackage @@ -144849,6 +150022,7 @@ self: { description = "Memcache procotol library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "memcached" = callPackage @@ -144884,6 +150058,7 @@ self: { description = "memcached client using binary protocol"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "memexml" = callPackage @@ -144907,6 +150082,7 @@ self: { description = "Library for reading `/proc/meminfo`"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "memis" = callPackage @@ -144933,6 +150109,7 @@ self: { description = "Memis Efficient Manual Image Sorting"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "memo-ptr" = callPackage @@ -144945,6 +150122,7 @@ self: { description = "Pointer equality memoization"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "memo-sqlite" = callPackage @@ -144973,6 +150151,7 @@ self: { description = "Utilities for memoizing functions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "memoize" = callPackage @@ -144995,8 +150174,8 @@ self: { }: mkDerivation { pname = "memorable-bits"; - version = "0.1.0.0"; - sha256 = "0jxx1i0x4lh16027cqbg3qha2acpjw8bc37ifjfjr8y12wgmkhvs"; + version = "0.1.0.1"; + sha256 = "13czmdwg3006xwpac1sngyy8qm5qcm6jbfglqbyy9w85i7qacpf9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145013,7 +150192,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "Generate human memorable strings from binary data"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memory" = callPackage @@ -145048,6 +150226,7 @@ self: { description = "basic memory pool outside of haskell heap/GC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "memscript" = callPackage @@ -145090,6 +150269,7 @@ self: { description = "Haskell binding for Menoh DNN inference library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {menoh = null;}; "menshen" = callPackage @@ -145132,7 +150312,6 @@ self: { ]; description = "Haskell binding to Mercury API for ThingMagic RFID readers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "merge-bash-history" = callPackage @@ -145194,6 +150373,7 @@ self: { description = "A modified Merkle Patricia DB"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "merkle-tree" = callPackage @@ -145259,7 +150439,6 @@ self: { ]; description = "Serialize instance for Message Pack Object"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "messagepack-rpc" = callPackage @@ -145278,6 +150457,7 @@ self: { description = "Message Pack RPC over TCP"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "messente" = callPackage @@ -145292,6 +150472,7 @@ self: { description = "Messente SMS Gateway"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "meta-misc" = callPackage @@ -145304,6 +150485,7 @@ self: { description = "Utility library providing miscellaneous meta-programming utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "meta-par" = callPackage @@ -145321,6 +150503,7 @@ self: { description = "Provides the monad-par interface, but based on modular scheduler \"mix-ins\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "meta-par-accelerate" = callPackage @@ -145339,6 +150522,7 @@ self: { description = "Support for integrated Accelerate computations within Meta-par"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "metadata" = callPackage @@ -145351,6 +150535,7 @@ self: { description = "metadata library for semantic web"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "metamorphic" = callPackage @@ -145375,6 +150560,7 @@ self: { description = "a tiny ghc api wrapper"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "metar" = callPackage @@ -145400,6 +150586,7 @@ self: { description = "Australian METAR"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "metar-http" = callPackage @@ -145425,6 +150612,7 @@ self: { description = "HTTP for METAR"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "metric" = callPackage @@ -145444,6 +150632,7 @@ self: { description = "Metric spaces"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "metrics" = callPackage @@ -145478,6 +150667,7 @@ self: { description = "Client for the metrics aggregator Metricsd"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "metronome" = callPackage @@ -145492,6 +150682,7 @@ self: { description = "Time Synchronized execution"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mezzo" = callPackage @@ -145513,6 +150704,7 @@ self: { description = "Typesafe music composition"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mezzolens" = callPackage @@ -145525,6 +150717,7 @@ self: { description = "Pure Profunctor Functional Lenses"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mfsolve" = callPackage @@ -145555,6 +150748,7 @@ self: { description = "Generics with multiple parameters"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mi" = callPackage @@ -145571,6 +150765,7 @@ self: { description = "Multiple Instance for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "miconix-test" = callPackage @@ -145587,6 +150782,7 @@ self: { description = "spam"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "micro-recursion-schemes" = callPackage @@ -145603,6 +150799,7 @@ self: { description = "Simple recursion schemes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "microaeson" = callPackage @@ -145627,6 +150824,7 @@ self: { description = "A tiny JSON library with light dependency footprint"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "microbench" = callPackage @@ -145689,7 +150887,6 @@ self: { ]; description = "A Microformats 2 parser"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microformats2-types" = callPackage @@ -145706,6 +150903,7 @@ self: { description = "Microformats 2 types (with Aeson instances)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "microgroove" = callPackage @@ -145718,6 +150916,7 @@ self: { description = "Array-backed extensible records"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "microlens" = callPackage @@ -145775,6 +150974,7 @@ self: { description = "'each' for microlens"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "microlens-ghc" = callPackage @@ -145856,6 +151056,7 @@ self: { description = "A super simple logging module"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "microsoft-translator" = callPackage @@ -145873,7 +151074,6 @@ self: { ]; description = "Bindings to the Microsoft Translator API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microspec" = callPackage @@ -145950,6 +151150,7 @@ self: { description = "Language for algorithmic generation of MIDI files"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "midair" = callPackage @@ -145996,7 +151197,7 @@ self: { ]; description = "Convert between datatypes of the midi and the alsa packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "midi-music-box" = callPackage @@ -146016,7 +151217,6 @@ self: { ]; description = "Convert MIDI file to music box punch tape"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-simple" = callPackage @@ -146071,6 +151271,7 @@ self: { description = "Utilities for working with MIDI data"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "midimory" = callPackage @@ -146091,6 +151292,7 @@ self: { description = "A Memory-like (Concentration, Pairs, ...) game for tones"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "midisurface" = callPackage @@ -146109,6 +151311,7 @@ self: { description = "A control midi surface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mighttpd" = callPackage @@ -146130,6 +151333,7 @@ self: { description = "Simple Web Server in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mighttpd2" = callPackage @@ -146180,6 +151384,7 @@ self: { description = "The Metropolis algorithm"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mikmod" = callPackage @@ -146194,6 +151399,7 @@ self: { description = "MikMod bindings"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mikrokosmos" = callPackage @@ -146220,6 +151426,7 @@ self: { description = "Lambda calculus interpreter"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "miku" = callPackage @@ -146237,6 +151444,7 @@ self: { description = "A minimum web dev DSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "milena" = callPackage @@ -146260,7 +151468,6 @@ self: { ]; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime" = callPackage @@ -146269,6 +151476,8 @@ self: { pname = "mime"; version = "0.4.0.2"; sha256 = "0x9qx8adradc5irfwfn4xs4j9pd228j1b3lpngap2qxabhz2iyp7"; + revision = "1"; + editedCabalFile = "07r4kyjm2bk8knyhbfivgxlxnxp7qqlcnzp61f2hi7d1s7clg290"; libraryHaskellDepends = [ base text ]; description = "Working with MIME types"; license = stdenv.lib.licenses.bsd3; @@ -146288,6 +151497,7 @@ self: { description = "A library for parsing/printing the text/directory mime type"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mime-mail" = callPackage @@ -146373,6 +151583,7 @@ self: { description = "a DSL for generating minecraft commands and levels"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mines" = callPackage @@ -146408,6 +151619,7 @@ self: { description = "Minesweeper game which is always solvable without guessing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "miniball" = callPackage @@ -146441,6 +151653,7 @@ self: { description = "Miniature FORTH-like interpreter"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "minilens" = callPackage @@ -146457,6 +151670,7 @@ self: { description = "A minimalistic lens library, providing only the simplest, most basic lens functionality"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "minimal-configuration" = callPackage @@ -146501,6 +151715,7 @@ self: { description = "Shows how to run grabber on Mac OS X"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "minio-hs" = callPackage @@ -146533,6 +151748,7 @@ self: { description = "A Minio Haskell Library for Amazon S3 compatible cloud storage"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "minions" = callPackage @@ -146549,6 +151765,7 @@ self: { description = "A fast parallel ssh tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "minioperational" = callPackage @@ -146566,6 +151783,7 @@ self: { description = "fast and simple operational monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "miniplex" = callPackage @@ -146583,6 +151801,7 @@ self: { description = "simple 1-to-N interprocess communication"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "minirotate" = callPackage @@ -146603,6 +151822,7 @@ self: { description = "Minimalistic file rotation utility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "minisat" = callPackage @@ -146645,6 +151865,7 @@ self: { description = "an interpreter for an operational semantics for the STG machine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "miniutter" = callPackage @@ -146690,6 +151911,7 @@ self: { description = "Read and write IDX data that is used in e.g. the MINST database."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mintty" = callPackage @@ -146725,6 +151947,7 @@ self: { description = "A Minisat-based CDCL SAT solver in Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mirror-tweet" = callPackage @@ -146744,6 +151967,7 @@ self: { description = "Tweet mirror"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "misfortune" = callPackage @@ -146920,6 +152144,7 @@ self: { description = "A Haskell git implimentation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "miss-porcelain" = callPackage @@ -146937,6 +152162,7 @@ self: { description = "Useability extras built on top of miss"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "missing-foreign" = callPackage @@ -146963,6 +152189,30 @@ self: { description = "Haskell interface to Python"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "miv" = callPackage + ({ mkDerivation, aeson, async, base, concurrent-output, directory + , ghc-prim, hashable, hspec, monad-parallel, process, text, time + , unordered-containers, yaml + }: + mkDerivation { + pname = "miv"; + version = "0.3.0"; + sha256 = "1s4xkr6mrlwvmxh4v63yzljsz96v5fy9mws8xwmbybqrlpqgc5qy"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async base concurrent-output directory ghc-prim hashable + monad-parallel process text time unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base directory ghc-prim hashable hspec monad-parallel process + text time unordered-containers yaml + ]; + description = "Manage Vim plugins with command"; + license = stdenv.lib.licenses.mit; }) {}; "mix-arrows" = callPackage @@ -146991,6 +152241,7 @@ self: { description = "Find optimal mixed strategies for two-player games"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mixed-types-num" = callPackage @@ -147049,6 +152300,32 @@ self: { description = "Mixpanel client"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "mixpanel-client_0_2_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec + , hspec-discover, http-client, http-client-tls, markdown-unlit + , servant, servant-client, string-conv, text, time + }: + mkDerivation { + pname = "mixpanel-client"; + version = "0.2.0"; + sha256 = "1c0lgysznql57wff90r5s6mwq7gwah0j6pw10i4wppqs6pdiiwik"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring http-client http-client-tls + servant servant-client string-conv text time + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring hspec http-client + http-client-tls markdown-unlit servant servant-client string-conv + text time + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Mixpanel client"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mkbndl" = callPackage @@ -147064,6 +152341,7 @@ self: { description = "Makes an OS X .app bundle from a binary."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mkcabal" = callPackage @@ -147083,6 +152361,7 @@ self: { description = "Generate cabal files for a Haskell project"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ml-w" = callPackage @@ -147098,6 +152377,7 @@ self: { description = "Minimal ML language to to demonstrate the W type infererence algorithm"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mlist" = callPackage @@ -147110,6 +152390,7 @@ self: { description = "Monadic List alternative to lazy I/O"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mltool" = callPackage @@ -147134,6 +152415,7 @@ self: { description = "Machine Learning Toolbox"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mmap" = callPackage @@ -147159,8 +152441,8 @@ self: { }: mkDerivation { pname = "mmark"; - version = "0.0.6.1"; - sha256 = "0riizf8qg6938w9vvf0lwaflsc3lpbqmbiqdfv8d7fhxpk10qaxw"; + version = "0.0.6.2"; + sha256 = "0j8n2rjfx590v0m3p9z8xhbfxgxbc1cxfkdg18vwyhayh55mn373"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -147200,26 +152482,6 @@ self: { }) {}; "mmark-ext" = callPackage - ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec - , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting - , text - }: - mkDerivation { - pname = "mmark-ext"; - version = "0.2.1.1"; - sha256 = "01av7d9n75mg9yzkxszrvbxjbsv4n0gsdmg3n2620zn40j5lwmcq"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri - skylighting text - ]; - testHaskellDepends = [ base hspec lucid mmark skylighting text ]; - testToolDepends = [ hspec-discover ]; - description = "Commonly useful extensions for the MMark markdown processor"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mmark-ext_0_2_1_2" = callPackage ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting , text @@ -147237,7 +152499,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Commonly useful extensions for the MMark markdown processor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmorph" = callPackage @@ -147272,6 +152533,7 @@ self: { description = "Macromolecular Transmission Format implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mmtl" = callPackage @@ -147284,6 +152546,7 @@ self: { description = "Modular Monad transformer library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mmtl-base" = callPackage @@ -147296,6 +152559,7 @@ self: { description = "MonadBase type-class for mmtl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mnist-idx" = callPackage @@ -147326,6 +152590,7 @@ self: { description = "Language-agnostic analyzer for positional morphosyntactic tags"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mockery" = callPackage @@ -147380,6 +152645,7 @@ self: { description = "Derive a model of a data type using Generics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "modelicaparser" = callPackage @@ -147397,6 +152663,7 @@ self: { description = "A parser for the modelica language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "modern-uri" = callPackage @@ -147449,6 +152716,7 @@ self: { description = "Modify fasta (and CLIP) files in several optional ways"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "modsplit" = callPackage @@ -147470,6 +152738,7 @@ self: { description = "Haskell source splitter driven by special comments"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "modular" = callPackage @@ -147482,6 +152751,7 @@ self: { description = "Type-safe modular arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "modular-arithmetic" = callPackage @@ -147494,7 +152764,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "A type for integers modulo some constant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modular-prelude" = callPackage @@ -147513,6 +152782,7 @@ self: { description = "A new Prelude featuring first class modules"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "modular-prelude-classy" = callPackage @@ -147525,6 +152795,7 @@ self: { description = "Reifying ClassyPrelude a la ModularPrelude"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "modularity" = callPackage @@ -147541,6 +152812,7 @@ self: { description = "Find the modularity of a network"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "module-management" = callPackage @@ -147572,6 +152844,7 @@ self: { description = "Clean up module imports, split and merge modules"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "modulespection" = callPackage @@ -147589,6 +152862,7 @@ self: { description = "Template Haskell for introspecting a module's declarations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "modulo" = callPackage @@ -147609,6 +152883,7 @@ self: { description = "Modular C code generator"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "moe" = callPackage @@ -147625,6 +152900,7 @@ self: { description = "html with style"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "moesocks" = callPackage @@ -147670,6 +152946,7 @@ self: { description = "Modular Haskell Web Server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mole" = callPackage @@ -147701,6 +152978,7 @@ self: { description = "A glorified string replacement tool"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mollie-api-haskell" = callPackage @@ -147720,6 +152998,7 @@ self: { description = "Mollie API client for Haskell http://www.mollie.com"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-abort-fd" = callPackage @@ -147748,6 +153027,7 @@ self: { description = "Monadically convert object to unique integers and back"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-atom-simple" = callPackage @@ -147760,6 +153040,7 @@ self: { description = "Monadically map objects to unique ints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-batcher" = callPackage @@ -147845,6 +153126,7 @@ self: { description = "Monadic conversion between complex data structures and unique integers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-connect" = callPackage @@ -147915,6 +153197,8 @@ self: { pname = "monad-dijkstra"; version = "0.1.1.2"; sha256 = "1890rnypk3ra4f0f3m7nr31df3x6pmpw6ivid77wj7h9mdp0bdb6"; + revision = "1"; + editedCabalFile = "0dwcwwlfkhjl31asr35cy1m26nacz9xjry01cnq1dyaqcg53xjjb"; libraryHaskellDepends = [ base containers free mtl psqueues transformers ]; @@ -147922,6 +153206,7 @@ self: { description = "A monad transformer for weighted graph searches"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-exception" = callPackage @@ -147939,6 +153224,7 @@ self: { description = "Exstensible monadic exceptions"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-extras" = callPackage @@ -147982,6 +153268,7 @@ self: { description = "Type class for monads which support a fork operation"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-gen" = callPackage @@ -148031,6 +153318,7 @@ self: { description = "A class of monads which can do http requests"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-interleave" = callPackage @@ -148043,6 +153331,7 @@ self: { description = "Monads with an unsaveInterleaveIO-like operation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-io-adapter" = callPackage @@ -148091,6 +153380,7 @@ self: { description = "Specific levels of monad transformers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-lgbt" = callPackage @@ -148110,6 +153400,7 @@ self: { description = "Monad transformers for combining local and global state"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-log" = callPackage @@ -148173,8 +153464,8 @@ self: { }: mkDerivation { pname = "monad-logger-prefix"; - version = "0.1.10"; - sha256 = "0xfrl084b45nq7598239ax3v0qck56d75p4jcqlykn8k7822vb53"; + version = "0.1.11"; + sha256 = "0zw591nqgyqy37vj0vmyyd2m7v6cyx8bgwfm1xhf1ppbxhjx38nv"; libraryHaskellDepends = [ base exceptions monad-control monad-logger mtl resourcet text transformers transformers-base @@ -148241,6 +153532,7 @@ self: { description = "a monad to calculate linear recursive sequence"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-markov" = callPackage @@ -148279,7 +153571,6 @@ self: { ]; description = "Memoization monad transformer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-mersenne-random" = callPackage @@ -148294,6 +153585,7 @@ self: { description = "An efficient random generator monad, based on the Mersenne Twister"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-metrics" = callPackage @@ -148330,6 +153622,7 @@ self: { description = "A monad transformer for mocking mtl-style typeclasses"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-open" = callPackage @@ -148342,6 +153635,7 @@ self: { description = "Open recursion for when you need it"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-ox" = callPackage @@ -148422,6 +153716,7 @@ self: { description = "Parallel execution of monadic computations with a progress bar"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-param" = callPackage @@ -148507,6 +153802,7 @@ self: { description = "Fast monads and monad transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-recorder" = callPackage @@ -148524,6 +153820,7 @@ self: { description = "Record and replay the results of monadic actions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-resumption" = callPackage @@ -148536,6 +153833,7 @@ self: { description = "Resumption and reactive resumption monads for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-skeleton" = callPackage @@ -148574,6 +153872,7 @@ self: { description = "Utility library for monads, particularly those involving state"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-statevar" = callPackage @@ -148587,6 +153886,7 @@ self: { description = "Concise, overloaded accessors for IORef, STRef, TVar"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-ste" = callPackage @@ -148604,6 +153904,7 @@ self: { description = "ST monad with efficient explicit errors"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-stlike-io" = callPackage @@ -148619,6 +153920,7 @@ self: { description = "ST-like monad capturing variables to regions and supporting IO"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-stlike-stm" = callPackage @@ -148631,6 +153933,7 @@ self: { description = "ST-like monad capturing variables to regions and supporting STM"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-stm" = callPackage @@ -148654,6 +153957,7 @@ self: { description = "Stateful supply monad"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-task" = callPackage @@ -148695,6 +153999,7 @@ self: { description = "Monad transformer for recording timing events"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-tx" = callPackage @@ -148707,6 +154012,7 @@ self: { description = "A transactional state monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-unify" = callPackage @@ -148721,6 +154027,7 @@ self: { description = "Generic first-order unification"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-unlift" = callPackage @@ -148765,6 +154072,7 @@ self: { description = "Generic operations over variables"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-wrap" = callPackage @@ -148777,6 +154085,7 @@ self: { description = "Wrap functions such as catch around different monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monadIO" = callPackage @@ -148811,6 +154120,7 @@ self: { description = "Arrow-like monad composition for monadLib"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monadacme" = callPackage @@ -148823,6 +154133,7 @@ self: { description = "The Acme and AcmeT monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monadbi" = callPackage @@ -148894,6 +154205,7 @@ self: { description = "Constraint Programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monadiccp-gecode" = callPackage @@ -148913,6 +154225,7 @@ self: { description = "Constraint Programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gecodeint = null; gecodekernel = null; gecodesearch = null; gecodeset = null; gecodesupport = null;}; @@ -148965,6 +154278,7 @@ self: { description = "A preprocessor for generating monadic call traces"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monadlog" = callPackage @@ -148985,6 +154299,7 @@ self: { description = "A simple and fast logging monad"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monadoid" = callPackage @@ -149012,6 +154327,7 @@ self: { description = "Haskell98 partial maps and filters over MonadPlus"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monads-fd" = callPackage @@ -149024,6 +154340,7 @@ self: { description = "Monad classes, using functional dependencies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monads-tf" = callPackage @@ -149065,6 +154382,7 @@ self: { description = "Monadic interface for TokyoTyrant"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mondo" = callPackage @@ -149089,6 +154407,7 @@ self: { description = "Haskell bindings for the Mondo API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monetdb-mapi" = callPackage @@ -149101,6 +154420,7 @@ self: { description = "Mid-level bindings for the MonetDB API (mapi)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "money" = callPackage @@ -149114,6 +154434,7 @@ self: { description = "Money"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mongoDB" = callPackage @@ -149126,8 +154447,8 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.4.0.0"; - sha256 = "06g7mvazsymbyzm1zhsyfpbmhvlizidb4lp5l6axfw2wh90h5f7x"; + version = "2.4.0.1"; + sha256 = "0wadf91vymy1wzf1xq9k5ackj5fc7220fgg6h42y4qpmg1xzbpip"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring conduit conduit-extra containers cryptohash @@ -149165,6 +154486,7 @@ self: { description = "message queue using MongoDB"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mongrel2-handler" = callPackage @@ -149183,6 +154505,7 @@ self: { description = "Mongrel2 Handler Library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monitor" = callPackage @@ -149197,6 +154520,7 @@ self: { description = "Do things when files change"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monky" = callPackage @@ -149222,6 +154546,7 @@ self: { description = "A system state collecting library and application"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mono-foldable" = callPackage @@ -149234,6 +154559,7 @@ self: { description = "Folds for monomorphic containers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mono-traversable" = callPackage @@ -149326,6 +154652,7 @@ self: { description = "A library for (left, right) zero monoids and backtracking with cut"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monoid-extras" = callPackage @@ -149354,6 +154681,7 @@ self: { description = "a practical monoid implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monoid-record" = callPackage @@ -149384,6 +154712,7 @@ self: { description = "Monoids for calculation of statistics of sample"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monoid-subclasses" = callPackage @@ -149444,6 +154773,7 @@ self: { description = "Extra classes/functions about monoids"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monoids" = callPackage @@ -149460,6 +154790,7 @@ self: { description = "Deprecated: Use 'reducers'"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monomorphic" = callPackage @@ -149488,6 +154819,7 @@ self: { description = "Well-typed paths"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "montage" = callPackage @@ -149554,6 +154886,7 @@ self: { description = "A monad and transformer for Monte Carlo calculations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monus" = callPackage @@ -149594,6 +154927,7 @@ self: { description = "Haskell bindings for the Monzo API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "moo" = callPackage @@ -149616,6 +154950,7 @@ self: { description = "Genetic algorithm library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "moonshine" = callPackage @@ -149633,6 +154968,7 @@ self: { description = "A web service framework for Haskell, similar in purpose to dropwizard"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "more-containers" = callPackage @@ -149646,6 +154982,7 @@ self: { description = "A few more collections"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "more-extensible-effects" = callPackage @@ -149678,6 +155015,7 @@ self: { description = "A tool for supervised learning of morphology"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "morfeusz" = callPackage @@ -149696,6 +155034,7 @@ self: { description = "Bindings to the morphological analyser Morfeusz"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {morfeusz = null;}; "morph" = callPackage @@ -149716,6 +155055,7 @@ self: { description = "A simple database migrator for PostgreSQL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "morphisms" = callPackage @@ -149738,6 +155078,7 @@ self: { description = "Functors, theirs compositions and transformations"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "morphisms-functors-inventory" = callPackage @@ -149750,6 +155091,7 @@ self: { description = "Inventory is state and store"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "morphisms-objects" = callPackage @@ -149762,6 +155104,7 @@ self: { description = "Algebraic structures"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "morte" = callPackage @@ -149796,6 +155139,7 @@ self: { description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mosaico-lib" = callPackage @@ -149815,6 +155159,7 @@ self: { description = "Generación interactiva de mosaicos"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mosquitto-hs" = callPackage @@ -149868,6 +155213,7 @@ self: { description = "General purpose migrations library"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "moto-postgresql" = callPackage @@ -149884,6 +155230,7 @@ self: { description = "PostgreSQL-based migrations registry for moto"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "motor" = callPackage @@ -149953,6 +155300,7 @@ self: { description = "Mounts and umounts filesystems"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mountpoints" = callPackage @@ -149988,6 +155336,7 @@ self: { description = "Plays videos using GStreamer and GTK+"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "moving-averages" = callPackage @@ -150025,6 +155374,7 @@ self: { description = "Music player for linux"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mp3decoder" = callPackage @@ -150057,6 +155407,7 @@ self: { description = "MPD/PowerMate executable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mpg123-bindings" = callPackage @@ -150092,6 +155443,7 @@ self: { description = "MPI bindings for Haskell"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) openmpi;}; "mpppc" = callPackage @@ -150106,6 +155458,7 @@ self: { description = "Multi-dimensional parametric pretty-printer with color"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mpretty" = callPackage @@ -150123,6 +155476,7 @@ self: { description = "a monadic, extensible pretty printing library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mpris" = callPackage @@ -150135,6 +155489,7 @@ self: { description = "Interface for MPRIS"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mprover" = callPackage @@ -150153,6 +155508,7 @@ self: { description = "Simple equational reasoning for a Haskell-ish language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mps" = callPackage @@ -150173,6 +155529,7 @@ self: { description = "simply oo"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mpvguihs" = callPackage @@ -150192,6 +155549,7 @@ self: { description = "A minimalist mpv GUI written in I/O heavy Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mqtt" = callPackage @@ -150221,6 +155579,7 @@ self: { description = "An MQTT protocol implementation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mqtt-hs" = callPackage @@ -150238,6 +155597,7 @@ self: { description = "A MQTT client library"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mrifk" = callPackage @@ -150252,6 +155612,7 @@ self: { description = "Decompiles Glulx files"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mrm" = callPackage @@ -150264,6 +155625,7 @@ self: { description = "Modular Refiable Matching, first-class matches"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ms" = callPackage @@ -150285,6 +155647,7 @@ self: { description = "metric spaces"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "msgpack" = callPackage @@ -150309,6 +155672,7 @@ self: { description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "msgpack-aeson" = callPackage @@ -150328,6 +155692,7 @@ self: { description = "Aeson adapter for MessagePack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "msgpack-idl" = callPackage @@ -150350,6 +155715,7 @@ self: { description = "An IDL Compiler for MessagePack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "msgpack-rpc" = callPackage @@ -150369,6 +155735,7 @@ self: { description = "A MessagePack-RPC Implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "msh" = callPackage @@ -150386,6 +155753,7 @@ self: { description = "Object-Oriented Programming in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "msi-kb-backlit" = callPackage @@ -150400,6 +155768,7 @@ self: { description = "A command line tool to change backlit colors of your MSI keyboards"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mstate" = callPackage @@ -150455,6 +155824,7 @@ self: { description = "Library to communicate with Mt.Gox"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mtl_2_1_3_1" = callPackage @@ -150520,6 +155890,7 @@ self: { description = "Instances for the mtl classes for all monad transformers"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mtl-extras" = callPackage @@ -150532,6 +155903,7 @@ self: { description = "Higher order versions of MTL classes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mtl-prelude_1_0_3" = callPackage @@ -150567,6 +155939,7 @@ self: { description = "Monad Transformer Library with Type Families"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mtl-unleashed" = callPackage @@ -150609,6 +155982,7 @@ self: { description = "Monad transformer library with type indexes, providing 'free' copies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mtp" = callPackage @@ -150622,6 +155996,7 @@ self: { description = "Bindings to libmtp"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {mtp = null;}; "mtree" = callPackage @@ -150669,6 +156044,7 @@ self: { description = "Multi-version deployer for web applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mudbath" = callPackage @@ -150760,6 +156136,7 @@ self: { description = "An intermediate language designed to perform advanced code analysis"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multext-east-msd" = callPackage @@ -150772,6 +156149,7 @@ self: { description = "MULTEXT-East morphosyntactic descriptors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multi-cabal" = callPackage @@ -150794,6 +156172,7 @@ self: { description = "A tool supporting multi cabal project builds"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multi-instance" = callPackage @@ -150806,7 +156185,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Typeclasses augmented with a phantom type parameter"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multi-trie" = callPackage @@ -150840,6 +156218,7 @@ self: { description = "A network address format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multiarg" = callPackage @@ -150859,6 +156238,7 @@ self: { description = "Command lines for options that take multiple arguments"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multifile" = callPackage @@ -150878,6 +156258,7 @@ self: { description = "create many files from one"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multifocal" = callPackage @@ -150904,6 +156285,7 @@ self: { description = "Bidirectional Two-level Transformation of XML Schemas"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multihash" = callPackage @@ -150928,6 +156310,7 @@ self: { description = "Multihash library and CLI executable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multihashmap" = callPackage @@ -150961,6 +156344,7 @@ self: { description = "Comprehensive and efficient (multi)linear algebra implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multilinear-io" = callPackage @@ -150985,6 +156369,7 @@ self: { description = "Conduit-based input/output capability for multilinear package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multimap" = callPackage @@ -151040,6 +156425,7 @@ self: { description = "Folding data with multiple named passes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multipath" = callPackage @@ -151052,6 +156438,7 @@ self: { description = "Parser and builder for unix-path-like objects"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multiplate" = callPackage @@ -151079,6 +156466,7 @@ self: { description = "Shorter, more generic functions for Multiplate"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multiplicity" = callPackage @@ -151205,6 +156593,7 @@ self: { description = "Alternative multirec instances deriver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multirec-binary" = callPackage @@ -151217,6 +156606,7 @@ self: { description = "Generic Data.Binary instances using MultiRec."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multiset" = callPackage @@ -151244,7 +156634,6 @@ self: { libraryHaskellDepends = [ base containers transformers ]; description = "Combinatorial algorithms over multisets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multisetrewrite" = callPackage @@ -151258,6 +156647,7 @@ self: { description = "Multi-set rewrite rules with guards and a parallel execution scheme"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multistate" = callPackage @@ -151277,6 +156667,7 @@ self: { description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multivariant" = callPackage @@ -151308,6 +156699,7 @@ self: { description = "Multivariant assignments generation language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multivector" = callPackage @@ -151347,6 +156739,7 @@ self: { description = "Static blog generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "murder" = callPackage @@ -151364,6 +156757,7 @@ self: { description = "MUtually Recursive Definitions Explicitly Represented"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "murmur" = callPackage @@ -151390,6 +156784,7 @@ self: { description = "Simple CUI Twitter Client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "murmur-hash" = callPackage @@ -151431,6 +156826,7 @@ self: { description = "32-bit non-cryptographic hashing"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mushu" = callPackage @@ -151458,6 +156854,7 @@ self: { description = "Minimalist MPD client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "music-articulation" = callPackage @@ -151523,6 +156920,7 @@ self: { description = "Diagrams-based visualization of musical data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "music-parts" = callPackage @@ -151546,6 +156944,7 @@ self: { description = "Musical instruments, parts and playing techniques"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "music-pitch" = callPackage @@ -151564,6 +156963,7 @@ self: { description = "Musical pitch representation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "music-pitch-literal" = callPackage @@ -151605,6 +157005,7 @@ self: { description = "Some useful preludes for the Music Suite"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "music-score" = callPackage @@ -151629,6 +157030,7 @@ self: { description = "Musical score and part representation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "music-sibelius" = callPackage @@ -151649,6 +157051,7 @@ self: { description = "Interaction with Sibelius"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "music-suite" = callPackage @@ -151669,6 +157072,7 @@ self: { description = "A set of libraries for composition, analysis and manipulation of music"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "music-util" = callPackage @@ -151687,6 +157091,7 @@ self: { description = "Utility for developing the Music Suite"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "musicbrainz-email" = callPackage @@ -151721,6 +157126,7 @@ self: { description = "Send an email to all MusicBrainz editors"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "musicxml" = callPackage @@ -151737,6 +157143,7 @@ self: { description = "MusicXML format encoded as Haskell type and functions of reading and writting"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "musicxml2" = callPackage @@ -151755,6 +157162,7 @@ self: { description = "A representation of the MusicXML format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mustache" = callPackage @@ -151809,6 +157217,7 @@ self: { description = "Straight implementation of mustache templates"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mustache2hs" = callPackage @@ -151863,6 +157272,7 @@ self: { description = "iteratees based upon mutable buffers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mute-unmute" = callPackage @@ -151882,6 +157292,7 @@ self: { description = "Watches your screensaver and (un)mutes music when you (un)lock the screen"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mvar-lock" = callPackage @@ -151894,6 +157305,7 @@ self: { description = "A trivial lock based on MVar"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mvc" = callPackage @@ -151911,6 +157323,7 @@ self: { description = "Model-view-controller"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mvc-updates" = callPackage @@ -151923,6 +157336,7 @@ self: { description = "Concurrent and combinable updates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mvclient" = callPackage @@ -151942,6 +157356,7 @@ self: { description = "Client library for metaverse systems like Second Life"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mwc-probability" = callPackage @@ -152002,6 +157417,7 @@ self: { description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mwc-random-monad" = callPackage @@ -152038,6 +157454,7 @@ self: { description = "MXNet interface in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) mxnet;}; "mxnet-dataiter" = callPackage @@ -152056,6 +157473,7 @@ self: { description = "mxnet dataiters"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mxnet-examples" = callPackage @@ -152070,6 +157488,7 @@ self: { description = "Examples for MXNet in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mxnet-nn" = callPackage @@ -152096,6 +157515,7 @@ self: { description = "Train a neural network with MXNet in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mxnet-nnvm" = callPackage @@ -152110,6 +157530,7 @@ self: { description = "NNVM interface in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) mxnet;}; "my-package-testing" = callPackage @@ -152135,6 +157556,7 @@ self: { description = "spam"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "my-test-docs" = callPackage @@ -152160,6 +157582,7 @@ self: { description = "spam"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "myTestlll" = callPackage @@ -152185,6 +157608,7 @@ self: { description = "None"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "myanimelist-export" = callPackage @@ -152209,6 +157633,7 @@ self: { description = "Export from MyAnimeList"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mybitcoin-sci" = callPackage @@ -152246,6 +157671,7 @@ self: { description = "Haskell binding to the Myo armband"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mysnapsession" = callPackage @@ -152263,6 +157689,7 @@ self: { description = "Sessions and continuations for Snap web apps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mysnapsession-example" = callPackage @@ -152283,6 +157710,7 @@ self: { description = "Example projects using mysnapsession"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mysql" = callPackage @@ -152316,6 +157744,7 @@ self: { description = "An extensible mysql effect using extensible-effects and mysql-simple"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mysql-haskell" = callPackage @@ -152371,6 +157800,7 @@ self: { description = "TLS support for mysql-haskell package using openssl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mysql-simple" = callPackage @@ -152405,6 +157835,7 @@ self: { description = "Quasi-quoter for use with mysql-simple"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mysql-simple-typed" = callPackage @@ -152421,6 +157852,7 @@ self: { description = "Typed extension to mysql simple"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mystem" = callPackage @@ -152440,6 +157872,7 @@ self: { description = "Bindings for Mystem morphological analyzer executabe"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mywatch" = callPackage @@ -152464,7 +157897,6 @@ self: { ]; description = "Web application to view and kill MySQL queries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mzv" = callPackage @@ -152477,6 +157909,7 @@ self: { description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "n-ary-functor" = callPackage @@ -152485,11 +157918,12 @@ self: { pname = "n-ary-functor"; version = "0.1.0.0"; sha256 = "1v1ki6mfgj7jhj7w94w15sisd57akwlb0c2s3bczvj47f7f8p7vi"; + revision = "1"; + editedCabalFile = "1pnl2kx406l99icyii50mr3vdaa6hxcsbgh37sh43my3l5dkfl57"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest doctest-discover ]; description = "An n-ary version of Functor"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "n-m" = callPackage @@ -152517,6 +157951,7 @@ self: { description = "Homogeneous tuples of arbitrary length"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "n2o" = callPackage @@ -152635,6 +158070,7 @@ self: { description = "Monitor ekg metrics via Nagios"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nakadi-client" = callPackage @@ -152674,6 +158110,7 @@ self: { description = "Client library for the Nakadi Event Broker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "namecoin-update" = callPackage @@ -152729,6 +158166,7 @@ self: { description = "A named lock that is created on demand"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "named-records" = callPackage @@ -152759,6 +158197,7 @@ self: { description = "fortran90 namelist parser/pretty printer"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "names" = callPackage @@ -152793,7 +158232,6 @@ self: { testHaskellDepends = [ base ]; description = "A Generic Haskell library for managing namespaces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nano-cryptr" = callPackage @@ -152835,6 +158273,7 @@ self: { description = "Bindings to OpenSSL HMAC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) openssl;}; "nano-md5" = callPackage @@ -152850,6 +158289,7 @@ self: { description = "Efficient, ByteString bindings to OpenSSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) openssl;}; "nanoAgda" = callPackage @@ -152881,6 +158321,7 @@ self: { description = "Simple Curses binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ncurses;}; "nanomsg" = callPackage @@ -152894,6 +158335,7 @@ self: { description = "nanomsg - scalability protocols library"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) nanomsg;}; "nanomsg-haskell" = callPackage @@ -152919,6 +158361,7 @@ self: { description = "Bindings to the nanomsg library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) nanomsg;}; "nanoparsec" = callPackage @@ -152931,6 +158374,7 @@ self: { description = "An implementation of attoparsec-like parser around list-like"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nanospec" = callPackage @@ -152965,6 +158409,7 @@ self: { description = "Haskell bindings for nanovg"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; inherit (pkgs) libGLU;}; @@ -152984,6 +158429,7 @@ self: { description = "Simple interface to rendering with NanoVG"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nanq" = callPackage @@ -153004,6 +158450,7 @@ self: { description = "Performs 漢字検定 (Japan Kanji Aptitude Test) level analysis on given Kanji"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "naperian" = callPackage @@ -153036,6 +158483,7 @@ self: { description = "A library for working with geospatial data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "narc" = callPackage @@ -153048,6 +158496,7 @@ self: { description = "Query SQL databases using Nested Relational Calculus embedded in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nat" = callPackage @@ -153072,6 +158521,7 @@ self: { description = "Variable-sized numbers from type-level nats"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nationstates" = callPackage @@ -153089,6 +158539,7 @@ self: { description = "NationStates API client"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "native" = callPackage @@ -153187,6 +158638,7 @@ self: { description = "Natural number"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "natural-induction" = callPackage @@ -153215,6 +158667,7 @@ self: { description = "Natural numbers tagged with a type-level representation of the number"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "natural-numbers" = callPackage @@ -153293,6 +158746,7 @@ self: { description = "Interface to Naver Translate"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nbt" = callPackage @@ -153330,7 +158784,6 @@ self: { ]; description = "CPU load and memory usage indicators for i3bar"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ncurses" = callPackage @@ -153376,6 +158829,7 @@ self: { description = "A Fast Retargetable Template Engine"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "neat-interpolation" = callPackage @@ -153409,6 +158863,7 @@ self: { description = "ASCII-fied arrow notation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "neet" = callPackage @@ -153426,6 +158881,7 @@ self: { description = "A NEAT library for Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nehe-tuts" = callPackage @@ -153446,6 +158902,7 @@ self: { description = "Port of the NeHe OpenGL tutorials to Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "neil" = callPackage @@ -153476,6 +158933,7 @@ self: { description = "Provide versions of Either with good monad and applicative instances. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "neko-lib" = callPackage @@ -153497,6 +158955,7 @@ self: { description = "Neko VM code generation and disassembly library"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "neko-obfs" = callPackage @@ -153519,6 +158978,7 @@ self: { description = "a TCP tunnel with packet length obfuscation"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nemesis" = callPackage @@ -153552,6 +159012,7 @@ self: { description = "A collection of Nemesis tasks to bootstrap a Haskell project with a focus on continuous integration"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nerf" = callPackage @@ -153575,6 +159036,7 @@ self: { description = "Nerf, the named entity recognition tool based on linear-chain CRFs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nero" = callPackage @@ -153594,6 +159056,7 @@ self: { description = "Lens-based HTTP toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nero-wai" = callPackage @@ -153610,6 +159073,7 @@ self: { description = "WAI adapter for Nero server applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nero-warp" = callPackage @@ -153622,6 +159086,7 @@ self: { description = "Run Nero server applications with Warp"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nest" = callPackage @@ -153638,6 +159103,7 @@ self: { testHaskellDepends = [ base bytestring containers hedgehog text ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nested-routes" = callPackage @@ -153668,6 +159134,7 @@ self: { description = "Declarative, compositional Wai responses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nested-sequence" = callPackage @@ -153685,6 +159152,7 @@ self: { description = "List-like data structures with O(log(n)) random access"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nested-sets" = callPackage @@ -153714,6 +159182,7 @@ self: { description = "A library for nested maps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "net-concurrent" = callPackage @@ -153741,8 +159210,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.2.4.0"; - sha256 = "130dsj8qvf3yi29saz1l52dy15gsj2vr8hd118br137l1zf2g3g0"; + version = "0.2.4.1"; + sha256 = "0s0drakh05ygwkvlcd8z0f5168hvk8qmvdq3mg2bk1p2fjd2hfb2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153783,6 +159252,7 @@ self: { description = "A graph database middleware to maintain a time-varying graph"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "netclock" = callPackage @@ -153797,6 +159267,7 @@ self: { description = "Netclock protocol"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "netcore" = callPackage @@ -153829,6 +159300,7 @@ self: { description = "The NetCore compiler and runtime system for OpenFlow networks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "netease-fm" = callPackage @@ -153858,6 +159330,7 @@ self: { description = "NetEase Cloud Music FM client in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "netlib-carray" = callPackage @@ -153918,6 +159391,7 @@ self: { description = "Enumerator tools for text-based network protocols"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "netlink" = callPackage @@ -153997,7 +159471,6 @@ self: { ]; description = "Parser for .netrc files"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netrium" = callPackage @@ -154018,6 +159491,7 @@ self: { description = "Contract normaliser and simulator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "netspec" = callPackage @@ -154035,6 +159509,7 @@ self: { description = "Simplify static Networking tasks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "netstring-enumerator" = callPackage @@ -154049,6 +159524,7 @@ self: { description = "Enumerator-based netstring parsing"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nettle" = callPackage @@ -154089,6 +159565,7 @@ self: { description = "FRP for controlling networks of OpenFlow switches"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nettle-netkit" = callPackage @@ -154105,6 +159582,7 @@ self: { description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nettle-openflow" = callPackage @@ -154122,6 +159600,7 @@ self: { description = "OpenFlow protocol messages, binary formats, and servers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "netwire" = callPackage @@ -154182,6 +159661,7 @@ self: { description = "JavaScript instance of netwire-input"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "netwire-vinylglfw-examples" = callPackage @@ -154205,6 +159685,7 @@ self: { description = "Netwire/GLFW/VinylGL input handling demo"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network_2_6_3_1" = callPackage @@ -154273,6 +159754,7 @@ self: { description = "IP data structures and textual representation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-anonymous-i2p" = callPackage @@ -154296,6 +159778,7 @@ self: { description = "Haskell API for I2P anonymous networking"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-anonymous-tor" = callPackage @@ -154342,7 +159825,6 @@ self: { ]; description = "Toolkit for building http client libraries over Network.Http.Conduit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-arbitrary" = callPackage @@ -154420,6 +159902,7 @@ self: { description = "POSIX network database () API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-builder" = callPackage @@ -154442,6 +159925,7 @@ self: { description = "Linux NetworkNameSpace Builder"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-byte-order" = callPackage @@ -154468,6 +159952,7 @@ self: { description = "Fast, memory-efficient, low-level networking"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-carbon" = callPackage @@ -154529,6 +160014,7 @@ self: { description = "A wrapper around a generic stream-like connection"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-data" = callPackage @@ -154595,6 +160081,7 @@ self: { description = "Enumerators for network sockets"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-fancy" = callPackage @@ -154618,6 +160105,7 @@ self: { description = "HaNS to Network shims for easier HaNS integration"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-house" = callPackage @@ -154652,6 +160140,7 @@ self: { description = "Haskell bindings for the ifreq structure"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-ip" = callPackage @@ -154710,6 +160199,7 @@ self: { description = "WebSocket backend for MessagePack RPC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-metrics" = callPackage @@ -154746,6 +160236,7 @@ self: { description = "A ByteString based library for writing HTTP(S) servers and clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-msg" = callPackage @@ -154781,6 +160272,7 @@ self: { description = "A MessagePack-RPC Implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-multicast" = callPackage @@ -154809,6 +160301,7 @@ self: { description = "Haskell bindings for low-level packet sockets (AF_PACKET)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-pgi" = callPackage @@ -154842,6 +160335,7 @@ self: { description = "Client library for the XMPP protocol"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-rpca" = callPackage @@ -154860,6 +160354,7 @@ self: { description = "A cross-platform RPC library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-server" = callPackage @@ -154875,6 +160370,7 @@ self: { description = "A light abstraction over sockets & co. for servers"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-service" = callPackage @@ -154891,6 +160387,7 @@ self: { description = "Provide a service at the data type level"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-simple" = callPackage @@ -154924,6 +160421,7 @@ self: { description = "network-simple for resolved addresses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-simple-tls" = callPackage @@ -154969,6 +160467,7 @@ self: { description = "ByteString and Text streams for networking"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-topic-models" = callPackage @@ -154991,6 +160490,7 @@ self: { description = "A few network topic model implementations for bayes-stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-transport" = callPackage @@ -155032,6 +160532,7 @@ self: { description = "AMQP-based transport layer for distributed-process (aka Cloud Haskell)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-transport-composed" = callPackage @@ -155064,6 +160565,7 @@ self: { description = "In-memory instantiation of Network.Transport"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-transport-tcp" = callPackage @@ -155083,6 +160585,7 @@ self: { description = "TCP instantiation of Network.Transport"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-transport-tests" = callPackage @@ -155100,6 +160603,7 @@ self: { description = "Unit tests for Network.Transport implementations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-transport-zeromq" = callPackage @@ -155129,6 +160633,7 @@ self: { description = "ZeroMQ backend for network-transport"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-uri" = callPackage @@ -155170,8 +160675,8 @@ self: { }: mkDerivation { pname = "network-uri-json"; - version = "0.3.0.0"; - sha256 = "15qw2knzj5b90vb4rhzxiv9wxdv41f5l75hpp4y0ycc60q5xja27"; + version = "0.3.1.1"; + sha256 = "0akyhgi79pzhvfq47risrqmr6hi409fnz1ivwpwwfc4laimf3mky"; libraryHaskellDepends = [ aeson base network-uri text ]; testHaskellDepends = [ aeson base hspec network-arbitrary network-uri test-invariant text @@ -155219,6 +160724,7 @@ self: { description = "VoiceText Web API wrapper"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-wai-router" = callPackage @@ -155231,6 +160737,7 @@ self: { description = "A routing library for wai"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-websocket" = callPackage @@ -155245,6 +160752,7 @@ self: { description = "WebSocket library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "networked-game" = callPackage @@ -155263,6 +160771,7 @@ self: { description = "Networked-game support library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "neural" = callPackage @@ -155296,6 +160805,7 @@ self: { description = "Neural Networks in native Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "neural-network-base" = callPackage @@ -155327,6 +160837,7 @@ self: { description = "Yet Another High Performance and Extendable Neural Network in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "neural-network-hmatrix" = callPackage @@ -155345,6 +160856,7 @@ self: { description = "Yet Another High Performance and Extendable Neural Network in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) blas;}; "newports" = callPackage @@ -155359,19 +160871,20 @@ self: { description = "List ports newer than N days on a FreeBSD system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "newsynth" = callPackage - ({ mkDerivation, base, containers, fixedprec, random, superdoc - , time + ({ mkDerivation, base, Cabal, containers, fixedprec, random + , superdoc, time }: mkDerivation { pname = "newsynth"; - version = "0.3.0.4"; - sha256 = "0w31h7xqv9sk0jb1mdviv107w8y7v018bzdvdw8gcrjyvp47307q"; + version = "0.3.0.5"; + sha256 = "1qfan8vf7s3bhdc3bfjsig4sv0cip0qfvqmyxw0iqc7gqbbkinzy"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base superdoc ]; + setupHaskellDepends = [ base Cabal superdoc ]; libraryHaskellDepends = [ base containers fixedprec random ]; executableHaskellDepends = [ base random time ]; description = "Exact and approximate synthesis of quantum circuits"; @@ -155397,6 +160910,7 @@ self: { description = "A trivially simple app to create things from simple templates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "newtype" = callPackage @@ -155425,6 +160939,7 @@ self: { description = "Instance derivers for newtype wrappers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "newtype-generics" = callPackage @@ -155460,6 +160975,7 @@ self: { description = "A template haskell deriver to create Control.Newtype instances."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "newtyper" = callPackage @@ -155484,6 +161000,7 @@ self: { description = "A concurrency primitive for a slow consumer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nextstep-plist" = callPackage @@ -155496,6 +161013,7 @@ self: { description = "NextStep style plist parser and printer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nf" = callPackage @@ -155523,6 +161041,7 @@ self: { description = "libnfc bindings"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {nfc = null;}; "ngram" = callPackage @@ -155563,6 +161082,7 @@ self: { description = "Ngrams loader based on http://www.ngrams.info format"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ngx-export" = callPackage @@ -155611,6 +161131,7 @@ self: { description = "High performance CSS EDSL"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nibblestring" = callPackage @@ -155632,6 +161153,7 @@ self: { description = "Packed, strict nibble arrays with a list interface (ByteString for nibbles)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nice-html" = callPackage @@ -155656,6 +161178,7 @@ self: { description = "A fast and nice HTML templating library with distinct compilation/rendering phases"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nicify" = callPackage @@ -155703,6 +161226,7 @@ self: { description = "Nico Nico Douga (ニコニコ動画) Comment Translator"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nikepub" = callPackage @@ -155724,6 +161248,7 @@ self: { description = "Command line utility publishes Nike+ runs on blogs and Twitter"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nimber" = callPackage @@ -155736,6 +161261,7 @@ self: { description = "Finite nimber arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nirum" = callPackage @@ -155775,6 +161301,7 @@ self: { description = "IDL compiler and RPC/distributed object framework for microservices"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nist-beacon" = callPackage @@ -155800,6 +161327,7 @@ self: { description = "Haskell bindings for Nitro"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nix-delegate" = callPackage @@ -155868,8 +161396,8 @@ self: { }: mkDerivation { pname = "nix-diff"; - version = "1.0.6"; - sha256 = "0ls3zh769ibba1f5igwxvm49nyp2iljx9msgawi6g01s4469yzxv"; + version = "1.0.7"; + sha256 = "0zf09wffmzkk6rbk5nx4qhygpb6m492mz422w9a71dzv1icxkbfs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155894,6 +161422,7 @@ self: { description = "Evaluate Haskell expressions using Nix to get packages"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nix-paths" = callPackage @@ -155934,6 +161463,7 @@ self: { description = "Generate nix expressions from npm packages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nixos-types" = callPackage @@ -155969,7 +161499,6 @@ self: { ]; description = "Tool for semi-automatic updating of nixpkgs repository"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nkjp" = callPackage @@ -155989,6 +161518,7 @@ self: { description = "Manipulating the National Corpus of Polish (NKJP)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nlopt-haskell" = callPackage @@ -156014,6 +161544,7 @@ self: { description = "Scoring functions commonly used for evaluation in NLP and IR"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nlp-scores-scripts" = callPackage @@ -156030,6 +161561,7 @@ self: { description = "NLP scoring command-line programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nm" = callPackage @@ -156047,6 +161579,7 @@ self: { description = "Network Manager, binding to libnm-glib"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {g = null; inherit (pkgs) glib; libnm-glib = null; nm-glib = null;}; @@ -156104,6 +161637,7 @@ self: { description = "Library to connect to an NNTP Server"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "no-buffering-workaround" = callPackage @@ -156128,6 +161662,7 @@ self: { description = "Role annotations without -XRoleAnnotations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "noether" = callPackage @@ -156151,6 +161686,7 @@ self: { description = "Math in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nofib-analyse" = callPackage @@ -156165,6 +161701,7 @@ self: { description = "Parse and compare nofib runs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nofib-analyze" = callPackage @@ -156179,6 +161716,7 @@ self: { description = "Parse and compare nofib runs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "noise" = callPackage @@ -156203,6 +161741,7 @@ self: { description = "A friendly language for graphic design"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nominal" = callPackage @@ -156412,6 +161951,7 @@ self: { description = "The Zipper for NonEmpty"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "non-negative" = callPackage @@ -156482,7 +162022,6 @@ self: { ]; description = "Non-empty variants of containers data types, with full API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonemptymap" = callPackage @@ -156516,7 +162055,6 @@ 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 @@ -156536,7 +162074,6 @@ self: { ]; description = "Wrapper of nonlinear-optimization package for using with AD package"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "noodle" = callPackage @@ -156587,6 +162124,7 @@ self: { description = "Normalization insensitive string comparison"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "normalize" = callPackage @@ -156656,6 +162194,7 @@ self: { description = "examples for not-gloss"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "not-in-base" = callPackage @@ -156681,6 +162220,7 @@ self: { description = "Avoiding the C preprocessor via cunning use of Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "notmuch" = callPackage @@ -156719,6 +162259,7 @@ self: { description = "Binding for notmuch MUA library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) notmuch;}; "notmuch-web" = callPackage @@ -156757,6 +162298,7 @@ self: { description = "A web interface to the notmuch email indexer"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "notzero" = callPackage @@ -156801,7 +162343,6 @@ self: { libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "np-linear" = callPackage @@ -156818,6 +162359,7 @@ self: { description = "Linear algebra for the numeric-prelude framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nptools" = callPackage @@ -156837,6 +162379,7 @@ self: { description = "A collection of random tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nqe" = callPackage @@ -156964,6 +162507,7 @@ self: { description = "NTRIP client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ntype" = callPackage @@ -156993,6 +162537,7 @@ self: { description = "HTML5 Canvas Graphics Library - forked Blank Canvas"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nullary" = callPackage @@ -157005,6 +162550,7 @@ self: { description = "A package for working with nullary type classes"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nullpipe" = callPackage @@ -157018,6 +162564,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "num-non-negative" = callPackage @@ -157084,6 +162631,7 @@ self: { description = "A sequence of semigroups, for composing stuff in multiple spatial directions"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numbering" = callPackage @@ -157133,6 +162681,7 @@ self: { description = "Convert numbers to number words"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numerals-base" = callPackage @@ -157155,6 +162704,7 @@ self: { description = "Convert numbers to number words"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numeric-extras" = callPackage @@ -157206,6 +162756,7 @@ self: { description = "Ode solvers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numeric-prelude" = callPackage @@ -157243,6 +162794,7 @@ self: { description = "Quasi-quoters for numbers of different bases"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numeric-quest" = callPackage @@ -157270,6 +162822,7 @@ self: { description = "A framework for numeric ranges"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numeric-tools" = callPackage @@ -157304,6 +162857,7 @@ self: { description = "core package for Numerical Haskell project"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numericpeano" = callPackage @@ -157327,6 +162881,7 @@ self: { description = "numeric classes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numhask-array" = callPackage @@ -157348,6 +162903,7 @@ self: { description = "n-dimensional arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numhask-histogram" = callPackage @@ -157365,6 +162921,7 @@ self: { description = "See readme.md"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numhask-prelude" = callPackage @@ -157378,6 +162935,7 @@ self: { description = "A numeric prelude"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numhask-range" = callPackage @@ -157399,6 +162957,7 @@ self: { description = "Numbers that are range representations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numhask-test" = callPackage @@ -157416,6 +162975,7 @@ self: { description = "Laws and tests for numhask"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nums" = callPackage @@ -157505,43 +163065,39 @@ self: { "nvim-hs" = callPackage ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit - , containers, data-default, deepseq, directory, dyre, filepath - , foreign-store, hslogger, hspec, hspec-discover, HUnit, megaparsec - , messagepack, mtl, network, optparse-applicative, prettyprinter - , prettyprinter-ansi-terminal, process, QuickCheck, resourcet - , setenv, stm, streaming-commons, template-haskell, text, time - , time-locale-compat, transformers, transformers-base, unliftio - , unliftio-core, utf8-string, void + , containers, data-default, deepseq, foreign-store, hslogger, hspec + , hspec-discover, HUnit, megaparsec, messagepack, mtl, network + , optparse-applicative, path, path-io, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, resourcet, stm + , streaming-commons, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , typed-process, unliftio, unliftio-core, utf8-string, vector, void }: mkDerivation { pname = "nvim-hs"; - version = "1.0.0.3"; - sha256 = "07pnabrb9hs2l8ajrzcs3wz1m9vfq88wqjirf84ygmmnnd8dva71"; - isLibrary = true; - isExecutable = true; + version = "2.0.0.0"; + sha256 = "0wnvvzd1ry8a3863dyj6ylsh075px7ppd1wrv3cbf9694dc5zfih"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers - data-default deepseq directory dyre filepath foreign-store hslogger - megaparsec messagepack mtl network optparse-applicative - prettyprinter prettyprinter-ansi-terminal process resourcet setenv - stm streaming-commons template-haskell text time time-locale-compat - transformers transformers-base unliftio unliftio-core utf8-string - void + data-default deepseq foreign-store hslogger megaparsec messagepack + mtl network optparse-applicative path path-io prettyprinter + prettyprinter-ansi-terminal resourcet stm streaming-commons + template-haskell text time time-locale-compat transformers + transformers-base typed-process unliftio unliftio-core utf8-string + vector void ]; - executableHaskellDepends = [ base data-default ]; testHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers - data-default directory dyre filepath foreign-store hslogger hspec - hspec-discover HUnit megaparsec messagepack mtl network - optparse-applicative prettyprinter prettyprinter-ansi-terminal - process QuickCheck resourcet setenv stm streaming-commons - template-haskell text time time-locale-compat transformers - transformers-base unliftio unliftio-core utf8-string + data-default foreign-store hslogger hspec hspec-discover HUnit + megaparsec messagepack mtl network optparse-applicative path + path-io prettyprinter prettyprinter-ansi-terminal QuickCheck + resourcet stm streaming-commons template-haskell text time + time-locale-compat transformers transformers-base typed-process + unliftio unliftio-core utf8-string vector ]; testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nvim-hs-contrib" = callPackage @@ -157552,8 +163108,8 @@ self: { }: mkDerivation { pname = "nvim-hs-contrib"; - version = "1.0.0.0"; - sha256 = "150kg8gkai4cz7yv42vgn3b6rl6p44vfksq897kjaa3b12yjwd5x"; + version = "2.0.0.0"; + sha256 = "0xqwvvhs2bpa146dnf4nkihx9lk9flwj3fyar2d4fchdfyszrbzr"; libraryHaskellDepends = [ base bytestring data-default directory filepath messagepack mtl nvim-hs prettyprinter prettyprinter-ansi-terminal text time @@ -157565,7 +163121,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nvim-hs-ghcid" = callPackage @@ -157584,6 +163139,7 @@ self: { description = "Neovim plugin that runs ghcid to update the quickfix list"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nvvm" = callPackage @@ -157633,6 +163189,7 @@ self: { description = "Client for the Nylas API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nymphaea" = callPackage @@ -157652,6 +163209,7 @@ self: { description = "An interactive GUI for manipulating L-systems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "o-clock" = callPackage @@ -157676,6 +163234,7 @@ self: { description = "Type-safe time library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "oanda-rest-api" = callPackage @@ -157701,6 +163260,7 @@ self: { description = "Client to the OANDA REST API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "oasis-xrd" = callPackage @@ -157724,6 +163284,7 @@ self: { description = "Extensible Resource Descriptor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "oauth10a" = callPackage @@ -157769,6 +163330,7 @@ self: { description = "OAuth2 jwt-bearer client flow as per rfc7523"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "oauthenticated" = callPackage @@ -157795,6 +163357,7 @@ self: { description = "Simple OAuth for http-client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "obd" = callPackage @@ -157820,6 +163383,7 @@ self: { description = "Communicate to OBD interfaces over ELM327"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "obdd" = callPackage @@ -157837,6 +163401,7 @@ self: { description = "Ordered Reduced Binary Decision Diagrams"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "oberon0" = callPackage @@ -157857,6 +163422,7 @@ self: { description = "Oberon0 Compiler"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "obj" = callPackage @@ -157877,6 +163443,7 @@ self: { description = "Reads and writes obj models"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "objectid" = callPackage @@ -157898,6 +163465,7 @@ self: { description = "Rather unique identifier for things that need to be stored"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "objective" = callPackage @@ -157919,6 +163487,7 @@ self: { description = "Composable objects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "oblivious-transfer" = callPackage @@ -157992,6 +163561,7 @@ self: { description = "Convert Haskell types in OCaml types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ochintin-daicho" = callPackage @@ -158033,6 +163603,7 @@ self: { description = "Parse Rocket League replays"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "octohat" = callPackage @@ -158064,6 +163635,7 @@ self: { description = "A tested, minimal wrapper around GitHub's API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "octopus" = callPackage @@ -158085,6 +163657,7 @@ self: { description = "Lisp with more dynamism, more power, more simplicity"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "oculus" = callPackage @@ -158102,6 +163675,7 @@ self: { description = "Oculus Rift ffi providing head tracking data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; ovr = null; inherit (pkgs) systemd;}; @@ -158133,6 +163707,7 @@ self: { description = "Haskell binding to the ODBC API, aimed at SQL Server driver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) unixODBC;}; "oden-go-packages" = callPackage @@ -158149,6 +163724,7 @@ self: { description = "Provides Go package metadata"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "odpic-raw" = callPackage @@ -158196,8 +163772,8 @@ self: { }: mkDerivation { pname = "oeis2"; - version = "1.0.1"; - sha256 = "0vw0k1lvh8fq4ivr7dq14ilydyaps010cz7wxk2m9sc6i2qq4jbf"; + version = "1.0.2"; + sha256 = "1pmyx9w3jg3wsfhqp4hby6px05g09a91s6fiazyvm9yxmhaaxhxd"; libraryHaskellDepends = [ aeson base containers http-conduit lens lens-aeson text vector ]; @@ -158208,6 +163784,7 @@ self: { description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "off-simple" = callPackage @@ -158220,6 +163797,7 @@ self: { description = "A parser for simplified-syntax OFF files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ofx" = callPackage @@ -158251,6 +163829,7 @@ self: { description = "A lightweight markup language for story writers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ohloh-hs" = callPackage @@ -158275,6 +163854,7 @@ self: { description = "Interface to the Ohloh API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "oi" = callPackage @@ -158292,6 +163872,7 @@ self: { description = "Library for purely functional lazy interactions with the outer world"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "oidc-client" = callPackage @@ -158316,6 +163897,7 @@ self: { description = "OpenID Connect 1.0 library for RP"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ois-input-manager" = callPackage @@ -158329,6 +163911,7 @@ self: { description = "wrapper for OIS input manager for use with hogre"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {OIS = null;}; "old-locale" = callPackage @@ -158393,6 +163976,7 @@ self: { description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "om-elm" = callPackage @@ -158411,6 +163995,7 @@ self: { description = "Haskell utilities for building embedded Elm programs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "omaketex" = callPackage @@ -158429,6 +164014,7 @@ self: { description = "A simple tool to generate OMakefile for latex files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ombra" = callPackage @@ -158449,6 +164035,7 @@ self: { description = "Render engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "omega" = callPackage @@ -158468,6 +164055,7 @@ self: { description = "A purely functional programming language and a proof system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "omnicodec" = callPackage @@ -158514,6 +164102,7 @@ self: { description = "A pretty-printer wrapper to faciliate ease of formatting during development"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "on-a-horse" = callPackage @@ -158533,6 +164122,7 @@ self: { description = "\"Haskell on a Horse\" - A combinatorial web framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "on-demand-ssh-tunnel" = callPackage @@ -158565,6 +164155,7 @@ self: { description = "HTML-parsing primitives for Parsec"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "once" = callPackage @@ -158669,6 +164260,7 @@ self: { description = "A never-empty list type"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "online" = callPackage @@ -158687,6 +164279,7 @@ self: { description = "online statistics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "only" = callPackage @@ -158712,6 +164305,7 @@ self: { description = "partition lenses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "onu-course" = callPackage @@ -158724,6 +164318,7 @@ self: { description = "Code for the Haskell course taught at the Odessa National University in 2012"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "oo-prototypes" = callPackage @@ -158784,6 +164379,7 @@ self: { description = "Opaleye wrapped up in classy MTL attire"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opaleye-sqlite" = callPackage @@ -158809,6 +164405,7 @@ self: { description = "An SQL-generating DSL targeting SQLite"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opaleye-trans" = callPackage @@ -158833,6 +164430,7 @@ self: { description = "A monad transformer for Opaleye"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "open-adt" = callPackage @@ -158895,6 +164493,7 @@ self: { description = "Open haddock HTML documentation"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "open-pandoc" = callPackage @@ -158918,6 +164517,7 @@ self: { description = "Conversion between markup formats"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "open-signals" = callPackage @@ -158931,6 +164531,7 @@ self: { description = "A mechanism similar to checked exceptions that integrates with MTL and transformer stacks"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "open-symbology" = callPackage @@ -158959,6 +164560,7 @@ self: { description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "open-union" = callPackage @@ -159002,8 +164604,8 @@ self: { }: mkDerivation { pname = "openapi-petstore"; - version = "0.0.3.0"; - sha256 = "1zm76djxnr2hrws3rhby144m2hqgwfk57cm3my2r26py76lf8c5i"; + version = "0.0.4.0"; + sha256 = "0ihrzkbkq03six73ir30hy1dbi53wrl6bns27m5dphl9qdlcc1mi"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -159018,6 +164620,7 @@ self: { description = "Auto-generated openapi-petstore API Client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opench-meteo" = callPackage @@ -159030,6 +164633,7 @@ self: { description = "A Haskell implementation of the Swiss Meteo Net data API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opencog-atomspace" = callPackage @@ -159111,6 +164715,7 @@ self: { description = "Raw Haskell bindings to OpenCV >= 2.0"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) opencv;}; "opendatatable" = callPackage @@ -159123,6 +164728,7 @@ self: { description = "A library for working with Open Data Tables"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "openexchangerates" = callPackage @@ -159230,6 +164836,7 @@ self: { description = "Functional interface for OpenGL 4.1+ and OpenGL ES 2.0+"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {EGL = null; GLESv2 = null;}; "openid" = callPackage @@ -159356,6 +164963,7 @@ self: { description = "Haskell OpenSoundControl utilities"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opensource" = callPackage @@ -159398,6 +165006,7 @@ self: { description = "Fetch OpenSSH keys from a GitHub team"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "openssh-protocol" = callPackage @@ -159511,6 +165120,7 @@ self: { description = "Unicode characters"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opentheory-divides" = callPackage @@ -159677,6 +165287,7 @@ self: { description = "An OpenTok SDK for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opentype" = callPackage @@ -159695,6 +165306,7 @@ self: { description = "Opentype loading and writing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "openweathermap" = callPackage @@ -159716,6 +165328,7 @@ self: { description = "Access data at OpenWeatherMap"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "operate-do" = callPackage @@ -159785,6 +165398,7 @@ self: { description = "Interpretation functions and simple instruction sets for operational"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opml" = callPackage @@ -159826,7 +165440,6 @@ self: { ]; description = "Streaming parser/renderer for the OPML 2.0 format."; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opml-conduit_0_7_0_0" = callPackage @@ -159892,6 +165505,7 @@ self: { description = "Simple command line interface arguments parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "optimal-blocks" = callPackage @@ -159917,6 +165531,7 @@ self: { description = "Optimal Block boundary determination for rsync-like behaviours"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "optimization" = callPackage @@ -159933,6 +165548,7 @@ self: { description = "Numerical optimization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "optimusprime" = callPackage @@ -159952,6 +165568,7 @@ self: { description = "A supercompiler for f-lite"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "option" = callPackage @@ -159978,6 +165595,7 @@ self: { description = "Using type-classes for optional function arguments"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "optional-args" = callPackage @@ -160018,6 +165636,7 @@ self: { description = "Command-line option types for dates and times"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "optparse-applicative" = callPackage @@ -160051,6 +165670,7 @@ self: { description = "Simple command line interface arguments parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "optparse-declarative" = callPackage @@ -160149,6 +165769,7 @@ self: { description = "Orchestration-style co-ordination EDSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "orchestrate" = callPackage @@ -160173,6 +165794,7 @@ self: { description = "An API client for http://orchestrate.io/."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "orchid" = callPackage @@ -160194,6 +165816,7 @@ self: { description = "Haskell Wiki Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "orchid-demo" = callPackage @@ -160214,6 +165837,7 @@ self: { description = "Haskell Wiki Demo"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ord-adhoc" = callPackage @@ -160242,6 +165866,7 @@ self: { description = "Algorithms for the order maintenance problem with a safe interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "order-statistic-tree" = callPackage @@ -160275,6 +165900,7 @@ self: { description = "L-Estimators for robust statistics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ordered" = callPackage @@ -160310,6 +165936,7 @@ self: { description = "basic orders"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ordrea" = callPackage @@ -160325,6 +165952,7 @@ self: { description = "Push-pull implementation of discrete-time FRP"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "org2anki" = callPackage @@ -160352,6 +165980,7 @@ self: { description = "Organize scala imports"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "orgmode" = callPackage @@ -160372,6 +166001,7 @@ self: { description = "Org Mode library for haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "orgmode-parse" = callPackage @@ -160381,8 +166011,8 @@ self: { }: mkDerivation { pname = "orgmode-parse"; - version = "0.3.0"; - sha256 = "0p1lb3ba060nnr3msqzqy0ymbm4i0nkmwix8xx5zz6hir74ix3y9"; + version = "0.2.2"; + sha256 = "1f6wcxkln5ddaa2z7wbkp6wndgq38qv9h1wnn27gqcms02758v2r"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable old-locale semigroups text thyme unordered-containers @@ -160394,7 +166024,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 @@ -160428,6 +166057,7 @@ self: { description = "Statistics visualizer for org-mode"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "origami" = callPackage @@ -160447,6 +166077,7 @@ self: { description = "An un-SYB framework for transforming heterogenous data through folds"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "orizentic" = callPackage @@ -160469,6 +166100,7 @@ self: { description = "Token-based authentication and authorization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "os-release" = callPackage @@ -160502,6 +166134,7 @@ self: { description = "A library to handle messages in the OSC protocol"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "oscpacking" = callPackage @@ -160514,6 +166147,7 @@ self: { description = "Implements an osculatory packing (kissing circles) algorithm and display"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "osdkeys" = callPackage @@ -160533,7 +166167,6 @@ self: { executableHaskellDepends = [ base process ]; description = "Show keys pressed with an on-screen display (Linux only)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "oset" = callPackage @@ -160570,6 +166203,7 @@ self: { description = "Parse and operate on OSM data in efficient way"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "osm-download" = callPackage @@ -160592,6 +166226,7 @@ self: { description = "Download Open Street Map tiles"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "oso2pdf" = callPackage @@ -160611,6 +166246,7 @@ self: { description = "Better conversion of Oxford Scholarship Online material to PDF"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "osx-ar" = callPackage @@ -160644,6 +166280,7 @@ self: { description = "Real-time collaborative editing with Operational Transformation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "otp-authenticator" = callPackage @@ -160673,6 +166310,7 @@ self: { description = "OTP Authenticator (a la google) command line client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ottparse-pretty" = callPackage @@ -160690,7 +166328,6 @@ self: { ]; description = "Pretty-printer for Ott parse trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "overhang" = callPackage @@ -160739,6 +166376,7 @@ self: { description = "Overloaded Records based on current GHC proposal"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "overture" = callPackage @@ -160753,6 +166391,7 @@ self: { description = "An alternative to some of the Prelude"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pack" = callPackage @@ -160769,6 +166408,7 @@ self: { description = "Bidirectional fast ByteString packer/unpacker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "package-description-remote" = callPackage @@ -160784,6 +166424,7 @@ self: { description = "Fetches a 'GenericPackageDescription' from Hackage"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "package-o-tron" = callPackage @@ -160803,6 +166444,7 @@ self: { description = "Utilities for working with cabal packages and your package database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "package-vt" = callPackage @@ -160819,6 +166461,7 @@ self: { description = "Haskell Package Versioning Tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "packcheck" = callPackage @@ -160855,6 +166498,7 @@ self: { description = "Check your cabal packages for lagging dependencies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "packed" = callPackage @@ -160899,6 +166543,7 @@ self: { description = "Generation and traversal of highly compressed directed acyclic word graphs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "packed-multikey-map" = callPackage @@ -160916,6 +166561,7 @@ self: { description = "Efficient “spreadsheet table” like maps with multiple marginals"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "packedstring" = callPackage @@ -160930,6 +166576,7 @@ self: { description = "(Deprecated) Packed Strings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "packer" = callPackage @@ -160984,6 +166631,7 @@ self: { description = "Serialization library for GHC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "packunused" = callPackage @@ -161005,6 +166653,7 @@ self: { description = "Tool for detecting redundant Cabal package dependencies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pacman-memcache" = callPackage @@ -161019,6 +166668,7 @@ self: { description = "Read whole Pacman database which pushes it into the memory cache"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "padKONTROL" = callPackage @@ -161035,6 +166685,7 @@ self: { description = "Controlling padKONTROL native mode"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pads-haskell" = callPackage @@ -161067,6 +166718,7 @@ self: { description = "PADS data description language for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pagarme" = callPackage @@ -161086,6 +166738,7 @@ self: { description = "Pagarme API wrapper"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pager" = callPackage @@ -161161,6 +166814,7 @@ self: { description = "Receive hooks from pagure and do things with them"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "paint" = callPackage @@ -161201,18 +166855,47 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pairing_0_2" = callPackage + ({ mkDerivation, arithmoi, base, bytestring, criterion, cryptonite + , memory, protolude, QuickCheck, quickcheck-instances, random + , tasty, tasty-discover, tasty-hunit, tasty-quickcheck + , wl-pprint-text + }: + mkDerivation { + pname = "pairing"; + version = "0.2"; + sha256 = "06w1vp9cqzxpqlg3hs68qxn8mjm46bkh7b5428ac6wh7f1zzxw88"; + libraryHaskellDepends = [ + arithmoi base bytestring cryptonite memory protolude QuickCheck + random wl-pprint-text + ]; + testHaskellDepends = [ + arithmoi base bytestring cryptonite memory protolude QuickCheck + quickcheck-instances random tasty tasty-discover tasty-hunit + tasty-quickcheck wl-pprint-text + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + arithmoi base bytestring criterion cryptonite memory protolude + QuickCheck quickcheck-instances random tasty tasty-hunit + tasty-quickcheck wl-pprint-text + ]; + description = "Optimal ate pairing over Barreto-Naehrig curves"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "palette" = callPackage ({ mkDerivation, array, base, colour, containers, MonadRandom }: mkDerivation { pname = "palette"; - version = "0.3.0.1"; - sha256 = "0ylwgb7a0mhffz00hmhx93y4kyjb9xgm96jrfcxl464x8cjka5gi"; + version = "0.3.0.2"; + sha256 = "0820n3cj4zy9s46diln2rrs4lrxbipkhdw74p2w42gc7k1nlj54i"; libraryHaskellDepends = [ array base colour containers MonadRandom ]; description = "Utilities for choosing and creating color schemes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "palindromes" = callPackage @@ -161239,7 +166922,9 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell binding for C PAM API"; license = stdenv.lib.licenses.bsd3; + platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {pam = null;}; "panda" = callPackage @@ -161261,6 +166946,7 @@ self: { description = "A simple static blog engine"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc" = callPackage @@ -161317,7 +167003,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_6" = callPackage + "pandoc_2_7_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, blaze-html, blaze-markup, bytestring, case-insensitive , cmark-gfm, containers, criterion, data-default, deepseq, Diff @@ -161332,10 +167018,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.6"; - sha256 = "046vya7ivngv0hp5chnfxc1dm5n3krbgm0883ph45l31c7liyxma"; - revision = "1"; - editedCabalFile = "1m0xna696r38g2nk7whhyzh52lyyg0vsr236n8dafbwqj0k66652"; + version = "2.7.1"; + sha256 = "1f0yipnf46hdj0f1x9z41pimc88mirgp1fgp2pv3kyz063qm2ajy"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -161403,10 +167087,9 @@ self: { doCheck = false; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pandoc-citeproc_0_16_1" = callPackage + "pandoc-citeproc_0_16_1_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils , libyaml, mtl, network, old-locale, pandoc, pandoc-types, parsec @@ -161415,8 +167098,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.16.1"; - sha256 = "0vn3kydzyx7r9zhhk4bgp8ljyi8a65fjlik52d6d536wz3p2pwd3"; + version = "0.16.1.3"; + sha256 = "13pd7rfpzpc7a4dn2sasc30icrihv5kgmngyx70s4v42scgsfndg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -161446,8 +167129,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc-preamble"; - version = "1.2.3"; - sha256 = "1ip5z2zyich5f4h8arwmi67nlzwfd0hfpz3ixgisips3mz2d5hl2"; + version = "1.2.4"; + sha256 = "0bdarf6rjncd8lfap4xn479675vsvqzxrmdqd367l2gxfi1nmrv5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161468,8 +167151,8 @@ self: { pname = "pandoc-crossref"; version = "0.3.4.0"; sha256 = "15vfqpfkw4wnsg98804l5ylqbc926s2j5z4ik5zhval4d3kiamgz"; - revision = "2"; - editedCabalFile = "18mnjhv578n5xz6yjzw1mymndscv8qxi6y41scljzwqs557ird7g"; + revision = "3"; + editedCabalFile = "11ajbgw8icgvn8ylfpgnd4sxivlxx2f58363va1gar1kipf7gkar"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -161493,7 +167176,6 @@ self: { ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-csv2table" = callPackage @@ -161509,7 +167191,6 @@ self: { executableHaskellDepends = [ base csv pandoc pandoc-types ]; description = "Convert CSV to Pandoc Table Markdown"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-emphasize-code" = callPackage @@ -161554,7 +167235,6 @@ self: { ]; description = "A Pandoc filter to use graphviz"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-highlighting-extensions" = callPackage @@ -161592,6 +167272,7 @@ self: { description = "Include other Markdown files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-include-code" = callPackage @@ -161616,6 +167297,7 @@ self: { description = "A Pandoc filter for including code from source files"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-japanese-filters" = callPackage @@ -161636,6 +167318,7 @@ self: { description = "Japanese-specific markup filters for pandoc"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-lens" = callPackage @@ -161648,6 +167331,7 @@ self: { description = "Lenses for Pandoc documents"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-placetable" = callPackage @@ -161690,6 +167374,7 @@ self: { description = "Render and insert PlantUML diagrams with Pandoc"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-pyplot" = callPackage @@ -161748,7 +167433,6 @@ self: { executableHaskellDepends = [ base pandoc-types ]; description = "Convert Pandoc Markdown-style footnotes into sidenotes"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-stylefrommeta" = callPackage @@ -161766,7 +167450,6 @@ self: { ]; description = "Pandoc filter to customize links, images and paragraphs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-types" = callPackage @@ -161804,6 +167487,7 @@ self: { description = "Literate Haskell support for GitHub's Markdown flavor"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-vimhl" = callPackage @@ -161852,6 +167536,7 @@ self: { description = "A super-pang clone"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pango" = callPackage @@ -161871,7 +167556,6 @@ self: { libraryPkgconfigDepends = [ pango ]; description = "Binding to the Pango text rendering engine"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) pango;}; "pangraph" = callPackage @@ -161890,6 +167574,7 @@ self: { description = "A set of parsers for graph languages and conversions to graph libaries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "panhandle" = callPackage @@ -161946,6 +167631,7 @@ self: { description = "Pandoc filter to execute code blocks"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pansite" = callPackage @@ -161974,7 +167660,6 @@ self: { testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; description = "Pansite: a simple web site management tool"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa" = callPackage @@ -162093,6 +167778,7 @@ self: { description = "Reasonable default import"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "papa-implement" = callPackage @@ -162115,6 +167801,7 @@ self: { description = "Reasonable default import"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "papa-include" = callPackage @@ -162132,6 +167819,7 @@ self: { description = "Third party libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "papa-lens" = callPackage @@ -162184,6 +167872,7 @@ self: { description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "papa-prelude-core" = callPackage @@ -162201,6 +167890,7 @@ self: { description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "papa-prelude-lens" = callPackage @@ -162218,6 +167908,7 @@ self: { description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "papa-prelude-semigroupoids" = callPackage @@ -162235,6 +167926,7 @@ self: { description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "papa-prelude-semigroups" = callPackage @@ -162252,6 +167944,7 @@ self: { description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "papa-semigroupoids" = callPackage @@ -162336,6 +168029,7 @@ self: { description = "A passphrase generator"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "papillon" = callPackage @@ -162357,6 +168051,7 @@ self: { description = "packrat parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pappy" = callPackage @@ -162371,6 +168066,7 @@ self: { description = "Packrat parsing; linear-time parsers for grammars in TDPL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "paprika" = callPackage @@ -162394,6 +168090,7 @@ self: { description = "The Haskell library and examples for the kids programming robot paprika"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "para" = callPackage @@ -162433,6 +168130,7 @@ self: { description = "Paragon"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parallel_3_2_0_3" = callPackage @@ -162489,6 +168187,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parallel-tree-search" = callPackage @@ -162513,6 +168212,7 @@ self: { description = "Parameterized/indexed monoids and monads using only a single parameter type variable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parameterized-data" = callPackage @@ -162547,6 +168247,7 @@ self: { description = "Classes and data structures for working with data-kind indexed types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "paramtree" = callPackage @@ -162564,6 +168265,7 @@ self: { description = "Generate labelled test/benchmark trees from sets of parameters"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "paranoia" = callPackage @@ -162590,6 +168292,7 @@ self: { description = "http proxy server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parco" = callPackage @@ -162602,6 +168305,7 @@ self: { description = "Generalised parser combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parco-attoparsec" = callPackage @@ -162614,6 +168318,7 @@ self: { description = "Generalised parser combinators - Attoparsec interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parco-parsec" = callPackage @@ -162626,6 +168331,7 @@ self: { description = "Generalised parser combinators - Parsec interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parcom-lib" = callPackage @@ -162670,6 +168376,7 @@ self: { description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pareto" = callPackage @@ -162682,6 +168389,7 @@ self: { description = "A library for cause-effect relationships"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "paripari" = callPackage @@ -162745,6 +168453,7 @@ self: { description = "generate command line arguments from a --help output"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parseargs" = callPackage @@ -162760,6 +168469,8 @@ self: { testHaskellDepends = [ base process ]; description = "Parse command-line arguments"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parsec_3_1_13_0" = callPackage @@ -162817,6 +168528,7 @@ self: { description = "Parsec API encoded as a deeply-embedded DSL, for debugging and analysis"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parsec-numbers" = callPackage @@ -162861,6 +168573,7 @@ self: { description = "Parsing instances for Parsec"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parsec-permutation" = callPackage @@ -162888,6 +168601,7 @@ self: { description = "Pratt Parser combinator for Parsec"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parsec-tagsoup" = callPackage @@ -162989,6 +168703,7 @@ self: { description = "Adds and Eq instance for Parsec's ParseError if needed"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parsek" = callPackage @@ -163011,6 +168726,7 @@ self: { libraryHaskellDepends = [ base mtl parsec ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parser-combinators" = callPackage @@ -163038,6 +168754,7 @@ self: { description = "Prints Haskell parse trees in JSON"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parser241" = callPackage @@ -163053,6 +168770,7 @@ self: { description = "An interface to create production rules using augmented grammars"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parsergen" = callPackage @@ -163075,6 +168793,7 @@ self: { description = "TH parser generator for splitting bytestring into fixed-width fields"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parsers" = callPackage @@ -163135,6 +168854,7 @@ self: { description = "NMR-STAR file format parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "parsimony" = callPackage @@ -163155,8 +168875,8 @@ self: { }: mkDerivation { pname = "parsix"; - version = "0.1.0.2"; - sha256 = "0dg48xycw7dl3700ws9qi49i8095nqag6wr9n1jan2w2gd0vchy1"; + version = "0.1.0.3"; + sha256 = "0b3lzdyr2zbj4rnqkk4nxg2ix2ymvy3cfa7rqay31k637v441c75"; libraryHaskellDepends = [ base containers fingertree mtl parsers prettyprinter prettyprinter-ansi-terminal text transformers @@ -163166,7 +168886,6 @@ self: { ]; description = "Parser combinators with slicing, error recovery, and syntax highlighting"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partage" = callPackage @@ -163186,6 +168905,7 @@ self: { description = "Parsing factorized"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "partial" = callPackage @@ -163235,6 +168955,7 @@ self: { description = "Haskell 98 Partial Lenses"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "partial-order" = callPackage @@ -163253,21 +168974,10 @@ self: { description = "Provides typeclass suitable for types admitting a partial order"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "partial-semigroup" = callPackage - ({ mkDerivation, base, doctest, hedgehog }: - mkDerivation { - pname = "partial-semigroup"; - version = "0.5.0.0"; - sha256 = "03wfizykalpnv2i2qmj2vm27ajs1s8kmzy7ynsh8b2l43nafixqm"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest hedgehog ]; - description = "A partial binary associative operator"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "partial-semigroup_0_5_1_0" = callPackage ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; @@ -163277,7 +168987,6 @@ self: { testHaskellDepends = [ base doctest hedgehog ]; description = "A partial binary associative operator"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-semigroup-hedgehog" = callPackage @@ -163336,6 +169045,7 @@ self: { description = "Inspect, create, and alter MBRs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "passage" = callPackage @@ -163355,6 +169065,7 @@ self: { description = "Parallel code generation for hierarchical Bayesian modeling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "passman" = callPackage @@ -163439,6 +169150,7 @@ self: { description = "Password generation/validation library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pasta" = callPackage @@ -163456,6 +169168,7 @@ self: { description = "PostgreSQL Abstract Syntax Tree Assember"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pastis" = callPackage @@ -163468,6 +169181,7 @@ self: { description = "Interface to the past.is URL shortening service"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pasty" = callPackage @@ -163482,6 +169196,7 @@ self: { description = "A simple command line pasting utility"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "patat" = callPackage @@ -163506,6 +169221,7 @@ self: { description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "patch-combinators" = callPackage @@ -163567,6 +169283,7 @@ self: { description = "Patches (diffs) on vectors: composable, mergeable, and invertible"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "path" = callPackage @@ -163609,27 +169326,6 @@ self: { }) {}; "path-io" = callPackage - ({ mkDerivation, base, containers, directory, dlist, exceptions - , filepath, hspec, path, temporary, time, transformers, unix-compat - }: - mkDerivation { - pname = "path-io"; - version = "1.4.1"; - sha256 = "0v5zwdsy8dd2ljidjm2rr8wfpvjlgk1g7c5xf40ddzjn9ghykk2p"; - revision = "1"; - editedCabalFile = "1qb9b3rvzpdm6xp2xljmp2izz0x26bj3zvai22iyl914pzph3181"; - libraryHaskellDepends = [ - base containers directory dlist exceptions filepath path temporary - time transformers unix-compat - ]; - testHaskellDepends = [ - base directory exceptions hspec path transformers unix-compat - ]; - description = "Interface to ‘directory’ package for users of ‘path’"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "path-io_1_4_2" = callPackage ({ mkDerivation, base, containers, directory, dlist, exceptions , filepath, hspec, path, temporary, time, transformers, unix-compat }: @@ -163646,7 +169342,6 @@ self: { ]; description = "Interface to ‘directory’ package for users of ‘path’"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path-pieces" = callPackage @@ -163705,6 +169400,7 @@ self: { description = "A toy pathfinding library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "paths" = callPackage @@ -163774,10 +169470,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "patience"; - version = "0.2.1.0"; - sha256 = "0mfkqf5kwxqva6pizj967gv7m8zvjvwnli5ala0qvv7jq8gqnfsf"; - revision = "1"; - editedCabalFile = "0zr4w80zx7gw7amj2mlxl0k7lvczxnl0i13mijvxnb0g15sa5clg"; + version = "0.2.1.1"; + sha256 = "14d6hkrkbanlv09z7dbg8q7hk5ax5mfpgzr0knmcviq02kmzbs0s"; libraryHaskellDepends = [ base containers ]; description = "Patience diff and longest increasing subsequence"; license = stdenv.lib.licenses.bsd3; @@ -163795,6 +169489,7 @@ self: { description = "A webpage scraper for Patreon which dumps a list of patrons to a text file"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pattern-arrows" = callPackage @@ -163849,6 +169544,7 @@ self: { description = "Common patterns in message-oriented applications"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "paymill" = callPackage @@ -163886,6 +169582,7 @@ self: { description = "Client for a limited part of PayPal's Adaptive Payments API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "paypal-api" = callPackage @@ -163903,6 +169600,7 @@ self: { description = "PayPal API, currently supporting \"ButtonManager\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "paypal-rest-client" = callPackage @@ -163920,6 +169618,7 @@ self: { description = "A client to connect to PayPal's REST API (v1)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pb" = callPackage @@ -163936,6 +169635,7 @@ self: { description = "pastebin command line application"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pb-next" = callPackage @@ -163956,6 +169656,7 @@ self: { description = "Utility CLI for working with protobuf files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pbc4hs" = callPackage @@ -163968,6 +169669,7 @@ self: { description = "pbc for HsLua"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pbkdf" = callPackage @@ -164025,6 +169727,7 @@ self: { description = "Convert a pcap into an enumerator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pcd-loader" = callPackage @@ -164050,6 +169753,7 @@ self: { description = "PCD file loader"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pcf" = callPackage @@ -164068,6 +169772,7 @@ self: { description = "A one file compiler for PCF"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pcf-font" = callPackage @@ -164182,6 +169887,7 @@ self: { description = "pcre-light extra functionality"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pcre-utils" = callPackage @@ -164224,6 +169930,7 @@ self: { description = "Tool to generate PDF from haskintex templates and YAML input"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pdf-slave-server" = callPackage @@ -164275,6 +169982,7 @@ self: { description = "Template format definition for pdf-slave tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pdf-toolbox-content" = callPackage @@ -164292,6 +170000,7 @@ self: { description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pdf-toolbox-core" = callPackage @@ -164309,6 +170018,7 @@ self: { description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pdf-toolbox-document" = callPackage @@ -164328,6 +170038,7 @@ self: { description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pdf-toolbox-viewer" = callPackage @@ -164349,6 +170060,7 @@ self: { description = "Simple pdf viewer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pdf2line" = callPackage @@ -164399,6 +170111,7 @@ self: { description = "Name a PDF file using information from the pdfinfo command"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pdfsplit" = callPackage @@ -164415,6 +170128,7 @@ self: { description = "split two-column PDFs, so there is one column per page"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pdynload" = callPackage @@ -164432,6 +170146,7 @@ self: { description = "pdynload is polymorphic dynamic linking library"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "peakachu" = callPackage @@ -164448,6 +170163,7 @@ self: { description = "Experiemental library for composable interactive programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "peano" = callPackage @@ -164498,6 +170214,7 @@ self: { description = "pec embedded compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pecoff" = callPackage @@ -164544,6 +170261,7 @@ self: { description = "A pedestrian implementation of directed acyclic graphs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "peg" = callPackage @@ -164562,6 +170280,7 @@ self: { description = "a lazy non-deterministic concatenative programming language"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "peggy" = callPackage @@ -164581,6 +170300,7 @@ self: { description = "The Parser Generator for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pell" = callPackage @@ -164598,7 +170318,6 @@ self: { ]; description = "Package to solve the Generalized Pell Equation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pem" = callPackage @@ -164637,6 +170356,7 @@ self: { description = "Static site generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "penn-treebank" = callPackage @@ -164677,6 +170397,7 @@ self: { description = "Extensible double-entry accounting system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "penny-bin" = callPackage @@ -164696,6 +170417,7 @@ self: { description = "Deprecated - use penny package instead"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "penny-lib" = callPackage @@ -164718,6 +170440,7 @@ self: { description = "Deprecated - use penny package instead"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "penrose" = callPackage @@ -164737,6 +170460,7 @@ self: { description = "A system that automatically visualize mathematics"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "peparser" = callPackage @@ -164749,6 +170473,7 @@ self: { description = "A parser for PE object files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "percent-format" = callPackage @@ -164773,6 +170498,7 @@ self: { description = "The perceptron learning algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "perdure" = callPackage @@ -164820,6 +170546,7 @@ self: { description = "Database migration support for use in other libraries"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "perf" = callPackage @@ -164837,6 +170564,7 @@ self: { description = "Low-level run time measurement"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "perf-analysis" = callPackage @@ -164861,6 +170589,7 @@ self: { description = "analysis example using perf"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "perfect-hash-generator" = callPackage @@ -164914,6 +170643,7 @@ self: { description = "A perfect hashing library for mapping bytestrings to values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "perhaps" = callPackage @@ -164932,6 +170662,7 @@ self: { description = "Perhaps, a monad"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "period" = callPackage @@ -164969,6 +170700,7 @@ self: { description = "A reliable at-least-once periodic job scheduler backed by redis"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "perm" = callPackage @@ -164986,6 +170718,7 @@ self: { description = "permutation Applicative and Monad with many mtl instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "permutation" = callPackage @@ -165022,6 +170755,7 @@ self: { description = "Permutations of finite sets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "permute" = callPackage @@ -165034,6 +170768,7 @@ self: { description = "Generalised permutation parser combinator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persist" = callPackage @@ -165067,6 +170802,7 @@ self: { description = "Transforms persist's quasi-quoted syntax into ER format"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistable-record" = callPackage @@ -165204,6 +170940,7 @@ self: { description = "Parses a Persist Model file and produces Audit Models"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-cereal" = callPackage @@ -165216,6 +170953,7 @@ self: { description = "Helper functions for writing Persistent instances"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-database-url" = callPackage @@ -165236,6 +170974,7 @@ self: { description = "Parse DATABASE_URL into configuration types for Persistent"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-equivalence" = callPackage @@ -165248,6 +170987,7 @@ self: { description = "Persistent equivalence relations (aka union-find)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-hssqlppp" = callPackage @@ -165265,6 +171005,7 @@ self: { description = "Declare Persistent entities using SQL SELECT query syntax"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-instances-iproute" = callPackage @@ -165309,6 +171050,7 @@ self: { description = "A thread-safe (STM) persistency interface for finite map types"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-migration" = callPackage @@ -165334,6 +171076,7 @@ self: { description = "Manual migrations for the persistent library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-mongoDB" = callPackage @@ -165354,6 +171097,7 @@ self: { description = "Backend for the persistent library using mongoDB"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-mysql" = callPackage @@ -165418,6 +171162,7 @@ self: { description = "Backend for the persistent library using ODBC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-parser" = callPackage @@ -165469,6 +171214,7 @@ self: { description = "Template-Haskell helpers for integrating protobufs with persistent"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-qq" = callPackage @@ -165498,6 +171244,7 @@ self: { description = "A library for rate limiting activities with a persistent backend"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-redis" = callPackage @@ -165536,6 +171283,7 @@ self: { description = "Haskell references backed by an IntMap for persistence and reversibility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-relational-record" = callPackage @@ -165559,6 +171307,7 @@ self: { description = "relational-record on persisten backends"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-spatial" = callPackage @@ -165708,6 +171457,7 @@ self: { description = "Generate classy lens field accessors for persistent models"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-test" = callPackage @@ -165747,6 +171497,33 @@ self: { description = "Tests for Persistent"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "persistent-typed-db" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec + , http-api-data, monad-logger, path-pieces, persistent + , persistent-template, resource-pool, resourcet, template-haskell + , text, transformers + }: + mkDerivation { + pname = "persistent-typed-db"; + version = "0.0.1.1"; + sha256 = "0cn9dyv5gzkjn9jbv2srw94akz1rpgxsvn1hv1ik90a8sl3drh9n"; + libraryHaskellDepends = [ + aeson base bytestring conduit http-api-data monad-logger + path-pieces persistent persistent-template resource-pool resourcet + template-haskell text transformers + ]; + testHaskellDepends = [ + aeson base bytestring conduit esqueleto hspec http-api-data + monad-logger path-pieces persistent persistent-template + resource-pool resourcet template-haskell text transformers + ]; + description = "Type safe access to multiple database schemata"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-vector" = callPackage @@ -165765,6 +171542,7 @@ self: { description = "A persistent sequence based on array mapped tries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persistent-zookeeper" = callPackage @@ -165795,6 +171573,7 @@ self: { description = "Backend for persistent library using Zookeeper"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persona" = callPackage @@ -165812,6 +171591,7 @@ self: { description = "Persona (BrowserID) library"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "persona-idp" = callPackage @@ -165834,6 +171614,7 @@ self: { description = "Persona (BrowserID) Identity Provider"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pesca" = callPackage @@ -165849,6 +171630,7 @@ self: { description = "Proof Editor for Sequent Calculus"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "peyotls" = callPackage @@ -165876,6 +171658,7 @@ self: { description = "Pretty Easy YOshikuni-made TLS library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "peyotls-codec" = callPackage @@ -165894,6 +171677,7 @@ self: { description = "Codec parts of Pretty Easy YOshikuni-made TLS library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pez" = callPackage @@ -165911,6 +171695,7 @@ self: { description = "A Pretty Extraordinary Zipper library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pg-harness" = callPackage @@ -165931,6 +171716,7 @@ self: { description = "REST service and library for creating/consuming temporary PostgreSQL databases"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pg-harness-client" = callPackage @@ -165962,6 +171748,7 @@ self: { description = "REST service for creating temporary PostgreSQL databases"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pg-recorder" = callPackage @@ -165988,6 +171775,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pg-store" = callPackage @@ -166012,6 +171800,7 @@ self: { description = "Simple storage interface to PostgreSQL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pg-transact" = callPackage @@ -166035,6 +171824,7 @@ self: { description = "Another postgresql-simple transaction monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pgdl" = callPackage @@ -166061,6 +171851,7 @@ self: { description = "browse directory listing webpages and download files from them"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pgm" = callPackage @@ -166109,6 +171900,7 @@ self: { description = "A mid-level PostgreSQL client library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pgstream" = callPackage @@ -166134,6 +171926,7 @@ self: { description = "Streaming Postgres bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "phantom-state" = callPackage @@ -166161,6 +171954,7 @@ self: { description = "Freezing, thawing, and copy elision"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "phaser" = callPackage @@ -166233,6 +172027,7 @@ self: { description = "Deprecated - ghci debug viewer with simple editor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "phoityne-vscode" = callPackage @@ -166284,6 +172079,7 @@ self: { description = "Haskell bindings to the libphonenumber library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {phonenumber = null; inherit (pkgs) protobuf;}; "phone-push" = callPackage @@ -166302,6 +172098,7 @@ self: { description = "Push notifications for Android and iOS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "phonetic-code" = callPackage @@ -166329,6 +172126,7 @@ self: { description = "Functional user interfaces"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "photoname" = callPackage @@ -166351,6 +172149,7 @@ self: { description = "Rename photo image files based on EXIF shoot date"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "phraskell" = callPackage @@ -166365,6 +172164,7 @@ self: { description = "A fractal viewer"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "phybin" = callPackage @@ -166398,6 +172198,7 @@ self: { description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "physics" = callPackage @@ -166430,6 +172231,7 @@ self: { description = "Applied pi-calculus interpreter"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pi-forall" = callPackage @@ -166454,6 +172256,7 @@ self: { description = "Demo implementation of typechecker for dependently-typed language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pi-hoole" = callPackage @@ -166480,6 +172283,7 @@ self: { description = "Lightweight access control solution for the pijul vcs"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pi-lcd" = callPackage @@ -166520,6 +172324,7 @@ self: { description = "Set up port forwarding with the Private Internet Access VPN service"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pianola" = callPackage @@ -166543,6 +172348,7 @@ self: { description = "Remotely controlling Java Swing applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "picedit" = callPackage @@ -166558,6 +172364,7 @@ self: { description = "simple image manipulation functions"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "picologic" = callPackage @@ -166581,6 +172388,7 @@ self: { description = "Utilities for symbolic predicate logic expressions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "picoparsec" = callPackage @@ -166612,6 +172420,7 @@ self: { description = "Fast combinator parsing for bytestrings and text"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "picosat" = callPackage @@ -166625,6 +172434,7 @@ self: { description = "Bindings to the PicoSAT solver"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pictikz" = callPackage @@ -166639,6 +172449,7 @@ self: { description = "Converts a svg image to tikz code"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pid1" = callPackage @@ -166667,6 +172478,7 @@ self: { description = "Run an IO action protected by a pidfile"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pier" = callPackage @@ -166688,6 +172500,7 @@ self: { description = "Yet another Haskell build system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pier-core" = callPackage @@ -166708,6 +172521,7 @@ self: { description = "A library for writing forwards-declared build systems in haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "piet" = callPackage @@ -166722,6 +172536,7 @@ self: { description = "A Piet interpreter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pig" = callPackage @@ -166739,6 +172554,7 @@ self: { description = "dice game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "piki" = callPackage @@ -166786,20 +172602,20 @@ self: { }: mkDerivation { pname = "pinch"; - version = "0.3.4.0"; - sha256 = "10rmk6f9cb2l7dyybwpbin0i5dqdg59d17m627kj9abyrlhcyf8a"; + version = "0.3.4.1"; + sha256 = "1yrw0g68j7jl9q19byq10nfg4rvn3wr49sganx8k4mr46j8pa0sk"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim hashable semigroups text unordered-containers vector ]; + libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ - base bytestring containers hspec hspec-discover QuickCheck - semigroups text unordered-containers vector + base bytestring containers hspec QuickCheck semigroups text + unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "An alternative implementation of Thrift for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pinchot" = callPackage @@ -166819,6 +172635,7 @@ self: { description = "Write grammars, not parsers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ping" = callPackage @@ -166836,6 +172653,7 @@ self: { description = "icmp echo requests"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ping-parser-attoparsec" = callPackage @@ -166915,6 +172733,7 @@ self: { description = "A gateway for various cloud notification services"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipe-enumerator" = callPackage @@ -166927,6 +172746,7 @@ self: { description = "A bidirectional bridge between pipes and iteratees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipeclip" = callPackage @@ -166945,6 +172765,17 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "pipeline" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "pipeline"; + version = "0.1.0"; + sha256 = "1bz7pfyfgc1cps5pwy31m5z3r6kxi5c4661qa60q333y0rd2y2j1"; + libraryHaskellDepends = [ base transformers ]; + description = "Continuation patterns"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes" = callPackage ({ mkDerivation, base, criterion, exceptions, mmorph, mtl , optparse-applicative, QuickCheck, semigroups, test-framework @@ -167005,6 +172836,7 @@ self: { description = "A higher-level interface to using concurrency with pipes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-attoparsec" = callPackage @@ -167045,6 +172877,7 @@ self: { description = "Streaming parsing in the pipes-core framework with Attoparsec"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-bgzf" = callPackage @@ -167061,6 +172894,7 @@ self: { description = "Blocked GZip"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-binary" = callPackage @@ -167154,6 +172988,7 @@ self: { description = "Pipes for Noise-secured network connections"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-category" = callPackage @@ -167209,6 +173044,7 @@ self: { description = "Encode and decode binary streams using the pipes and cereal libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-cereal-plus" = callPackage @@ -167225,6 +173061,7 @@ self: { description = "A streaming serialization library on top of \"pipes\" and \"cereal-plus\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-cliff" = callPackage @@ -167272,6 +173109,7 @@ self: { description = "Conduit adapters"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-core" = callPackage @@ -167288,6 +173126,7 @@ self: { description = "Compositional pipelines"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-courier" = callPackage @@ -167300,6 +173139,7 @@ self: { description = "Pipes utilities for interfacing with the courier message-passing framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-csv" = callPackage @@ -167333,6 +173173,7 @@ self: { description = "Integration between pipes and errors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-extra" = callPackage @@ -167361,6 +173202,7 @@ self: { description = "Various basic utilities for Pipes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-extras" = callPackage @@ -167420,6 +173262,7 @@ self: { description = "Fast traversal of directory trees using pipes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-fluid" = callPackage @@ -167442,7 +173285,6 @@ self: { ]; description = "Reactively combines Producers so that a value is yielded as soon as possible"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-group" = callPackage @@ -167490,6 +173332,7 @@ self: { description = "Illumina NGS data processing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-interleave" = callPackage @@ -167516,6 +173359,7 @@ self: { description = "Stateful IO streams based on pipes"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-kafka" = callPackage @@ -167557,6 +173401,7 @@ self: { description = "Streaming processing of CSV files preceded by key-value pairs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-lines" = callPackage @@ -167662,6 +173507,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-ordered-zip" = callPackage + ({ mkDerivation, base, foldl, pipes }: + mkDerivation { + pname = "pipes-ordered-zip"; + version = "1.0.0.1"; + sha256 = "18qm08h5mq8pyn7cx1dabvmj63mhykm4cqsxhqsb7qf1kv70nqc8"; + libraryHaskellDepends = [ base pipes ]; + testHaskellDepends = [ base foldl pipes ]; + description = "merge two ordered Producers into a new Producer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-p2p" = callPackage ({ mkDerivation, async, base, binary, bytestring, errors , exceptions, mtl, network, network-simple-sockaddr, pipes @@ -167678,6 +173535,7 @@ self: { description = "P2P network nodes with pipes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-p2p-examples" = callPackage @@ -167697,6 +173555,7 @@ self: { description = "Examples using pipes-p2p"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-parse" = callPackage @@ -167748,6 +173607,7 @@ self: { description = "Alternate Prelude for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-random" = callPackage @@ -167762,6 +173622,7 @@ self: { description = "Producers for handling randomness"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-rt" = callPackage @@ -167777,6 +173638,7 @@ self: { description = "A few pipes to control the timing of yields"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-s3" = callPackage @@ -167800,6 +173662,7 @@ self: { description = "A simple interface for streaming data to and from Amazon S3"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-safe" = callPackage @@ -167837,6 +173700,7 @@ self: { description = "Create proper Pipes from System.Process"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-sqlite-simple" = callPackage @@ -167851,6 +173715,7 @@ self: { description = "Functions that smash Pipes and sqlite-simple together"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-text" = callPackage @@ -167869,6 +173734,7 @@ self: { description = "properly streaming text"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-transduce" = callPackage @@ -167893,6 +173759,7 @@ self: { description = "Interfacing pipes with foldl folds"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-vector" = callPackage @@ -167959,6 +173826,7 @@ self: { description = "Pipes integration for ZeroMQ messaging"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pipes-zlib" = callPackage @@ -167999,6 +173867,7 @@ self: { description = "A dependently typed core language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pit" = callPackage @@ -168022,6 +173891,7 @@ self: { description = "Account management tool"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pitchtrack" = callPackage @@ -168043,6 +173913,7 @@ self: { description = "Pitch tracking library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pivotal-tracker" = callPackage @@ -168067,6 +173938,7 @@ self: { description = "A library and a CLI tool for accessing Pivotal Tracker API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pixela" = callPackage @@ -168112,6 +173984,7 @@ self: { description = "A library and application for generating pixelated avatars"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "piyo" = callPackage @@ -168169,6 +174042,7 @@ self: { description = "PKCS#10 library"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pkcs7" = callPackage @@ -168182,6 +174056,7 @@ self: { description = "PKCS #7 padding in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pkggraph" = callPackage @@ -168196,6 +174071,7 @@ self: { description = "Package dependency graph for installed packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pktree" = callPackage @@ -168231,6 +174107,7 @@ self: { description = "plaimi's prelude"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plan-applicative" = callPackage @@ -168252,6 +174129,7 @@ self: { description = "Applicative/Arrow for resource estimation and progress tracking"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plan-b" = callPackage @@ -168271,6 +174149,7 @@ self: { description = "Failure-tolerant file and directory editing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "planar-graph" = callPackage @@ -168288,6 +174167,7 @@ self: { description = "A representation of planar graphs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "planb-token-introspection" = callPackage @@ -168312,6 +174192,7 @@ self: { description = "Token Introspection for PlanB"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "planet-mitchell" = callPackage @@ -168367,6 +174248,7 @@ self: { description = "Planet Mitchell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "planet-mitchell-test" = callPackage @@ -168384,6 +174266,7 @@ self: { description = "Planet Mitchell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plankton" = callPackage @@ -168396,6 +174279,7 @@ self: { description = "The core of a numeric prelude, taken from numhask"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plat" = callPackage @@ -168410,6 +174294,7 @@ self: { description = "Simple templating library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "platinum-parsing" = callPackage @@ -168434,6 +174319,7 @@ self: { description = "General Framework for compiler development"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "playlists" = callPackage @@ -168493,6 +174379,8 @@ self: { ]; description = "run a subprocess, combining stdout and stderr"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plist" = callPackage @@ -168529,6 +174417,7 @@ self: { description = "Remote monad for editing plists"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plivo" = callPackage @@ -168563,6 +174452,7 @@ self: { description = "plot data from stdin through socketed"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plot" = callPackage @@ -168579,6 +174469,7 @@ self: { description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plot-gtk" = callPackage @@ -168591,6 +174482,7 @@ self: { description = "GTK plots and interaction with GHCi"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plot-gtk-ui" = callPackage @@ -168608,6 +174500,7 @@ self: { description = "A quick way to use Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plot-gtk3" = callPackage @@ -168622,6 +174515,7 @@ self: { description = "GTK3 plots and interaction with GHCi"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plot-lab" = callPackage @@ -168639,6 +174533,7 @@ self: { description = "A plotting tool with Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plot-light" = callPackage @@ -168678,6 +174573,7 @@ self: { description = "Example binaries for plot-light"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plotfont" = callPackage @@ -168751,6 +174647,7 @@ self: { description = "Diagrams based plotting library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plotserver-api" = callPackage @@ -168779,6 +174676,7 @@ self: { description = "Dynamic linking for Haskell and C objects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plugins-auto" = callPackage @@ -168796,6 +174694,7 @@ self: { description = "Automatic recompilation and reloading of haskell modules"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plugins-multistage" = callPackage @@ -168815,6 +174714,7 @@ self: { description = "Dynamic linking for embedded DSLs with staged compilation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "plumbers" = callPackage @@ -168838,7 +174738,6 @@ self: { testHaskellDepends = [ base hedgehog hedgehog-classes ]; description = "Plurality monad: Zero, one, or at least two"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plural" = callPackage @@ -168852,6 +174751,7 @@ self: { description = "Pluralize"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ply-loader" = callPackage @@ -168887,6 +174787,7 @@ self: { description = "read/write png file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pngload" = callPackage @@ -168904,6 +174805,7 @@ self: { description = "Pure Haskell loader for PNG images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pngload-fixed" = callPackage @@ -168917,6 +174819,7 @@ self: { description = "Pure Haskell loader for PNG images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pnm" = callPackage @@ -168945,6 +174848,7 @@ self: { description = "Bindings for the Pocket API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pocket-dns" = callPackage @@ -168980,6 +174884,7 @@ self: { description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "point-octree" = callPackage @@ -168999,6 +174904,7 @@ self: { description = "Point octree, with bounding boxes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pointed" = callPackage @@ -169087,6 +174993,7 @@ self: { description = "Tool for refactoring expressions into pointfree form"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pointful" = callPackage @@ -169106,6 +175013,7 @@ self: { description = "Pointful refactoring tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pointless-fun" = callPackage @@ -169144,6 +175052,7 @@ self: { description = "Pointless Lenses library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pointless-rewrite" = callPackage @@ -169160,6 +175069,7 @@ self: { description = "Pointless Rewrite library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pokemon-go-protobuf-types" = callPackage @@ -169177,6 +175087,7 @@ self: { description = "Haskell types for the Pokemon Go protobuf protocol"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "poker-eval" = callPackage @@ -169190,6 +175101,7 @@ self: { description = "Binding to libpoker-eval"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {poker-eval = null;}; "pokitdok" = callPackage @@ -169208,6 +175120,7 @@ self: { description = "PokitDok Platform API Client for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polar" = callPackage @@ -169232,6 +175145,7 @@ self: { description = "Fork of ConfigFile for Polar Game Engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polar-shader" = callPackage @@ -169245,6 +175159,7 @@ self: { description = "High-level shader compiler framework"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polh-lexicon" = callPackage @@ -169264,6 +175179,7 @@ self: { description = "A library for manipulating the historical dictionary of Polish (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polimorf" = callPackage @@ -169278,6 +175194,7 @@ self: { description = "Working with the PoliMorf dictionary"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "poll" = callPackage @@ -169323,6 +175240,7 @@ self: { description = "This package provides abstraction for polymorphic controls, like PolyMonads or PolyApplicatives"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polyToMonoid" = callPackage @@ -169353,6 +175271,7 @@ self: { description = "Wrap together data and it's constraints"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polydata-core" = callPackage @@ -169365,6 +175284,7 @@ self: { description = "Core data definitions for the \"polydata\" package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polymap" = callPackage @@ -169419,6 +175339,7 @@ self: { description = "Polynomials"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polynomials-bernstein" = callPackage @@ -169462,6 +175383,7 @@ self: { description = "Taming Selective Strictness"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polysoup" = callPackage @@ -169476,6 +175398,7 @@ self: { description = "Online XML parsing with polyparse and tagsoup"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polytypeable" = callPackage @@ -169488,6 +175411,7 @@ self: { description = "Typeable for polymorphic types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polytypeable-utils" = callPackage @@ -169500,6 +175424,7 @@ self: { description = "Utilities for polytypeable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polyvariadic" = callPackage @@ -169508,8 +175433,8 @@ self: { pname = "polyvariadic"; version = "0.3.0.3"; sha256 = "0zf7znslayjmcnajmsymc79f0lyyk7ph9zfczq78inirg0hv7hq1"; - revision = "3"; - editedCabalFile = "10lqcrp16v1h0lzr931haramkxkxz2bkfsyadxnc7ki73k39g11p"; + revision = "5"; + editedCabalFile = "1pzqc1hppzlj03wr2hrlm7liq9kcf650mpsrm4chr6msq491na9c"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "Creation and application of polyvariadic functions"; @@ -169538,6 +175463,7 @@ self: { description = "Maps and sets of partial orders"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pomodoro" = callPackage @@ -169557,6 +175483,7 @@ self: { description = "pomodoro timer"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pomohoro" = callPackage @@ -169581,6 +175508,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ponder" = callPackage @@ -169593,6 +175521,7 @@ self: { description = "PEG parser combinator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pong-server" = callPackage @@ -169611,6 +175540,7 @@ self: { description = "A simple embedded pingable server that runs in the background"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pontarius-mediaserver" = callPackage @@ -169670,7 +175600,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "An XMPP client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pontarius-xpmn" = callPackage @@ -169714,6 +175643,7 @@ self: { description = "Thread-safe resource pools. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pool-conduit" = callPackage @@ -169732,6 +175662,7 @@ self: { description = "Resource pool allocations via ResourceT. (deprecated)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pooled-io" = callPackage @@ -169775,6 +175706,7 @@ self: { description = "popenhs is a popen-like library for Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "poppler" = callPackage @@ -169796,7 +175728,8 @@ self: { description = "Binding to the Poppler"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gdk_pixbuf; gtk2 = pkgs.gnome2.gtk; + broken = true; + }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gtk2; inherit (pkgs.gnome2) pango; inherit (pkgs) poppler;}; "populate-setup-exe-cache" = callPackage @@ -169862,6 +175795,7 @@ self: { description = "DSL for configuring Gentoo portage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "portaudio" = callPackage @@ -169893,6 +175827,7 @@ self: { description = "FreeBSD ports index search and analysis tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "porter" = callPackage @@ -169905,6 +175840,7 @@ self: { description = "Implementation of the Porter stemming algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ports" = callPackage @@ -169917,6 +175853,7 @@ self: { description = "The Haskell Ports Library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ports-tools" = callPackage @@ -169975,19 +175912,19 @@ self: { description = "Support for Posix ACL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) acl;}; "posix-api" = callPackage ({ mkDerivation, base, primitive, tasty, tasty-hunit }: mkDerivation { pname = "posix-api"; - version = "0.2.0.0"; - sha256 = "059b5zip3i7cfa977kz0jzxc7b8nws9libkxwf8pnvxk70i7apq1"; + version = "0.2.1.0"; + sha256 = "1vxasjdy3l41brzyrjqv13zazm1ryqy496p2rfvm19062bfpixji"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive tasty tasty-hunit ]; description = "posix bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "posix-error-codes" = callPackage @@ -170056,7 +175993,6 @@ self: { testHaskellDepends = [ base bytestring process ]; description = "Pseudo terminal interaction with subprocesses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {util = null;}; "posix-realtime" = callPackage @@ -170069,6 +176005,7 @@ self: { description = "POSIX Realtime functionality"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "posix-socket" = callPackage @@ -170110,6 +176047,7 @@ self: { description = "Low-level wrapping of POSIX waitpid(2)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "possible" = callPackage @@ -170123,6 +176061,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "possibly" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "possibly"; + version = "1.0.0.0"; + sha256 = "08pannfx1831xp4zj4q3qp64vjr208df83qdwvzzlrn9ffc9ikaj"; + libraryHaskellDepends = [ base ]; + description = "type Possibly a = Either String a"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "post-mess-age" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -170144,6 +176093,7 @@ self: { description = "A library that gets postcode information from the uk-postcodes.com"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgres-embedded" = callPackage @@ -170163,6 +176113,7 @@ self: { description = "Library for easily running embedded PostgreSQL server for tests"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgres-tmp" = callPackage @@ -170175,6 +176126,7 @@ self: { description = "Create a temporary database that is deleted after performing some operation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgres-websockets" = callPackage @@ -170210,6 +176162,7 @@ self: { description = "Middleware to map LISTEN/NOTIFY messages to Websockets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-binary" = callPackage @@ -170318,6 +176271,7 @@ self: { description = "Format data to feed to a PostgreSQL COPY FROM statement"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-cube" = callPackage @@ -170371,6 +176325,7 @@ self: { description = "Utilities for streaming PostgreSQL LargeObjects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-named" = callPackage @@ -170389,6 +176344,7 @@ self: { description = "Generic deserialization of PostgreSQL rows based on column names"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-orm" = callPackage @@ -170414,7 +176370,6 @@ self: { executableHaskellDepends = [ base filepath ]; description = "An ORM (Object Relational Mapping) and migrations DSL for PostgreSQL"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-query" = callPackage @@ -170449,6 +176404,7 @@ self: { description = "Sql interpolating quasiquote plus some kind of primitive ORM using it"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-schema" = callPackage @@ -170475,14 +176431,15 @@ self: { "postgresql-simple" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, bytestring-builder, case-insensitive, containers - , cryptohash, filepath, hashable, HUnit, Only, postgresql-libpq - , scientific, tasty, tasty-golden, tasty-hunit, template-haskell - , text, time, transformers, uuid-types, vector + , cryptohash-md5, filepath, hashable, HUnit, inspection-testing + , Only, postgresql-libpq, scientific, tasty, tasty-golden + , tasty-hunit, template-haskell, text, time, transformers + , uuid-types, vector }: mkDerivation { pname = "postgresql-simple"; - version = "0.6"; - sha256 = "1jp08vg040p2qbgy2hldkac1qy1m2k1r6r67hh6dziw5ak1kjs69"; + version = "0.6.1"; + sha256 = "0hc3zarmykf0hvc5jr0rm66z4kar73zp737m4vg0y2nc2k5yp9m8"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -170491,8 +176448,8 @@ self: { ]; testHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive containers - cryptohash filepath HUnit tasty tasty-golden tasty-hunit text time - vector + cryptohash-md5 filepath HUnit inspection-testing postgresql-libpq + tasty tasty-golden tasty-hunit text time vector ]; benchmarkHaskellDepends = [ base vector ]; description = "Mid-Level PostgreSQL client library"; @@ -170518,6 +176475,7 @@ self: { description = "FFI-like bindings for PostgreSQL stored functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-simple-migration" = callPackage @@ -170563,7 +176521,6 @@ self: { ]; 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 @@ -170590,6 +176547,7 @@ self: { description = "A PostgreSQL backed queue"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-simple-sop" = callPackage @@ -170602,6 +176560,7 @@ self: { description = "Generic functions for postgresql-simple"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-simple-typed" = callPackage @@ -170619,6 +176578,7 @@ self: { description = "Typed extension for PostgreSQL simple"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-simple-url" = callPackage @@ -170640,6 +176600,7 @@ self: { description = "Parse postgres:// url into ConnectInfo"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-syntax" = callPackage @@ -170692,6 +176653,7 @@ self: { description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-typed-lifted" = callPackage @@ -170709,6 +176671,7 @@ self: { description = "postgresql-typed operations lifted to any instance of MonadBase or MonadBaseControl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgrest" = callPackage @@ -170755,6 +176718,7 @@ self: { description = "REST API for any Postgres database"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgrest-ws" = callPackage @@ -170791,6 +176755,7 @@ self: { description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postie" = callPackage @@ -170811,6 +176776,7 @@ self: { description = "SMTP server library to receive emails from within Haskell programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postmark" = callPackage @@ -170829,7 +176795,6 @@ self: { ]; description = "Library for postmarkapp.com HTTP Api"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postmark-streams" = callPackage @@ -170847,6 +176812,7 @@ self: { description = "Send email via Postmark using io-streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postmaster" = callPackage @@ -170857,6 +176823,8 @@ self: { pname = "postmaster"; version = "0.3.3"; sha256 = "05608xvaig1d67j3h8ykw7a11yr1mqkw98p0ii7gbp4mp3d9kncd"; + revision = "1"; + editedCabalFile = "00rp6mdds4kssvcyc9n6iz1asgkhv96050x50jwvg3wp3pp69fg2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170880,6 +176848,7 @@ self: { description = "Command line Dreamcast VMU filesystem toolset"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "potoki" = callPackage @@ -170892,6 +176861,7 @@ self: { description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "potoki-cereal" = callPackage @@ -170915,6 +176885,7 @@ self: { description = "Streaming serialization"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "potoki-conduit" = callPackage @@ -170938,6 +176909,7 @@ self: { description = "Integration of \"potoki\" and \"conduit\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "potoki-core" = callPackage @@ -170966,6 +176938,7 @@ self: { description = "Low-level components of \"potoki\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "potoki-hasql" = callPackage @@ -170982,6 +176955,7 @@ self: { description = "Integration of \"potoki\" and \"hasql\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "potoki-zlib" = callPackage @@ -170996,6 +176970,7 @@ self: { description = "Streaming ZLib decompression"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "potrace" = callPackage @@ -171051,6 +177026,7 @@ self: { description = "Tools for PowerPC programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "powerqueue" = callPackage @@ -171065,6 +177041,7 @@ self: { description = "A flexible job queue with exchangeable backends"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "powerqueue-distributed" = callPackage @@ -171084,6 +177061,7 @@ self: { description = "A distributed worker backend for powerqueu"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "powerqueue-levelmem" = callPackage @@ -171111,6 +177089,7 @@ self: { description = "A high performance in memory and LevelDB backend for powerqueue"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;}; "powerqueue-sqs" = callPackage @@ -171125,6 +177104,7 @@ self: { description = "A Amazon SQS backend for powerqueue"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ppm" = callPackage @@ -171171,6 +177151,7 @@ self: { description = "Parallel batch driver for QuickCheck"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pqueue" = callPackage @@ -171199,6 +177180,7 @@ self: { description = "Fully encapsulated monad transformers with queuelike functionality"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "practice-room" = callPackage @@ -171218,6 +177200,7 @@ self: { description = "Practice Room"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "praglude" = callPackage @@ -171239,6 +177222,7 @@ self: { description = "A pragmatic Prelude"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pragmatic-show" = callPackage @@ -171256,6 +177240,7 @@ self: { description = "Alternative Show class that gives shorter view if possible"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "preamble" = callPackage @@ -171313,6 +177298,7 @@ self: { description = "Prelude replacement"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pred-set" = callPackage @@ -171353,6 +177339,7 @@ self: { description = "Predicative tries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "predicate-class" = callPackage @@ -171365,6 +177352,7 @@ self: { description = "Helper class for passing context along a predicate value"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "predicates" = callPackage @@ -171409,6 +177397,7 @@ self: { description = "Evaluate and display trees of predicates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prednote-test" = callPackage @@ -171432,6 +177421,7 @@ self: { description = "Tests and QuickCheck generators to accompany prednote"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prefetch" = callPackage @@ -171496,6 +177486,7 @@ self: { description = "A library for building a prefork-style server quickly"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pregame" = callPackage @@ -171537,6 +177528,7 @@ self: { description = "A larger alternative to the Prelude"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prelude-compat" = callPackage @@ -171582,6 +177574,7 @@ self: { description = "Another kind of alternate Prelude file"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prelude-plus" = callPackage @@ -171596,6 +177589,7 @@ self: { description = "Prelude for rest of us"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prelude-prime" = callPackage @@ -171660,6 +177654,7 @@ self: { description = "Preprocess Haskell Repositories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "preprocessor" = callPackage @@ -171681,6 +177676,7 @@ self: { description = "Remove cpp annotations to get the source ready for static analysis"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "preprocessor-tools" = callPackage @@ -171707,6 +177703,7 @@ self: { description = "A decision procedure for quantifier-free linear arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "present" = callPackage @@ -171730,6 +177727,7 @@ self: { description = "Text template library targeted at the web / HTML generation"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "presto-hdbc" = callPackage @@ -171750,6 +177748,7 @@ self: { description = "An HDBC connector for Presto"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prettify" = callPackage @@ -171835,6 +177834,32 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "pretty-ghci" = callPackage + ({ mkDerivation, alex, array, base, directory, filepath + , haddock-library, happy, prettyprinter + , prettyprinter-ansi-terminal, process, text + }: + mkDerivation { + pname = "pretty-ghci"; + version = "0.1.0.0"; + sha256 = "0g3vssp09n77p05z7y36iddq05gymzlaar6k3k3si49il0cl56v7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base haddock-library prettyprinter + prettyprinter-ansi-terminal text + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory filepath prettyprinter process + ]; + description = "Functionality for beautifying GHCi"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "pretty-hex" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -171856,6 +177881,7 @@ self: { description = "A implementation of multi-column layout w/ Text.PrettyPrint"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pretty-relative-time" = callPackage @@ -171874,6 +177900,7 @@ self: { description = "Pretty relative time"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pretty-show" = callPackage @@ -172129,6 +178156,7 @@ self: { description = "prettyprinter backend for vty"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "preview" = callPackage @@ -172145,6 +178173,7 @@ self: { description = "The method of previewing data (instead of wholly show-ing it)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prim-array" = callPackage @@ -172159,6 +178188,7 @@ self: { description = "Primitive byte array with type variable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prim-instances" = callPackage @@ -172177,6 +178207,7 @@ self: { description = "prim typeclass instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prim-ref" = callPackage @@ -172239,6 +178270,7 @@ self: { description = "Type-safe prime numbers"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primesieve" = callPackage @@ -172254,7 +178286,6 @@ self: { executableSystemDepends = [ primesieve ]; description = "FFI bindings for the primesieve library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) primesieve;}; "primitive_0_5_1_0" = callPackage @@ -172319,6 +178350,7 @@ self: { description = "containers backed by arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-extras" = callPackage @@ -172353,6 +178385,7 @@ self: { testHaskellDepends = [ base doctest QuickCheck ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-maybe" = callPackage @@ -172371,6 +178404,7 @@ self: { description = "Arrays of Maybes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-simd" = callPackage @@ -172386,6 +178420,7 @@ self: { description = "SIMD data types and functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-sort" = callPackage @@ -172430,6 +178465,7 @@ self: { description = "ImageBoard on Happstack and HSP"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primula-bot" = callPackage @@ -172449,6 +178485,7 @@ self: { description = "Jabber-bot for primula-board ImageBoard"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pringletons" = callPackage @@ -172466,6 +178503,7 @@ self: { description = "Classes and data structures complementing the singletons library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "print-debugger" = callPackage @@ -172478,6 +178516,7 @@ self: { description = "Debug print formatting library"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "printcess" = callPackage @@ -172495,6 +178534,7 @@ self: { description = "Pretty printing with indentation, mixfix operators, and automatic line breaks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "printf-mauke" = callPackage @@ -172561,6 +178601,7 @@ self: { description = "Simple implementation of a priority queue"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "priority-sync" = callPackage @@ -172578,7 +178619,6 @@ self: { executableHaskellDepends = [ base ]; description = "Cooperative task prioritization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "private-hackage-uploader" = callPackage @@ -172655,8 +178695,8 @@ self: { pname = "probable"; version = "0.1.3"; sha256 = "196m3v30818q034x7jdnqdwfqffx5pfj64yyw0q2blhwzkhc0f9n"; - revision = "2"; - editedCabalFile = "01cah34a5bzqlf76aqpc3038gxq7iy4krrzrj788c11ybawq0mgn"; + revision = "3"; + editedCabalFile = "0fvvf9l4vkmnv7qffvkxd0rajv7n64v0550nd7cpjazns41y4lz2"; libraryHaskellDepends = [ base mtl mwc-random primitive statistics transformers vector ]; @@ -172665,6 +178705,8 @@ self: { ]; description = "Easy and reasonably efficient probabilistic programming and random generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proc" = callPackage @@ -172684,6 +178726,7 @@ self: { description = "Parse process information for Linux"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proc-net" = callPackage @@ -172733,6 +178776,7 @@ self: { description = "Conduits for processes (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "process-extras" = callPackage @@ -172769,6 +178813,7 @@ self: { description = "IterIO Process Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "process-leksah" = callPackage @@ -172781,6 +178826,7 @@ self: { description = "Process libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "process-listlike" = callPackage @@ -172798,6 +178844,7 @@ self: { description = "Process extras"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "process-progress" = callPackage @@ -172815,6 +178862,7 @@ self: { description = "Run a process and do reportsing on its progress"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "process-qq" = callPackage @@ -172832,6 +178880,7 @@ self: { description = "Quasi-Quoters for exec process"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "process-streaming" = callPackage @@ -172864,6 +178913,7 @@ self: { description = "Streaming interface to system processes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "processing" = callPackage @@ -172883,6 +178933,7 @@ self: { description = "Web graphic applications with processing.js."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "processing-for-haskell" = callPackage @@ -172938,6 +178989,7 @@ self: { description = "Haskell values that cannot be evaluated immediately"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "procstat" = callPackage @@ -172950,6 +179002,7 @@ self: { description = "get information on processes in Linux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proctest" = callPackage @@ -172986,6 +179039,7 @@ self: { description = "Simple streaming datatype"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "product" = callPackage @@ -172998,6 +179052,7 @@ self: { description = "Product category"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "product-isomorphic" = callPackage @@ -173058,6 +179113,7 @@ self: { description = "Convert GHC profiles into GraphViz's dot format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prof2pretty" = callPackage @@ -173077,6 +179133,7 @@ self: { description = "generate pretty source from time/allocation profiles"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "profiterole" = callPackage @@ -173104,8 +179161,8 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.4.5.0"; - sha256 = "18wyq1czj99zxgqmv6v2qpwlax3a4r7d93pc24ihzg5v8ps6iz89"; + version = "0.4.5.1"; + sha256 = "0mq2fal93v42rkgiq0xwqzqc413dgkiawa09bxgv0sgajzslqx80"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -173115,7 +179172,6 @@ self: { ]; description = "Treemap visualiser for GHC prof files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "profunctor-extras" = callPackage @@ -173172,6 +179228,7 @@ self: { description = "Simple progress tracking & projection library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "progress-meter" = callPackage @@ -173184,6 +179241,7 @@ self: { description = "Live diagnostics for concurrent activity"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "progress-reporting" = callPackage @@ -173211,6 +179269,7 @@ self: { description = "Progressbar API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "progression" = callPackage @@ -173228,6 +179287,7 @@ self: { description = "Automates the recording and graphing of criterion benchmarks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "progressive" = callPackage @@ -173247,6 +179307,7 @@ self: { description = "Multilabel classification model which learns sequentially (online)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proj4-hs-bindings" = callPackage @@ -173260,6 +179321,7 @@ self: { description = "Haskell bindings for the Proj4 C dynamic library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) proj;}; "project-m36" = callPackage @@ -173331,6 +179393,7 @@ self: { description = "Relational Algebra Engine"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "project-template" = callPackage @@ -173374,6 +179437,7 @@ self: { description = "Go to README.md"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "projection" = callPackage @@ -173415,7 +179479,6 @@ self: { ]; description = "A Prolog interpreter written in Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prolog-graph" = callPackage @@ -173434,6 +179497,7 @@ self: { description = "A command line tool to visualize query resolution in Prolog"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prolog-graph-lib" = callPackage @@ -173445,7 +179509,6 @@ self: { libraryHaskellDepends = [ base fgl graphviz mtl prolog text ]; description = "Generating images of resolution trees for Prolog queries"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prologue" = callPackage @@ -173491,6 +179554,7 @@ self: { description = "Prometheus Haskell Client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prometheus-client" = callPackage @@ -173545,6 +179609,7 @@ self: { description = "Instrument applications with metrics and publish/push to Prometheus"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prometheus-metrics-ghc" = callPackage @@ -173588,6 +179653,7 @@ self: { description = "A monadic interface for async"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "promises" = callPackage @@ -173631,6 +179697,7 @@ self: { description = "A library for interfacing with the CMU Pronouncing Dictionary"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proof-combinators" = callPackage @@ -173643,6 +179710,7 @@ self: { description = "Proof Combinators used in Liquid Haskell for Theorem Proving"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "propane" = callPackage @@ -173659,6 +179727,7 @@ self: { description = "Functional synthesis of images and animations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "propellor" = callPackage @@ -173681,7 +179750,6 @@ self: { executableHaskellDepends = [ base ]; description = "property-based host configuration management in haskell"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "properties" = callPackage @@ -173694,6 +179762,7 @@ self: { description = "check quickCheck properties in real time"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "property-list" = callPackage @@ -173714,6 +179783,7 @@ self: { description = "Apple property list parser"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proplang" = callPackage @@ -173726,6 +179796,7 @@ self: { description = "A library for functional GUI development"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "props" = callPackage @@ -173774,6 +179845,7 @@ self: { description = "Bindings to the Prosper marketplace API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proteaaudio" = callPackage @@ -173829,6 +179901,7 @@ self: { description = "neovim project manager"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proto-lens_0_2_2_0" = callPackage @@ -173926,6 +179999,7 @@ self: { description = "Utilities functions to proto-lens"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proto-lens-descriptors" = callPackage @@ -173943,6 +180017,7 @@ self: { description = "Protocol buffers for describing the definitions of messages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proto-lens-optparse" = callPackage @@ -174175,6 +180250,7 @@ self: { description = "Protocol Buffers via C++"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "protobuf-simple" = callPackage @@ -174248,6 +180324,7 @@ self: { description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "protocol-buffers-fork" = callPackage @@ -174265,6 +180342,7 @@ self: { description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "protocol-radius" = callPackage @@ -174300,6 +180378,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-radius-test_0_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers + , protocol-radius, QuickCheck, quickcheck-simple, transformers + }: + mkDerivation { + pname = "protocol-radius-test"; + version = "0.1.0.0"; + sha256 = "1zgfq76k86jf1jpm14mpb8iaiya0d6vz0lrmbwc0fn34hqhkcd88"; + libraryHaskellDepends = [ + base bytestring cereal containers protocol-radius QuickCheck + quickcheck-simple transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + description = "testsuit of protocol-radius haskell package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protolude" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text @@ -174330,6 +180426,7 @@ self: { description = "Protolude with lifted-base and lifted-async"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proton-haskell" = callPackage @@ -174349,6 +180446,7 @@ self: { description = "Simple XML templating library"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prototype" = callPackage @@ -174361,6 +180459,7 @@ self: { description = "prototype-based programming on Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prove-everywhere-server" = callPackage @@ -174382,14 +180481,15 @@ self: { description = "The server for ProveEverywhere"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proxied" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "proxied"; - version = "0.3"; - sha256 = "09pbvf40qykrzmg4lrk5krhx30gzsldk1bz2i6bb6d18bx14skak"; + version = "0.3.1"; + sha256 = "0ldcyvzg5i4axkn5qwgkc8vrc0f0715842ca41d7237p1bh98s4r"; libraryHaskellDepends = [ base ]; description = "Make functions consume Proxy instead of undefined"; license = stdenv.lib.licenses.bsd3; @@ -174416,6 +180516,7 @@ self: { description = "A library for kind-polymorphic manipulation and inspection of Proxy values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proxy-mapping" = callPackage @@ -174428,6 +180529,7 @@ self: { description = "Mapping of Proxy Types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "psc-ide" = callPackage @@ -174458,6 +180560,7 @@ self: { description = "Language support for the PureScript programming language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pseudo-boolean" = callPackage @@ -174494,6 +180597,7 @@ self: { description = "A tagged rose-tree with short circuited unique leaves"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pseudomacros" = callPackage @@ -174582,6 +180686,7 @@ self: { description = "Bindings for the pthread library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ptr" = callPackage @@ -174605,6 +180710,7 @@ self: { description = "Abstractions for operations on pointers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pub" = callPackage @@ -174638,7 +180744,6 @@ self: { benchmarkHaskellDepends = [ base criterion random ]; description = "The publicsuffix list exposed as proper Haskell types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "publicsuffixlist" = callPackage @@ -174676,6 +180781,7 @@ self: { description = "Create the publicsuffixlist package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "publish" = callPackage @@ -174698,6 +180804,8 @@ self: { ]; description = "Publishing tools for papers, books, and presentations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pubnub" = callPackage @@ -174731,6 +180839,7 @@ self: { description = "PubNub Haskell SDK"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pubsub" = callPackage @@ -174750,6 +180859,7 @@ self: { description = "A library for Google/SixApart pubsub hub interaction"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "puffytools" = callPackage @@ -174780,6 +180890,7 @@ self: { description = "A CLI assistant"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pugixml" = callPackage @@ -174797,6 +180908,7 @@ self: { description = "pugixml binding"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pugs-DrIFT" = callPackage @@ -174821,6 +180933,7 @@ self: { description = "DrIFT with pugs-specific rules"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pugs-HsSyck" = callPackage @@ -174854,6 +180967,7 @@ self: { description = "Portable Haskell/POSIX layer for Pugs"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pugs-hsregex" = callPackage @@ -174866,6 +180980,7 @@ self: { description = "Haskell PCRE binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pulse" = callPackage @@ -174922,6 +181037,7 @@ self: { description = "Multilingual unsupervised sentence tokenization with Punkt"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "punycode" = callPackage @@ -174957,6 +181073,7 @@ self: { description = "A program that displays the puppet resources associated to a node given .pp files."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pure-cdb" = callPackage @@ -174976,6 +181093,7 @@ self: { description = "Another pure-haskell CDB (Constant Database) implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pure-fft" = callPackage @@ -174999,6 +181117,7 @@ self: { description = "Pure IO monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pure-priority-queue" = callPackage @@ -175011,6 +181130,7 @@ self: { description = "A pure priority queue"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pure-priority-queue-tests" = callPackage @@ -175030,6 +181150,7 @@ self: { description = "Tests for the pure-priority-queue package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pure-shuffle" = callPackage @@ -175135,8 +181256,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.12.2"; - sha256 = "1y7bcfj6fdlwmisdd75xcdkz7grch0pcmb9xsh6zwyvi6c40a3g2"; + version = "0.12.3"; + sha256 = "0h4216x80cgqdvl7l0glw9xxhnpakh8272p65yc2d5zwbvvfra6k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175180,6 +181301,7 @@ self: { description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "purescript-bridge" = callPackage @@ -175247,6 +181369,7 @@ self: { description = "Isomorphic trivial data type definitions over JSON"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "purescript-tsd-gen" = callPackage @@ -175270,6 +181393,7 @@ self: { description = "TypeScript Declaration File (.d.ts) generator for PureScript"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pursuit-client" = callPackage @@ -175310,6 +181434,7 @@ self: { description = "A server-side library for sending push notifications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "push-notify-apn" = callPackage @@ -175355,6 +181480,7 @@ self: { description = "A server-side library for sending/receiving push notifications through CCS (Google Cloud Messaging)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "push-notify-general" = callPackage @@ -175374,6 +181500,7 @@ self: { description = "A general library for sending/receiving push notif. through dif. services."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pushbullet" = callPackage @@ -175423,6 +181550,7 @@ self: { description = "A Pusher.com client written in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pusher-http-haskell" = callPackage @@ -175467,6 +181595,7 @@ self: { description = "Implementation of the Pusher WebSocket protocol"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pushme" = callPackage @@ -175493,6 +181622,7 @@ self: { description = "Tool to synchronize directories with rsync, zfs or git-annex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pushover" = callPackage @@ -175530,6 +181660,7 @@ self: { description = "Put-based lens library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "puzzle-draw" = callPackage @@ -175562,6 +181693,7 @@ self: { description = "Creating graphics for pencil puzzles"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "puzzle-draw-cmdline" = callPackage @@ -175581,6 +181713,7 @@ self: { description = "Creating graphics for pencil puzzles, command line tools"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pvd" = callPackage @@ -175601,6 +181734,7 @@ self: { description = "A photo viewer daemon application with remote controlling abilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libdevil;}; "pvss" = callPackage @@ -175706,6 +181840,7 @@ self: { description = "Call python inline from haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) python;}; "pyfi" = callPackage @@ -175723,6 +181858,7 @@ self: { description = "Call python inline from haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) python;}; "python-pickle" = callPackage @@ -175747,6 +181883,7 @@ self: { description = "Serialization/deserialization using Python Pickle format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "q4c12-twofinger" = callPackage @@ -175766,6 +181903,7 @@ self: { description = "Efficient alternating finger trees"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "qc-oi-testgenerator" = callPackage @@ -175780,6 +181918,7 @@ self: { description = "Compile time generation of operation invariance tests for QuickCheck"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "qchas" = callPackage @@ -175809,6 +181948,7 @@ self: { description = "double-double and quad-double number type via libqd"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {qd = null;}; "qd-vec" = callPackage @@ -175821,6 +181961,7 @@ self: { description = "'Vec' instances for 'qd' types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "qed" = callPackage @@ -175840,6 +181981,7 @@ self: { description = "Simple prover"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "qhull-simple" = callPackage @@ -175853,6 +181995,7 @@ self: { description = "Simple bindings to Qhull, a library for computing convex hulls"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) qhull;}; "qif" = callPackage @@ -175873,6 +182016,7 @@ self: { description = "A simple QIF file format parser / printer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "qm-interpolated-string" = callPackage @@ -175936,8 +182080,8 @@ self: { "qr-imager" = callPackage ({ mkDerivation, base, binary, bytestring, cryptonite, directory - , haskell-qrencode, hspec, jose-jwt, JuicyPixels, libqrencode - , microlens, process, split, vector + , haskell-qrencode, hspec, jose-jwt, JuicyPixels, microlens + , process, qrencode, split, vector }: mkDerivation { pname = "qr-imager"; @@ -175947,12 +182091,13 @@ self: { base binary bytestring cryptonite directory haskell-qrencode jose-jwt JuicyPixels microlens process split vector ]; - libraryPkgconfigDepends = [ libqrencode ]; + libraryPkgconfigDepends = [ qrencode ]; testHaskellDepends = [ base hspec ]; description = "Library to generate images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libqrencode;}; + broken = true; + }) {inherit (pkgs) qrencode;}; "qr-repa" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, directory @@ -175972,6 +182117,7 @@ self: { description = "Library to generate QR codes from bytestrings and objects and scale image files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "qrcode" = callPackage @@ -176061,6 +182207,7 @@ self: { description = "Qt bindings for Haskell - C++ library"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs.qt5) qtbase;}; "qtah-examples" = callPackage @@ -176079,6 +182226,7 @@ self: { description = "Example programs for Qtah Qt bindings"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "qtah-generator" = callPackage @@ -176102,6 +182250,7 @@ self: { description = "Generator for Qtah Qt bindings"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "qtah-qt5" = callPackage @@ -176122,6 +182271,7 @@ self: { description = "Qt bindings for Haskell"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs.qt5) qtbase;}; "quack" = callPackage @@ -176157,7 +182307,6 @@ self: { ]; description = "An implementation of quadratic irrationals"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quandl-api" = callPackage @@ -176195,6 +182344,7 @@ self: { description = "Quant finance library in pure Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quantification" = callPackage @@ -176245,6 +182395,7 @@ self: { description = "An embedding of quantum computation as a Haskell arrow"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quantum-random" = callPackage @@ -176268,6 +182419,7 @@ self: { description = "Retrieve, store and manage real quantum random data"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "qudb" = callPackage @@ -176287,6 +182439,7 @@ self: { description = "Quite Useless DB"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quenya-verb" = callPackage @@ -176310,6 +182463,7 @@ self: { description = "Quenya verb conjugator"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "queryparser" = callPackage @@ -176330,6 +182484,7 @@ self: { description = "Analysis and parsing library for SQL queries"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "queryparser-demo" = callPackage @@ -176347,6 +182502,7 @@ self: { description = "Demo package containing queryparser examples"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "queryparser-hive" = callPackage @@ -176367,6 +182523,7 @@ self: { description = "Parsing for Hive SQL queries"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "queryparser-presto" = callPackage @@ -176387,6 +182544,7 @@ self: { description = "Parsing for Presto SQL queries"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "queryparser-vertica" = callPackage @@ -176407,6 +182565,7 @@ self: { description = "Parsing for Vertica SQL queries"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "querystring-pickle" = callPackage @@ -176441,6 +182600,7 @@ self: { description = "A package for prompting values from the command-line"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "queue" = callPackage @@ -176464,6 +182624,7 @@ self: { description = "A library of queuelike data structures, both functional and stateful"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quick-generator" = callPackage @@ -176495,6 +182656,7 @@ self: { description = "Slimmed down json schema language and validator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickbench" = callPackage @@ -176534,6 +182696,7 @@ self: { description = "QuickBooks API binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-arbitrary-adt" = callPackage @@ -176568,6 +182731,7 @@ self: { description = "Generate QuickCheck Gen for Sum Types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-assertions" = callPackage @@ -176603,6 +182767,7 @@ self: { description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-combinators" = callPackage @@ -176675,6 +182840,7 @@ self: { description = "Automating QuickCheck for polymorphic and overlaoded properties"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-properties" = callPackage @@ -176698,6 +182864,7 @@ self: { description = "Combinators for Quickcheck Property construction and diagnostics"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-property-monad" = callPackage @@ -176710,6 +182877,7 @@ self: { description = "A monad for generating QuickCheck properties without Arbitrary instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-regex" = callPackage @@ -176726,6 +182894,7 @@ self: { description = "Generate regex-constrained strings for QuickCheck"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-relaxng" = callPackage @@ -176742,6 +182911,7 @@ self: { description = "Generate RelaxNG-constrained XML documents for QuickCheck"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-rematch" = callPackage @@ -176755,6 +182925,7 @@ self: { description = "QuickCheck support for rematch"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-report" = callPackage @@ -176771,6 +182942,7 @@ self: { description = "Customizable reports for quickcheck properties"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-script" = callPackage @@ -176839,6 +183011,7 @@ self: { description = "Test monadic programs using state machine based models"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-state-machine_0_6_0" = callPackage @@ -176871,6 +183044,7 @@ self: { description = "Test monadic programs using state machine based models"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-state-machine-distributed" = callPackage @@ -176895,6 +183069,7 @@ self: { description = "Test monadic programs using state machine based models"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-string-random" = callPackage @@ -176903,15 +183078,14 @@ self: { }: mkDerivation { pname = "quickcheck-string-random"; - version = "0.1.1.0"; - sha256 = "1dxazyn5h2njhjs41x2cb5nwydf87a29yxgy7wv40s6fq6ajj084"; + version = "0.1.2.0"; + sha256 = "0n5h7nlicgm8xn23pvrsxrw4y2f4j1ammpbccl6z1c37yasf1xm7"; libraryHaskellDepends = [ base QuickCheck string-random text ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck text ]; description = "Helper to build generators with Text.StringRandom"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-text" = callPackage @@ -176958,6 +183132,7 @@ self: { description = "Utilities for using WebDriver with QuickCheck"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickcheck-with-counterexamples" = callPackage @@ -177002,6 +183177,7 @@ self: { description = "Generate Main module with QuickCheck tests"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickselect" = callPackage @@ -177028,6 +183204,7 @@ self: { description = "Very fast and memory-compact query-only set and map structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickson" = callPackage @@ -177091,6 +183268,7 @@ self: { description = "A reflective batch tester for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quickwebapp" = callPackage @@ -177110,6 +183288,7 @@ self: { description = "A quick webapp generator for any file processing tool"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quipper" = callPackage @@ -177127,6 +183306,7 @@ self: { description = "An embedded, scalable functional programming language for quantum computing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quipper-core" = callPackage @@ -177143,6 +183323,7 @@ self: { description = "An embedded, scalable functional programming language for quantum computing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quipper-rendering" = callPackage @@ -177160,6 +183341,7 @@ self: { description = "An embedded, scalable functional programming language for quantum computing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quiver" = callPackage @@ -177188,6 +183370,7 @@ self: { description = "Binary serialisation support for Quivers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quiver-bytestring" = callPackage @@ -177237,6 +183420,7 @@ self: { description = "Bridge between Quiver and Iteratee paradigms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quiver-groups" = callPackage @@ -177250,6 +183434,7 @@ self: { description = "Group and chunk values within a Quiver"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quiver-http" = callPackage @@ -177268,6 +183453,7 @@ self: { description = "Adapter to stream over HTTP(s) with quiver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quiver-instances" = callPackage @@ -177284,6 +183470,7 @@ self: { description = "Extra instances for Quiver"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quiver-interleave" = callPackage @@ -177297,6 +183484,7 @@ self: { description = "Interleave values from multiple Quivers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quiver-sort" = callPackage @@ -177321,6 +183509,7 @@ self: { description = "Sort the values in a quiver"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quoridor-hs" = callPackage @@ -177346,6 +183535,7 @@ self: { description = "A Quoridor implementation in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "qux" = callPackage @@ -177365,6 +183555,7 @@ self: { description = "Command line binary for working with the Qux language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "raaz" = callPackage @@ -177391,6 +183582,7 @@ self: { description = "The raaz cryptographic library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rabocsv2qif" = callPackage @@ -177421,6 +183613,7 @@ self: { description = "Reverse Automatic Differentiation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "radian" = callPackage @@ -177429,11 +183622,12 @@ self: { pname = "radian"; version = "0.1"; sha256 = "150vb9wk73avh8rrsz92y1fcwlm30w4k23lbdncb8ivinqhdi4pv"; + revision = "1"; + editedCabalFile = "1mkk17rrg2z6s1qkzz7qcm6q6qvgmcmvii9rzjzgn73m1x1l5rim"; libraryHaskellDepends = [ base profunctors ]; testHaskellDepends = [ base HUnit lens ]; description = "Isomorphisms for measurements that use radians"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "radium" = callPackage @@ -177451,6 +183645,7 @@ self: { description = "Chemistry"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "radium-formula-parser" = callPackage @@ -177467,6 +183662,7 @@ self: { description = "Chemistry"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "radius" = callPackage @@ -177498,6 +183694,7 @@ self: { description = "Command-line tool for emitting numbers in various bases"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "radix-tree" = callPackage @@ -177567,6 +183764,7 @@ self: { description = "librados haskell bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {rados = null;}; "raft" = callPackage @@ -177586,6 +183784,7 @@ self: { description = "Miscellaneous Haskell utilities for data structures and data manipulation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rail-compiler-editor" = callPackage @@ -177609,6 +183808,7 @@ self: { description = "Compiler and editor for the esolang rail"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rails-session" = callPackage @@ -177633,6 +183833,7 @@ self: { description = "Decrypt Ruby on Rails sessions in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rainbow" = callPackage @@ -177667,6 +183868,7 @@ self: { description = "Tests and QuickCheck generators to accompany rainbow"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rainbox" = callPackage @@ -177728,6 +183930,7 @@ self: { description = "distributed-process node"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rakhana" = callPackage @@ -177745,6 +183948,7 @@ self: { description = "Stream based PDF library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rakuten" = callPackage @@ -177770,6 +183974,7 @@ self: { description = "The Rakuten API in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ralist" = callPackage @@ -177796,6 +184001,7 @@ self: { description = "'$' in reverse"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "raml" = callPackage @@ -177812,6 +184018,7 @@ self: { description = "RESTful API Modeling Language (RAML) library for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ramus" = callPackage @@ -177838,6 +184045,7 @@ self: { description = "Random variable library, with Functor, Applicative and Monad instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "randfile" = callPackage @@ -177857,6 +184065,7 @@ self: { description = "Program for picking a random file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rando" = callPackage @@ -177872,6 +184081,7 @@ self: { description = "Easy-to-use randomness for livecoding"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "random" = callPackage @@ -177888,6 +184098,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "random-access-file" = callPackage + ({ mkDerivation, base, bytestring, concurrent-extra, containers + , criterion, directory, lrucaching, mwc-random, random, stm, unix + , unix-bytestring, unix-memory, vector + }: + mkDerivation { + pname = "random-access-file"; + version = "0.1.0.0"; + sha256 = "1cs62f6hswyzmq730y79sv0c7iifqm5v91mkam36iaigz3i2xpv0"; + libraryHaskellDepends = [ + base bytestring concurrent-extra containers directory lrucaching + stm unix unix-bytestring unix-memory + ]; + benchmarkHaskellDepends = [ + base bytestring concurrent-extra containers criterion directory + lrucaching mwc-random random stm unix unix-bytestring unix-memory + vector + ]; + description = "Random file access methods, supporting application-level page cache"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "random-access-list" = callPackage ({ mkDerivation, array, base, containers }: mkDerivation { @@ -177898,6 +184130,7 @@ self: { description = "Random-access lists in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "random-bytestring" = callPackage @@ -177940,6 +184173,7 @@ self: { description = "A Template Haskell helper for deriving Random instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "random-eff" = callPackage @@ -177952,6 +184186,7 @@ self: { description = "A simple random generator library for extensible-effects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "random-effin" = callPackage @@ -177964,6 +184199,7 @@ self: { description = "A simple random generator library for effin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "random-extras" = callPackage @@ -178010,6 +184246,7 @@ self: { description = "Multivariate distributions for random-fu"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "random-hypergeometric" = callPackage @@ -178028,6 +184265,7 @@ self: { description = "Random variate generation from hypergeometric distributions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "random-names" = callPackage @@ -178079,6 +184317,7 @@ self: { description = "An infinite stream of random data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "random-string" = callPackage @@ -178224,6 +184463,7 @@ self: { description = "Memory efficient sets with ranges of elements"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "range-space" = callPackage @@ -178245,6 +184485,7 @@ self: { description = "A Range type with vector-space instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rangemin" = callPackage @@ -178257,6 +184498,7 @@ self: { description = "Linear range-min algorithms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ranges" = callPackage @@ -178305,6 +184547,7 @@ self: { description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rank2classes" = callPackage @@ -178324,6 +184567,7 @@ self: { description = "standard type constructor class hierarchy, only with methods of rank 2 types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rapid" = callPackage @@ -178338,6 +184582,7 @@ self: { description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rapid-term" = callPackage @@ -178354,6 +184599,7 @@ self: { description = "External terminal support for rapid"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rasa" = callPackage @@ -178379,6 +184625,7 @@ self: { description = "A modular text editor"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rasa-example-config" = callPackage @@ -178399,6 +184646,7 @@ self: { description = "Example user config for Rasa"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rasa-ext-bufs" = callPackage @@ -178414,6 +184662,7 @@ self: { description = "Rasa Ext for useful buffer utilities"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rasa-ext-cmd" = callPackage @@ -178429,6 +184678,7 @@ self: { description = "Rasa Ext for running commands"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rasa-ext-cursors" = callPackage @@ -178445,6 +184695,7 @@ self: { description = "Rasa Ext adding cursor(s)"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rasa-ext-files" = callPackage @@ -178462,6 +184713,7 @@ self: { description = "Rasa Ext for filesystem actions"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rasa-ext-logger" = callPackage @@ -178474,6 +184726,7 @@ self: { description = "Rasa Ext for logging state/actions"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rasa-ext-slate" = callPackage @@ -178491,6 +184744,7 @@ self: { description = "Rasa extension for rendering to terminal with vty"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rasa-ext-status-bar" = callPackage @@ -178503,6 +184757,7 @@ self: { description = "Rasa Ext for populating status-bar"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rasa-ext-style" = callPackage @@ -178515,6 +184770,7 @@ self: { description = "Rasa Ext managing rendering styles"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rasa-ext-views" = callPackage @@ -178532,6 +184788,7 @@ self: { description = "Rasa Ext managing rendering views"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rasa-ext-vim" = callPackage @@ -178551,6 +184808,7 @@ self: { description = "Rasa Ext for vim bindings"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rascal" = callPackage @@ -178580,6 +184838,7 @@ self: { description = "A command-line client for Reddit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rasterific-svg" = callPackage @@ -178680,6 +184939,8 @@ self: { benchmarkHaskellDepends = [ base-noprelude gauge relude ]; description = "Client for rating.chgk.info API and CSV tables (documentation in Russian)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rating-systems" = callPackage @@ -178734,9 +184995,10 @@ self: { description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "rattletrap_6_2_1" = callPackage + "rattletrap_6_2_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, clock, containers, filepath, http-client , http-client-tls, HUnit, template-haskell, temporary, text @@ -178744,8 +185006,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "6.2.1"; - sha256 = "0pygwgq5q6mvpbkis2xiw6ac65fn8q9452qql5dc21p4mi27bwka"; + version = "6.2.3"; + sha256 = "0h542a6i1rc1zh2xy4fc9cdaq424hka77mxndg2ka8a0c0mj0jfp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178766,6 +185028,7 @@ self: { description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "raven-haskell" = callPackage @@ -178802,6 +185065,7 @@ self: { description = "Sentry http interface for Scotty web server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "raw-feldspar" = callPackage @@ -178828,6 +185092,7 @@ self: { description = "Resource-Aware Feldspar"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "raw-strings-qq" = callPackage @@ -178870,6 +185135,7 @@ self: { description = "Anonymous extensible records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rawstring-qm" = callPackage @@ -178899,6 +185165,7 @@ self: { description = "Random Access Zippers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "razom-text-util" = callPackage @@ -178918,6 +185185,7 @@ self: { description = "Common text/parsing tools for Razom language packages"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rbpcp-api" = callPackage @@ -178954,6 +185222,7 @@ self: { description = "Mask nucleotide (EST) sequences in Fasta format"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rc" = callPackage @@ -178978,6 +185247,7 @@ self: { description = "Reservoir Computing, fast RNNs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rclient" = callPackage @@ -179020,6 +185290,7 @@ self: { description = "Read-Copy-Update for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rdf" = callPackage @@ -179039,6 +185310,7 @@ self: { description = "Representation and Incremental Processing of RDF Data"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rdf4h" = callPackage @@ -179068,6 +185340,7 @@ self: { description = "A library for RDF processing in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rdioh" = callPackage @@ -179091,6 +185364,7 @@ self: { description = "A Haskell wrapper for Rdio's API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rdtsc" = callPackage @@ -179145,6 +185419,7 @@ self: { description = "A binding to React based on the Flux application architecture for GHCJS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "react-flux-servant" = callPackage @@ -179157,6 +185432,7 @@ self: { description = "Allow react-flux stores to send requests to a servant server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "react-haskell" = callPackage @@ -179175,6 +185451,7 @@ self: { description = "Haskell React bindings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "react-tutorial-haskell-server" = callPackage @@ -179193,6 +185470,7 @@ self: { description = "react-tutorial web server"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reaction-logic" = callPackage @@ -179208,6 +185486,7 @@ self: { description = "pluggable pure logic serializable reactor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reactive" = callPackage @@ -179238,6 +185517,7 @@ self: { description = "FRP (functional reactive programming) framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reactive-balsa" = callPackage @@ -179259,7 +185539,6 @@ self: { ]; description = "Programmatically edit MIDI events via ALSA and reactive-banana"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana" = callPackage @@ -179282,7 +185561,6 @@ self: { ]; description = "Library for functional reactive programming (FRP)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana-automation" = callPackage @@ -179300,6 +185578,7 @@ self: { description = "home (etc) automation using reactive-banana"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reactive-banana-bunch" = callPackage @@ -179315,7 +185594,6 @@ self: { ]; description = "Extend reactive-banana to multiple events per time point"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana-gi-gtk" = callPackage @@ -179333,6 +185611,7 @@ self: { description = "Simple reactive programming with GTK GObject Introspection"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reactive-banana-sdl" = callPackage @@ -179350,6 +185629,7 @@ self: { description = "Reactive Banana bindings for SDL"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reactive-banana-sdl2" = callPackage @@ -179363,6 +185643,7 @@ self: { description = "Reactive Banana integration with SDL2"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reactive-banana-threepenny" = callPackage @@ -179378,6 +185659,7 @@ self: { description = "Examples for the reactive-banana library, using threepenny-gui"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reactive-banana-wx" = callPackage @@ -179396,6 +185678,7 @@ self: { description = "Examples for the reactive-banana library, using wxHaskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reactive-fieldtrip" = callPackage @@ -179413,6 +185696,7 @@ self: { description = "Connect Reactive and FieldTrip"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reactive-glut" = callPackage @@ -179429,6 +185713,7 @@ self: { description = "Connects Reactive and GLUT"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reactive-haskell" = callPackage @@ -179471,7 +185756,6 @@ self: { ]; description = "Process MIDI events via reactive-banana and JACK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-midyim" = callPackage @@ -179491,7 +185775,6 @@ self: { ]; description = "Process MIDI events via reactive-banana"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-thread" = callPackage @@ -179509,6 +185792,7 @@ self: { description = "Reactive programming via imperative threads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reactivity" = callPackage @@ -179526,7 +185810,7 @@ self: { ]; description = "An alternate implementation of push-pull FRP"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.none; }) {}; "reactor" = callPackage @@ -179544,6 +185828,7 @@ self: { description = "Reactor - task parallel reactive programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "read-bounded" = callPackage @@ -179593,6 +185878,7 @@ self: { description = "Read IO library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "readable" = callPackage @@ -179641,6 +185927,7 @@ self: { description = "Readline with variables (setX/getY) wrapped in state vars"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "readme-lhs" = callPackage @@ -179663,6 +185950,7 @@ self: { description = "See readme.lhs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "readpyc" = callPackage @@ -179677,6 +185965,7 @@ self: { description = "Read and pretty print Python bytecode (.pyc) files."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "readshp" = callPackage @@ -179695,6 +185984,7 @@ self: { description = "Code for reading ESRI Shapefiles"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "real-day-end" = callPackage @@ -179723,6 +186013,53 @@ self: { description = "A really simple XML parser"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "reanimate" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , cubicbezier, diagrams, diagrams-contrib, diagrams-core + , diagrams-lib, diagrams-svg, directory, filepath, fsnotify + , hashable, JuicyPixels, lens, linear, matrices, matrix, mtl + , palette, parallel, process, reanimate-svg, svg-builder, text + , time, unix, websockets, xml + }: + mkDerivation { + pname = "reanimate"; + version = "0.1.4.1"; + sha256 = "04yzlznyrd4c21732ijl1y5c8kg6x3139jv3d5qvcxphsmkxw81f"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers cubicbezier diagrams + diagrams-contrib diagrams-core diagrams-lib diagrams-svg directory + filepath fsnotify hashable JuicyPixels lens linear matrices matrix + mtl palette parallel process reanimate-svg svg-builder text time + unix websockets xml + ]; + description = "Animation library based on SVGs"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + + "reanimate-svg" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, hspec + , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text + , transformers, vector, xml + }: + mkDerivation { + pname = "reanimate-svg"; + version = "0.8.2.0"; + sha256 = "1bry53rhiqdcckn92k2l2n31c3lfcvzqr7k1pm75kqwcf7wy0pwq"; + libraryHaskellDepends = [ + attoparsec base bytestring containers JuicyPixels lens linear mtl + scientific text transformers vector xml + ]; + testHaskellDepends = [ + attoparsec base hspec linear scientific svg-tree + ]; + description = "SVG file loader and serializer"; + license = stdenv.lib.licenses.bsd3; }) {}; "reasonable-lens" = callPackage @@ -179735,6 +186072,7 @@ self: { description = "Lens implementation. It is more small but adequately."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reasonable-operational" = callPackage @@ -179809,6 +186147,7 @@ self: { description = "Anonymous records"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "record-aeson" = callPackage @@ -179826,6 +186165,7 @@ self: { description = "Instances of \"aeson\" classes for the \"record\" types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "record-dot-preprocessor" = callPackage @@ -179858,6 +186198,7 @@ self: { description = "Generic encoding of records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "record-gl" = callPackage @@ -179882,6 +186223,7 @@ self: { description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "record-preprocessor" = callPackage @@ -179902,6 +186244,7 @@ self: { description = "Compiler preprocessor introducing a syntactic extension for anonymous records"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "record-syntax" = callPackage @@ -179926,6 +186269,7 @@ self: { description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "records" = callPackage @@ -179940,6 +186284,7 @@ self: { description = "A flexible record system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "records-sop" = callPackage @@ -179975,14 +186320,15 @@ self: { description = "Template Haskell declarations for the records package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "recursion" = callPackage ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "2.2.2.0"; - sha256 = "1ij7yxh06zb7fjkba2ghq88kvhr1rw4jlc0miwqfl53f6ssvcklf"; + version = "2.2.3.0"; + sha256 = "193v6ygjhgv8l5b31gs4279dah677lhlj68kvj80pw5vj5azyawr"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for GHC"; license = stdenv.lib.licenses.bsd3; @@ -179994,35 +186340,15 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.1.1"; - sha256 = "0qw112jkl6jzy3wcyxvv5liv16mxiiqi5v5zyzazl9p8h2wy1rb0"; + version = "5.1.2"; + sha256 = "0mya8lijdnxw3vm0dqp878gqmd3qfymk1dnp6hqihbvsnzm5l910"; libraryHaskellDepends = [ base base-orphans comonad free template-haskell th-abstraction transformers ]; testHaskellDepends = [ base HUnit template-haskell transformers ]; description = "Representing common recursion patterns as higher-order functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "recursion-schemes_5_1_1_1" = callPackage - ({ mkDerivation, base, base-orphans, comonad, free, HUnit - , template-haskell, th-abstraction, transformers - }: - mkDerivation { - pname = "recursion-schemes"; - version = "5.1.1.1"; - sha256 = "0f9f1x1vjdqk6bzgsiqv7z7fq955dlkca3m0l4sc2mnpds3b0cgj"; - revision = "1"; - editedCabalFile = "19sqa4v3knasdmfzwmal1pi0yfj3zllrdr6n1chjvy1b6fa5za7z"; - libraryHaskellDepends = [ - base base-orphans comonad free template-haskell th-abstraction - transformers - ]; - testHaskellDepends = [ base HUnit template-haskell transformers ]; - description = "Representing common recursion patterns as higher-order functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = stdenv.lib.licenses.bsd2; }) {}; "recursion-schemes-ext" = callPackage @@ -180059,7 +186385,6 @@ self: { ]; description = "Count lines in files and display them hierarchically"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "recursors" = callPackage @@ -180073,6 +186398,7 @@ self: { description = "Auto-generate final encodings and their isomorphisms using Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "red-black-record" = callPackage @@ -180081,13 +186407,14 @@ self: { }: mkDerivation { pname = "red-black-record"; - version = "1.1.0.0"; - sha256 = "12q3b44qcb8zp5m0zrbj88kigk00rm6ljrnpwd29wv1gdwzd15af"; + version = "2.0.2.2"; + sha256 = "1afmqdgd0xhawjckjz318561zsr478a7jkpr20l7alic6zxnl4z9"; libraryHaskellDepends = [ base sop-core ]; testHaskellDepends = [ aeson base bytestring doctest profunctors sop-core tasty tasty-hunit text ]; + doHaddock = false; description = "Extensible records and variants indexed by a type-level Red-Black tree"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180144,6 +186471,7 @@ self: { description = "Library for interfacing with Reddit's API"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "redis" = callPackage @@ -180161,6 +186489,7 @@ self: { description = "A driver for Redis key-value database"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "redis-hs" = callPackage @@ -180240,6 +186569,7 @@ self: { description = "Simple redis bindings for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "redland" = callPackage @@ -180253,6 +186583,7 @@ self: { description = "Redland RDF library bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {raptor2 = null; redland = null;}; "redo" = callPackage @@ -180296,6 +186627,7 @@ self: { description = "Simplify a set of equations by removing redundancies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reducers" = callPackage @@ -180341,6 +186673,7 @@ self: { description = "Reed-Solomon Erasure Coding in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reenact" = callPackage @@ -180355,6 +186688,7 @@ self: { description = "A reimplementation of the Reactive library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reexport-crypto-random" = callPackage @@ -180377,6 +186711,7 @@ self: { description = "Generic Mutable Ref Abstraction Layer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ref-fd" = callPackage @@ -180389,6 +186724,7 @@ self: { description = "A type class for monads with references using functional dependencies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ref-mtl" = callPackage @@ -180401,6 +186737,7 @@ self: { description = "A type class for monads with references compatible with the mtl2 library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ref-tf" = callPackage @@ -180414,7 +186751,6 @@ self: { libraryHaskellDepends = [ base stm transformers ]; description = "A type class for monads with references using type families"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "refact" = callPackage @@ -180448,6 +186784,7 @@ self: { description = "Container with element counts"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reference" = callPackage @@ -180499,6 +186836,7 @@ self: { description = "A command-line tool for pasting to https://www.refheap.com"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "refined" = callPackage @@ -180515,6 +186853,8 @@ self: { ]; description = "Refinement types with static and runtime checking"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reflection" = callPackage @@ -180541,6 +186881,7 @@ self: { description = "Utilities for the reflection package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reflection-without-remorse" = callPackage @@ -180567,10 +186908,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.5"; - sha256 = "0c9idjkbnw822ky7dn374vq43kivdy0znf2k2w43q7yw7snjh09r"; - revision = "1"; - editedCabalFile = "1l5xsinln6wyj726ilqvvg4y0qk645j5ffiyhmda8qi9rmyk2a2x"; + version = "0.5.0.1"; + sha256 = "0al49xxy8zr28v0c9crjwp8khkrm04sbcq98dgkf8c95fi2mrxnb"; libraryHaskellDepends = [ base bifunctors comonad containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts @@ -180591,6 +186930,7 @@ self: { description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reflex-animation" = callPackage @@ -180608,6 +186948,7 @@ self: { description = "Continuous animations support for reflex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reflex-dom" = callPackage @@ -180692,6 +187033,8 @@ self: { ]; description = "Functional Reactive Web Apps with Reflex"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reflex-dom-fragment-shader-canvas" = callPackage @@ -180742,6 +187085,7 @@ self: { description = "An reflex interface for gloss"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reflex-gloss-scene" = callPackage @@ -180770,6 +187114,7 @@ self: { description = "A simple scene-graph using reflex and gloss"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reflex-jsx" = callPackage @@ -180804,6 +187149,7 @@ self: { description = "Useful missing instances for Reflex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reflex-sdl2" = callPackage @@ -180824,6 +187170,7 @@ self: { description = "SDL2 and reflex FRP"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reflex-transformers" = callPackage @@ -180840,6 +187187,7 @@ self: { description = "Collections and switchable Monad transformers for Reflex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reform" = callPackage @@ -180915,6 +187263,7 @@ self: { description = "The parser and render to parsec and render the string"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "refresht" = callPackage @@ -180931,6 +187280,7 @@ self: { description = "Environment Monad with automatic resource refreshment"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "refty" = callPackage @@ -180971,6 +187321,7 @@ self: { description = "Tools for maintaining a database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regex" = callPackage @@ -181072,6 +187423,7 @@ self: { description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Brzozowski's Deriviatives"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regex-dfa" = callPackage @@ -181084,6 +187436,7 @@ self: { description = "Replaces/Enhances Text.Regex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regex-do" = callPackage @@ -181173,6 +187526,7 @@ self: { description = "Generate a random string from a PCRE"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regex-genex" = callPackage @@ -181204,6 +187558,7 @@ self: { description = "Replaces/Enhances Text.Regex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regex-pcre" = callPackage @@ -181266,6 +187621,7 @@ self: { description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regex-posix" = callPackage @@ -181328,6 +187684,7 @@ self: { description = "Parse with regular expressions on Producers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regex-tdfa-quasiquoter" = callPackage @@ -181340,6 +187697,7 @@ self: { description = "Quasi-quoter for TDFA (extended POSIX) regular expressions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regex-tdfa-rc" = callPackage @@ -181356,6 +187714,7 @@ self: { description = "Replaces/Enhances Text.Regex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regex-tdfa-text" = callPackage @@ -181403,6 +187762,7 @@ self: { description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regex-tre" = callPackage @@ -181416,6 +187776,7 @@ self: { description = "Replaces/Enhances Text.Regex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) tre;}; "regex-type" = callPackage @@ -181428,6 +187789,7 @@ self: { description = "Type-level regular expressions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regex-with-pcre" = callPackage @@ -181458,6 +187820,7 @@ self: { description = "A regular expression library for W3C XML Schema regular expressions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regexchar" = callPackage @@ -181514,6 +187877,7 @@ self: { description = "Regular Expressions on Tries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regexpr" = callPackage @@ -181538,6 +187902,7 @@ self: { description = "Regular expressions via symbolic manipulation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regexqq" = callPackage @@ -181552,6 +187917,7 @@ self: { description = "A quasiquoter for PCRE regexes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regional-pointers" = callPackage @@ -181567,6 +187933,7 @@ self: { description = "Regional memory pointers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regions" = callPackage @@ -181583,6 +187950,7 @@ self: { description = "Provides the region monad for safely opening and working with scarce resources"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regions-monadsfd" = callPackage @@ -181599,6 +187967,7 @@ self: { description = "Monads-fd instances for the RegionT monad transformer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regions-monadstf" = callPackage @@ -181615,6 +187984,7 @@ self: { description = "Monads-tf instances for the RegionT monad transformer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regions-mtl" = callPackage @@ -181627,6 +187997,7 @@ self: { description = "mtl instances for the RegionT monad transformer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "register-machine-typelevel" = callPackage @@ -181639,6 +188010,7 @@ self: { description = "A computationally universal register machine implementation at the type-level"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "registry" = callPackage @@ -181676,6 +188048,7 @@ self: { description = "Linear and logistic regression through automatic differentiation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regular" = callPackage @@ -181690,6 +188063,7 @@ self: { description = "Generic programming library for regular datatypes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regular-extras" = callPackage @@ -181702,6 +188076,7 @@ self: { description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regular-web" = callPackage @@ -181718,6 +188093,7 @@ self: { description = "Generic programming for the web"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regular-xmlpickler" = callPackage @@ -181730,6 +188106,7 @@ self: { description = "Generic generation of HXT XmlPickler instances using Regular"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reheat" = callPackage @@ -181745,6 +188122,7 @@ self: { description = "to make notes and reduce impact on idle time on writing other programms"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rehoo" = callPackage @@ -181780,6 +188158,7 @@ self: { description = "Process lists easily"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reified-records" = callPackage @@ -181792,6 +188171,7 @@ self: { description = "Reify records to Maps and back again"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reify" = callPackage @@ -181808,6 +188188,7 @@ self: { description = "Serialize data"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reinterpret-cast" = callPackage @@ -181835,6 +188216,7 @@ self: { description = "A relation data structure"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "relapse" = callPackage @@ -181853,7 +188235,6 @@ self: { ]; description = "Sensible RLP encoding"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relation" = callPackage @@ -181866,6 +188247,7 @@ self: { description = "A data structure representing Relations on Sets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "relational-postgresql8" = callPackage @@ -181884,6 +188266,7 @@ self: { description = "PostgreSQL v8.x driver for haskell-relational-record"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "relational-query" = callPackage @@ -181997,6 +188380,7 @@ self: { description = "Durations and generalized time parsing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "relevant-time" = callPackage @@ -182055,6 +188439,7 @@ self: { description = "A web based Haskell IDE"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "relude" = callPackage @@ -182098,6 +188483,7 @@ self: { description = "A DSL for marking student work"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "remarks" = callPackage @@ -182120,6 +188506,7 @@ self: { description = "A DSL for marking student work"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rematch" = callPackage @@ -182162,6 +188549,7 @@ self: { description = "Cloud Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "remote-debugger" = callPackage @@ -182178,6 +188566,7 @@ self: { description = "Interface to ghci debugger"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "remote-json" = callPackage @@ -182203,6 +188592,7 @@ self: { description = "Remote Monad implementation of the JSON RPC protocol"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "remote-json-client" = callPackage @@ -182221,6 +188611,7 @@ self: { description = "Web client wrapper for remote-json"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "remote-json-server" = callPackage @@ -182239,6 +188630,7 @@ self: { description = "Web server wrapper for remote-json"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "remote-monad" = callPackage @@ -182262,6 +188654,7 @@ self: { description = "An parametrizable Remote Monad, and parametrizable Applicative Functor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "remotion" = callPackage @@ -182295,6 +188688,22 @@ self: { description = "A library for client-server applications based on custom protocols"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "render-utf8" = callPackage + ({ mkDerivation, base, bytestring, fmt, semigroups, text + , transformers + }: + mkDerivation { + pname = "render-utf8"; + version = "0.1.0.0"; + sha256 = "1mp52cv3mf6px1f4f9zdba2y1q6zssc64ny24a3h7dd8axmn1szg"; + libraryHaskellDepends = [ + base bytestring fmt semigroups text transformers + ]; + description = "Simple Utf8 wrapper for ByteString Builder with conversion classes"; + license = stdenv.lib.licenses.bsd3; }) {}; "renderable" = callPackage @@ -182379,6 +188788,7 @@ self: { description = "Bulk array representations and operators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repa-bytestring" = callPackage @@ -182392,6 +188802,7 @@ self: { description = "(deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repa-convert" = callPackage @@ -182408,6 +188819,7 @@ self: { description = "Packing and unpacking flat tables"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repa-devil" = callPackage @@ -182421,6 +188833,7 @@ self: { description = "Support for image reading and writing of Repa arrays using in-place FFI calls"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libdevil;}; "repa-eval" = callPackage @@ -182433,6 +188846,7 @@ self: { description = "Low-level parallel operators on bulk random-accessble arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repa-examples" = callPackage @@ -182492,6 +188906,7 @@ self: { description = "Data-parallel data flows"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repa-io" = callPackage @@ -182521,6 +188936,7 @@ self: { description = "HMatrix operations for Repa"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repa-plugin" = callPackage @@ -182538,6 +188954,7 @@ self: { description = "Data Flow Fusion GHC Plugin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repa-scalar" = callPackage @@ -182554,6 +188971,7 @@ self: { description = "Scalar data types and conversions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repa-series" = callPackage @@ -182566,6 +188984,7 @@ self: { description = "Series Expressionss API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repa-sndfile" = callPackage @@ -182596,6 +189015,7 @@ self: { description = "Stream functions not present in the vector library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repa-v4l2" = callPackage @@ -182616,6 +189036,7 @@ self: { description = "Provides high-level access to webcams"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repl" = callPackage @@ -182630,6 +189051,7 @@ self: { description = "IRC friendly REPL library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repl-toolkit" = callPackage @@ -182675,6 +189097,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repline" = callPackage @@ -182715,6 +189138,7 @@ self: { description = "Blogging module using blaze html for markup"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repr" = callPackage @@ -182731,6 +189155,7 @@ self: { description = "Render overloaded expressions to their textual representation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "repr-tree-syb" = callPackage @@ -182761,6 +189186,7 @@ self: { description = "Representable functors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "representable-profunctors" = callPackage @@ -182792,6 +189218,7 @@ self: { description = "Tries from representations of polynomial functors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reprinter" = callPackage @@ -182807,6 +189234,7 @@ self: { description = "Scrap Your Reprinter"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reproject" = callPackage @@ -182820,6 +189248,7 @@ self: { description = "Define and combine \"materialized\" projections"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "req" = callPackage @@ -182854,7 +189283,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "req_2_0_0" = callPackage + "req_2_0_1" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, hspec, hspec-core , hspec-discover, http-api-data, http-client, http-client-tls @@ -182863,8 +189292,8 @@ self: { }: mkDerivation { pname = "req"; - version = "2.0.0"; - sha256 = "0avwvslsb689p9afbh3k0zwmqwkrqagicz26xcyfjsd5648mh3wr"; + version = "2.0.1"; + sha256 = "1mfm6yy23l64kqbxvp1yn3yqf7fl46as87rz4yazg7f5x13bas3r"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -182907,6 +189336,7 @@ self: { description = "Conduit helpers for the req HTTP client library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "req-oauth2" = callPackage @@ -182974,15 +189404,14 @@ self: { }: mkDerivation { pname = "reqcatcher"; - version = "0.1.1.0"; - sha256 = "15qpd11ijbip88pf7sn1cmms369cv963l2xdp3wxg7qvlf362ns8"; + version = "0.1.2.0"; + sha256 = "0vwk4cl3jcahwg9sggic1rac2l2ia3nv3f4ri8iv8qknwah8mf5n"; libraryHaskellDepends = [ base http-types network text wai warp ]; testHaskellDepends = [ base http-client http-types HUnit lens tasty tasty-hunit wai wreq ]; description = "A local http server to catch the HTTP redirect"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "request-monad" = callPackage @@ -182995,6 +189424,7 @@ self: { description = "A transformer for generic requests"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "require" = callPackage @@ -183026,6 +189456,7 @@ self: { description = "Scrap your qualified import clutter"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rerebase" = callPackage @@ -183085,6 +189516,7 @@ self: { description = "Reserve reloads web applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reservoir" = callPackage @@ -183097,6 +189529,7 @@ self: { description = "Unweighted reservoir sampling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "resin" = callPackage @@ -183122,6 +189555,7 @@ self: { description = "Compute total resistance of a cube of resistors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "resolv" = callPackage @@ -183158,6 +189592,7 @@ self: { description = "A name resolusion library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "resolve-trivial-conflicts" = callPackage @@ -183177,6 +189612,7 @@ self: { description = "Remove trivial conflict markers in a git repository"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "resource-effect" = callPackage @@ -183196,6 +189632,7 @@ self: { description = "A port of the package 'resourcet' for extensible effects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "resource-embed" = callPackage @@ -183210,6 +189647,7 @@ self: { description = "Embed data files via C and FFI"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "resource-pool" = callPackage @@ -183243,6 +189681,7 @@ self: { description = "Fork of resource-pool, with a MonadCatchIO constraint"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "resource-pool-monad" = callPackage @@ -183275,6 +189714,7 @@ self: { description = "Allocate resources which are guaranteed to be released"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "resourcet_1_1_11" = callPackage @@ -183341,6 +189781,7 @@ self: { description = "process and route HTTP requests and generate responses on top of WAI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rest-client" = callPackage @@ -183363,6 +189804,7 @@ self: { description = "Utility library for use in generated API client libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rest-core" = callPackage @@ -183391,6 +189833,7 @@ self: { description = "Rest API library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rest-example" = callPackage @@ -183414,6 +189857,7 @@ self: { description = "Example project for rest"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rest-gen" = callPackage @@ -183442,6 +189886,7 @@ self: { description = "Documentation and client generation from rest definition"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rest-happstack" = callPackage @@ -183460,6 +189905,7 @@ self: { description = "Rest driver for Happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rest-snap" = callPackage @@ -183478,6 +189924,7 @@ self: { description = "Rest driver for Snap"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rest-stringmap" = callPackage @@ -183495,6 +189942,7 @@ self: { description = "Maps with stringy keys that can be transcoded to JSON and XML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rest-types" = callPackage @@ -183515,6 +189963,7 @@ self: { description = "Silk Rest Framework Types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rest-wai" = callPackage @@ -183535,6 +189984,7 @@ self: { description = "Rest driver for WAI applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "restful-snap" = callPackage @@ -183555,6 +190005,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "restless-git" = callPackage @@ -183592,6 +190043,7 @@ self: { description = "Running worker processes under system resource restrictions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "restyle" = callPackage @@ -183607,6 +190059,7 @@ self: { description = "Convert between camel case and separated words style"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "result" = callPackage @@ -183655,6 +190108,7 @@ self: { description = "A driver for RethinkDB 2.2"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rethinkdb-client-driver" = callPackage @@ -183684,6 +190138,7 @@ self: { description = "Client driver for RethinkDB"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rethinkdb-model" = callPackage @@ -183700,6 +190155,7 @@ self: { description = "Useful tools for modeling data with rethinkdb"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rethinkdb-wereHamster" = callPackage @@ -183720,6 +190176,7 @@ self: { description = "RethinkDB driver for Haskell"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "retry" = callPackage @@ -183775,6 +190232,7 @@ self: { description = "Retry failed commands"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rev-state" = callPackage @@ -183840,6 +190298,7 @@ self: { description = "Simple reverse geocoding using OpenStreeMap"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reversi" = callPackage @@ -183854,6 +190313,7 @@ self: { description = "Text-only reversi (aka othelo) game"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rewrite" = callPackage @@ -183870,6 +190330,7 @@ self: { description = "open file and rewrite it with new contents"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rewriting" = callPackage @@ -183882,6 +190343,7 @@ self: { description = "Generic rewriting library for regular datatypes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rex" = callPackage @@ -183918,6 +190380,7 @@ self: { description = "Github resume generator"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rfc" = callPackage @@ -183952,6 +190415,7 @@ self: { description = "Robert Fischer's Common library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rfc-env" = callPackage @@ -183964,6 +190428,7 @@ self: { description = "Environment variable support from the Robert Fischer Commons"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rfc-http-client" = callPackage @@ -183982,6 +190447,7 @@ self: { description = "The HTTP client extensions from the Robert Fischer Commons"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rfc-prelude" = callPackage @@ -184006,6 +190472,7 @@ self: { description = "The Prelude from the Robert Fischer Commons"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rfc-psql" = callPackage @@ -184023,6 +190490,7 @@ self: { description = "The PostgreSQL extensions from the Robert Fischer Commons"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rfc-redis" = callPackage @@ -184035,6 +190503,7 @@ self: { description = "The Redis extensions from the Robert Fischer Commons"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rfc-servant" = callPackage @@ -184057,6 +190526,7 @@ self: { description = "The Servant extensions from the Robert Fischer Commons"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rfc1413-server" = callPackage @@ -184149,6 +190619,7 @@ self: { description = "Functional Reactive Programming with type-level clocks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rhine-gloss" = callPackage @@ -184164,6 +190635,7 @@ self: { description = "Gloss backend for Rhine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rhythm-game-tutorial" = callPackage @@ -184183,6 +190655,7 @@ self: { description = "Haskell rhythm game tutorial"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "riak" = callPackage @@ -184197,8 +190670,8 @@ self: { }: mkDerivation { pname = "riak"; - version = "1.1.2.5"; - sha256 = "1ln7qm6rl8nr4fc1109pk0jmnqhw4dm3q2jfmvd4a34whplzwln7"; + version = "1.1.2.6"; + sha256 = "0dialr56k5406zav54hk4lx6dr9yisv8yq0hrjjga5my08ga5v4y"; libraryHaskellDepends = [ aeson async attoparsec base bifunctors binary blaze-builder bytestring containers data-default-class deepseq @@ -184224,8 +190697,8 @@ self: { }: mkDerivation { pname = "riak-protobuf"; - version = "0.23.0.0"; - sha256 = "0cyarnp2yqlj98zdbd51krpz3ls75vcl8am6h4wf98b6vdmx1jsx"; + version = "0.24.0.0"; + sha256 = "175sww7s8r1brl3iz2m3vxx8ffk059ciyvzxqfn47cwf8yljw10s"; libraryHaskellDepends = [ array base parsec protocol-buffers protocol-buffers-descriptor ]; @@ -184240,8 +190713,8 @@ self: { }: mkDerivation { pname = "riak-protobuf-lens"; - version = "0.23.0.0"; - sha256 = "0i01p6ix5304hd9alahq5bpmcf1rzc9k2qqy6n7c002fmnwsw2zw"; + version = "0.24.0.0"; + sha256 = "1qmpa4vg5mxkx804c2bl6dnsgwrvv9hj62a208ns2smps6fnbndh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184258,32 +190731,35 @@ self: { "ribosome" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , data-default-class, deepseq, directory, either, filepath - , hslogger, HTF, lens, messagepack, MissingH, mtl, nvim-hs - , pretty-terminal, prettyprinter, process, resourcet, safe, split - , stm, strings, text, time, transformers, unliftio, utf8-string + , data-default, deepseq, directory, either, filepath, hslogger, HTF + , lens, messagepack, MissingH, mtl, nvim-hs, pretty-terminal + , prettyprinter, prettyprinter-ansi-terminal, process, resourcet + , safe, split, stm, text, time, transformers, typed-process, unix + , unliftio, unliftio-core, utf8-string }: mkDerivation { pname = "ribosome"; - version = "0.1.2.0"; - sha256 = "0sx4c7inv7dgy68wjnl13wmx6ybfjwl6flf2x9wz5aw1v5ssaw8z"; + version = "0.2.2.0"; + sha256 = "0cz0ksrxin9k8pnzfhvv6ihskba7kmrwn6np3bdg6rq2g9745v9d"; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring containers data-default-class - deepseq directory either filepath hslogger lens messagepack - MissingH mtl nvim-hs pretty-terminal prettyprinter process - resourcet safe split stm strings text time transformers unliftio - utf8-string + aeson ansi-terminal base bytestring containers data-default deepseq + directory either filepath hslogger lens messagepack MissingH mtl + nvim-hs pretty-terminal prettyprinter prettyprinter-ansi-terminal + process resourcet safe split stm text time transformers + typed-process unix unliftio unliftio-core utf8-string ]; testHaskellDepends = [ - aeson ansi-terminal base bytestring containers data-default-class - deepseq directory either filepath hslogger HTF lens messagepack - MissingH mtl nvim-hs pretty-terminal prettyprinter process - resourcet safe split stm strings text time transformers unliftio + aeson ansi-terminal base bytestring containers data-default deepseq + directory either filepath hslogger HTF lens messagepack MissingH + mtl nvim-hs pretty-terminal prettyprinter + prettyprinter-ansi-terminal process resourcet safe split stm text + time transformers typed-process unix unliftio unliftio-core utf8-string ]; description = "api extensions for nvim-hs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "richreports" = callPackage @@ -184324,6 +190800,7 @@ self: { description = "Quick metrics to grow your app strong"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ridley-extras" = callPackage @@ -184342,6 +190819,7 @@ self: { description = "Handy metrics that don't belong to ridley"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "riemann" = callPackage @@ -184372,6 +190850,7 @@ self: { description = "A Riemann client for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "riff" = callPackage @@ -184391,6 +190870,23 @@ self: { description = "RIFF parser for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "rigel-viz" = callPackage + ({ mkDerivation, aeson, base, bytestring, colour, containers, hspec + , QuickCheck, text + }: + mkDerivation { + pname = "rigel-viz"; + version = "0.2.0.0"; + sha256 = "0z6c6hynisf5165c4izh31bfr4zcdik13ww5c4ylpqzxsig2z5xs"; + libraryHaskellDepends = [ + aeson base bytestring colour containers text + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A mid-level wrapper for vega-lite"; + license = stdenv.lib.licenses.bsd3; }) {}; "ring-buffer" = callPackage @@ -184406,6 +190902,7 @@ self: { description = "A concurrent, mutable ring-buffer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rio" = callPackage @@ -184470,6 +190967,7 @@ self: { description = "Riot is an Information Organisation Tool"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ncurses;}; "ripple" = callPackage @@ -184540,6 +191038,7 @@ self: { description = "Reduced instruction set i386 simulator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "riscv-isa" = callPackage @@ -184555,6 +191054,7 @@ self: { description = "Haskell representation of the RISC-V instruction set architecture"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rison" = callPackage @@ -184587,6 +191087,7 @@ self: { description = "Rivers are like Streams, but different"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rivet" = callPackage @@ -184601,6 +191102,7 @@ self: { description = "A project management tool for Haskell applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rivet-adaptor-postgresql" = callPackage @@ -184649,6 +191151,7 @@ self: { description = "Postgresql migration support for project management tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rivet-simple-deploy" = callPackage @@ -184661,6 +191164,7 @@ self: { description = "Basic deployment support for project management tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rl-satton" = callPackage @@ -184687,6 +191191,7 @@ self: { description = "Collection of Reinforcement Learning algorithms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rlglue" = callPackage @@ -184710,6 +191215,7 @@ self: { description = "A Haskell codec for RL-Glue"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rlist" = callPackage @@ -184746,6 +191252,7 @@ self: { description = "Ring-LWE/LWR challenges using Lol"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rmonad" = callPackage @@ -184763,6 +191270,7 @@ self: { description = "Restricted monad library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rncryptor" = callPackage @@ -184792,6 +191300,7 @@ self: { description = "Haskell implementation of the RNCryptor file format"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rng-utils" = callPackage @@ -184830,7 +191339,6 @@ self: { testHaskellDepends = [ base directory ]; description = "Simple projects generator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "robin" = callPackage @@ -184851,6 +191359,7 @@ self: { description = "A build daemon for Haskell development"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "robot" = callPackage @@ -184885,6 +191394,7 @@ self: { description = "Parser for robots.txt"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roc-cluster" = callPackage @@ -184900,6 +191410,7 @@ self: { description = "ROC online clustering algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roc-cluster-demo" = callPackage @@ -184918,6 +191429,7 @@ self: { description = "Gloss interactive demo for roc-cluster package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roc-id" = callPackage @@ -185064,6 +191576,7 @@ self: { description = "Bindings to Roku's External Control API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roles" = callPackage @@ -185114,6 +191627,7 @@ self: { description = "Core Rollbar data types and APIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roller" = callPackage @@ -185135,6 +191649,7 @@ self: { description = "Playing with applicatives and dice!"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rolling-queue" = callPackage @@ -185185,8 +191700,8 @@ self: { }: mkDerivation { pname = "ron"; - version = "0.5"; - sha256 = "1czcpcc52sv1m4wj66wsbjscb5g2wrg22spvi1qsxgpjjs3grj1f"; + version = "0.6"; + sha256 = "022ilxpk9axw41d1cmlgdsgc3c7ss6a0j6a1w10l81g56xlpi67z"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers hashable integer-gmp mtl template-haskell text time unordered-containers @@ -185194,7 +191709,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq integer-gmp ]; description = "RON"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ron-rdt" = callPackage @@ -185232,15 +191746,16 @@ self: { "ron-storage" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , integer-gmp, mtl, network-info, ron, ron-rdt, text, transformers + , integer-gmp, mtl, network-info, ron, ron-rdt, stm, text + , transformers }: mkDerivation { pname = "ron-storage"; - version = "0.5"; - sha256 = "17gq7pxnniigvg7jk6kn87fd5m9bg0glv0mrahhralsb3zdp4klq"; + version = "0.6"; + sha256 = "07bnvlamw8cdw9s8fra9fd1jz3sw203jnimj2ad50rahn2r3zrnq"; libraryHaskellDepends = [ base bytestring containers directory filepath integer-gmp mtl - network-info ron ron-rdt text transformers + network-info ron ron-rdt stm text transformers ]; description = "RON Storage"; license = stdenv.lib.licenses.bsd3; @@ -185269,6 +191784,7 @@ self: { description = "Tools for manipulating fingertrees of bytestrings with optional annotations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rope-utf16-splay" = callPackage @@ -185333,6 +191849,7 @@ self: { description = "A collection of rose tree structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rose-trie" = callPackage @@ -185349,6 +191866,7 @@ self: { description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rosezipper" = callPackage @@ -185393,6 +191911,7 @@ self: { description = "Haskell support for the ROS robotics framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rosmsg" = callPackage @@ -185411,6 +191930,7 @@ self: { description = "ROS message parser, render, TH"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rosmsg-bin" = callPackage @@ -185429,6 +191949,7 @@ self: { description = "ROS message management tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rospkg" = callPackage @@ -185461,6 +191982,7 @@ self: { description = "General purpose utility library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rot13" = callPackage @@ -185526,6 +192048,7 @@ self: { description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;}; "rounding" = callPackage @@ -185538,6 +192061,7 @@ self: { description = "Explicit floating point rounding mode wrappers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roundtrip" = callPackage @@ -185556,6 +192080,7 @@ self: { description = "Bidirectional (de-)serialization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roundtrip-aeson" = callPackage @@ -185577,6 +192102,7 @@ self: { description = "Un-/parse JSON with roundtrip invertible syntax definitions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roundtrip-string" = callPackage @@ -185589,6 +192115,7 @@ self: { description = "Bidirectional (de-)serialization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roundtrip-xml" = callPackage @@ -185611,6 +192138,7 @@ self: { description = "Bidirectional (de-)serialization for XML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "route-generator" = callPackage @@ -185646,6 +192174,7 @@ self: { description = "A library and utilities for creating a route"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "row" = callPackage @@ -185715,6 +192244,7 @@ self: { description = "Build records from lists of strings, as from CSV files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rpc" = callPackage @@ -185732,6 +192262,7 @@ self: { description = "type safe rpcs provided as basic IO actions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rpc-framework" = callPackage @@ -185751,6 +192282,7 @@ self: { description = "a remote procedure call framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rpf" = callPackage @@ -185771,6 +192303,7 @@ self: { description = "Receiver Policy Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rpm" = callPackage @@ -185785,6 +192318,7 @@ self: { description = "Cozy little project to question unruly rpm packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rpmbuild-order" = callPackage @@ -185823,6 +192357,7 @@ self: { description = "The RogueStar Animation and Graphics Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rsagl-frp" = callPackage @@ -185839,6 +192374,7 @@ self: { description = "The RogueStar Animation and Graphics Library: Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rsagl-math" = callPackage @@ -185856,6 +192392,7 @@ self: { description = "The RogueStar Animation and Graphics Library: Mathematics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rset" = callPackage @@ -185881,6 +192418,7 @@ self: { description = "A Rational Street Performer Protocol solver"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rss" = callPackage @@ -185923,6 +192461,7 @@ self: { description = "Streaming parser/renderer for the RSS standard"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rss2irc" = callPackage @@ -185947,6 +192486,7 @@ self: { description = "watches an RSS/Atom feed and writes it to an IRC channel"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rstream" = callPackage @@ -186011,7 +192551,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings to librtlsdr"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rtl-sdr;}; "rtnetlink" = callPackage @@ -186032,6 +192572,7 @@ self: { description = "Manipulate network devices, addresses, and routes on Linux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rtorrent-rpc" = callPackage @@ -186049,6 +192590,7 @@ self: { description = "A library for communicating with RTorrent over its XML-RPC interface"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rtorrent-state" = callPackage @@ -186089,6 +192631,7 @@ self: { description = "Dynamically load Haskell libraries"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rubberband" = callPackage @@ -186106,7 +192649,7 @@ self: { testHaskellDepends = [ base ]; description = "Binding to the C++ audio stretching library Rubber Band"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rubberband;}; "ruby-marshal" = callPackage @@ -186126,6 +192669,7 @@ self: { description = "Parse a subset of Ruby objects serialised with Marshal.dump."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ruby-qq" = callPackage @@ -186143,6 +192687,7 @@ self: { description = "rubyish quasiquoters"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ruff" = callPackage @@ -186176,6 +192721,7 @@ self: { description = "Pliable records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ruler" = callPackage @@ -186195,6 +192741,7 @@ self: { description = "Ruler tool for UHC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ruler-core" = callPackage @@ -186213,6 +192760,7 @@ self: { ]; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rungekutta" = callPackage @@ -186225,6 +192773,7 @@ self: { description = "A collection of explicit Runge-Kutta methods of various orders"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "runghc" = callPackage @@ -186260,6 +192809,7 @@ self: { description = "Run multiple commands, interleaving output and errors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "runmemo" = callPackage @@ -186283,6 +192833,7 @@ self: { description = "Runtime generation of Arbitrary values"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rv" = callPackage @@ -186346,6 +192897,7 @@ self: { description = "Packet Generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "s-cargot" = callPackage @@ -186388,6 +192940,7 @@ self: { description = "simple general-purpose s-expressions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "s3-signer" = callPackage @@ -186433,6 +192986,7 @@ self: { description = "A simple environment to control access to data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-buffer-monad" = callPackage @@ -186449,6 +193003,7 @@ self: { description = "A monadic buffer resilient to exceptions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-coerce" = callPackage @@ -186519,6 +193074,7 @@ self: { description = "control-monad-exception Instances for safe-failure"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-foldable" = callPackage @@ -186542,6 +193098,7 @@ self: { description = "Support for safely freezing multiple arrays in the ST monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-globals" = callPackage @@ -186554,6 +193111,7 @@ self: { description = "Safe top-level mutable variables which scope like ordinary values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-lazy-io" = callPackage @@ -186569,6 +193127,7 @@ self: { description = "A library providing safe lazy IO features"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-length" = callPackage @@ -186587,6 +193146,7 @@ self: { description = "Tired of accidentally calling length on tuples? Relief at last!"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-money" = callPackage @@ -186609,6 +193169,7 @@ self: { 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; + broken = true; }) {}; "safe-money-aeson" = callPackage @@ -186627,6 +193188,7 @@ self: { description = "Instances from the aeson library for the safe-money library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-money-cereal" = callPackage @@ -186645,6 +193207,7 @@ self: { description = "Instances from the cereal library for the safe-money library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-money-serialise" = callPackage @@ -186663,6 +193226,7 @@ self: { description = "Instances from the serialise library for the safe-money library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-money-store" = callPackage @@ -186681,6 +193245,7 @@ self: { description = "Instances from the store library for the safe-money library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-money-xmlbf" = callPackage @@ -186699,6 +193264,7 @@ self: { description = "Instances from the xmlbf library for the safe-money library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-plugins" = callPackage @@ -186715,6 +193281,7 @@ self: { description = "A small wrapper over hs-plugins to allow loading safe plugins"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safe-printf" = callPackage @@ -186735,6 +193302,7 @@ self: { description = "Well-typed, flexible and variadic printf for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safecopy" = callPackage @@ -186798,6 +193366,7 @@ self: { description = "Binary serialization with version control"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safeint" = callPackage @@ -186816,6 +193385,7 @@ self: { description = "overflow-checked Int type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safeio" = callPackage @@ -186851,6 +193421,7 @@ self: { description = "Safe Paths in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safer-file-handles" = callPackage @@ -186868,6 +193439,7 @@ self: { description = "Type-safe file handling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safer-file-handles-bytestring" = callPackage @@ -186885,6 +193457,7 @@ self: { description = "Extends safer-file-handles with ByteString operations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "safer-file-handles-text" = callPackage @@ -186901,6 +193474,7 @@ self: { description = "Extends safer-file-handles with Text operations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "saferoute" = callPackage @@ -186913,6 +193487,7 @@ self: { description = "A simple type-safe routing library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sai-shape-syb" = callPackage @@ -186929,6 +193504,7 @@ self: { description = "Obtain homogeneous values from arbitrary values, transforming or culling data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sajson" = callPackage @@ -186952,6 +193528,7 @@ self: { description = "Fast JSON parsing powered by Chad Austin's sajson library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sakuraio-platform" = callPackage @@ -186993,6 +193570,8 @@ self: { ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "salak_0_2_3" = callPackage @@ -187015,6 +193594,7 @@ self: { description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "saltine" = callPackage @@ -187054,6 +193634,7 @@ self: { description = "Quickcheck implementations for some NaCl data"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libsodium;}; "salve" = callPackage @@ -187087,6 +193668,7 @@ self: { description = "Modular web application framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "salvia-demo" = callPackage @@ -187110,6 +193692,7 @@ self: { description = "Demo Salvia servers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "salvia-extras" = callPackage @@ -187131,6 +193714,7 @@ self: { description = "Collection of non-fundamental handlers for the Salvia web server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "salvia-protocol" = callPackage @@ -187148,6 +193732,7 @@ self: { description = "Salvia webserver protocol suite supporting URI, HTTP, Cookie and MIME"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "salvia-sessions" = callPackage @@ -187166,6 +193751,7 @@ self: { description = "Session support for the Salvia webserver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "salvia-websocket" = callPackage @@ -187183,6 +193769,7 @@ self: { description = "Websocket implementation for the Salvia Webserver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sample-frame" = callPackage @@ -187242,6 +193829,7 @@ self: { description = "Binding to the C samtools library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) zlib;}; "samtools-conduit" = callPackage @@ -187263,6 +193851,7 @@ self: { description = "Conduit interface to SAM/BAM format files through samtools"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "samtools-enumerator" = callPackage @@ -187279,6 +193868,7 @@ self: { description = "Enumerator interface to SamTools library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "samtools-iteratee" = callPackage @@ -187296,6 +193886,7 @@ self: { description = "Iteratee interface to SamTools library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sandi" = callPackage @@ -187306,6 +193897,8 @@ self: { pname = "sandi"; version = "0.5"; sha256 = "1ndgai8idlxyccvkz5zsgq06v58blc30i6hkky5b1sf5x6gs2h29"; + revision = "1"; + editedCabalFile = "1aj9i1ir6ks3bdb47yvqlxv2azrz09p69ggr73m0cxvir9rd0y5j"; libraryHaskellDepends = [ base bytestring conduit exceptions ]; testHaskellDepends = [ base bytestring tasty tasty-hunit tasty-quickcheck tasty-th @@ -187325,6 +193918,7 @@ self: { description = "SAND data serialization and manipulation library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sandman" = callPackage @@ -187355,6 +193949,7 @@ self: { description = "audio library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sarsi" = callPackage @@ -187383,6 +193978,7 @@ self: { description = "A universal quickfix toolkit and his protocol"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sasl" = callPackage @@ -187400,6 +193996,7 @@ self: { description = "SASL implementation using simple-pipe"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sat" = callPackage @@ -187414,6 +194011,7 @@ self: { description = "CNF SATisfier"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sat-micro-hs" = callPackage @@ -187432,6 +194030,7 @@ self: { description = "A minimal SAT solver"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "satchmo" = callPackage @@ -187451,6 +194050,7 @@ self: { description = "SAT encoding monad"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "satchmo-backends" = callPackage @@ -187467,6 +194067,7 @@ self: { description = "driver for external satchmo backends"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "satchmo-examples" = callPackage @@ -187485,6 +194086,7 @@ self: { description = "examples that show how to use satchmo"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "satchmo-funsat" = callPackage @@ -187501,6 +194103,7 @@ self: { description = "funsat driver as backend for satchmo"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "satchmo-minisat" = callPackage @@ -187513,6 +194116,7 @@ self: { description = "minisat driver as backend for satchmo"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "satchmo-toysat" = callPackage @@ -187529,6 +194133,7 @@ self: { description = "toysat driver as backend for satchmo"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "savage" = callPackage @@ -187548,6 +194153,7 @@ self: { description = "re-export of the random generators from Hedgehog"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sax" = callPackage @@ -187567,6 +194173,7 @@ self: { description = "Monadic streaming XML parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "say" = callPackage @@ -187661,7 +194268,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) z3;}; - "sbv_8_0" = callPackage + "sbv_8_1" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , crackNum, deepseq, directory, doctest, filepath, generic-deriving , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb @@ -187670,8 +194277,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "8.0"; - sha256 = "1bv5vf8r892q5ykh4xnzrczay6i423rbyk3rdz3z5ch4fyisvlrj"; + version = "8.1"; + sha256 = "1lwd4j2bi9hw3549k0d3bmgssprsz9l62kjl02whh7qcjq19ws9y"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum deepseq directory filepath @@ -187707,6 +194314,7 @@ self: { description = "Formally prove properties of Haskell programs using SBV/SMT"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sc2-lowlevel" = callPackage @@ -187726,6 +194334,8 @@ self: { ]; description = "Low-level Starcraft II API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sc2-proto" = callPackage @@ -187745,6 +194355,8 @@ self: { libraryToolDepends = [ proto-lens-protoc protoc ]; description = "A protocol buffer model for the Starcraft II bot API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {protoc = null;}; "sc2-support" = callPackage @@ -187802,6 +194414,7 @@ self: { description = "Haskell bindings to sc3-rdu (sc3 rd ugens)"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scalable-server" = callPackage @@ -187820,6 +194433,7 @@ self: { description = "Library for writing fast/scalable TCP-based services"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scaleimage" = callPackage @@ -187834,6 +194448,7 @@ self: { description = "Scale an image to a new geometry"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scalendar" = callPackage @@ -187851,6 +194466,7 @@ self: { description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scalp-webhooks" = callPackage @@ -187878,6 +194494,7 @@ self: { description = "Test webhooks locally"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scalpel" = callPackage @@ -187975,6 +194592,7 @@ self: { description = "An implementation of the Scan Vector Machine instruction set in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scanf" = callPackage @@ -188039,7 +194657,6 @@ self: { ]; description = "Generates unique passwords for various websites from a single password"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scc" = callPackage @@ -188073,6 +194690,7 @@ self: { description = "Streaming component combinators"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scenegraph" = callPackage @@ -188090,6 +194708,7 @@ self: { description = "Scene Graph"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scgi" = callPackage @@ -188123,6 +194742,7 @@ self: { description = "Marge schedules and show EVR"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schedule-planner" = callPackage @@ -188143,6 +194763,7 @@ self: { description = "Find the ideal lesson layout"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schedyield" = callPackage @@ -188155,6 +194776,7 @@ self: { description = "Exposes standard POSIX function sched_yield"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schema" = callPackage @@ -188178,8 +194800,8 @@ self: { }: mkDerivation { pname = "schematic"; - version = "0.4.2.0"; - sha256 = "0k63pnv8mip8kn623s5n7w24bd4spjmi1a9h280nf7wd1q8z72n4"; + version = "0.5.0.0"; + sha256 = "0mq38m08gj90gyk38lj4vyyfz0d6qrpxlpqjizqvyj4k3hqqy4ka"; libraryHaskellDepends = [ aeson base bytestring containers hjsonschema mtl profunctors regex-tdfa regex-tdfa-text scientific singletons smallcheck tagged @@ -188196,6 +194818,7 @@ self: { description = "JSON-biased spec and validation tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scholdoc" = callPackage @@ -188241,6 +194864,7 @@ self: { description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scholdoc-citeproc" = callPackage @@ -188275,6 +194899,7 @@ self: { description = "Scholdoc fork of pandoc-citeproc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scholdoc-texmath" = callPackage @@ -188298,6 +194923,7 @@ self: { description = "Scholdoc fork of texmath"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scholdoc-types" = callPackage @@ -188314,6 +194940,7 @@ self: { description = "Scholdoc fork of pandoc-types"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schonfinkeling" = callPackage @@ -188363,6 +194990,7 @@ self: { description = "Mathematical/physical/chemical constants"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scientific" = callPackage @@ -188412,6 +195040,7 @@ self: { description = "Haskell IDE library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scion-browser" = callPackage @@ -188447,6 +195076,7 @@ self: { description = "Command-line interface for browsing and searching packages documentation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scons2dot" = callPackage @@ -188461,6 +195091,7 @@ self: { description = "Generates graphviz file of scons dependency information"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scope" = callPackage @@ -188479,6 +195110,7 @@ self: { description = "An interactive renderer for plotting time-series data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scope-cairo" = callPackage @@ -188503,6 +195135,7 @@ self: { description = "An interactive renderer for plotting time-series data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scottish" = callPackage @@ -188521,6 +195154,7 @@ self: { description = "scotty with batteries included"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scotty" = callPackage @@ -188550,7 +195184,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-binding-play" = callPackage @@ -188570,6 +195203,7 @@ self: { description = "The Play Framework style data binding in Scotty"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scotty-blaze" = callPackage @@ -188585,6 +195219,7 @@ self: { description = "blaze-html integration for Scotty"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scotty-cookie" = callPackage @@ -188603,7 +195238,6 @@ self: { ]; description = "Cookie management helper functions for Scotty framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-fay" = callPackage @@ -188627,6 +195261,7 @@ self: { description = "Fay integration for Scotty"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scotty-format" = callPackage @@ -188644,6 +195279,7 @@ self: { description = "Response format helper for the Scotty web framework"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scotty-hastache" = callPackage @@ -188661,6 +195297,7 @@ self: { description = "Easy Mustache templating support for Scotty"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scotty-params-parser" = callPackage @@ -188677,7 +195314,6 @@ self: { ]; description = "HTTP-request's query parameters parser abstraction for \"scotty\""; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-path-normalizer" = callPackage @@ -188690,7 +195326,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Redirect to a normalized path"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-resource" = callPackage @@ -188707,6 +195342,7 @@ self: { description = "A Better way of modeling web resources"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scotty-rest" = callPackage @@ -188733,6 +195369,7 @@ self: { description = "Webmachine-style REST library for scotty"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scotty-session" = callPackage @@ -188752,6 +195389,7 @@ self: { description = "Adding session functionality to scotty"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scotty-tls" = callPackage @@ -188765,7 +195403,6 @@ self: { ]; description = "TLS for Scotty"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-view" = callPackage @@ -188783,6 +195420,7 @@ self: { executableHaskellDepends = [ base scotty text transformers ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scp-streams" = callPackage @@ -188805,6 +195443,7 @@ self: { description = "An SCP protocol implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scrabble-bot" = callPackage @@ -188825,6 +195464,7 @@ self: { description = "Scrabble play generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scrapbook" = callPackage @@ -188852,6 +195492,8 @@ self: { ]; description = "Automatically derive Kotlin class to query servant webservices"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scrape-changes" = callPackage @@ -188879,6 +195521,7 @@ self: { description = "Scrape websites for changes"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "script-monad" = callPackage @@ -188906,6 +195549,7 @@ self: { description = "Stack of error, reader, writer, state, and prompt monad transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scrobble" = callPackage @@ -188929,6 +195573,7 @@ self: { description = "Scrobbling server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scroll" = callPackage @@ -189026,6 +195671,7 @@ self: { description = "Fast CSV lexing on ByteString"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scyther-proof" = callPackage @@ -189048,6 +195694,7 @@ self: { description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sde-solver" = callPackage @@ -189067,6 +195714,7 @@ self: { description = "Distributed SDE solver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sdf2p1-parser" = callPackage @@ -189116,7 +195764,6 @@ self: { libraryHaskellDepends = [ base cairo linear sdl2 ]; description = "Render with Cairo on SDL textures"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sdl2-cairo-image" = callPackage @@ -189133,6 +195780,7 @@ self: { description = "An image loading and rendering library for sdl2 / sdl2-cairo"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sdl2-compositor" = callPackage @@ -189155,6 +195803,7 @@ self: { description = "image compositing with sdl2 - declarative style"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sdl2-fps" = callPackage @@ -189226,7 +195875,7 @@ self: { libraryPkgconfigDepends = [ SDL2_mixer ]; description = "Bindings to SDL2_mixer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL2_mixer;}; "sdl2-sprite" = callPackage @@ -189263,7 +195912,7 @@ self: { libraryPkgconfigDepends = [ SDL2 SDL2_ttf ]; description = "Bindings to SDL2_ttf"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage @@ -189308,6 +195957,7 @@ self: { license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "seacat" = callPackage @@ -189344,6 +195994,7 @@ self: { description = "Pure SQL layer on top of other libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "seakale-postgresql" = callPackage @@ -189360,6 +196011,7 @@ self: { description = "PostgreSQL backend for Seakale"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "seakale-tests" = callPackage @@ -189376,6 +196028,7 @@ self: { description = "Helpers to test code using Seakale"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "seal-module" = callPackage @@ -189418,6 +196071,7 @@ self: { description = "Common graph search algorithms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sec" = callPackage @@ -189430,6 +196084,7 @@ self: { description = "Semantic Editor Combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "secd" = callPackage @@ -189461,6 +196116,7 @@ self: { description = "SECDH Machine Simulator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "seclib" = callPackage @@ -189473,6 +196129,7 @@ self: { description = "A simple library for static information-flow security in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "second-transfer" = callPackage @@ -189501,6 +196158,7 @@ self: { description = "Second Transfer HTTP/2 web server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "secp256k1" = callPackage @@ -189525,6 +196183,7 @@ self: { description = "Bindings for secp256k1 library from Bitcoin Core"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) secp256k1;}; "secp256k1-haskell" = callPackage @@ -189566,6 +196225,7 @@ self: { description = "Secret Santa game assigner using QR-Codes"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "secret-sharing" = callPackage @@ -189589,6 +196249,7 @@ self: { description = "Information-theoretic secure secret sharing"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "secrm" = callPackage @@ -189603,6 +196264,7 @@ self: { description = "Example of writing \"secure\" file removal in Haskell rather than C"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "secure-sockets" = callPackage @@ -189659,6 +196321,7 @@ self: { description = "Sedna C API XML Binding"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {sedna = null;}; "selda" = callPackage @@ -189733,6 +196396,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "selective" = callPackage + ({ mkDerivation, base, checkers, containers, mtl, QuickCheck, tasty + , tasty-expected-failure, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "selective"; + version = "0.1.0"; + sha256 = "1f30y2q5xph8jp2pfwkqdy59byad3q70kfp9jgcy2039i268fjfv"; + revision = "1"; + editedCabalFile = "1p6r23ahxpsq6rkb925ryd0cn09876z435q61wfz4r2rnb3s2wb2"; + libraryHaskellDepends = [ base containers mtl transformers ]; + testHaskellDepends = [ + base checkers containers mtl QuickCheck tasty + tasty-expected-failure tasty-quickcheck + ]; + description = "Selective applicative functors"; + license = stdenv.lib.licenses.mit; + }) {}; + "selectors" = callPackage ({ mkDerivation, alex, array, base, containers, happy , template-haskell, text, xml-conduit @@ -189748,6 +196430,7 @@ self: { description = "CSS Selectors for DOM traversal"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "selenium" = callPackage @@ -189760,6 +196443,7 @@ self: { description = "Test web applications through a browser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "selenium-server" = callPackage @@ -189780,6 +196464,7 @@ self: { description = "Run the selenium standalone server for usage with webdriver"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "self-extract" = callPackage @@ -189800,6 +196485,7 @@ self: { description = "A Haskell library to make self-extracting executables"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "selfrestart" = callPackage @@ -189824,6 +196510,7 @@ self: { description = "SELinux bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {selinux = null;}; "semaphore-plus" = callPackage @@ -189856,6 +196543,7 @@ self: { description = "Evaluate code snippets in Literate Haskell"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "semi-iso" = callPackage @@ -189872,6 +196560,7 @@ self: { description = "Weakened partial isomorphisms, reversible computations"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "semibounded-lattices" = callPackage @@ -189885,6 +196574,7 @@ self: { description = "A Haskell implementation of semibounded lattices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "semigroupoid-extras" = callPackage @@ -189938,6 +196628,7 @@ self: { description = "RebindableSyntax using the semigroupoids package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "semigroups" = callPackage @@ -189961,6 +196652,7 @@ self: { description = "Semigroups actions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "semilattices" = callPackage @@ -189980,6 +196672,7 @@ self: { description = "Semilattices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "semiring" = callPackage @@ -189994,6 +196687,7 @@ self: { description = "Semirings, ring-like structures used for dynamic programming applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "semiring-num" = callPackage @@ -190022,6 +196716,7 @@ self: { description = "Basic semiring class and instances"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "semiring-simple" = callPackage @@ -190100,6 +196795,7 @@ self: { description = "An implementation of semver and semantic version ranges"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sendfile" = callPackage @@ -190130,6 +196826,7 @@ self: { description = "Sengrid API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sendgrid-v3" = callPackage @@ -190145,6 +196842,7 @@ self: { description = "Sendgrid v3 API library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sensei" = callPackage @@ -190173,6 +196871,7 @@ self: { description = "Automatically run Hspec tests on file modifications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sensenet" = callPackage @@ -190191,6 +196890,7 @@ self: { description = "Distributed sensor network for the raspberry pi"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sensu-run" = callPackage @@ -190226,6 +196926,7 @@ self: { description = "Easily generating message of japanese natural language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sentiwordnet-parser" = callPackage @@ -190263,6 +196964,7 @@ self: { description = "Process monitoring tool written and configured in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "senza" = callPackage @@ -190321,6 +197023,7 @@ self: { description = "Dynamic strictness control, including space leak repair"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "seqalign" = callPackage @@ -190344,6 +197047,7 @@ self: { description = "Sequence ID production and consumption"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "seqid" = callPackage @@ -190356,6 +197060,7 @@ self: { description = "Sequence ID production and consumption"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "seqid-streams_0_1_0" = callPackage @@ -190368,6 +197073,7 @@ self: { description = "Sequence ID IO-Streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "seqid-streams" = callPackage @@ -190380,6 +197086,7 @@ self: { description = "Sequence ID IO-Streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "seqloc" = callPackage @@ -190401,6 +197108,7 @@ self: { description = "Handle sequence locations for bioinformatics"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "seqloc-datafiles" = callPackage @@ -190435,6 +197143,7 @@ self: { description = "Read and write BED and GTF format genome annotations"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sequence" = callPackage @@ -190449,6 +197158,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sequence-formats" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-memocombinators, errors, exceptions, foldl, hslogger + , lens-family, MissingH, pipes, pipes-attoparsec, pipes-bytestring + , pipes-safe, pipes-text, split, text, transformers, turtle, vector + }: + mkDerivation { + pname = "sequence-formats"; + version = "1.1.4.1"; + sha256 = "1zh2n1ksyvqzk2w35nsyj3sxdf7ni2iqv2ksrk8xs64n0j25c7ac"; + libraryHaskellDepends = [ + attoparsec base bytestring containers data-memocombinators errors + exceptions foldl hslogger lens-family MissingH pipes + pipes-attoparsec pipes-bytestring pipes-safe pipes-text split text + transformers turtle vector + ]; + description = "A package with basic parsing utilities for several Bioinformatic data formats"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sequent-core" = callPackage ({ mkDerivation, base, bytestring, containers, ghc, transformers }: mkDerivation { @@ -190463,6 +197194,7 @@ self: { description = "Alternative Core language for GHC plugins"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sequential-index" = callPackage @@ -190498,6 +197230,7 @@ self: { description = "A sequence labeler based on Collins's sequence perceptron"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "serf" = callPackage @@ -190591,6 +197324,7 @@ self: { description = "Instances for Serialize of cereal"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "serialport" = callPackage @@ -190634,6 +197368,7 @@ self: { description = "General-purpose functions by Serokell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "serpentine" = callPackage @@ -190653,6 +197388,7 @@ self: { description = "Simple project template from stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "serv" = callPackage @@ -190667,6 +197403,7 @@ self: { description = "Dependently typed API framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "serv-wai" = callPackage @@ -190692,6 +197429,7 @@ self: { description = "Dependently typed API servers with Serv"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant" = callPackage @@ -190722,6 +197460,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant_0_16" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors + , bytestring, Cabal, cabal-doctest, case-insensitive, deepseq + , doctest, hspec, hspec-discover, http-api-data, http-media + , http-types, mmorph, mtl, network-uri, QuickCheck + , quickcheck-instances, singleton-bool, string-conversions, tagged + , text, transformers, vault + }: + mkDerivation { + pname = "servant"; + version = "0.16"; + sha256 = "0flpk4hd459lglxxyrbcvsk1401lcl5qrcr4ixz87jrs6vx97h37"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bifunctors bytestring + case-insensitive deepseq http-api-data http-media http-types mmorph + mtl network-uri QuickCheck singleton-bool string-conversions tagged + text transformers vault + ]; + testHaskellDepends = [ + aeson base base-compat bytestring doctest hspec mtl QuickCheck + quickcheck-instances string-conversions text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-JuicyPixels" = callPackage ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant , servant-server, wai, warp @@ -190768,6 +197535,7 @@ self: { description = "generic tests for aeson serialization in servant"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth" = callPackage @@ -190794,8 +197562,8 @@ self: { pname = "servant-auth-client"; version = "0.3.3.0"; sha256 = "1pxkwpg1in3anamfvrp8gd7iihng0ikhl4k7ymz5d75ma1qwa2j9"; - revision = "2"; - editedCabalFile = "05ibhx700r0xn746g691ypysnjgxqb0lkq2gjrih5ylzc7nfvv2s"; + revision = "3"; + editedCabalFile = "1kzyqd9hg7xld5s8qpm76l9ym48z81j6ycdwp3lb0f1p2d3aagcd"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core text @@ -190810,6 +197578,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-client_0_4_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-discover, http-client, http-types, jose, QuickCheck + , servant, servant-auth, servant-auth-server, servant-client + , servant-client-core, servant-server, time, transformers, wai + , warp + }: + mkDerivation { + pname = "servant-auth-client"; + version = "0.4.0.0"; + sha256 = "1kh4kq3cc9fn49vmh304zyzn7idb4k1j0803yp7a6qc733panf9g"; + libraryHaskellDepends = [ + base bytestring containers servant servant-auth servant-client-core + ]; + testHaskellDepends = [ + aeson base bytestring hspec http-client http-types jose QuickCheck + servant servant-auth servant-auth-server servant-client + servant-server time transformers wai warp + ]; + testToolDepends = [ hspec-discover ]; + description = "servant-client/servant-auth compatibility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-auth-cookie" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , cereal, cereal-time, cookie, criterion, cryptonite, data-default @@ -190839,6 +197632,7 @@ self: { description = "Authentication via encrypted cookies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-docs" = callPackage @@ -190863,7 +197657,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-docs/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-hmac" = callPackage @@ -190900,6 +197693,7 @@ self: { description = "Authentication via HMAC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-server" = callPackage @@ -190912,8 +197706,8 @@ self: { }: mkDerivation { pname = "servant-auth-server"; - version = "0.4.3.0"; - sha256 = "1kzh4j6118qjzhfbxlszwi6ixgg9g4zn903n9qwrb5z8c2y6b9bl"; + version = "0.4.4.0"; + sha256 = "13196aknmb125ri3szqx8z5hdkk8lglv4795ck5glpn953vgq51c"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring case-insensitive cookie data-default-class entropy http-types jose @@ -190922,8 +197716,8 @@ self: { ]; testHaskellDepends = [ aeson base bytestring case-insensitive hspec http-client http-types - jose lens lens-aeson mtl QuickCheck servant-auth servant-server - time transformers wai warp wreq + jose lens lens-aeson mtl QuickCheck servant servant-auth + servant-server time transformers wai warp wreq ]; testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; @@ -190950,7 +197744,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-swagger/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token" = callPackage @@ -190971,6 +197764,7 @@ self: { description = "Servant based API and server for token based authorisation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-acid" = callPackage @@ -190993,6 +197787,7 @@ self: { description = "Acid-state backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-api" = callPackage @@ -191010,6 +197805,7 @@ self: { description = "Servant based API for token based authorisation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-leveldb" = callPackage @@ -191032,6 +197828,7 @@ self: { description = "Leveldb backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-persistent" = callPackage @@ -191052,6 +197849,7 @@ self: { description = "Persistent backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-rocksdb" = callPackage @@ -191075,6 +197873,7 @@ self: { description = "RocksDB backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-wordpress" = callPackage @@ -191083,8 +197882,8 @@ self: { }: mkDerivation { pname = "servant-auth-wordpress"; - version = "1.0.0.0"; - sha256 = "0ns744n58irm2la9xz4nqxz3yyb69vwbw2h9nqcfhr66dmqd80ar"; + version = "1.0.0.1"; + sha256 = "08ngbgmzksp27n8znigrj5i2nvsqjansn4vv3my38vdqqgzm09w8"; libraryHaskellDepends = [ base mtl servant-server text time wai wordpress-auth ]; @@ -191133,6 +197932,8 @@ self: { pname = "servant-blaze"; version = "0.9"; sha256 = "1pfnpc6m7i8knndc1734fbzpfgmvdcpkd8cj0jyw139b70siz63r"; + revision = "1"; + editedCabalFile = "06lq9lyli0pnmpw9489vzindjs0s9f982v6y9zk1lwc043nzg3ax"; libraryHaskellDepends = [ base blaze-html http-media servant ]; testHaskellDepends = [ base blaze-html servant-server wai warp ]; description = "Blaze-html support for servant"; @@ -191148,8 +197949,8 @@ self: { pname = "servant-cassava"; version = "0.10"; sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v"; - revision = "4"; - editedCabalFile = "0kk7vqnh5ycrvhrvhi3ahva6v56fvi17k3qrh8a8qnhx25094jaj"; + revision = "5"; + editedCabalFile = "1hidradrcdcchbr0hn9y7y1bc0i0gxzfbganyy7p2z8ip2czddvj"; libraryHaskellDepends = [ base base-compat bytestring cassava http-media servant vector ]; @@ -191172,6 +197973,8 @@ self: { pname = "servant-checked-exceptions"; version = "2.0.0.0"; sha256 = "127nav7z2zkgfgzpjjprqb6s55mbdj9z2p05knjx3mangs2q5wm7"; + revision = "1"; + editedCabalFile = "0h18x8gimmczgml4rj74kx3463pwrsyxl2vnd13ra5hj0q44d683"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191186,7 +197989,6 @@ self: { ]; description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-checked-exceptions-core" = callPackage @@ -191198,6 +198000,8 @@ self: { pname = "servant-checked-exceptions-core"; version = "2.0.0.0"; sha256 = "0j5j7ai1b7nnsvzal27jy6hamwx5i2pyc1f6mmmb06r40cs53lxa"; + revision = "1"; + editedCabalFile = "1q2y4cri4h33cfdpgz95dczhvhmyrqajm7k6ypl3b8rw953qlzy7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191207,7 +198011,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-client" = callPackage @@ -191241,6 +198044,36 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-client_0_16" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , deepseq, entropy, exceptions, hspec, hspec-discover + , http-api-data, http-client, http-media, http-types, HUnit + , kan-extensions, markdown-unlit, monad-control, mtl, network + , QuickCheck, semigroupoids, servant, servant-client-core + , servant-server, stm, tdigest, text, time, transformers + , transformers-base, transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.16"; + sha256 = "0641fqlvqkm5075pcgcg5q81j7jil79sjpifg1snagfisrsxifxj"; + libraryHaskellDepends = [ + base base-compat bytestring containers deepseq exceptions + http-client http-media http-types kan-extensions monad-control mtl + semigroupoids servant servant-client-core stm text time + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring entropy hspec http-api-data + http-client http-types HUnit kan-extensions markdown-unlit mtl + network QuickCheck servant servant-client-core servant-server stm + tdigest text transformers transformers-compat wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -191265,6 +198098,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-client-core_0_16" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, containers, deepseq, exceptions, free, hspec + , hspec-discover, http-media, http-types, network-uri, QuickCheck + , safe, servant, template-haskell, text, transformers + }: + mkDerivation { + pname = "servant-client-core"; + version = "0.16"; + sha256 = "0cvv9a7z6ahwjp433c4sxa9i1ifabbih63bx71r9gvqzl85pb3dz"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring containers + deepseq exceptions free http-media http-types network-uri safe + servant template-haskell text transformers + ]; + testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Core functionality and class for client function generation for servant APIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-client-namedargs" = callPackage ({ mkDerivation, async, base, hspec, http-client, named, QuickCheck , servant, servant-client, servant-client-core, servant-namedargs @@ -191272,10 +198127,8 @@ self: { }: mkDerivation { pname = "servant-client-namedargs"; - version = "0.1.0.0"; - sha256 = "0smf6ahmzkbsnvgkji5jzj99sy8bgqz0zxx5k1y1ar82pd6m4qnd"; - revision = "1"; - editedCabalFile = "0kfhrikja6rvrn3m4c6w7dg28l17f2jx8rwswxiwzvmg2zmwbc1n"; + version = "0.1.1.0"; + sha256 = "11638zddkdna50lxiyk8ya1hakkriymlyvz6l6zli94ri5a3lprg"; libraryHaskellDepends = [ base named servant servant-client-core servant-namedargs text ]; @@ -191287,6 +198140,7 @@ self: { description = "Automatically derive API client functions with named and optional parameters"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-conduit" = callPackage @@ -191298,6 +198152,8 @@ self: { pname = "servant-conduit"; version = "0.15"; sha256 = "0mpnkqcls4mrxfd3ksy53k7vvm0hildj21b8mdy53z993wq1blfz"; + revision = "1"; + editedCabalFile = "0l6pv8bqca88k8wjx7qczagka6l99zd7xyz1ma95004665gc56x6"; libraryHaskellDepends = [ base bytestring conduit mtl resourcet servant unliftio-core ]; @@ -191307,7 +198163,6 @@ self: { ]; description = "Servant Stream support for conduit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-csharp" = callPackage @@ -191328,6 +198183,7 @@ self: { description = "Generate servant client library for C#"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-db" = callPackage @@ -191340,6 +198196,7 @@ self: { description = "Servant types for defining API with relational DBs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-db-postgresql" = callPackage @@ -191366,6 +198223,7 @@ self: { description = "Derive a postgres client to database API specified by servant-db"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-dhall" = callPackage @@ -191375,10 +198233,8 @@ self: { }: mkDerivation { pname = "servant-dhall"; - version = "0.1.0.1"; - sha256 = "1yriifnflvh4f0vv2mrfv6qw0cv35isrq03q4h43g096ml2wl3ll"; - revision = "3"; - editedCabalFile = "13mq4pwffxqpjirb6rfhzd2xqhm0xyycl98h6kf4j0ic38g3saz1"; + version = "0.1.0.2"; + sha256 = "09fvyhkqpypg73cxs7y2asvlch83i4sqzh2w0d5ix0zl5i7f6rz3"; libraryHaskellDepends = [ base base-compat bytestring dhall http-media megaparsec prettyprinter servant text @@ -191390,6 +198246,7 @@ self: { description = "Servant Dhall content-type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-docs" = callPackage @@ -191403,6 +198260,8 @@ self: { pname = "servant-docs"; version = "0.11.3"; sha256 = "0cys1h3m0aq77aw0szj7k6p7zqcr8074zrxzsjp58lss1daqisq7"; + revision = "1"; + editedCabalFile = "1f5vdd096yrb0fsnzy709xw3x1r5q1pymscqaaarz3h2sky385lv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191419,7 +198278,6 @@ self: { ]; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-ede" = callPackage @@ -191446,29 +198304,29 @@ self: { }) {}; "servant-ekg" = callPackage - ({ mkDerivation, aeson, base, ekg, ekg-core, hspec, http-client - , http-types, process, servant, servant-client, servant-server - , text, time, transformers, unordered-containers, wai, warp + ({ mkDerivation, aeson, base, ekg, ekg-core, hashable, hspec + , hspec-discover, http-client, http-types, process, servant + , servant-client, servant-server, text, time, transformers + , unordered-containers, wai, warp }: mkDerivation { pname = "servant-ekg"; - version = "0.2.0.0"; - sha256 = "1crsd5yirv5rygc6855qcz31c7abjakzklgxg6c6qnkyx1h4xd82"; - isLibrary = true; - isExecutable = true; + version = "0.3"; + sha256 = "0kqsvpqh36ripps7lvqlg5d407yhh3rzccgyn8zkbrir0ifjfy2l"; libraryHaskellDepends = [ - base ekg-core http-types servant text time unordered-containers wai - ]; - executableHaskellDepends = [ - aeson base ekg ekg-core process servant-server text wai warp + base ekg-core hashable http-types servant text time + unordered-containers wai ]; testHaskellDepends = [ aeson base ekg ekg-core hspec http-client servant servant-client servant-server text transformers unordered-containers wai warp ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base ekg ekg-core process servant-server text wai warp + ]; description = "Helpers for using ekg with servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-elm" = callPackage @@ -191512,6 +198370,7 @@ self: { description = "Example programs for servant"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-exceptions" = callPackage @@ -191553,6 +198412,8 @@ self: { pname = "servant-foreign"; version = "0.15"; sha256 = "0wxx9drycam46vcmf3kxp2lq1drlpxb1b6fxbxyb6dd7349py6gi"; + revision = "1"; + editedCabalFile = "1amvhixa0zwjipmv6iv97pfzlr83p0b0kvxif2d2l7akcdgd2ddz"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -191574,6 +198435,7 @@ self: { description = "Utilities for generating mock server implementations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-generic" = callPackage @@ -191591,6 +198453,7 @@ self: { description = "Specify Servant APIs with records"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-github" = callPackage @@ -191615,6 +198478,7 @@ self: { description = "Bindings to GitHub API using servant"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-github-webhook" = callPackage @@ -191637,7 +198501,6 @@ self: { ]; description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-haxl-client" = callPackage @@ -191666,6 +198529,7 @@ self: { description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-hmac-auth" = callPackage @@ -191693,6 +198557,42 @@ self: { description = "Servant authentication with HMAC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "servant-http-streams" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring + , case-insensitive, containers, deepseq, entropy, exceptions, hspec + , hspec-discover, http-api-data, http-common, http-media + , http-streams, http-types, HUnit, io-streams, kan-extensions + , markdown-unlit, monad-control, mtl, network, QuickCheck + , semigroupoids, servant, servant-client-core, servant-server, stm + , tdigest, text, time, transformers, transformers-base + , transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-http-streams"; + version = "0.16"; + sha256 = "1gkgk13zxi8y071i9dx0i1kbs14rgp8cfnfcd7rpg86pffxkx6cp"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive containers deepseq + exceptions http-common http-media http-streams http-types + io-streams kan-extensions monad-control mtl semigroupoids servant + servant-client-core text time transformers transformers-base + transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring deepseq entropy hspec + http-api-data http-streams http-types HUnit kan-extensions + markdown-unlit mtl network QuickCheck servant servant-client-core + servant-server stm tdigest text transformers transformers-compat + wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-http2-client" = callPackage @@ -191718,6 +198618,7 @@ self: { description = "Generate HTTP2 clients from Servant API descriptions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-iCalendar" = callPackage @@ -191727,14 +198628,15 @@ self: { pname = "servant-iCalendar"; version = "0.1.0.1"; sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas"; - revision = "3"; - editedCabalFile = "0bcab5xk354glypz15lnlzvr157pbvh4mjfd5ln59hr3ip84bzi9"; + revision = "6"; + editedCabalFile = "0pqn5lxcicccy73xbxsaqkxlga0ljc2kr8ysmdffxyndjyph4237"; libraryHaskellDepends = [ base data-default http-media iCalendar servant ]; description = "Servant support for iCalendar"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-jquery" = callPackage @@ -191754,6 +198656,7 @@ self: { description = "Automatically derive (jquery) javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-js" = callPackage @@ -191765,6 +198668,8 @@ self: { pname = "servant-js"; version = "0.9.4"; sha256 = "041wigqgn5ygcs49ndc39rk66j5bcvgpihshxk678jk470ysfszq"; + revision = "1"; + editedCabalFile = "09nd1wlpaj20pyp6jzp2hsnyl02lvbi5vvvymhfhqf3rjxxpnyyr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191786,8 +198691,8 @@ self: { }: mkDerivation { pname = "servant-kotlin"; - version = "0.1.1.6"; - sha256 = "0v16y6f956yf64npq8fm1q6j1q8yygci3amsxyvrggs1rdd8hi31"; + version = "0.1.1.7"; + sha256 = "138xx3jn2ay38fradssi7biff5cc6g1g3wk003bid349irmgvid4"; libraryHaskellDepends = [ base containers directory formatting lens servant servant-foreign text time wl-pprint-text @@ -191828,6 +198733,8 @@ self: { pname = "servant-lucid"; version = "0.9"; sha256 = "1xamwcijd03cynml5c2hr577qairybyrqd90ixyb1a94lql6agbf"; + revision = "1"; + editedCabalFile = "0fgik3s4vqyx5f8r777x82baj42qqgnxwi8gfp8iz3wfifvpc43k"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -191844,6 +198751,8 @@ self: { pname = "servant-machines"; version = "0.15"; sha256 = "137c0svvwvkh3ad8cc5q5vygci3c5951hbwlhk09znqaqycck35i"; + revision = "1"; + editedCabalFile = "18ag4ynzq62n8n52551bm4y4xr7sn03jyp14f3kx08wid3pf5p8a"; libraryHaskellDepends = [ base bytestring machines mtl servant ]; testHaskellDepends = [ base base-compat bytestring http-client http-media machines servant @@ -191851,7 +198760,6 @@ self: { ]; description = "Servant Stream support for machines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-match" = callPackage @@ -191889,6 +198797,7 @@ self: { description = "Matrix parameter combinator for servant"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-mock" = callPackage @@ -191901,6 +198810,8 @@ self: { pname = "servant-mock"; version = "0.8.5"; sha256 = "10bvqwyp5ca53k47a1xfbihdv22gjlj97spr1bn5plf5vlk70m5f"; + revision = "1"; + editedCabalFile = "0jn1inj9rc6dwf1lml3blwf1kx2d73zpwarn6jwd4j4mf7wvak4a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191927,22 +198838,19 @@ self: { }: mkDerivation { pname = "servant-multipart"; - version = "0.11.3"; - sha256 = "0xkzzsi4d3hjn33zfrqadxjv7ymp4z7r5g37fidj3ryhwc1l6d9v"; - isLibrary = true; - isExecutable = true; + version = "0.11.4"; + sha256 = "0vcwrdzj1xyjg11yvfcds9rql3gcwgdcdq4z085g44fpabjxj50s"; libraryHaskellDepends = [ base bytestring directory http-media lens resourcet servant servant-docs servant-foreign servant-server text transformers wai wai-extra ]; - executableHaskellDepends = [ + testHaskellDepends = [ base bytestring http-client network servant servant-server text transformers wai warp ]; description = "multipart/form-data (e.g file upload) support for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-named" = callPackage @@ -191967,15 +198875,14 @@ self: { ({ mkDerivation, base, hspec, named, QuickCheck, servant, text }: mkDerivation { pname = "servant-namedargs"; - version = "0.1.0.1"; - sha256 = "0ylxcl11wmi3il5bpl7qc32qh2s210xfp37vfhhvnlxzgdzj84vh"; - revision = "1"; - editedCabalFile = "0nr11syaq0l04qdwh5ac0gnpfcgi9vakfjgv5i6p6kraag8za5k7"; + version = "0.1.1.0"; + sha256 = "10y1a9cr5fb794nqck1dmdr4dr6yl2x32zwsk1l2k4zfwy9bwyj1"; libraryHaskellDepends = [ base named servant text ]; testHaskellDepends = [ base hspec named QuickCheck servant ]; description = "Combinators for servant providing named parameters"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-nix" = callPackage @@ -191998,6 +198905,7 @@ self: { description = "Servant Nix content-type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-options" = callPackage @@ -192021,8 +198929,8 @@ self: { }: mkDerivation { pname = "servant-pagination"; - version = "2.2.0"; - sha256 = "15imbn6iyvbi80yainpi59q2r621r43d6cim3aydf6bbmz9pgnxd"; + version = "2.2.2"; + sha256 = "00ki2crhrp87m0dwyrb6rv25cfyag51igm772a54zvgi713qj7rr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192048,7 +198956,6 @@ self: { ]; description = "Use Pandoc to render servant API documentation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-pipes" = callPackage @@ -192060,6 +198967,8 @@ self: { pname = "servant-pipes"; version = "0.15"; sha256 = "04ypy9vjrfggrk7dg3sxwj9nav50v85vpr5mnp5r2c9ka6xn4v90"; + revision = "1"; + editedCabalFile = "1q4w4fnvpi4m62yhv37pcg5sj21m4s02glsa5q56vc51bjbx8xi4"; libraryHaskellDepends = [ base bytestring monad-control mtl pipes pipes-safe servant ]; @@ -192070,7 +198979,6 @@ self: { ]; description = "Servant Stream support for pipes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-pool" = callPackage @@ -192085,6 +198993,7 @@ self: { description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-postgresql" = callPackage @@ -192102,6 +199011,7 @@ self: { description = "Useful functions and instances for using servant with a PostgreSQL context"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-proto-lens" = callPackage @@ -192125,6 +199035,7 @@ self: { description = "Servant Content-Type for proto-lens protobuf modules"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-purescript" = callPackage @@ -192149,6 +199060,7 @@ self: { description = "Generate PureScript accessor functions for you servant API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-pushbullet-client" = callPackage @@ -192169,6 +199081,7 @@ self: { description = "Bindings to the Pushbullet API using servant-client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-py" = callPackage @@ -192191,6 +199104,7 @@ self: { description = "Automatically derive python functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-quickcheck" = callPackage @@ -192220,6 +199134,7 @@ self: { description = "QuickCheck entire APIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-rawm" = callPackage @@ -192248,7 +199163,30 @@ self: { ]; description = "Embed a raw 'Application' in a Servant API"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-reflex" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , data-default, exceptions, ghcjs-dom, http-api-data, http-media + , jsaddle, mtl, network-uri, reflex, reflex-dom-core, safe, servant + , servant-auth, string-conversions, text, transformers + }: + mkDerivation { + pname = "servant-reflex"; + version = "0.3.4"; + sha256 = "1k7dkzs2lsdjj94ai7p225zm09l9sgbxpb4av14xgy9m54rih5kk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers data-default exceptions + ghcjs-dom http-api-data http-media jsaddle mtl network-uri reflex + reflex-dom-core safe servant servant-auth string-conversions text + transformers + ]; + description = "servant API generator for reflex apps"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-response" = callPackage @@ -192282,6 +199220,7 @@ self: { description = "Servant router for non-server applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-ruby" = callPackage @@ -192315,6 +199254,7 @@ self: { description = "Generate a web service for servant 'Resource's using scotty and JSON"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-server" = callPackage @@ -192354,23 +199294,61 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-server_0_16" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, Cabal, cabal-doctest, containers, directory, doctest + , exceptions, filepath, hspec, hspec-discover, hspec-wai + , http-api-data, http-media, http-types, monad-control, mtl + , network, network-uri, QuickCheck, resourcet, safe, servant + , should-not-typecheck, string-conversions, tagged, temporary, text + , transformers, transformers-base, transformers-compat, wai + , wai-app-static, wai-extra, warp, word8 + }: + mkDerivation { + pname = "servant-server"; + version = "0.16"; + sha256 = "18rv99hyb448mcv1cjvs0p6cqrkw9f3zpdh18nsd29fskcybsv3b"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-compat base64-bytestring bytestring containers exceptions + filepath http-api-data http-media http-types monad-control mtl + network network-uri resourcet servant string-conversions tagged + text transformers transformers-base wai wai-app-static word8 + ]; + executableHaskellDepends = [ + aeson base base-compat servant text wai warp + ]; + testHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring directory + doctest hspec hspec-wai http-types mtl QuickCheck resourcet safe + servant should-not-typecheck string-conversions temporary text + transformers transformers-compat wai wai-extra + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs and serving them"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-server-namedargs" = callPackage - ({ mkDerivation, base, http-api-data, http-types, named, servant - , servant-namedargs, servant-server, string-conversions, text, wai + ({ mkDerivation, base, bytestring, http-api-data, http-types, named + , servant, servant-namedargs, servant-server, string-conversions + , text, wai }: mkDerivation { pname = "servant-server-namedargs"; - version = "0.1.0.0"; - sha256 = "0ncrrl91b8bcih4qf7gwl7m2qqmx6glwgvwcd4rvi1kdjrry8w0y"; - revision = "1"; - editedCabalFile = "1yf69y0w8miwcgdq9f88c2vabmqbn85rqsr8pqhijz24byyxnnl7"; + version = "0.1.1.0"; + sha256 = "1i810rw4kncpfyh2q67bqyiw6mh9pbhl4m40x2clwfsxqqpnkyda"; libraryHaskellDepends = [ - base http-api-data http-types named servant servant-namedargs - servant-server string-conversions text wai + base bytestring http-api-data http-types named servant + servant-namedargs servant-server string-conversions text wai ]; description = "Automatically derive API server functions with named and optional parameters"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-smsc-ru" = callPackage @@ -192394,6 +199372,7 @@ self: { description = "Servant client for smsc.ru service for sending SMS to cell phones"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-snap" = callPackage @@ -192435,6 +199414,7 @@ self: { description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-stache" = callPackage @@ -192523,6 +199503,7 @@ self: { description = "Client instances for the 'servant-streaming' package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-streaming-docs" = callPackage @@ -192541,6 +199522,7 @@ self: { description = "Client instances for the 'servant-docs' package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-streaming-server" = callPackage @@ -192568,6 +199550,7 @@ self: { description = "Server instances for the 'servant-streaming' package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-subscriber" = callPackage @@ -192594,7 +199577,6 @@ self: { executableHaskellDepends = [ base purescript-bridge ]; description = "When REST is not enough ..."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger" = callPackage @@ -192608,6 +199590,8 @@ self: { pname = "servant-swagger"; version = "1.1.7"; sha256 = "0dnyh4g55x70cb6xwksm0rk23v5lawdws5bxgq27ja1walh106p3"; + revision = "1"; + editedCabalFile = "0maasfw086a2iy4dyfaap4f1ncq1cg3p2mw6ypqhfr3dipgj5d3v"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -192619,9 +199603,8 @@ self: { QuickCheck servant swagger2 template-haskell text time utf8-string ]; testToolDepends = [ hspec-discover ]; - description = "Generate Swagger specification for your servant API"; + description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui" = callPackage @@ -192632,15 +199615,14 @@ self: { pname = "servant-swagger-ui"; version = "0.3.2.3.19.3"; sha256 = "0s2y6fhm26gzs344ig86nh6d1sy2dxfqpwpgz6c2dcg65jcbbpc7"; - revision = "1"; - editedCabalFile = "0k2s6y93ii3d1myacq70ifpjf9q0mglxdr97wmxll6ixzsn7fjpl"; + revision = "2"; + editedCabalFile = "1p16lixhl9dbv3xlxpzy784a68xqnhvy91wyl5y183kixjniyf6f"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text ]; description = "Servant swagger ui"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui-core" = callPackage @@ -192652,8 +199634,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.2"; sha256 = "1a1wk90vm6mq8byxz4syr03l1rf6qj8zhda7lnp23pn5d270xkd2"; - revision = "2"; - editedCabalFile = "02yxnvd54wcykhswivhg5sr67njz0p3raxmp5nqmijwwxh0iqdvc"; + revision = "3"; + editedCabalFile = "1di8fz3kcyp395yvjx3i48p68kx3qg83vbjc81c5jdp1i8w0kmww"; libraryHaskellDepends = [ base blaze-markup bytestring http-media servant servant-blaze servant-server swagger2 text transformers transformers-compat @@ -192661,7 +199643,6 @@ self: { ]; description = "Servant swagger ui core components"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui-jensoleg" = callPackage @@ -192672,15 +199653,14 @@ self: { pname = "servant-swagger-ui-jensoleg"; version = "0.3.2"; sha256 = "1ybkwa6dyi9v1rcqd0gzl1hqkinkmsqwz0ang0cmsa6d8ym3zmii"; - revision = "1"; - editedCabalFile = "1n735zxdkfnhr0vh6r3cgw97pggp0lnpd6bq6fspzv5bbylg3mkc"; + revision = "2"; + editedCabalFile = "0ckx9bvngl65mcg8d16baknvz0637z7griqqwkclcvgksx812kbh"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text ]; description = "Servant swagger ui: Jens-Ole Graulund theme"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui-redoc" = callPackage @@ -192691,15 +199671,14 @@ self: { pname = "servant-swagger-ui-redoc"; version = "0.3.2.1.22.2"; sha256 = "0d4r6rp48lkgd4903hfja14mlar1h17hrb4fhq05p3wga7kik6g0"; - revision = "1"; - editedCabalFile = "030zf1z5h96d40ifwagxblz1dij2ypbcqyy0wpqvjqbianyqgcim"; + revision = "2"; + editedCabalFile = "160acp4hvwm4m42kx275qr1nkg9s7bjxlk61agvm45hi3lg0lm6f"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text ]; description = "Servant swagger ui: ReDoc theme"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-tracing" = callPackage @@ -192733,25 +199712,27 @@ self: { }) {}; "servant-waargonaut" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, http-media - , http-types, lens, servant, servant-server, tasty, tasty-wai, text - , transformers, waargonaut, wai, wl-pprint-annotated + ({ mkDerivation, base, bytestring, http-media, http-types, lens + , servant, servant-server, tasty, tasty-wai, text, transformers + , waargonaut, wai, wl-pprint-annotated }: mkDerivation { pname = "servant-waargonaut"; - version = "0.5.0.1"; - sha256 = "05j4d99nl5165fr5799fpfw9xxadn77gmx1zcvsi075piacf0s2k"; + version = "0.6.0.0"; + sha256 = "17igh9s4bmzsx10qscrqpqd8djkmr2krfc660nhdsi7cx5hmlwl3"; libraryHaskellDepends = [ - attoparsec base bytestring http-media lens servant text waargonaut + base bytestring http-media lens servant text waargonaut wl-pprint-annotated ]; testHaskellDepends = [ - attoparsec base bytestring http-media http-types lens servant - servant-server tasty tasty-wai text transformers waargonaut wai + base bytestring http-media http-types lens servant servant-server + tasty tasty-wai text transformers waargonaut wai wl-pprint-annotated ]; description = "Servant Integration for Waargonaut JSON Package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-websockets" = callPackage @@ -192789,7 +199770,6 @@ self: { ]; description = "Servant support for the XML Content-Type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-yaml" = callPackage @@ -192800,6 +199780,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.1"; sha256 = "00gnbdlcq6cvmhsga8h0csd35pnfib038rqlhm445l4wa0cp8m01"; + revision = "1"; + editedCabalFile = "05j3hqvqiq8wa45jsdx72xa5phbhvn2lxbkbhh1g0j13ky8x2waw"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -192821,6 +199803,7 @@ self: { description = "Types and definitions of servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-zeppelin-client" = callPackage @@ -192845,6 +199828,7 @@ self: { description = "Client library for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-zeppelin-server" = callPackage @@ -192869,6 +199853,7 @@ self: { description = "Server library for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-zeppelin-swagger" = callPackage @@ -192891,6 +199876,7 @@ self: { description = "Swagger instances for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "server-generic" = callPackage @@ -192907,6 +199893,7 @@ self: { description = "Auto-generate a server for your datatype"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "serverless-haskell" = callPackage @@ -192918,8 +199905,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.8.5"; - sha256 = "0jnq2z5h7bqzbrppznw38vq9ibbijddw3jkx3vhrf0jzvk50gqqg"; + version = "0.8.6"; + sha256 = "1ji1rkgrygsmrvgpirvc1pr2rw2xq15ff1v86ckwn7gcb9q8z7jy"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -192935,6 +199922,7 @@ self: { description = "Deploying Haskell code onto AWS Lambda using Serverless"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "serversession" = callPackage @@ -193042,6 +200030,7 @@ self: { description = "Snap bindings for serversession"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "serversession-frontend-wai" = callPackage @@ -193078,6 +200067,7 @@ self: { description = "Yesod bindings for serversession"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "services" = callPackage @@ -193096,6 +200086,7 @@ self: { description = "Tools for building services"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "serviette" = callPackage @@ -193162,6 +200153,7 @@ self: { description = "Snaplet for the ses-html package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sessions" = callPackage @@ -193177,6 +200169,7 @@ self: { description = "Session Types for Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sessiontypes" = callPackage @@ -193199,6 +200192,7 @@ self: { description = "Session types library"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sessiontypes-distributed" = callPackage @@ -193222,6 +200216,7 @@ self: { description = "Session types distributed"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "set-cover" = callPackage @@ -193242,6 +200237,7 @@ self: { description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "set-extra" = callPackage @@ -193275,7 +200271,6 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Sets of fixed size, with typelits"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "set-with" = callPackage @@ -193294,6 +200289,7 @@ self: { description = "Set of elements sorted by a different data type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "setdown" = callPackage @@ -193314,6 +200310,7 @@ self: { description = "Treating files as sets to perform rapid set manipulation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "setenv" = callPackage @@ -193344,6 +200341,7 @@ self: { description = "A console interface to the game of Set"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "setlocale" = callPackage @@ -193374,6 +200372,7 @@ self: { description = "A Haskell implementation of setoid"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "setop" = callPackage @@ -193439,6 +200438,7 @@ self: { description = "Ducktyped set interface for Haskell containers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "setters" = callPackage @@ -193453,6 +200453,7 @@ self: { description = "Small (TH) library to declare setters for typical `record' data type fields"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "settings" = callPackage @@ -193489,6 +200490,7 @@ self: { description = "S-Expression parsing/printing made fun and easy"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sexp-grammar" = callPackage @@ -193517,7 +200519,6 @@ self: { ]; description = "Invertible grammar combinators for S-expressions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sexp-show" = callPackage @@ -193584,6 +200585,7 @@ self: { description = "Lists, Texts, ByteStrings and Vectors with type-encoded length"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sfml-audio" = callPackage @@ -193609,6 +200611,7 @@ self: { description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sfnt2woff" = callPackage @@ -193630,24 +200633,25 @@ self: { description = "A command line tool to convert TrueType/OpenType fonts to WOFF format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) zlib;}; "sgd" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , filepath, lazy-io, logfloat, monad-par, mtl, primitive, random - , temporary, vector + ({ mkDerivation, base, binary, bytestring, containers, data-default + , deepseq, filepath, hmatrix, logfloat, monad-par, mtl, parallel + , pipes, primitive, random, random-shuffle, temporary, vector }: mkDerivation { pname = "sgd"; - version = "0.4.0.1"; - sha256 = "05ngij0zigjxplw76qaczpd4dmdmqj23h8bfls5cd5s5sbxv5irb"; + version = "0.7.0.1"; + sha256 = "1bfj74i9m1989wav6irlfiwgq8mgyf9g49cpdipgdiqqb4qmhv13"; libraryHaskellDepends = [ - base binary bytestring containers deepseq filepath lazy-io logfloat - monad-par mtl primitive random temporary vector + base binary bytestring containers data-default deepseq filepath + hmatrix logfloat monad-par mtl parallel pipes primitive random + random-shuffle temporary vector ]; description = "Stochastic gradient descent"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sgf" = callPackage @@ -193665,6 +200669,7 @@ self: { description = "SGF (Smart Game Format) parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sgrep" = callPackage @@ -193679,6 +200684,7 @@ self: { description = "Sgrep - grep Fasta files for sequences matching a regular expression"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sh2md" = callPackage @@ -193706,6 +200712,7 @@ self: { description = "Record your shell session and print in the markdown format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sha-streams" = callPackage @@ -193721,6 +200728,7 @@ self: { description = "SHA hashes for io-streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shade" = callPackage @@ -193735,6 +200743,7 @@ self: { description = "A control structure used to combine heterogenous types with delayed effects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shadower" = callPackage @@ -193758,6 +200767,7 @@ self: { description = "An automated way to run doctests in files that are changing"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shadowsocks" = callPackage @@ -193914,6 +200924,7 @@ self: { description = "Utility for building Shake build systems using Cabal sandboxes"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shake-ccjs" = callPackage @@ -193963,6 +200974,7 @@ self: { description = "Extra utilities for shake build systems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shake-google-closure-compiler" = callPackage @@ -194017,6 +201029,7 @@ self: { description = "Shake Minify Rules"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shake-pack" = callPackage @@ -194029,6 +201042,7 @@ self: { description = "Shake File Pack Rule"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shake-path" = callPackage @@ -194041,6 +201055,7 @@ self: { description = "path alternatives to shake functions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shake-persist" = callPackage @@ -194059,6 +201074,7 @@ self: { description = "Shake build system on-disk caching"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shaker" = callPackage @@ -194088,6 +201104,7 @@ self: { description = "simple and interactive command-line build tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shakers" = callPackage @@ -194144,6 +201161,7 @@ self: { description = "compile es2015"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shakespeare-css" = callPackage @@ -194196,6 +201214,7 @@ self: { description = "SASS support for Shakespeare and Yesod"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shakespeare-text" = callPackage @@ -194268,6 +201287,7 @@ self: { description = "Generics using @(,)@ and @Either@, with algebraic operations and typed conversions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shapes" = callPackage @@ -194366,6 +201386,7 @@ self: { description = "A circular buffer built on shared memory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shared-fields" = callPackage @@ -194380,6 +201401,7 @@ self: { description = "a tiny library for using shared lens fields"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shared-memory" = callPackage @@ -194420,6 +201442,7 @@ self: { description = "A Haskell preprocessor adding miscellaneous features"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shelduck" = callPackage @@ -194451,6 +201474,7 @@ self: { description = "Test webhooks locally"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shell-conduit" = callPackage @@ -194514,6 +201538,7 @@ self: { description = "Pipe streams through external shell commands"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shellish" = callPackage @@ -194531,6 +201556,7 @@ self: { description = "shell-/perl- like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shellmate" = callPackage @@ -194548,6 +201574,7 @@ self: { description = "Simple interface for shell scripting in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shellmate-extras" = callPackage @@ -194567,6 +201594,23 @@ self: { description = "Extra functionality for shellmate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "shellmet" = callPackage + ({ mkDerivation, base, markdown-unlit, process, text }: + mkDerivation { + pname = "shellmet"; + version = "0.0.0"; + sha256 = "1mn9m1jdbfb9p273wb9jvdnflhp6569ix6sa1z7yzqr91g7w4017"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base process text ]; + executableHaskellDepends = [ base text ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ base ]; + description = "Out of the shell solution for scripting in Haskell"; + license = stdenv.lib.licenses.mpl20; }) {}; "shellout" = callPackage @@ -194613,7 +201657,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Parse strings into words, like a shell would"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelly" = callPackage @@ -194714,25 +201757,38 @@ self: { }) {}; "shh" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath, mtl - , process, split, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, unix + ({ mkDerivation, async, base, deepseq, directory, filepath + , hashable, mtl, process, split, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, unix }: mkDerivation { pname = "shh"; - version = "0.2.0.0"; - sha256 = "1r3giir4l1l2pn4kamgmdqsw1j8qz9aaw741lq761yk1s3lciwim"; + version = "0.3.0.0"; + sha256 = "15w2izm0wmxqh5f0343rj42vq2dg4xp77a11qp4q10yj7r5cbp52"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base deepseq directory filepath mtl process split template-haskell unix ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ + async base directory hashable split temporary + ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Simple shell scripting from Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "shh-extras" = callPackage + ({ mkDerivation, base, hostname, shh, tasty, time }: + mkDerivation { + pname = "shh-extras"; + version = "0.1.0.1"; + sha256 = "0w4ddjszs0lrpr4zcggcwb80bg3yd8lr628jngmh4a05ypv3hxkk"; + libraryHaskellDepends = [ base hostname shh time ]; + testHaskellDepends = [ base tasty ]; + description = "Utility functions for using shh"; + license = stdenv.lib.licenses.bsd3; }) {}; "shift" = callPackage @@ -194792,7 +201848,6 @@ self: { ]; description = "The Reflective Lambda Machine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shine" = callPackage @@ -194803,6 +201858,8 @@ self: { pname = "shine"; version = "0.2.0.3"; sha256 = "16h5igycgas28qk22yg08qkfwsrar9g4bw7q8p94vmf993p4542k"; + revision = "1"; + editedCabalFile = "0af20y679gqd8dzsfjhiaag1dc25dlvgml2jdkqnp6mi28sbz3n1"; libraryHaskellDepends = [ base ghcjs-dom ghcjs-prim keycode mtl time transformers ]; @@ -194819,8 +201876,8 @@ self: { pname = "shine-varying"; version = "0.1.0.0"; sha256 = "13mnzf8i9y7ifn73mvsrzv0dh01vc20cymqli29j384z1491sc40"; - revision = "3"; - editedCabalFile = "1icg7mcfw6zrdf884kh2g0ss2lki0zf0b3r0yqzmz4h2cwvxl910"; + revision = "4"; + editedCabalFile = "1q46j41fxi8y52vzx7g18izndwrckcny56xdzyzrj5455znhwrsy"; libraryHaskellDepends = [ base ghcjs-dom keycode shine varying ]; testHaskellDepends = [ base ghcjs-dom keycode shine varying ]; description = "FRP interface for shine using the varying package"; @@ -194842,6 +201899,7 @@ self: { description = "Implementation of Shivers' Control-Flow Analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shoap" = callPackage @@ -194854,6 +201912,7 @@ self: { description = "A very basic SOAP package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shopify" = callPackage @@ -194875,6 +201934,7 @@ self: { description = "A haskell API binding for shopify.com"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shortcircuit" = callPackage @@ -194921,6 +201981,7 @@ self: { description = "Shorten a variety of string-like types adding ellipsis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "should-not-typecheck" = callPackage @@ -194981,8 +202042,8 @@ self: { }: mkDerivation { pname = "show-prettyprint"; - version = "0.2.2"; - sha256 = "0mdgx484vgf2lif4a58vm8yl8zghxh0533038r76l5xlkc5qczgh"; + version = "0.2.3"; + sha256 = "01wg1bzp6dylysbm9rfq8n0ci7yzg3gw6jkzy8kzmsydgs5c54pd"; libraryHaskellDepends = [ ansi-wl-pprint base prettyprinter trifecta ]; @@ -195015,6 +202076,7 @@ self: { description = "A simple gtk based Russian Roulette game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shower" = callPackage @@ -195035,6 +202097,8 @@ self: { ]; description = "Clean up the formatting of 'show' output"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shpider" = callPackage @@ -195052,6 +202116,7 @@ self: { description = "Web automation library in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shplit" = callPackage @@ -195102,6 +202167,7 @@ self: { description = "Shuffle tool for UHC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shunya-library" = callPackage @@ -195138,6 +202204,7 @@ self: { description = "An interface to the Silicon Labs Si5351 clock chip"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sibe" = callPackage @@ -195164,6 +202231,7 @@ self: { description = "Machine Learning algorithms"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sieve" = callPackage @@ -195199,6 +202267,7 @@ self: { description = "Simple, visual, functional language for learning about recursion"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sifflet-lib" = callPackage @@ -195218,6 +202287,7 @@ self: { description = "Library of modules shared by sifflet and its tests and its exporters"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gdk_x11 = null; gtk_x11 = null;}; "siggy-chardust" = callPackage @@ -195259,6 +202329,7 @@ self: { description = "Thom polynomials of second order Thom-Boardman singularities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sign" = callPackage @@ -195282,6 +202353,7 @@ self: { description = "Arithmetic over signs and sets of signs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "signal" = callPackage @@ -195313,6 +202385,7 @@ self: { description = "Synchronous signal processing for DSLs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "signed-multiset" = callPackage @@ -195325,6 +202398,7 @@ self: { description = "Multisets with negative membership"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "silently" = callPackage @@ -195355,6 +202429,7 @@ self: { description = "A generator for different kinds of data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simd" = callPackage @@ -195367,6 +202442,7 @@ self: { description = "simple interface to GHC's SIMD instructions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simgi" = callPackage @@ -195385,6 +202461,7 @@ self: { description = "stochastic simulation engine"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple" = callPackage @@ -195420,6 +202497,7 @@ self: { description = "A minimalist web framework for the WAI server interface"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-actors" = callPackage @@ -195435,6 +202513,7 @@ self: { description = "A library for more structured concurrent programming, based on the Actor Model"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-affine-space" = callPackage @@ -195452,6 +202531,7 @@ self: { description = "A simple library for affine and vector spaces"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-atom" = callPackage @@ -195464,6 +202544,7 @@ self: { description = "Atom (or symbol) datatype for fast comparision and sorting"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-bluetooth" = callPackage @@ -195477,6 +202558,7 @@ self: { description = "Simple Bluetooth API for Windows and Linux (bluez)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {bluetooth = null;}; "simple-c-value" = callPackage @@ -195500,19 +202582,31 @@ self: { description = "A simple C value type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-cmd" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { pname = "simple-cmd"; - version = "0.1.2"; - sha256 = "10jdyl1ghzczxw5bi8s1694fla42s1aknmj5grxndidwzf95b8g6"; + version = "0.1.3"; + sha256 = "04bbdfmfy08fl07f0pqzp31jy4fdky4d9hazyxpqla8m3rs49xa9"; libraryHaskellDepends = [ base directory filepath process ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; }) {}; + "simple-cmd-args" = callPackage + ({ mkDerivation, base, optparse-applicative }: + mkDerivation { + pname = "simple-cmd-args"; + version = "0.1.0.1"; + sha256 = "1fs528gr70ppwfz1yalvjdfdxf7b7zxcc9cvsmdba8r1m489qp9d"; + libraryHaskellDepends = [ base optparse-applicative ]; + description = "Simple command args parsing and execution"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-conduit" = callPackage ({ mkDerivation, base, bifunctors, bytestring, CC-delcont , chunked-data, conduit, conduit-combinators, conduit-extra @@ -195543,6 +202637,7 @@ self: { description = "A simple streaming I/O library based on monadic folds"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-config" = callPackage @@ -195561,6 +202656,7 @@ self: { description = "Simple config file parser generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-css" = callPackage @@ -195577,6 +202673,7 @@ self: { description = "simple binding of css and html"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-download" = callPackage @@ -195593,6 +202690,7 @@ self: { description = "A simple wrapper of http-conduit for file download"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-effects" = callPackage @@ -195629,6 +202727,7 @@ self: { description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-firewire" = callPackage @@ -195641,6 +202740,7 @@ self: { description = "Simplified interface for firewire cameras"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-form" = callPackage @@ -195673,6 +202773,7 @@ self: { description = "Simple parallel genetic algorithm implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-genetic-algorithm-mr" = callPackage @@ -195699,8 +202800,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "simple-get-opt"; - version = "0.2.0"; - sha256 = "1xx751j2vszqr8x9nf4f56aj5b6v0j8qdf90pd1xdasrfc67af9c"; + version = "0.3"; + sha256 = "1kcngbcl8kv6v9762z1f6kp4x7kary8n4zqpky6d7kxpv5zqrnfy"; libraryHaskellDepends = [ base ]; description = "A simple library for processing command-line options"; license = stdenv.lib.licenses.bsd3; @@ -195720,6 +202821,7 @@ self: { description = "Allows simple indexation on any data type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-log" = callPackage @@ -195752,6 +202854,7 @@ self: { description = "Syslog backend for simple-log"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-logger" = callPackage @@ -195786,6 +202889,7 @@ self: { description = "Logging effect to plug into the simple-effects framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-money" = callPackage @@ -195798,6 +202902,7 @@ self: { description = "Simple library to handle and interexchange money"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-neural-networks" = callPackage @@ -195818,6 +202923,7 @@ self: { description = "Simple parallel neural networks implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-nix" = callPackage @@ -195840,6 +202946,7 @@ self: { description = "Simple parsing/pretty printing for Nix expressions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-observer" = callPackage @@ -195869,6 +202976,7 @@ self: { description = "Simplified Pascal language to SSVM compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-pipe" = callPackage @@ -195888,6 +202996,7 @@ self: { description = "simple pipeline library like conduit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-postgresql-orm" = callPackage @@ -195906,6 +203015,7 @@ self: { description = "Connector package for integrating postgresql-orm with the Simple web framework"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-reflect" = callPackage @@ -195929,6 +203039,7 @@ self: { description = "Memory-efficient strings with concatenation and splitting"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-sendfile" = callPackage @@ -195980,6 +203091,7 @@ self: { description = "Cookie-based session management for the Simple web framework"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-sessions" = callPackage @@ -196064,6 +203176,7 @@ self: { description = "Simple tabular-text formatter"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-tar" = callPackage @@ -196080,6 +203193,7 @@ self: { description = "Simple, pure, file-system-free reading of tar files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-templates" = callPackage @@ -196099,6 +203213,7 @@ self: { description = "A basic template language for the Simple web framework"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-text-format" = callPackage @@ -196133,6 +203248,7 @@ self: { description = "UI library for terminal"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-vec3" = callPackage @@ -196151,6 +203267,7 @@ self: { description = "Three-dimensional vectors of doubles with basic operations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simple-zipper" = callPackage @@ -196164,6 +203281,7 @@ self: { description = "Zippers made slightly easier"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simpleargs" = callPackage @@ -196177,6 +203295,7 @@ self: { description = "Provides a more flexible getArgs function with better error reporting"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simpleconfig" = callPackage @@ -196194,6 +203313,7 @@ self: { description = "Short description of your package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simpleirc" = callPackage @@ -196211,6 +203331,7 @@ self: { description = "Simple IRC Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simpleirc-lens" = callPackage @@ -196223,6 +203344,7 @@ self: { description = "Lenses for simpleirc types"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simplemesh" = callPackage @@ -196251,6 +203373,7 @@ self: { description = "Haskell interface for the simplenote API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simpleprelude" = callPackage @@ -196270,6 +203393,7 @@ self: { description = "A simplified Haskell prelude for teaching"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simplesmtpclient" = callPackage @@ -196312,6 +203436,7 @@ self: { description = "Simplest SQLite3 binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) sqlite;}; "simplex" = callPackage @@ -196365,6 +203490,7 @@ self: { description = "Simulate sequencing with different models for priming and errors"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "simtreelo" = callPackage @@ -196439,6 +203565,7 @@ self: { description = "Typelevel balanced search trees via a singletonized Data.Map"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "singleton-nats" = callPackage @@ -196462,6 +203589,7 @@ self: { description = "Singletons and induction over GHC TypeLits"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "singletons" = callPackage @@ -196493,6 +203621,7 @@ self: { description = "Singnal"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sink" = callPackage @@ -196505,6 +203634,7 @@ self: { description = "An alternative to lazy I/O that doesn't conflate execution with evaluation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "siphash" = callPackage @@ -196551,6 +203681,7 @@ self: { description = "Encode and decode CSV files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "siren-json" = callPackage @@ -196561,8 +203692,8 @@ self: { }: mkDerivation { pname = "siren-json"; - version = "0.3.0.0"; - sha256 = "096a4ls4kqpslqsh499ykh7mkvnz3q7n00w1par69kmj4x3g9v0j"; + version = "0.3.1.1"; + sha256 = "0idkblh14jz1l2miphb07lynpw8n1bshxf3q37chclc25wr156zk"; libraryHaskellDepends = [ aeson base bytestring containers http-media http-types network-uri network-uri-json text unordered-containers @@ -196576,6 +203707,7 @@ self: { description = "Siren Tools for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sirkel" = callPackage @@ -196593,6 +203725,7 @@ self: { description = "Sirkel, a Chord DHT"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sitemap" = callPackage @@ -196610,21 +203743,22 @@ self: { ({ mkDerivation, aeson, base, bytestring, containers, directory , exceptions, filepath, Glob, lens, lens-aeson, megaparsec , MissingH, mtl, mustache, optparse-applicative, pandoc, parsec - , shelly, text, unordered-containers, yaml + , shelly, text, transformers, unordered-containers, yaml }: mkDerivation { pname = "sitepipe"; - version = "0.3.0.2"; - sha256 = "0f26sqpf8rjrbpk6q9hp0q705hhmhyp71jyj5w9jgq6mnj34rxy8"; + version = "0.4.0.0"; + sha256 = "0y8llic3imc1zs53glig24vjm59f2dnw4sw32gzkvlzq33689s7s"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions filepath Glob lens lens-aeson megaparsec MissingH mtl mustache - optparse-applicative pandoc parsec shelly text unordered-containers - yaml + optparse-applicative pandoc parsec shelly text transformers + unordered-containers yaml ]; description = "A simple to understand static site generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sixfiguregroup" = callPackage @@ -196642,6 +203776,7 @@ self: { description = "A six figure group of time"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sixty-five-oh-two" = callPackage @@ -196688,6 +203823,7 @@ self: { description = "Sized sequence data-types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sized-grid" = callPackage @@ -196713,6 +203849,7 @@ self: { description = "Multidimensional grids with sized specified at compile time"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sized-types" = callPackage @@ -196732,6 +203869,7 @@ self: { description = "Sized types in Haskell using the GHC Nat kind"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sized-vector" = callPackage @@ -196749,6 +203887,7 @@ self: { description = "Size-parameterized vector types and functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sizes" = callPackage @@ -196769,6 +203908,7 @@ self: { description = "Recursively show space (size and i-nodes) used in subdirectories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sjsp" = callPackage @@ -196791,6 +203931,7 @@ self: { description = "Simple JavaScript Profiler"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skein" = callPackage @@ -196828,6 +203969,7 @@ self: { description = "Skeletal set - a set with equivalence relation different from equality"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skeleton" = callPackage @@ -196847,6 +203989,7 @@ self: { description = "a tool to access the OSX keychain"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skeletons" = callPackage @@ -196866,6 +204009,7 @@ self: { description = "Manage project skeletons"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skell" = callPackage @@ -196882,6 +204026,7 @@ self: { description = "An overly complex Haskell web framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skemmtun" = callPackage @@ -196901,6 +204046,7 @@ self: { description = "A MyAnimeList.net client."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skews" = callPackage @@ -196909,17 +204055,14 @@ self: { }: mkDerivation { pname = "skews"; - version = "0.1.0.1"; - sha256 = "03dn42hj50g4if1biln8m9rzf54iccqivkdciw06yrvx7q64hi5m"; - revision = "1"; - editedCabalFile = "0zvqfr9dfcap3ljpkq5hq95npmhrmndlh0gs4pa2zm8bwrh1nl66"; + version = "0.1.0.2"; + sha256 = "0xw9zlv7f77048c47kc3kymwxv9whg286d270n9d1k52c0df8h0p"; libraryHaskellDepends = [ base bytestring deque websockets ]; testHaskellDepends = [ async base bytestring deque envy hspec network websockets ]; description = "A very quick-and-dirty WebSocket server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skip-list" = callPackage @@ -196957,6 +204100,7 @@ self: { description = "Eclectic collection of utility functions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skylark-client" = callPackage @@ -196980,6 +204124,7 @@ self: { description = "Skylark client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skylighting" = callPackage @@ -196991,8 +204136,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.7.6"; - sha256 = "0dzwk8603xd7wasxw0hg7pr18kfdb4f6gjqh42j6ldbn89w00d4f"; + version = "0.7.7"; + sha256 = "03nn5z67jg45myrcmbwkz06z4ywy06whbc0jhc3ycpw9wfy5iqvy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197015,8 +204160,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.7.6"; - sha256 = "02jhla474vpr56dn0573j29lngqi2v167n7bxlra20ywlgbj5mn7"; + version = "0.7.7"; + sha256 = "0zd7gsybi02rigbgly63d8asfz8xy1xlnfy90m92zayizkagyg49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197079,6 +204224,7 @@ self: { description = "Skype Desktop API binding for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skypelogexport" = callPackage @@ -197117,6 +204263,7 @@ self: { description = "Haskell API for interacting with Slack"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "slack-api" = callPackage @@ -197187,8 +204334,8 @@ self: { }: mkDerivation { pname = "slack-web"; - version = "0.2.0.10"; - sha256 = "0dcvy6x08xm3kgxh65p7kvp7r4f1n819g933vna37sjwy94mmqh1"; + version = "0.2.0.11"; + sha256 = "14ngln71sn5i26041m4v614vq4qhr44pzlgyxliyqw08dxn25la7"; libraryHaskellDepends = [ aeson base containers errors http-api-data http-client http-client-tls megaparsec mtl servant servant-client @@ -197200,7 +204347,6 @@ self: { ]; description = "Bindings for the Slack web API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slate" = callPackage @@ -197299,7 +204445,6 @@ self: { pandoc shake text time ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slidemews" = callPackage @@ -197319,6 +204464,7 @@ self: { description = "ws convert markdown to reveal-js"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "slim" = callPackage @@ -197335,6 +204481,7 @@ self: { description = "Functional reactive user interface programming"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sloane" = callPackage @@ -197357,6 +204504,7 @@ self: { description = "A command line interface to Sloane's OEIS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "slope-field" = callPackage @@ -197376,6 +204524,7 @@ self: { description = "Visualize mathematical function's slope fields"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "slot-lambda" = callPackage @@ -197393,6 +204542,7 @@ self: { description = "Write lambdas without naming the parameters"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sloth" = callPackage @@ -197405,6 +204555,7 @@ self: { description = "Testing for minimal strictness"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "slotmap" = callPackage @@ -197439,6 +204590,7 @@ self: { description = "Type-safe slugs for Yesod ecosystem"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smallarray" = callPackage @@ -197451,6 +204603,7 @@ self: { description = "low-level unboxed arrays, with minimal features"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smallcaps" = callPackage @@ -197474,6 +204627,7 @@ self: { description = "Flatten camel case text in LaTeX files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smallcheck" = callPackage @@ -197497,6 +204651,7 @@ self: { description = "SmallCheck properties for common laws"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smallcheck-lens" = callPackage @@ -197513,6 +204668,7 @@ self: { description = "SmallCheck properties for lens"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smallcheck-series" = callPackage @@ -197523,13 +204679,14 @@ self: { pname = "smallcheck-series"; version = "0.6.1"; sha256 = "07kjbci4wxi6g9m0k0fqpxm8p2kxspyrcmg175vb3bp008vqb931"; + revision = "2"; + editedCabalFile = "1944nax2aq32cd8i335nc511zis3lcwkclkh5caigsfs34kwwglg"; libraryHaskellDepends = [ base bytestring containers logict smallcheck text transformers ]; testHaskellDepends = [ base doctest Glob ]; description = "Extra SmallCheck series and utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smallpt-hs" = callPackage @@ -197544,6 +204701,7 @@ self: { description = "A Haskell port of the smallpt path tracer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smallstring" = callPackage @@ -197560,6 +204718,7 @@ self: { description = "A Unicode text type, optimized for low memory overhead"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smaoin" = callPackage @@ -197589,6 +204748,7 @@ self: { description = "group strings or bytestrings by words in common"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smartcheck" = callPackage @@ -197610,6 +204770,7 @@ self: { description = "A smarter QuickCheck"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smartconstructor" = callPackage @@ -197622,6 +204783,7 @@ self: { description = "A package exposing a helper function for generating smart constructors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smartword" = callPackage @@ -197639,6 +204801,7 @@ self: { description = "Web based flash card for Word Smart I and II vocabularies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smcdel" = callPackage @@ -197667,6 +204830,7 @@ self: { description = "Symbolic Model Checking for Dynamic Epistemic Logic"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sme" = callPackage @@ -197679,6 +204843,7 @@ self: { description = "A library for Secure Multi-Execution in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smerdyakov" = callPackage @@ -197698,6 +204863,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smiles" = callPackage @@ -197710,6 +204876,7 @@ self: { testHaskellDepends = [ base hspec megaparsec QuickCheck text ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smith-cli" = callPackage @@ -197733,6 +204900,8 @@ self: { ]; description = "Command line tool for ."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smith-client" = callPackage @@ -197756,6 +204925,8 @@ self: { ]; description = "API client for ."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smoothie" = callPackage @@ -197785,6 +204956,7 @@ self: { description = "SMSAero API and HTTP client based on servant library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smt-lib" = callPackage @@ -197797,6 +204969,7 @@ self: { description = "Parsing and printing SMT-LIB"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smtLib" = callPackage @@ -197841,6 +205014,7 @@ self: { description = "Dump the communication with an SMT solver for debugging purposes"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smtlib2-pipe" = callPackage @@ -197863,6 +205037,7 @@ self: { description = "A type-safe interface to communicate with an SMT solver"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smtlib2-quickcheck" = callPackage @@ -197879,6 +205054,7 @@ self: { description = "Helper functions to create SMTLib expressions in QuickCheck"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smtlib2-timing" = callPackage @@ -197927,6 +205103,7 @@ self: { description = "An SMTP client EDSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smtp2mta" = callPackage @@ -197960,6 +205137,7 @@ self: { description = "Gmail SMTP Client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smuggler" = callPackage @@ -197981,6 +205159,7 @@ self: { description = "GHC Source Plugin that helps to manage imports"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snake" = callPackage @@ -197995,6 +205174,7 @@ self: { description = "A basic console snake game"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snake-game" = callPackage @@ -198007,6 +205187,7 @@ self: { description = "Snake Game Using OpenGL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snap" = callPackage @@ -198023,6 +205204,8 @@ self: { pname = "snap"; version = "1.1.2.0"; sha256 = "05da0dg0p6djcsinycih50hjnircibmicarwg2vr14a7zbrhynps"; + revision = "1"; + editedCabalFile = "07k5sq44w09cq7w8y128ifkm7837nyklgp9i1ydnavnhf044ah2n"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist fail filepath hashable @@ -198043,6 +205226,7 @@ self: { description = "Top-level package for the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snap-accept" = callPackage @@ -198090,6 +205274,7 @@ self: { description = "Command-line tool to manage Snap AuthManager database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snap-blaze" = callPackage @@ -198113,6 +205298,7 @@ self: { description = "blaze-html-clay integration for Snap"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snap-configuration-utilities" = callPackage @@ -198127,6 +205313,7 @@ self: { description = "Methods to manipulate Configurator objects for Snap & Snaplets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snap-core" = callPackage @@ -198206,6 +205393,7 @@ self: { description = "Collect errors in batches and dispatch them"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snap-extras" = callPackage @@ -198238,6 +205426,7 @@ self: { description = "A collection of useful helpers and utilities for Snap web applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snap-language" = callPackage @@ -198254,6 +205443,7 @@ self: { description = "Language handling for Snap"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snap-loader-dynamic" = callPackage @@ -198327,6 +205517,7 @@ self: { description = "Typesafe URLs for Snap applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snap-server" = callPackage @@ -198426,6 +205617,7 @@ self: { description = "Streaming Snap handlers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snap-templates" = callPackage @@ -198437,6 +205629,8 @@ self: { pname = "snap-templates"; version = "1.0.0.2"; sha256 = "1gz410718j77plw4lx5l0ajgb6ics1nd6msdk88zj1lanbfwnz7l"; + revision = "1"; + editedCabalFile = "0p2vkq4d8wci18z7fqnhlz9k9zv5wgv1p95x5fcl0dafkyylgx41"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -198445,7 +205639,6 @@ self: { ]; description = "Scaffolding CLI for the Snap Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-testing" = callPackage @@ -198470,6 +205663,7 @@ self: { description = "A library for BDD-style testing with the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snap-utils" = callPackage @@ -198488,6 +205682,7 @@ self: { description = "Snap Framework utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snap-web-routes" = callPackage @@ -198504,6 +205699,7 @@ self: { description = "Type safe URLs for Snap"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-acid-state" = callPackage @@ -198518,6 +205714,7 @@ self: { description = "acid-state snaplet for Snap Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-actionlog" = callPackage @@ -198543,6 +205740,7 @@ self: { description = "Generic action log snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-amqp" = callPackage @@ -198561,6 +205759,7 @@ self: { description = "Snap framework snaplet for the AMQP library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-auth-acid" = callPackage @@ -198582,6 +205781,7 @@ self: { description = "Provides an Acid-State backend for the Auth Snaplet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-coffee" = callPackage @@ -198600,6 +205800,7 @@ self: { description = "CoffeeScript for Snap, auto-compilation and pre-compilation"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-css-min" = callPackage @@ -198617,6 +205818,7 @@ self: { description = "A Snaplet for CSS minification"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-customauth" = callPackage @@ -198639,6 +205841,7 @@ self: { description = "Alternate authentication snaplet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-environments" = callPackage @@ -198656,6 +205859,7 @@ self: { description = "DEPRECATED! You should use standard Snap >= 0.9 \"environments\" functionality. It provided ability to easly read configuration based on given app environment given at command line, envs are defined in app configuration file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-fay" = callPackage @@ -198676,6 +205880,7 @@ self: { description = "Fay integration for Snap with request- and pre-compilation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-ghcjs" = callPackage @@ -198693,6 +205898,7 @@ self: { description = "Serve javascript files compiled with GHCJS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-hasql" = callPackage @@ -198711,6 +205917,7 @@ self: { description = "A Hasql snaplet"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-haxl" = callPackage @@ -198727,6 +205934,7 @@ self: { description = "Snaplet for Facebook's Haxl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-hdbc" = callPackage @@ -198748,6 +205956,7 @@ self: { description = "HDBC snaplet for Snap Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-hslogger" = callPackage @@ -198765,6 +205974,7 @@ self: { description = "Snap framework snaplet for the Logger API library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-i18n" = callPackage @@ -198789,6 +205999,7 @@ self: { description = "snaplet-i18n"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-influxdb" = callPackage @@ -198808,6 +206019,7 @@ self: { description = "Snap framework snaplet for the InfluxDB library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-lss" = callPackage @@ -198841,6 +206053,7 @@ self: { description = "Snap framework snaplet for the Mandrill API library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-mongoDB" = callPackage @@ -198861,6 +206074,7 @@ self: { description = "Snap Framework MongoDB support as Snaplet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-mongodb-minimalistic" = callPackage @@ -198876,6 +206090,7 @@ self: { description = "Minimalistic MongoDB Snaplet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-mysql-simple" = callPackage @@ -198897,6 +206112,7 @@ self: { description = "mysql-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-oauth" = callPackage @@ -198923,6 +206139,7 @@ self: { description = "snaplet-oauth"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-persistent" = callPackage @@ -198946,6 +206163,7 @@ self: { description = "persistent snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-postgresql-simple" = callPackage @@ -198969,6 +206187,7 @@ self: { description = "postgresql-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-postmark" = callPackage @@ -198986,6 +206205,7 @@ self: { description = "Postmark snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-purescript" = callPackage @@ -199003,6 +206223,7 @@ self: { description = "Automatic (re)compilation of purescript projects"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-recaptcha" = callPackage @@ -199021,6 +206242,7 @@ self: { description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-redis" = callPackage @@ -199041,6 +206263,7 @@ self: { description = "Redis support for Snap Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-redson" = callPackage @@ -199061,6 +206284,7 @@ self: { description = "CRUD for JSON data with Redis storage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-rest" = callPackage @@ -199079,6 +206303,7 @@ self: { description = "REST resources for the Snap web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-riak" = callPackage @@ -199097,6 +206322,7 @@ self: { description = "A Snaplet for the Riak database"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-sass" = callPackage @@ -199115,6 +206341,7 @@ self: { description = "Sass integration for Snap with request- and pre-compilation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-scoped-session" = callPackage @@ -199132,6 +206359,7 @@ self: { description = "Modularised session state for Snaplets, in a Snaplet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-sedna" = callPackage @@ -199149,6 +206377,7 @@ self: { description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-ses-html" = callPackage @@ -199166,6 +206395,7 @@ self: { description = "Snaplet for the ses-html package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-sqlite-simple" = callPackage @@ -199197,6 +206427,7 @@ self: { description = "sqlite-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-sqlite-simple-jwt-auth" = callPackage @@ -199217,6 +206448,7 @@ self: { description = "Snaplet for JWT authentication with snaplet-sqlite-simple"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-stripe" = callPackage @@ -199236,6 +206468,7 @@ self: { description = "Stripe snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-tasks" = callPackage @@ -199253,6 +206486,7 @@ self: { description = "Snaplet for Snap Framework enabling developers to administrative tasks akin to Rake tasks from Ruby On Rails framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-typed-sessions" = callPackage @@ -199271,6 +206505,7 @@ self: { description = "Typed session snaplets and continuation-based programming for the Snap web framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snaplet-wordpress" = callPackage @@ -199298,6 +206533,7 @@ self: { description = "A snaplet that communicates with wordpress over its api"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snappy" = callPackage @@ -199328,6 +206564,7 @@ self: { description = "Conduit bindings for Snappy (see snappy package)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snappy-framing" = callPackage @@ -199351,6 +206588,7 @@ self: { description = "An enumeratee that uses Google's snappy compression library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sndfile-enumerators" = callPackage @@ -199370,6 +206608,7 @@ self: { description = "Audio file reading/writing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sneakyterm" = callPackage @@ -199386,6 +206625,7 @@ self: { description = "Tiny, declarative wrapper around ncurses"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sneathlane-haste" = callPackage @@ -199409,7 +206649,6 @@ self: { libraryHaskellDepends = [ base containers pandoc process text ]; description = "Markdown tester"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snippet-extractor" = callPackage @@ -199445,26 +206684,25 @@ self: { description = "The Simple Nice-Looking Manual Generator"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snmp" = callPackage - ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, async, base - , binary, bytestring, cipher-aes, cipher-des, containers - , crypto-cipher-types, cryptohash, mtl, network, network-info - , random, securemem, text, time + ({ mkDerivation, base, bytestring, containers, cryptonite, ip + , language-asn, memory, network, stm, vector }: mkDerivation { pname = "snmp"; - version = "0.2.1.1"; - sha256 = "1944ffsmw4hamjpzb9prlcnz6l9lgggbsgi6ilj0v84r8bydcdq7"; + version = "0.3.0.0"; + sha256 = "1lpmwl74hg1x5065r1jhgi6rfmyasjmhqaghnckg6rzii0nxym9d"; libraryHaskellDepends = [ - asn1-encoding asn1-parse asn1-types async base binary bytestring - cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl - network network-info random securemem text time + base bytestring containers cryptonite ip language-asn memory + network stm vector ]; - description = "API for write snmp client"; + description = "SNMP protocol library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snorkels" = callPackage @@ -199488,6 +206726,7 @@ self: { description = "Strategic board game of medium complexity"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snow-white" = callPackage @@ -199501,6 +206740,7 @@ self: { description = "encode any binary instance to white space"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snowball" = callPackage @@ -199549,6 +206789,7 @@ self: { description = "twitter's snowflake"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snowflake-server" = callPackage @@ -199568,6 +206809,7 @@ self: { description = "snowflake http server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snowglobe" = callPackage @@ -199602,6 +206844,7 @@ self: { description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "soap" = callPackage @@ -199644,6 +206887,7 @@ self: { description = "TLS-enabled SOAP transport (using openssl bindings)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "soap-tls" = callPackage @@ -199759,6 +207003,7 @@ self: { description = "STCP socket extensions library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) lksctp-tools;}; "socket-unix" = callPackage @@ -199776,6 +207021,7 @@ self: { description = "Unix domain sockets"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "socketed" = callPackage @@ -199803,6 +207049,7 @@ self: { description = "simpe tool to serve piped data over http and websocket"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "socketio" = callPackage @@ -199832,24 +207079,30 @@ self: { description = "Socket.IO server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sockets" = callPackage - ({ mkDerivation, async, base, ip, posix-api, primitive, tasty - , tasty-hunit + ({ mkDerivation, async, base, bytestring, entropy, error-codes, ip + , posix-api, primitive, stm, tasty, tasty-hunit, text }: mkDerivation { pname = "sockets"; - version = "0.1.0.0"; - sha256 = "000j2bfjsa33l73pg57g4rignl7dy0jl072r3h9wl4d1f4qc3sim"; + version = "0.3.1.0"; + sha256 = "0i1h7m7yrsgz8srmpm9fw2wa1jj0cfxah2alp7q88zpgyaz2zr9d"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ip posix-api primitive ]; - testHaskellDepends = [ async base ip primitive tasty tasty-hunit ]; - benchmarkHaskellDepends = [ base ip primitive ]; + libraryHaskellDepends = [ + base bytestring error-codes ip posix-api primitive stm text + ]; + testHaskellDepends = [ + async base bytestring ip primitive tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ base bytestring entropy ip primitive ]; description = "High-level network sockets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "socketson" = callPackage @@ -199876,6 +207129,7 @@ self: { description = "A small websocket backend provider"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "socks" = callPackage @@ -199901,6 +207155,7 @@ self: { description = "Sodium Reactive Programming (FRP) System"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "soegtk" = callPackage @@ -199914,6 +207169,7 @@ self: { description = "GUI functions as used in the book \"The Haskell School of Expression\""; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "softfloat-hs" = callPackage @@ -199927,6 +207183,7 @@ self: { description = "Haskell bindings for SoftFloat"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {softfloat = null;}; "solga" = callPackage @@ -199951,6 +207208,7 @@ self: { description = "Simple typesafe web routing"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "solga-swagger" = callPackage @@ -199969,6 +207227,7 @@ self: { description = "Swagger generation for Solga"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "solr" = callPackage @@ -199994,6 +207253,7 @@ self: { description = "A minimal Solr client library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "solve" = callPackage @@ -200030,6 +207290,7 @@ self: { description = "Sonic Visualiser"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sop-core" = callPackage @@ -200099,6 +207360,7 @@ self: { description = "Efficient, type-safe sorted sequences"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sorted-list" = callPackage @@ -200123,6 +207385,7 @@ self: { description = "Utils for sorting"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sorty" = callPackage @@ -200137,6 +207400,7 @@ self: { description = "Sort lines per file size"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sound-collage" = callPackage @@ -200160,6 +207424,7 @@ self: { description = "Approximate a song from other pieces of sound"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sounddelay" = callPackage @@ -200173,6 +207438,8 @@ self: { executableHaskellDepends = [ base containers parseargs WAVE ]; description = "Audio delay line"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "soundgen" = callPackage @@ -200186,6 +207453,8 @@ self: { executableHaskellDepends = [ base split WAVE ]; description = "sound generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "source-code-server" = callPackage @@ -200210,6 +207479,7 @@ self: { description = "The server backend for the source code iPhone app"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sourcemap" = callPackage @@ -200252,6 +207522,7 @@ self: { description = "Source/Sink/Transform: An alternative to lazy IO and iteratees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sox" = callPackage @@ -200308,6 +207579,7 @@ self: { description = "DCPU-16 architecture utilities for Notch's 0x10c game"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "space" = callPackage @@ -200351,6 +207623,7 @@ self: { description = "Space partition data structures. Currently only a QuadTree."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spaceprobe" = callPackage @@ -200396,6 +207669,7 @@ self: { description = "Implementation of the SPAKE2 Password-Authenticated Key Exchange algorithm"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spanout" = callPackage @@ -200414,6 +207688,7 @@ self: { description = "A breakout clone written in netwire and gloss"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sparkle" = callPackage @@ -200440,6 +207715,7 @@ self: { description = "Distributed Apache Spark applications in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sparql-protocol" = callPackage @@ -200486,6 +207762,7 @@ self: { description = "Unified streaming data-dependency framework for web apps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sparse" = callPackage @@ -200514,6 +207791,7 @@ self: { description = "A playground of sparse linear algebra primitives using Morton ordering"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sparse-lin-alg" = callPackage @@ -200532,6 +207810,7 @@ self: { description = "Effective linear algebra on sparse matrices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sparse-linear-algebra" = callPackage @@ -200566,6 +207845,7 @@ self: { description = "Sparse bitmaps for pattern match coverage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sparsecheck" = callPackage @@ -200578,6 +207858,7 @@ self: { description = "A Logic Programming Library for Test-Data Generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sparser" = callPackage @@ -200594,6 +207875,7 @@ self: { description = "Lightweight parsing library based on partial functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spata" = callPackage @@ -200607,6 +207889,7 @@ self: { description = "brainless form validation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spatial-math" = callPackage @@ -200649,6 +207932,7 @@ self: { description = "Rotate about any suitable axis"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spawn" = callPackage @@ -200703,6 +207987,7 @@ self: { description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "special-keys" = callPackage @@ -200721,6 +208006,7 @@ self: { description = "Simple data types that help me here and there"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "special-values" = callPackage @@ -200761,6 +208047,7 @@ self: { description = "Create specialized types from polymorphic ones using TH"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "species" = callPackage @@ -200779,7 +208066,6 @@ self: { ]; description = "Computational combinatorial species"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spectral-clustering" = callPackage @@ -200789,8 +208075,8 @@ self: { }: mkDerivation { pname = "spectral-clustering"; - version = "0.3.0.1"; - sha256 = "08q0wbpy0s1lvfyff0h8fxd54shhhvgy9zm298x2n022lvvap893"; + version = "0.3.0.2"; + sha256 = "1jxjqdyjj8ajv7qb3qldaqh2mr00fg51yp4fiqi5d3bd4b4isga8"; libraryHaskellDepends = [ base clustering containers eigen hmatrix hmatrix-svdlibc mwc-random safe sparse-linear-algebra statistics vector @@ -200798,6 +208084,7 @@ self: { description = "Library for spectral clustering"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "speculate" = callPackage @@ -200823,6 +208110,7 @@ self: { description = "A framework for safe, programmable, speculative parallelism"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "speculation-transformers" = callPackage @@ -200836,6 +208124,7 @@ self: { description = "Merged into 'speculation'. Use that instead."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "speechmatics" = callPackage @@ -200867,6 +208156,7 @@ self: { description = "Speechmatics api client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "speedy-slice" = callPackage @@ -200885,6 +208175,7 @@ self: { description = "Speedy slice sampling"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spelling-suggest" = callPackage @@ -200907,6 +208198,7 @@ self: { description = "Spelling suggestion tool with library and command-line interfaces"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spherical" = callPackage @@ -200934,6 +208226,7 @@ self: { description = "Orbotix Sphero client library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sphinx" = callPackage @@ -200964,6 +208257,7 @@ self: { description = "Sphinx CLI and demo of Haskell Sphinx library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sphinxesc" = callPackage @@ -200983,6 +208277,7 @@ self: { description = "Transform queries for sphinx input"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spice" = callPackage @@ -201000,6 +208295,7 @@ self: { description = "An FRP-based game engine written in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spike" = callPackage @@ -201044,6 +208340,7 @@ self: { description = "Some utilities for reading and writing SPIR-V files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spiros" = callPackage @@ -201075,6 +208372,7 @@ self: { description = "Generic splay-based sequence representation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "splaytree" = callPackage @@ -201093,6 +208391,7 @@ self: { description = "Provides an annotated splay tree"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "splice" = callPackage @@ -201113,8 +208412,8 @@ self: { }: mkDerivation { pname = "spline3"; - version = "0.0.2"; - sha256 = "112agbhn11wpy4dn0g3j9mrqcja5hhql55swmwh3lbm26hcvwjpq"; + version = "1.0.0"; + sha256 = "02sj4mqgjakmk24fv8swwr06rpl4idgmwwnjwqf257hzlns6lriw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -201126,8 +208425,7 @@ self: { tasty tasty-hunit tasty-quickcheck vector ]; description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + license = stdenv.lib.licenses.agpl3; }) {}; "splines" = callPackage @@ -201150,6 +208448,7 @@ self: { description = "B-Splines, other splines, and NURBS"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "split_0_1_4_3" = callPackage @@ -201189,6 +208488,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "split-morphism" = callPackage + ({ mkDerivation, base, invariant, lens, QuickCheck }: + mkDerivation { + pname = "split-morphism"; + version = "0.1.0.0"; + sha256 = "08mrnaj03j5z9ihayqikb06rw1fvrbjrqq0ysz28nlzawhz8x970"; + libraryHaskellDepends = [ base invariant lens ]; + testHaskellDepends = [ base invariant lens QuickCheck ]; + description = "Split Epimorphisms and Monomorphisms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "split-record" = callPackage ({ mkDerivation, base, numeric-prelude, soxlib, storablevector , synthesizer-core, transformers, utility-ht @@ -201255,6 +208566,7 @@ self: { description = "Use numerical ranges to split out certain lines from a file"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "splot" = callPackage @@ -201275,6 +208587,7 @@ self: { description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spool" = callPackage @@ -201317,6 +208630,7 @@ self: { description = "Spoon's utilities. Simple testing and nice looking error reporting."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spoty" = callPackage @@ -201334,6 +208648,7 @@ self: { description = "Spotify web API wrapper"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spreadsheet" = callPackage @@ -201394,6 +208709,7 @@ self: { description = "JSON API to HTML website wrapper"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spritz" = callPackage @@ -201406,6 +208722,7 @@ self: { description = "An implementation of the Spritz RC4-like stream cipher in Haskell"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sproxy" = callPackage @@ -201455,7 +208772,6 @@ self: { ]; description = "Web interface to sproxy database"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sproxy2" = callPackage @@ -201501,6 +208817,7 @@ self: { description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "spy" = callPackage @@ -201527,6 +208844,7 @@ self: { description = "A compact file system watcher for Mac OS X, Linux and Windows"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sql-simple" = callPackage @@ -201544,6 +208862,7 @@ self: { description = "common middle-level sql client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sql-simple-mysql" = callPackage @@ -201560,6 +208879,7 @@ self: { description = "mysql backend for sql-simple"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sql-simple-pool" = callPackage @@ -201577,6 +208897,7 @@ self: { description = "conection pool for sql-simple"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sql-simple-postgresql" = callPackage @@ -201593,6 +208914,7 @@ self: { description = "postgresql backend for sql-simple"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sql-simple-sqlite" = callPackage @@ -201605,6 +208927,7 @@ self: { description = "sqlite backend for sql-simple"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sql-words" = callPackage @@ -201636,6 +208959,7 @@ self: { description = "Haskell binding to sqlcipher"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) openssl;}; "sqlcli" = callPackage @@ -201677,6 +209001,7 @@ self: { description = "Haskell binding to sqlite3"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) sqlite;}; "sqlite-simple" = callPackage @@ -201727,6 +209052,7 @@ self: { description = "Typed extension to sqlite simple"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sqlvalue-list" = callPackage @@ -201739,6 +209065,7 @@ self: { description = "Class and instances for conversion to list of SqlValue"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sqsd-local" = callPackage @@ -201761,6 +209088,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "squeal-postgresql" = callPackage @@ -201795,6 +209123,7 @@ self: { description = "Squeal PostgreSQL Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "squeeze" = callPackage @@ -201856,6 +209185,7 @@ self: { description = "Build and install Debian packages completely from source"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "srcloc" = callPackage @@ -201897,6 +209227,7 @@ self: { description = "text UI for scanning with SANE"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sscgi" = callPackage @@ -201915,6 +209246,7 @@ self: { description = "Simple SCGI Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sscript" = callPackage @@ -201957,6 +209289,7 @@ self: { description = "A pure-Haskell SSH server library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ssh-known-hosts" = callPackage @@ -201995,6 +209328,7 @@ self: { description = "Proxy http-client via ssh tunnel"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sshd-lint" = callPackage @@ -202016,6 +209350,7 @@ self: { description = "Check sshd configuration for adherence to best practices"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sshtun" = callPackage @@ -202064,6 +209399,7 @@ self: { description = "HTTP proxy for S3"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sstable" = callPackage @@ -202083,6 +209419,7 @@ self: { description = "SSTables in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ssv" = callPackage @@ -202125,6 +209462,7 @@ self: { description = "Purely functional stable heaps (fair priority queues)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stable-maps" = callPackage @@ -202137,6 +209475,7 @@ self: { description = "Heterogeneous maps keyed by StableNames"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stable-marriage" = callPackage @@ -202149,6 +209488,7 @@ self: { description = "algorithms around stable marriage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stable-memo" = callPackage @@ -202163,6 +209503,7 @@ self: { description = "Memoization based on argument identity"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stable-tree" = callPackage @@ -202188,6 +209529,7 @@ self: { description = "Trees whose branches are resistant to change"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stache" = callPackage @@ -202336,6 +209678,7 @@ self: { description = "Dead simple version bumping for hpack packages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stack-hpc-coveralls" = callPackage @@ -202363,6 +209706,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stack-lib" = callPackage @@ -202379,6 +209723,7 @@ self: { description = "Wrapper to use stack as a library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stack-network" = callPackage @@ -202421,6 +209766,7 @@ self: { description = "A program for extending Stack to add distributed capabilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stack-prism" = callPackage @@ -202440,6 +209786,7 @@ self: { description = "Stack prisms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stack-run" = callPackage @@ -202460,6 +209807,7 @@ self: { description = "An equivalent to cabal run for stack"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stack-run-auto" = callPackage @@ -202488,6 +209836,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stack-tag" = callPackage @@ -202521,6 +209870,7 @@ self: { description = "The basic stack type"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stack-yaml" = callPackage @@ -202556,6 +209906,7 @@ self: { description = "Convert stack projects to cabal.project + cabal.project.freeze"; license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stack2nix" = callPackage @@ -202568,6 +209919,8 @@ self: { pname = "stack2nix"; version = "0.2.2"; sha256 = "0x5dsgq9mdibbbilc0wn86qqkdgjkm606y4ix57vwxpfgrgkd3wm"; + revision = "1"; + editedCabalFile = "1rxrdpzgql4pldx990hmhhjj39kirxvqphiqjmwr9gbhbkyv7hcg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202601,6 +209954,7 @@ self: { description = "Dummy package forcing installation of other Stackage packages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stackage-build-plan" = callPackage @@ -202626,6 +209980,7 @@ self: { description = "Calculate and print (in different formats) Stackage build plans"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stackage-cabal" = callPackage @@ -202647,6 +210002,7 @@ self: { description = "A CLI executable for cabal-based stackage commands"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stackage-cli" = callPackage @@ -202669,6 +210025,7 @@ self: { description = "A CLI library for stackage commands"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stackage-curator" = callPackage @@ -202714,6 +210071,7 @@ self: { description = "Tools for curating Stackage bundles"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stackage-install" = callPackage @@ -202763,6 +210121,7 @@ self: { description = "DEPRECATED Grab current metadata for all packages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stackage-query" = callPackage @@ -202804,6 +210163,7 @@ self: { description = "Work with shared stackage sandboxes"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stackage-setup" = callPackage @@ -202828,6 +210188,7 @@ self: { description = "An executable for downloading a Haskell setup"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stackage-to-hackage" = callPackage @@ -202852,6 +210213,7 @@ self: { description = "Convert stack.yaml to cabal.project + cabal.project.freeze"; license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stackage-types" = callPackage @@ -202870,6 +210232,7 @@ self: { description = "Shared data types between various Stackage packages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stackage-update" = callPackage @@ -202907,6 +210270,7 @@ self: { description = "A more secure version of cabal upload which uses HTTPS"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stackage2nix" = callPackage @@ -202938,6 +210302,7 @@ self: { description = "Convert Stack files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stacked-dag" = callPackage @@ -203004,6 +210369,7 @@ self: { description = "This package will derive class instance along the data type declaration tree"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "standalone-haddock" = callPackage @@ -203022,6 +210388,7 @@ self: { description = "Generate standalone haddock documentation for a set of packages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "star" = callPackage @@ -203071,6 +210438,7 @@ self: { description = "A memcached client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "starrover2" = callPackage @@ -203118,6 +210486,7 @@ self: { description = "To be written"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "state" = callPackage @@ -203130,6 +210499,7 @@ self: { description = "Data.State"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "state-bag" = callPackage @@ -203147,6 +210517,7 @@ self: { description = "Monad transformers for holding bags of state"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "state-codes" = callPackage @@ -203173,6 +210544,7 @@ self: { description = "MonadPlus for StateT"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "state-record" = callPackage @@ -203185,6 +210557,7 @@ self: { description = "Better records for State monad states"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stateWriter" = callPackage @@ -203206,6 +210579,7 @@ self: { description = "A faster variant of the RWS monad transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "statechart" = callPackage @@ -203231,6 +210605,7 @@ self: { description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stateref" = callPackage @@ -203301,6 +210676,7 @@ self: { description = "DSL to generate HTML5 Canvas javascript"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "static-closure" = callPackage @@ -203318,6 +210694,7 @@ self: { description = "Serialisable static pointers to functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "static-hash" = callPackage @@ -203374,6 +210751,7 @@ self: { description = "Tensors of statically known size"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "static-text" = callPackage @@ -203396,6 +210774,7 @@ self: { description = "Lists, Texts, ByteStrings and Vectors of statically known length"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "staticanalysis" = callPackage @@ -203450,6 +210829,7 @@ self: { description = "Functions for working with Dirichlet densities and mixtures on vectors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "statistics-fusion" = callPackage @@ -203462,6 +210842,7 @@ self: { description = "An implementation of high performance, minimal statistics functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "statistics-hypergeometric-genvar" = callPackage @@ -203478,6 +210859,7 @@ self: { description = "Random variate generation from hypergeometric distributions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "statistics-linreg" = callPackage @@ -203507,6 +210889,7 @@ self: { description = "command line statistics"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "statsd" = callPackage @@ -203523,6 +210906,7 @@ self: { description = "StatsD API"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "statsd-client" = callPackage @@ -203541,6 +210925,7 @@ self: { description = "Statsd UDP client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "statsd-datadog" = callPackage @@ -203580,6 +210965,7 @@ self: { description = "A lovely [Dog]StatsD implementation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "status-notifier-item" = callPackage @@ -203602,7 +210988,6 @@ self: { ]; description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "statvfs" = callPackage @@ -203643,6 +211028,7 @@ self: { description = "What version is the package X in stackage lts-Y.ZZ?"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stb-image" = callPackage @@ -203667,6 +211053,7 @@ self: { description = "Image loading and writing microlibrary"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stb-truetype" = callPackage @@ -203679,6 +211066,7 @@ self: { description = "A wrapper around Sean Barrett's TrueType rasterizer library"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stdata" = callPackage @@ -203691,6 +211079,7 @@ self: { description = "Structure Data Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stdf" = callPackage @@ -203714,24 +211103,26 @@ self: { description = "Parse Structured Test Data Format (STDF)"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stdio" = callPackage ({ mkDerivation, base, case-insensitive, deepseq, exceptions , ghc-prim, hashable, hspec, hspec-discover, HUnit, integer-gmp - , primitive, QuickCheck, quickcheck-instances, scientific, stm - , template-haskell, time, transformers, uv, word8 + , libuv, primitive, QuickCheck, quickcheck-instances, scientific + , stm, template-haskell, time, word8 }: mkDerivation { pname = "stdio"; - version = "0.1.0.0"; - sha256 = "1y98y92n30sxn8hk4nwfh8jjrwnc2v0cqd766r5dgd1rq6rlf6yv"; + version = "0.1.1.0"; + sha256 = "1sspnrflqac9clf9h6zwnhlvsw52xx97dlxyl6lhw6czy2qy813d"; + revision = "1"; + editedCabalFile = "1xdw84i0nlc3iz3i01li9p44raxn265kqjd284ifbf83vvhbp897"; libraryHaskellDepends = [ base case-insensitive deepseq exceptions ghc-prim hashable - integer-gmp primitive scientific stm template-haskell time - transformers word8 + integer-gmp primitive scientific stm template-haskell time word8 ]; - librarySystemDepends = [ uv ]; + libraryPkgconfigDepends = [ libuv ]; libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ base hashable hspec HUnit integer-gmp primitive QuickCheck @@ -203739,7 +211130,9 @@ self: { ]; description = "A simple and high performance IO toolkit for Haskell"; license = stdenv.lib.licenses.bsd3; - }) {uv = null;}; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) libuv;}; "steambrowser" = callPackage ({ mkDerivation, base, directory, parsec, transformers }: @@ -203753,6 +211146,7 @@ self: { description = "List and launch steam games from the cli"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "steeloverseer" = callPackage @@ -203797,6 +211191,7 @@ self: { description = "Generator and verifier for steganographic numbers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stemmer" = callPackage @@ -203809,6 +211204,7 @@ self: { description = "Haskell bindings to the Snowball stemming library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stemmer-german" = callPackage @@ -203823,6 +211219,7 @@ self: { description = "Extract the stem of a German inflected word form"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "step-function" = callPackage @@ -203852,6 +211249,7 @@ self: { libraryHaskellDepends = [ base containers mtl ]; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stgi" = callPackage @@ -203881,6 +211279,7 @@ self: { description = "Educational implementation of the STG (Spineless Tagless G-machine)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stickyKeysHotKey" = callPackage @@ -203959,6 +211358,7 @@ self: { description = "Chunked Communication Queues"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-conduit" = callPackage @@ -204046,6 +211446,7 @@ self: { description = "Conduits and STM operations for fire hoses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-hamt" = callPackage @@ -204086,6 +211487,7 @@ self: { description = "STM with IO hooks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-lifted" = callPackage @@ -204100,6 +211502,7 @@ self: { description = "Software Transactional Memory lifted to MonadIO"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-linkedlist" = callPackage @@ -204135,6 +211538,7 @@ self: { description = "Simple STM Promises for IO computations and external processes"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-queue-extras" = callPackage @@ -204182,6 +211586,7 @@ self: { description = "retry statistics for STM transactions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-supply" = callPackage @@ -204196,7 +211601,6 @@ self: { testHaskellDepends = [ async base QuickCheck random Unique ]; description = "STM wrapper around Control.Concurrent.Supply."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-tlist" = callPackage @@ -204221,6 +211625,7 @@ self: { description = "Control communication among retrying transactions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stochastic" = callPackage @@ -204237,6 +211642,7 @@ self: { description = "Monadic composition of probabilistic functions and sampling"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stocks" = callPackage @@ -204340,6 +211746,7 @@ self: { description = "Storable type class for variable-sized data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "storable-complex" = callPackage @@ -204391,6 +211798,7 @@ self: { description = "Statically-sized array wrappers with Storable instances for FFI marshaling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "storable-tuple" = callPackage @@ -204454,6 +211862,7 @@ self: { description = "Conversion between storablevector and stream-fusion lists with fusion"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "store" = callPackage @@ -204557,6 +211966,7 @@ self: { description = "Simple Theorem Prover"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "str" = callPackage @@ -204574,6 +211984,7 @@ self: { description = "A type class to abstract between many different string types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stratosphere" = callPackage @@ -204600,15 +212011,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_30_1" = callPackage + "stratosphere_0_34_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.30.1"; - sha256 = "1j2k4z5chi41fjf1shhci8yf6x5fyj1z5wa077n3n3m7hrlf3r76"; + version = "0.34.0"; + sha256 = "0nrpwc17pmvrd8r0l6k142ihc51vwi2j55009lw1dph4n54zgs4h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204644,6 +212055,7 @@ self: { description = "Client for Stratum protocol"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stratux" = callPackage @@ -204663,6 +212075,7 @@ self: { description = "A library for stratux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stratux-http" = callPackage @@ -204685,6 +212098,7 @@ self: { description = "A library for using HTTP with stratux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stratux-types" = callPackage @@ -204705,6 +212119,7 @@ self: { description = "A library for reading JSON output from stratux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stratux-websockets" = callPackage @@ -204728,6 +212143,7 @@ self: { description = "A library for using websockets with stratux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stream" = callPackage @@ -204748,6 +212164,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stream-fusion" = callPackage @@ -204762,6 +212179,7 @@ self: { description = "Faster Haskell lists using stream fusion"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stream-monad" = callPackage @@ -204776,6 +212194,7 @@ self: { description = "Simple, Fair and Terminating Backtracking Monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "streamdeck" = callPackage @@ -204788,6 +212207,7 @@ self: { description = "Control library for the Elgato Stream Deck"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "streamed" = callPackage @@ -204807,6 +212227,7 @@ self: { description = "Programmatically edit MIDI event streams via ALSA"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "streaming" = callPackage @@ -204847,23 +212268,24 @@ self: { }) {}; "streaming-base64" = callPackage - ({ mkDerivation, base, safe-exceptions, streaming - , streaming-bytestring, tasty, tasty-hunit, transformers + ({ mkDerivation, base, base-compat-batteries, filepath + , safe-exceptions, streaming, streaming-bytestring, streaming-with + , tasty, tasty-golden, transformers }: mkDerivation { pname = "streaming-base64"; - version = "0.1.0.0"; - sha256 = "0w6xj80z1z21pgxadwc48w15a08g94i4g7qkgv5gvq46kpl44bq6"; - revision = "1"; - editedCabalFile = "0mc71ncw2mw3yfryk0g2iq86wba7i3khy8fbsjaz5dr22hkkzh9r"; + version = "0.1.1.0"; + sha256 = "0yyjdld05i4bfx73maf5vzdrp7hx65784sv7bnnw4xfal1k20vlj"; libraryHaskellDepends = [ - base safe-exceptions streaming streaming-bytestring transformers + base base-compat-batteries safe-exceptions streaming + streaming-bytestring transformers ]; testHaskellDepends = [ - base streaming-bytestring tasty tasty-hunit + base base-compat-batteries filepath streaming-bytestring + streaming-with tasty tasty-golden ]; description = "Streaming conversion from/to base64"; - license = stdenv.lib.licenses.cc0; + license = stdenv.lib.licenses.publicDomain; }) {}; "streaming-benchmarks" = callPackage @@ -204890,6 +212312,7 @@ self: { description = "Benchmarks to compare streaming packages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "streaming-binary" = callPackage @@ -204968,6 +212391,7 @@ self: { description = "Cassava support for the streaming ecosystem"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "streaming-commons" = callPackage @@ -205015,6 +212439,7 @@ self: { description = "Concurrency support for the streaming ecosystem"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "streaming-conduit" = callPackage @@ -205032,6 +212457,7 @@ self: { description = "Bidirectional support between the streaming and conduit libraries"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "streaming-eversion" = callPackage @@ -205068,6 +212494,7 @@ self: { description = "online streaming fft"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "streaming-histogram" = callPackage @@ -205108,6 +212535,7 @@ self: { description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "streaming-pcap" = callPackage @@ -205134,6 +212562,7 @@ self: { description = "Stream packets via libpcap"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "streaming-png" = callPackage @@ -205155,6 +212584,7 @@ self: { description = "Perfectly streaming PNG image decoding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "streaming-postgresql-simple" = callPackage @@ -205173,6 +212603,7 @@ self: { description = "Stream postgresql-query results using the streaming library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "streaming-process" = callPackage @@ -205198,6 +212629,7 @@ self: { description = "Streaming support for running system process"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "streaming-sort" = callPackage @@ -205220,6 +212652,7 @@ self: { description = "Sorting streams"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "streaming-utils" = callPackage @@ -205239,7 +212672,6 @@ self: { ]; description = "http, attoparsec, pipes and other utilities for the streaming libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-wai" = callPackage @@ -205335,6 +212767,8 @@ self: { pname = "streamproc"; version = "1.6.2"; sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7"; + revision = "1"; + editedCabalFile = "19c51gks028x8mnywkx1nz0s6bwn2mxs5ddmaj2q8n9l5pvfkcgs"; libraryHaskellDepends = [ base ]; description = "Stream Processer Arrow"; license = stdenv.lib.licenses.bsd3; @@ -205376,6 +212810,7 @@ self: { description = "A simple, flexible and composable web-router"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "strelka-core" = callPackage @@ -205485,6 +212920,7 @@ self: { description = "A collection of commonly used strict data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "strict-ghc-plugin" = callPackage @@ -205522,6 +212958,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "strict-list" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase + , semigroupoids, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "strict-list"; + version = "0.1.0.1"; + sha256 = "13s3bwg9zslh04i5djvlf7wfs3ckn3sscxvlawj9nsi3md4fsvdz"; + libraryHaskellDepends = [ base semigroupoids ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Strict linked list"; + license = stdenv.lib.licenses.mit; + }) {}; + "strict-tuple" = callPackage ({ mkDerivation, base, deepseq, hashable }: mkDerivation { @@ -205587,6 +213040,7 @@ self: { description = "Combinators for strictifying functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "string" = callPackage @@ -205666,6 +213120,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "string-interpolate" = callPackage + ({ mkDerivation, base, bytestring, criterion, formatting + , haskell-src-meta, hspec, interpolate, QuickCheck + , quickcheck-instances, quickcheck-text, template-haskell, text + , text-conversions, utf8-string + }: + mkDerivation { + pname = "string-interpolate"; + version = "0.0.1.0"; + sha256 = "1mc2xg1aybqjrsqlk0w7vkdydxzxr1vknbh6ad3w355svrb6krxm"; + libraryHaskellDepends = [ + base bytestring haskell-src-meta template-haskell text + text-conversions utf8-string + ]; + testHaskellDepends = [ + base bytestring hspec QuickCheck quickcheck-instances + quickcheck-text text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion formatting interpolate text + ]; + description = "Haskell string interpolation that just works"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "string-isos" = callPackage ({ mkDerivation, base, bytestring, mono-traversable, safe, text , type-iso @@ -205680,6 +213159,7 @@ self: { description = "Tools for working with isomorphisms of strings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "string-qq" = callPackage @@ -205716,8 +213196,8 @@ self: { }: mkDerivation { pname = "string-random"; - version = "0.1.1.0"; - sha256 = "0gypx0lg9kz8s2aksj2qg238m41cnl49k4bxwz7sgf94h12nhil2"; + version = "0.1.2.0"; + sha256 = "1jw05cvzzmma28xvak517y8gb7gjsdmr5iafgz5snxikcjzav0l2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205730,7 +213210,6 @@ self: { ]; description = "A library for generating random string from a regular experession"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "string-similarity" = callPackage @@ -205778,6 +213257,7 @@ self: { description = "Type-level Chars and Strings, with decidable equality"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stringable" = callPackage @@ -205819,6 +213299,7 @@ self: { description = "Transformations to several string-like types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stringprep" = callPackage @@ -205872,6 +213353,7 @@ self: { description = "Memoize Strings as Atoms for fast comparison and sorting, with maps and sets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "strio" = callPackage @@ -205904,6 +213386,7 @@ self: { description = "A Haskell implementation of the Stripe API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stripe-concepts" = callPackage @@ -205943,6 +213426,7 @@ self: { description = "Stripe API for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stripe-http-client" = callPackage @@ -205963,6 +213447,7 @@ self: { description = "Stripe API for Haskell - http-client backend"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stripe-http-streams" = callPackage @@ -206001,7 +213486,6 @@ self: { ]; description = "Listen for Stripe webhook events with Scotty"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stripe-signature" = callPackage @@ -206090,6 +213574,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "strongswan-sql" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, attoparsec, base + , bytestring, data-default, failable, haskeline, io-streams + , iproute, lens, mtl, mysql-haskell, network, structured-cli, text + , transformers + }: + mkDerivation { + pname = "strongswan-sql"; + version = "1.2.2.0"; + sha256 = "0dv52cf6v84f8q6kckwbgw85iqckd17q3gqif6fh7xrx1z4vhimb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + asn1-encoding asn1-types attoparsec base bytestring data-default + failable haskeline io-streams iproute lens mtl mysql-haskell + network structured-cli text transformers + ]; + executableHaskellDepends = [ + asn1-encoding asn1-types attoparsec base bytestring data-default + failable haskeline io-streams iproute lens mtl mysql-haskell + network structured-cli text transformers + ]; + testHaskellDepends = [ + asn1-encoding asn1-types attoparsec base bytestring data-default + failable haskeline io-streams iproute lens mtl mysql-haskell + network structured-cli text transformers + ]; + description = "Interface library for strongSwan SQL backend"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -206142,6 +213659,7 @@ self: { description = "Instantiate structural induction schemas for algebraic data types"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "structural-traversal" = callPackage @@ -206155,6 +213673,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "structured-cli" = callPackage @@ -206163,8 +213682,8 @@ self: { }: mkDerivation { pname = "structured-cli"; - version = "2.5.0.3"; - sha256 = "14kmsh3n4d6zgpqkv1v4laz2sd52317i840szp9mw3i72f012gj0"; + version = "2.5.1.0"; + sha256 = "023mpmnkjc7z0fyzn5xp43jwnjzd4hhixz56fmyx5j7sal2lrj92"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206213,6 +213732,7 @@ self: { description = "Structured MongoDB interface"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "structures" = callPackage @@ -206244,6 +213764,7 @@ self: { description = "\"Advanced\" Data Structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stt" = callPackage @@ -206261,6 +213782,7 @@ self: { description = "A monad transformer version of the ST monad"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stunclient" = callPackage @@ -206305,6 +213827,7 @@ self: { description = "A revival of the classic game Stunts (LambdaCube tech demo)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stutter" = callPackage @@ -206332,7 +213855,6 @@ self: { ]; description = "(Stutter Text|String)-Utterer"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stylish-cabal" = callPackage @@ -206401,6 +213923,7 @@ self: { description = "Ways to output stylized text on ANSI consoles"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "styx" = callPackage @@ -206465,6 +213988,7 @@ self: { description = "Get the total, put a single element"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "subhask" = callPackage @@ -206492,6 +214016,7 @@ self: { description = "Type safe interface for programming in subcategories of Hask"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "subleq-toolchain" = callPackage @@ -206514,6 +214039,7 @@ self: { description = "Toolchain of subleq computer"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "submark" = callPackage @@ -206536,6 +214062,7 @@ self: { description = "Extract a part from CommonMark/Markdown docs"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "subnet" = callPackage @@ -206566,6 +214093,7 @@ self: { description = "Subsample data"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "substring-parser" = callPackage @@ -206585,6 +214113,7 @@ self: { description = "Match / replace substrings with a parser combinators"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "subtitleParser" = callPackage @@ -206622,6 +214151,7 @@ self: { description = "Subword graph implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "subzero" = callPackage @@ -206661,6 +214191,7 @@ self: { description = "An applicative functor to manage successors"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "suffix-array" = callPackage @@ -206682,6 +214213,7 @@ self: { description = "Simple and moderately efficient suffix array implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "suffixarray" = callPackage @@ -206697,6 +214229,7 @@ self: { description = "n log n implementation of suffix array"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "suffixtree" = callPackage @@ -206733,6 +214266,7 @@ self: { description = "Abstract over the constraints on the parameters to type constructors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sum-type-boilerplate" = callPackage @@ -206772,6 +214306,7 @@ self: { description = "Tool for scaffolding completely configured production Haskell projects"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sump" = callPackage @@ -206790,6 +214325,7 @@ self: { description = "A Haskell interface to SUMP-compatible logic analyzers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sundown" = callPackage @@ -206818,6 +214354,7 @@ self: { description = "Test Cabalized package against multiple dependency versions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sunroof-compiler" = callPackage @@ -206836,6 +214373,7 @@ self: { description = "Monadic Javascript Compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sunroof-examples" = callPackage @@ -206858,6 +214396,7 @@ self: { description = "Tests for Sunroof"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sunroof-server" = callPackage @@ -206880,6 +214419,7 @@ self: { description = "Monadic Javascript Compiler - Server Utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "super-user-spark" = callPackage @@ -206910,6 +214450,7 @@ self: { description = "Configure your dotfile deployment with a DSL"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "superbubbles" = callPackage @@ -206925,6 +214466,7 @@ self: { description = "Find \"superbubbles\", as described in https://arxiv.org/abs/1307.7925"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "superbuffer" = callPackage @@ -206943,6 +214485,7 @@ self: { description = "Efficiently build a bytestring from smaller chunks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "supercollider-ht" = callPackage @@ -206961,6 +214504,7 @@ self: { description = "Haskell SuperCollider utilities"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "supercollider-midi" = callPackage @@ -206984,6 +214528,7 @@ self: { description = "Demonstrate how to control SuperCollider via ALSA-MIDI"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "superconstraints" = callPackage @@ -207001,6 +214546,7 @@ self: { description = "Access an instance's constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "superdoc" = callPackage @@ -207041,6 +214587,7 @@ self: { description = "A simple opinionated event store implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "supermonad" = callPackage @@ -207058,6 +214605,7 @@ self: { description = "Plugin and base library to support supermonads in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "supero" = callPackage @@ -207077,6 +214625,7 @@ self: { description = "A Supercompiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "superrecord" = callPackage @@ -207110,6 +214659,7 @@ self: { description = "Control an internal monad execution for trace generation, backtrakcking, testing and other purposes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "supervisors" = callPackage @@ -207145,6 +214695,7 @@ self: { description = "Early termination for monads"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "surjective" = callPackage @@ -207157,6 +214708,7 @@ self: { description = "An output coverage checker"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "suspend" = callPackage @@ -207179,8 +214731,8 @@ self: { }: mkDerivation { pname = "sv"; - version = "1.3"; - sha256 = "19mf3sf3smza4yk21k98wb39mk3jg0nxr93nl924ivsyv514flgx"; + version = "1.3.0.1"; + sha256 = "0h6qibvkmslil9jvbzminhpxgz7z95qak3zv5dxj8sfpc3p3lk7g"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -207197,6 +214749,7 @@ self: { description = "Encode and decode separated values (CSV, PSV, ...)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sv-cassava" = callPackage @@ -207287,6 +214840,7 @@ self: { description = "sv-core + svfactor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "svfactor" = callPackage @@ -207311,6 +214865,7 @@ self: { description = "Syntax-preserving CSV manipulation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "svg-builder" = callPackage @@ -207344,6 +214899,7 @@ self: { description = "DSL for building SVG"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "svg-tree" = callPackage @@ -207379,6 +214935,7 @@ self: { description = "Code generation tool for Quartz code from a SVG"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "svgcairo" = callPackage @@ -207396,8 +214953,7 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the libsvg-cairo library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) librsvg;}; + }) {inherit (pkgs) librsvg;}; "svgutils" = callPackage ({ mkDerivation, base, filepath, xml }: @@ -207412,6 +214968,7 @@ self: { description = "Helper functions for dealing with SVG files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "svm" = callPackage @@ -207431,12 +214988,11 @@ self: { pname = "svm-light-utils"; version = "0.1.4"; sha256 = "01wz59ldv5n0xwl3d1sll11n3yy3wf2qrm67v4cskmrl7rib7177"; - revision = "1"; - editedCabalFile = "1yqvr9i681wv7y4qjqmyg617sjbgcpmkhxkf2r77xh1kv0zagylv"; + revision = "2"; + editedCabalFile = "0mrnfxg1h3mrbx192n8hl7m9i64n8cfrai2yksvhkgp6b8qxqnma"; libraryHaskellDepends = [ attoparsec base bytestring containers ]; description = "Parsers and formatters for the SVMlight input file format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "svm-simple" = callPackage @@ -207454,6 +215010,7 @@ self: { description = "Medium level, simplified, bindings to libsvm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "svndump" = callPackage @@ -207473,6 +215030,7 @@ self: { description = "Library for reading Subversion dump files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "swagger" = callPackage @@ -207518,6 +215076,7 @@ self: { description = "Auto-generated openapi-petstore API Client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "swagger-test" = callPackage @@ -207548,6 +215107,7 @@ self: { description = "Testing of Swagger APIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "swagger2" = callPackage @@ -207580,7 +215140,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "swapper" = callPackage @@ -207599,6 +215158,7 @@ self: { description = "Transparently swapping data from in-memory structures to disk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) tokyocabinet;}; "swearjure" = callPackage @@ -207619,6 +215179,7 @@ self: { description = "Clojure without alphanumerics"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "swf" = callPackage @@ -207631,6 +215192,7 @@ self: { description = "A library for creating Shockwave Flash (SWF) files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "swift-lda" = callPackage @@ -207647,6 +215209,7 @@ self: { description = "Online sampler for Latent Dirichlet Allocation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "swish" = callPackage @@ -207731,6 +215294,7 @@ self: { description = "Higher order versions of the Scrap Your Boilerplate classes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "syb-with-class" = callPackage @@ -207758,6 +215322,7 @@ self: { description = "Scrap Your Boilerplate With Class Text instance"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "syfco" = callPackage @@ -207779,6 +215344,7 @@ self: { description = "Synthesis Format Conversion Tool / Library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sylvia" = callPackage @@ -207805,6 +215371,7 @@ self: { description = "Lambda calculus visualization"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sym" = callPackage @@ -207818,6 +215385,7 @@ self: { description = "Permutations, patterns, and statistics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sym-plot" = callPackage @@ -207830,6 +215398,7 @@ self: { description = "Plot permutations; an addition to the sym package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "symantic" = callPackage @@ -207847,6 +215416,7 @@ self: { description = "Library for Typed Tagless-Final Higher-Order Composable DSL"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "symantic-cli" = callPackage @@ -207863,6 +215433,7 @@ self: { description = "Library for Command Line Interface (CLI)"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "symantic-document" = callPackage @@ -207896,6 +215467,7 @@ self: { description = "Library for symantic grammars"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "symantic-lib" = callPackage @@ -207919,6 +215491,7 @@ self: { description = "Symantics for common types"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "symbol" = callPackage @@ -207959,6 +215532,7 @@ self: { description = "SymEngine symbolic mathematics engine for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; "symengine-hs" = callPackage @@ -207977,6 +215551,7 @@ self: { description = "SymEngine symbolic mathematics engine for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; "symmetric-properties" = callPackage @@ -207989,7 +215564,6 @@ self: { testHaskellDepends = [ base hspec HUnit ]; description = "Monoids for sameness and uniqueness"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "symon" = callPackage @@ -208017,6 +215591,7 @@ self: { description = "A fast implementation of synchronous channels with a CML-like API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sync-mht" = callPackage @@ -208055,6 +215630,7 @@ self: { description = "Fast incremental file transfer using Merkle-Hash-Trees"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "synchronous-channels" = callPackage @@ -208094,6 +215670,7 @@ self: { description = "Haskell bindings for the Syncthing REST API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "synt" = callPackage @@ -208143,6 +215720,7 @@ self: { description = "Generic representation and manipulation of abstract syntax"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "syntactical" = callPackage @@ -208172,6 +215750,7 @@ self: { description = "Reversible parsing and pretty-printing"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "syntax-attoparsec" = callPackage @@ -208188,6 +215767,7 @@ self: { description = "Syntax instances for Attoparsec"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "syntax-example" = callPackage @@ -208207,6 +215787,7 @@ self: { description = "Example application using syntax, a library for abstract syntax descriptions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "syntax-example-json" = callPackage @@ -208226,6 +215807,7 @@ self: { description = "Example JSON parser/pretty-printer"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "syntax-pretty" = callPackage @@ -208241,6 +215823,7 @@ self: { description = "Syntax instance for pretty, the pretty printing library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "syntax-printer" = callPackage @@ -208258,6 +215841,7 @@ self: { description = "Text and ByteString printers for 'syntax'"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "syntax-trees" = callPackage @@ -208274,6 +215858,7 @@ self: { description = "Convert between different Haskell syntax trees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "syntax-trees-fork-bairyn" = callPackage @@ -208290,6 +215875,7 @@ self: { description = "Convert between different Haskell syntax trees. Bairyn's fork."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "syntaxnet-haskell" = callPackage @@ -208309,6 +215895,7 @@ self: { description = "Working with Google's SyntaxNet output files - CoNLL, Tree"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "synthesizer" = callPackage @@ -208331,6 +215918,7 @@ self: { description = "Audio signal processing coded in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "synthesizer-alsa" = callPackage @@ -208469,6 +216057,7 @@ self: { description = "Efficient signal processing using runtime compilation"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "synthesizer-midi" = callPackage @@ -208529,6 +216118,7 @@ self: { description = "A replacement for System.Exit and System.Process."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sysinfo" = callPackage @@ -208569,6 +216159,7 @@ self: { description = "Abstract data type for canonical paths with some utilities"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "system-command" = callPackage @@ -208588,6 +216179,7 @@ self: { description = "A replacement for System.Exit and System.Process"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "system-error" = callPackage @@ -208614,6 +216206,7 @@ self: { description = "A bunch of system utilities used by other projects"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "system-fileio" = callPackage @@ -208709,6 +216302,7 @@ self: { description = "Lifted versions of System functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "system-linux-proc" = callPackage @@ -208726,6 +216320,7 @@ self: { description = "A library for accessing the /proc filesystem in Linux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "system-locale" = callPackage @@ -208780,6 +216375,7 @@ self: { description = "Random number generation for extensible effects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "system-test" = callPackage @@ -208885,6 +216481,7 @@ self: { description = "An application that regularly logs system stats for later analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "syz" = callPackage @@ -208914,6 +216511,7 @@ self: { description = "Matchers and grammars using tree regular expressions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "t3-client" = callPackage @@ -208926,6 +216524,7 @@ self: { description = "tic-tac-toe Rexports for client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "t3-game" = callPackage @@ -208962,6 +216561,7 @@ self: { description = "tic-tac-toe server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ta" = callPackage @@ -208978,6 +216578,7 @@ self: { description = "Transito Abierto: convenience library when using Takusen and Oracle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tabl" = callPackage @@ -209008,6 +216609,7 @@ self: { description = "Simple tool to generate tables from DSV input"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "table-layout" = callPackage @@ -209033,6 +216635,7 @@ self: { description = "Layout text as grid or table"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "table-tennis" = callPackage @@ -209045,6 +216648,7 @@ self: { description = "A table tennis game tracking engine"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tableaux" = callPackage @@ -209063,6 +216667,7 @@ self: { description = "An interactive theorem prover based on semantic tableaux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tables" = callPackage @@ -209087,6 +216692,7 @@ self: { description = "In-memory storage with multiple keys using lenses and traversals"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tablestorage" = callPackage @@ -209108,6 +216714,7 @@ self: { description = "Azure Table Storage REST API Wrapper"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tablize" = callPackage @@ -209145,6 +216752,7 @@ self: { description = "View the output of shell commands in a table"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tabs" = callPackage @@ -209160,6 +216768,7 @@ self: { description = "Indents source files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tabular" = callPackage @@ -209211,8 +216820,7 @@ self: { executablePkgconfigDepends = [ gtk3 ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage ({ mkDerivation, base, ghc-prim }: @@ -209224,6 +216832,7 @@ self: { description = "Provides access to the dynamic pointer tagging bits used by GHC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tag-stream" = callPackage @@ -209240,6 +216849,7 @@ self: { description = "streamlined html tag parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tagchup" = callPackage @@ -209305,6 +216915,7 @@ self: { description = "Reflect exceptions using phantom types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tagged-identity" = callPackage @@ -209336,6 +216947,7 @@ self: { description = "Lists tagged with a type-level natural number representing their length"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tagged-th" = callPackage @@ -209350,6 +216962,7 @@ self: { description = "QuasiQuoter and Template Haskell splices for creating proxies at higher-kinds"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tagged-timers" = callPackage @@ -209364,6 +216977,7 @@ self: { description = "Simple wrappers for timing IO actions (single-threaded)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tagged-transformer" = callPackage @@ -209467,6 +217081,7 @@ self: { description = "An FFI layer over TagLib's C bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) taglib;}; "tagset-positional" = callPackage @@ -209533,6 +217148,7 @@ self: { description = "alternative parser for the tagsoup package"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tagsoup-megaparsec" = callPackage @@ -209550,6 +217166,7 @@ self: { description = "A Tag token parser and Tag specific parsing combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tagsoup-parsec" = callPackage @@ -209562,6 +217179,7 @@ self: { description = "Tokenizes Tag, so [ Tag ] can be used as parser input"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tagsoup-selection" = callPackage @@ -209574,6 +217192,7 @@ self: { description = "Selecting subtrees from TagSoup's TagTrees using CSS selectors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tagstream-conduit" = callPackage @@ -209610,6 +217229,7 @@ self: { description = "Support library to enable TAI usage on systems with time kept in UTC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tai64" = callPackage @@ -209629,6 +217249,7 @@ self: { description = "Tai64 Labels for Haskell"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tailfile-hinotify" = callPackage @@ -209702,6 +217323,7 @@ self: { description = "create slide for presentation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "takusen-oracle" = callPackage @@ -209717,6 +217339,7 @@ self: { description = "Database library with left-fold interface for Oracle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {clntsh = null;}; "tal" = callPackage @@ -209733,6 +217356,7 @@ self: { description = "An implementation of Typed Assembly Language (Morrisett, Walker, Crary, Glew)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tamarin-prover" = callPackage @@ -209763,6 +217387,7 @@ self: { description = "The Tamarin prover for security protocol analysis"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tamarin-prover-term" = callPackage @@ -209782,6 +217407,7 @@ self: { description = "Term manipulation library for the tamarin prover"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tamarin-prover-theory" = callPackage @@ -209804,6 +217430,7 @@ self: { description = "Term manipulation library for the tamarin prover"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tamarin-prover-utils" = callPackage @@ -209822,6 +217449,7 @@ self: { description = "Utility library for the tamarin prover"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tamper" = callPackage @@ -209834,6 +217462,7 @@ self: { description = "Blaze-style HTML templates as a Monad Transformer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tao" = callPackage @@ -209992,6 +217621,7 @@ self: { description = "Generate test-suites from refinement types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) z3;}; "tart" = callPackage @@ -210034,6 +217664,7 @@ self: { description = "A command line tool for keeping track of tasks you worked on"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "task-distribution" = callPackage @@ -210071,6 +217702,7 @@ self: { description = "Distributed processing of changing tasks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "taskell" = callPackage @@ -210082,8 +217714,8 @@ self: { }: mkDerivation { pname = "taskell"; - version = "1.3.5.0"; - sha256 = "13ln9djap9kzm0s82r01qrygsg7w5pm6wvy25i7b6lakqy4az0x3"; + version = "1.3.6.0"; + sha256 = "1s7wgn9ixmk5h9s5a977ddj1a0fsjmpifl0i97pak35rk92ca7wc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210099,6 +217731,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "taskpool" = callPackage @@ -210161,8 +217795,8 @@ self: { }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.1.5"; - sha256 = "1px562a9c3vn0qxy8zs8mkp73nfqca17hdwhv5p7qgawpjafxk32"; + version = "1.1.6"; + sha256 = "13qqpl1prr9dda87dp45mqybay24n8rhxxgvpc9j34kh72g8j5qw"; libraryHaskellDepends = [ base containers directory filepath generic-deriving ghc-prim mtl stm tagged tasty transformers xml @@ -210190,6 +217824,7 @@ self: { description = "Auto discovery for Tasty with support for ingredients and test tree generation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-dejafu" = callPackage @@ -210269,6 +217904,7 @@ self: { description = "Adds the ability to fail a tasty test suite on first test failure"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-golden" = callPackage @@ -210308,6 +217944,7 @@ self: { description = "Tasty Tests for groundhog converters"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-hedgehog" = callPackage @@ -210337,8 +217974,8 @@ self: { pname = "tasty-hedgehog-coverage"; version = "0.1.0.0"; sha256 = "1d2hnhkpk71k0xjw63jsn6fa4ih01xqn4dgdbflp6yrs0zw6p95c"; - revision = "1"; - editedCabalFile = "1p3d9w24q39fnljv9m5a8anpv3j3cvazbca4d3hqrjx5w06ik42f"; + revision = "2"; + editedCabalFile = "10fzklan91gyd3bs5qgyv83v7xflxdfcjlvqgcv15bzwplzngclx"; libraryHaskellDepends = [ base containers hedgehog mtl tagged tasty tasty-hedgehog text transformers wl-pprint-annotated @@ -210348,7 +217985,6 @@ self: { ]; description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-hspec" = callPackage @@ -210438,6 +218074,7 @@ self: { description = "automated integration of QuickCheck properties into tasty suites"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-jenkins-xml" = callPackage @@ -210458,6 +218095,7 @@ self: { description = "Render tasty output to both console and XML for Jenkins"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-kat" = callPackage @@ -210492,6 +218130,7 @@ self: { description = "Test common laws"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-leancheck" = callPackage @@ -210521,6 +218160,7 @@ self: { description = "Tasty TestTrees for Lens validation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-program" = callPackage @@ -210634,6 +218274,7 @@ self: { description = "Collect statistics of your Tasty testsuite"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-tap" = callPackage @@ -210651,6 +218292,7 @@ self: { description = "TAP (Test Anything Protocol) Version 13 formatter for tasty"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-test-vector" = callPackage @@ -210691,6 +218333,7 @@ self: { description = "Fancy Travis CI output for tasty tests"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-wai" = callPackage @@ -210764,6 +218407,7 @@ self: { description = "Transactional variables and data structures with IO hooks"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tcache-AWS" = callPackage @@ -210780,6 +218424,7 @@ self: { description = "tcache using Amazon Web Services as default persistence mechanism"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tccli" = callPackage @@ -210798,6 +218443,7 @@ self: { description = "TokyoCabinet CLI interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tce-conf" = callPackage @@ -210832,6 +218478,7 @@ self: { description = "Bindings to libtcod roguelike engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {tcod = null;}; "tconfig" = callPackage @@ -210855,6 +218502,7 @@ self: { description = "A purely functional TCP implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tcp-streams" = callPackage @@ -210899,6 +218547,7 @@ self: { description = "Tcp streams using openssl for tls support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tdd-util" = callPackage @@ -210927,6 +218576,7 @@ self: { description = "Test framework wrapper"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tdigest" = callPackage @@ -210951,7 +218601,6 @@ self: { ]; description = "On-line accumulation of rank-based statistics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tdigest-Chart" = callPackage @@ -210972,6 +218621,7 @@ self: { description = "Chart generation from tdigest"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tdoc" = callPackage @@ -210999,6 +218649,7 @@ self: { description = "Graphical modeling tools for sequential teams"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "teardown" = callPackage @@ -211020,7 +218671,6 @@ self: { ]; description = "Build safe and composable teardown sub-routines for resources"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "teeth" = callPackage @@ -211033,6 +218683,7 @@ self: { description = "Dental data types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "telegram" = callPackage @@ -211049,6 +218700,7 @@ self: { description = "Telegram API client"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "telegram-api" = callPackage @@ -211077,6 +218729,7 @@ self: { description = "Telegram Bot API bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "telegram-bot" = callPackage @@ -211098,6 +218751,7 @@ self: { description = "Telegram Bot microframework for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "telegram-bot-simple" = callPackage @@ -211130,6 +218784,7 @@ self: { description = "Easy to use library for building Telegram bots"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "teleport" = callPackage @@ -211151,6 +218806,7 @@ self: { description = "A tool to quickly switch between directories"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "teleshell" = callPackage @@ -211174,6 +218830,7 @@ self: { description = "Telnet client and other things"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tellbot" = callPackage @@ -211194,6 +218851,7 @@ self: { description = "IRC tellbot"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tempered" = callPackage @@ -211238,6 +218896,7 @@ self: { description = "declaring Default instances just got even easier"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "template-haskell_2_14_0_0" = callPackage @@ -211256,12 +218915,11 @@ self: { ({ mkDerivation, base, base-prelude, template-haskell }: mkDerivation { pname = "template-haskell-compat-v0208"; - version = "0.1.1"; - sha256 = "1dgxfcz68h583r15vc3zmj2fchsv5v4n2v55fz2ccw6sl3kyvlp3"; + version = "0.1.1.1"; + sha256 = "0il2bm5bwa4majddlzckc6jlcwx4w1kmymz9szj11hwjchgd1w3l"; libraryHaskellDepends = [ base base-prelude template-haskell ]; description = "A backwards compatibility layer for Template Haskell newer than 2.8"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template-haskell-util" = callPackage @@ -211276,6 +218934,7 @@ self: { description = "Some utilities for template Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "template-hsml" = callPackage @@ -211297,6 +218956,7 @@ self: { description = "Haskell's Simple Markup Language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "template-toolkit" = callPackage @@ -211328,6 +218988,7 @@ self: { description = "Process template file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "templateify" = callPackage @@ -211342,6 +219003,7 @@ self: { description = "Make template from website"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "templatepg" = callPackage @@ -211360,6 +219022,7 @@ self: { description = "A PostgreSQL access library with compile-time SQL type inference"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "templater" = callPackage @@ -211415,6 +219078,7 @@ self: { description = "A small Haskell wrapper around the TempoDB api"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "temporal-csound" = callPackage @@ -211433,6 +219097,7 @@ self: { description = "library to make electronic music, brings together temporal-music-notation and csound-expression packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "temporal-media" = callPackage @@ -211535,6 +219200,7 @@ self: { description = "Portable temporary files and directories with automatic deletion"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tempus" = callPackage @@ -211556,6 +219222,7 @@ self: { description = "Interpreter for the FRP language Tempus"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tempus-fugit" = callPackage @@ -211584,6 +219251,7 @@ self: { description = "A completely type-safe library for linear algebra"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow" = callPackage @@ -211613,6 +219281,7 @@ self: { description = "TensorFlow bindings"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libtensorflow;}; "tensorflow-core-ops" = callPackage @@ -211634,6 +219303,7 @@ self: { description = "Haskell wrappers for Core Tensorflow Ops"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-logging" = callPackage @@ -211663,6 +219333,7 @@ self: { description = "TensorBoard related functionality"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-mnist" = callPackage @@ -211716,6 +219387,7 @@ self: { description = "Code generation for TensorFlow operations"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-ops" = callPackage @@ -211746,6 +219418,7 @@ self: { description = "Friendly layer around TensorFlow bindings"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-proto" = callPackage @@ -211764,6 +219437,7 @@ self: { description = "TensorFlow protocol buffers"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) protobuf;}; "tensorflow-records" = callPackage @@ -211869,6 +219543,7 @@ self: { description = "reactive-banana + termbox"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "termbox-bindings" = callPackage @@ -211885,6 +219560,7 @@ self: { description = "Bindings to the Termbox library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "termcolor" = callPackage @@ -211899,7 +219575,6 @@ self: { executableHaskellDepends = [ base cli ]; description = "Composable terminal colors"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "terminal" = callPackage @@ -211958,6 +219633,7 @@ self: { description = "Simple terminal-based time tracker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "terminal-size" = callPackage @@ -211985,6 +219661,7 @@ self: { description = "Text data type for styled terminal output, including all standard ANSI effects (bold, italic, blinking) and ANSI / 256 / truecolor colors support for Unix and Windows (whenever possible)"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "termination-combinators" = callPackage @@ -211997,6 +219674,7 @@ self: { description = "Termination combinators for forcing non-terminating algorithms to terminate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "terminfo_0_4_1_4" = callPackage @@ -212061,8 +219739,7 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk; vte_291 = pkgs.gnome3.vte;}; + }) {inherit (pkgs) gtk3; vte_291 = pkgs.vte;}; "termplot" = callPackage ({ mkDerivation, base, brick, data-default, optparse-applicative @@ -212081,6 +219758,7 @@ self: { description = "Plot time series in your terminal using commands stdout"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "terntup" = callPackage @@ -212099,6 +219777,7 @@ self: { description = "a ternary library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "terrahs" = callPackage @@ -212112,6 +219791,7 @@ self: { description = "A Haskell GIS Programming Environment"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {terralib4c = null; translib = null;}; "tersmu" = callPackage @@ -212133,6 +219813,7 @@ self: { description = "A semantic parser for lojban"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "test-fixture" = callPackage @@ -212155,6 +219836,7 @@ self: { description = "Test monadic side-effects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "test-framework" = callPackage @@ -212196,6 +219878,7 @@ self: { description = "Test.Framework wrapper for DocTest"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "test-framework-golden" = callPackage @@ -212266,6 +219949,7 @@ self: { description = "QuickCheck support for the test-framework package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "test-framework-quickcheck2" = callPackage @@ -212302,6 +219986,7 @@ self: { description = "test-sandbox support for the test-framework package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "test-framework-skip" = callPackage @@ -212322,6 +220007,7 @@ self: { description = "Functions for conveniently marking some of the tests in a suite as being skipped"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "test-framework-smallcheck" = callPackage @@ -212348,6 +220034,7 @@ self: { description = "A test framework provider for testing-feat"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "test-framework-th" = callPackage @@ -212437,6 +220124,8 @@ self: { executableHaskellDepends = [ base simple-get-opt ]; description = "A library to make a quick test-runner script"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "test-pkg" = callPackage @@ -212449,6 +220138,7 @@ self: { description = "Just tests Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "test-sandbox" = callPackage @@ -212508,6 +220198,7 @@ self: { description = "Lightweight development enviroments using test-sandbox"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "test-sandbox-hunit" = callPackage @@ -212520,6 +220211,7 @@ self: { description = "HUnit convenience functions for use with test-sandbox"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "test-sandbox-quickcheck" = callPackage @@ -212549,6 +220241,7 @@ self: { description = "Catchy combinators for HUnit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "test-simple" = callPackage @@ -212568,6 +220261,7 @@ self: { description = "Simple Perl inspired testing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "testCom" = callPackage @@ -212586,6 +220280,7 @@ self: { description = "Write your tests in comments"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "testPkg" = callPackage @@ -212622,6 +220317,7 @@ self: { description = "Create tests and benchmarks together"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "testing-feat" = callPackage @@ -212667,6 +220363,7 @@ self: { description = "Quick feedback loop for test suites"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "testpack" = callPackage @@ -212684,6 +220381,7 @@ self: { description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "testpattern" = callPackage @@ -212699,6 +220397,7 @@ self: { description = "Display a monitor test pattern"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "testrunner" = callPackage @@ -212714,6 +220413,7 @@ self: { description = "Easy unit test driver framework"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tetris" = callPackage @@ -212743,6 +220443,7 @@ self: { description = "LaTeX to plain-text conversion"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "texbuilder" = callPackage @@ -212764,6 +220465,7 @@ self: { description = "View your latex output while editing"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "texmath" = callPackage @@ -212773,8 +220475,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.11.2"; - sha256 = "12jkv3wa5lmlik516fp6i429vlznzybhhw4843d55hdid5yhvihf"; + version = "0.11.2.2"; + sha256 = "11qhp37ghz70bbpapzafd1ksvzqrd1p0fi7fjlyfs10i02pj8kpy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212847,6 +220549,7 @@ self: { description = "Everything Data.Text related in one package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-and-plots" = callPackage @@ -212864,6 +220567,7 @@ self: { description = "EDSL to create HTML documents with plots based on the C3.js library."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-ansi" = callPackage @@ -212932,6 +220636,7 @@ self: { description = "Memory-efficient string-indexed container types"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-conversions" = callPackage @@ -213034,6 +220739,7 @@ self: { description = "A generic, derivable, haskell pretty printer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-icu" = callPackage @@ -213078,6 +220784,7 @@ self: { description = "Dealing with Strict Text in NFC normalization"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-icu-translit" = callPackage @@ -213162,6 +220869,7 @@ self: { description = "Lenses for operating over text"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-lips" = callPackage @@ -213200,6 +220908,7 @@ self: { description = "Encode and decode Text to/from ByteString using TextEncoding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-manipulate" = callPackage @@ -213232,6 +220941,7 @@ self: { description = "A data structure for mapping metadata to text subsequences"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-metrics" = callPackage @@ -213266,6 +220976,7 @@ self: { description = "Unicode-normalized text"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-plus" = callPackage @@ -213283,6 +220994,7 @@ self: { description = "Utils for text"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-position" = callPackage @@ -213298,6 +221010,7 @@ self: { description = "Handling positions in text and position-tagging it"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-postgresql" = callPackage @@ -213378,6 +221091,7 @@ self: { description = "A Haskell implementation of the 1# Text Register Machine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-render" = callPackage @@ -213528,6 +221242,7 @@ self: { description = "Library for Time parsing from Text into UTCTime"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-utf7" = callPackage @@ -213570,6 +221285,7 @@ self: { description = "An efficient packed UTF-8 backed Unicode text type"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-utils" = callPackage @@ -213611,6 +221327,7 @@ self: { description = "Quasiquoter for xml. XML DSL in Haskell."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text-zipper" = callPackage @@ -213637,6 +221354,7 @@ self: { description = "Monadic interface to the text-zipper package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "text1" = callPackage @@ -213694,6 +221412,7 @@ self: { description = "A simple Haskell program to provide tags for Haskell code completion in TextMate"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "textocat-api" = callPackage @@ -213715,6 +221434,7 @@ self: { description = "Unofficial Haskell SDK for Textocat API -- http://textocat.com"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "texts" = callPackage @@ -213738,6 +221458,7 @@ self: { description = "Textual type class for data that represent text"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tf-random" = callPackage @@ -213773,6 +221494,7 @@ self: { description = "Template-Haskell code for tfp"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tftp" = callPackage @@ -213798,6 +221520,7 @@ self: { description = "A library for building tftp servers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tga" = callPackage @@ -213810,14 +221533,15 @@ self: { description = "Reading and writing of tga image files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-abstraction" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.2.10.0"; - sha256 = "1bql46ylr111g0pncdsf5mbhn6cpaw9xlqby89bz417dlk5gzny9"; + version = "0.2.11.0"; + sha256 = "0340w34cqa42m0b9hdys9bfphi13swdp7xc8cwzbj9fq6764p22i"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -213844,6 +221568,7 @@ self: { description = "Alpha equivalence for TH Exp"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-build" = callPackage @@ -213856,6 +221581,7 @@ self: { description = "More convenient construction of TH ASTs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-cas" = callPackage @@ -213903,6 +221629,7 @@ self: { description = "Test instance context"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-data-compat" = callPackage @@ -213946,6 +221673,7 @@ self: { description = "Automatically discover available dictionaries at compile time"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-expand-syns" = callPackage @@ -213983,6 +221711,7 @@ self: { description = "TH fold generator"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-format" = callPackage @@ -214000,6 +221729,7 @@ self: { description = "Template Haskell based support for format strings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-inline-io-action" = callPackage @@ -214032,6 +221762,7 @@ self: { description = "Fixed versions of instances reification functions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-instances" = callPackage @@ -214056,6 +221787,7 @@ self: { description = "A place to collect orphan instances for Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-kinds" = callPackage @@ -214087,6 +221819,7 @@ self: { description = "Automated kind inference in Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-lift" = callPackage @@ -214152,7 +221885,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Template Haskell splice that expands to current time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-orphans" = callPackage @@ -214240,6 +221972,7 @@ self: { description = "Binding group analysis in Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-strict-compat" = callPackage @@ -214264,6 +221997,7 @@ self: { description = "Provides a way to persist data from compile-time to runtime"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-traced" = callPackage @@ -214276,6 +222010,7 @@ self: { description = "Tracing Q monad computation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-typegraph" = callPackage @@ -214304,6 +222039,7 @@ self: { description = "Graph of the subtype relation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-utilities" = callPackage @@ -214347,6 +222083,7 @@ self: { description = "Give your dependencies stars on GitHub!"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "theatre" = callPackage @@ -214388,6 +222125,7 @@ self: { description = "Haskell API bindings for http://themoviedb.org"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "themplate" = callPackage @@ -214435,6 +222173,7 @@ self: { description = "All-in-one session handling for servant-based frontends"; license = "AGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "theoremquest" = callPackage @@ -214447,6 +222186,7 @@ self: { description = "A common library for TheoremQuest, a theorem proving game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "theoremquest-client" = callPackage @@ -214461,6 +222201,7 @@ self: { description = "A simple client for the TheoremQuest theorem proving game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "these" = callPackage @@ -214487,6 +222228,32 @@ self: { ]; description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "these_0_8" = callPackage + ({ mkDerivation, aeson, assoc, base, base-compat, bifunctors + , binary, containers, data-default-class, deepseq, hashable, keys + , lens, mtl, QuickCheck, quickcheck-instances, semigroupoids, tasty + , tasty-quickcheck, transformers, transformers-compat + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "these"; + version = "0.8"; + sha256 = "145m71z43rqgps0nh29hcfkr3cbs9l82y3dfycf7i5fjr2472rga"; + libraryHaskellDepends = [ + aeson assoc base base-compat bifunctors binary containers + data-default-class deepseq hashable keys lens mtl QuickCheck + semigroupoids transformers transformers-compat unordered-containers + vector vector-instances + ]; + testHaskellDepends = [ + aeson base base-compat bifunctors binary containers hashable lens + QuickCheck quickcheck-instances tasty tasty-quickcheck transformers + unordered-containers vector + ]; + description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -214496,10 +222263,13 @@ self: { pname = "these-skinny"; version = "0.7.4"; sha256 = "0hlxf94ir99y0yzm9pq8cvs7vbar4bpj1w1ibs96hrx2biwfbnkr"; + revision = "1"; + editedCabalFile = "057hgdbc5ch43cn5qz0kr02iws9p1l24z23pifll29iazzl1jk6c"; libraryHaskellDepends = [ base deepseq ]; description = "A fork of the 'these' package without the dependency bloat"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "thespian" = callPackage @@ -214537,6 +222307,7 @@ self: { description = "Typing Haskell In Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "thimk" = callPackage @@ -214556,6 +222327,7 @@ self: { description = "Command-line spelling word suggestion tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "thorn" = callPackage @@ -214575,6 +222347,7 @@ self: { description = "Datatype Manipulation with Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "thread-hierarchy" = callPackage @@ -214625,6 +222398,7 @@ self: { description = "(deprecated in favor of 'threads') Simple thread management"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "threads" = callPackage @@ -214689,6 +222463,7 @@ self: { description = "Simple, IO-based library for Erlang-style thread supervision"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "threadscope" = callPackage @@ -214711,6 +222486,7 @@ self: { description = "A graphical tool for profiling parallel Haskell programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "threefish" = callPackage @@ -214784,6 +222560,7 @@ self: { description = "Write simple nested context menus for threepenny-gui"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "threepenny-gui-flexbox" = callPackage @@ -214799,6 +222576,7 @@ self: { description = "Flexbox layouts for Threepenny-gui"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "thrift" = callPackage @@ -214822,6 +222600,7 @@ self: { description = "Haskell bindings for the Apache Thrift RPC system"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "thrist" = callPackage @@ -214885,6 +222664,7 @@ self: { description = "Loop over an action but throttle it to a certain rate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "through-text" = callPackage @@ -214899,6 +222679,7 @@ self: { description = "Convert textual types through Text without needing O(n^2) instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "throwable-exceptions" = callPackage @@ -214917,6 +222698,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "throwable-exceptions gives the easy way to throw exceptions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "thumbnail" = callPackage @@ -214952,6 +222735,7 @@ self: { description = "Generate thumbnails easily and safely"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "thyme" = callPackage @@ -215020,7 +222804,7 @@ self: { description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;}; + }) {inherit (pkgs) gtk3; webkitgtk = null;}; "tibetan-utils" = callPackage ({ mkDerivation, base, composition-prelude, either, hspec @@ -215053,6 +222837,7 @@ self: { description = "Useful if reading \"Why FP matters\" by John Hughes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ticker" = callPackage @@ -215090,6 +222875,7 @@ self: { description = "A port of @Data.Binary@"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tictactoe3d" = callPackage @@ -215102,28 +222888,46 @@ self: { description = "3D Tic-Tac-Toe game"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tidal" = callPackage ({ mkDerivation, base, bifunctors, colour, containers, hosc - , microspec, mwc-random, network, parsec, text, transformers - , vector + , microspec, mwc-random, network, parsec, template-haskell, text + , transformers, vector }: mkDerivation { pname = "tidal"; - version = "1.0.7"; - sha256 = "1p2h3g9fa3jd3133ryhcdpkb6a3a3994hrbr1ryd0gza8gd3bgv1"; - revision = "1"; - editedCabalFile = "16ingdhhc38zj1gixj3c7b01lr9lbnxkr8pf0x2j8z1jpbl7jg4a"; + version = "1.0.8"; + sha256 = "0mxwaalbc23rmk163r40vqw15f3kjg5bagpq7f6rn3nyks7095qz"; libraryHaskellDepends = [ base bifunctors colour containers hosc mwc-random network parsec - text transformers vector + template-haskell text transformers vector ]; testHaskellDepends = [ base containers microspec parsec ]; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; }) {}; + "tidal_1_0_10" = callPackage + ({ mkDerivation, base, bifunctors, colour, containers, hosc + , microspec, mwc-random, network, parsec, template-haskell, text + , transformers, vector + }: + mkDerivation { + pname = "tidal"; + version = "1.0.10"; + sha256 = "1pays7hjsv7rpc0ldmzhavxkyp3avcwz912zfm9y80fyhhyyf4jp"; + libraryHaskellDepends = [ + base bifunctors colour containers hosc mwc-random network parsec + template-haskell text transformers vector + ]; + testHaskellDepends = [ base containers microspec parsec ]; + description = "Pattern language for improvised music"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers @@ -215140,6 +222944,7 @@ self: { description = "MIDI support for tidal"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tidal-serial" = callPackage @@ -215154,6 +222959,7 @@ self: { description = "Serial support for tidal"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tidal-vis" = callPackage @@ -215166,6 +222972,7 @@ self: { description = "Visual rendering for Tidal patterns"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tie-knot" = callPackage @@ -215178,6 +222985,7 @@ self: { description = "\"Ties the knot\" on a given set of structures that reference each other by keys"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tiempo" = callPackage @@ -215190,6 +222998,7 @@ self: { description = "Specify time intervals in different units (secs, mins, hours, etc.)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tiger" = callPackage @@ -215207,6 +223016,7 @@ self: { description = "Tiger Compiler of Universiteit Utrecht"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tight-apply" = callPackage @@ -215235,6 +223045,7 @@ self: { description = "Nice API for a Slackbot"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tighttp" = callPackage @@ -215254,6 +223065,7 @@ self: { description = "Tiny and Incrementally-Growing HTTP library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tile" = callPackage @@ -215297,6 +223109,7 @@ self: { description = "The Timber Compiler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "time_1_9_2" = callPackage @@ -215353,6 +223166,7 @@ self: { description = "Data instances for the time package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "time-exts" = callPackage @@ -215398,6 +223212,7 @@ self: { description = "Parse and format HTTP/1.1 Date and Time strings"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "time-interval" = callPackage @@ -215421,6 +223236,7 @@ self: { description = "IO Access for time"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "time-lens" = callPackage @@ -215467,6 +223283,7 @@ self: { description = "A library to mock the current time"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "time-out" = callPackage @@ -215504,6 +223321,7 @@ self: { description = "Parsers for types in `time`"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "time-patterns" = callPackage @@ -215548,6 +223366,7 @@ self: { description = "Quasi-quoters for dates and times"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "time-recurrence" = callPackage @@ -215566,6 +223385,7 @@ self: { description = "Generate recurring dates"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "time-series" = callPackage @@ -215581,6 +223401,7 @@ self: { description = "Time series analysis"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "time-series-lib" = callPackage @@ -215595,6 +223416,7 @@ self: { description = "Library for Time Series processing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "time-units" = callPackage @@ -215620,6 +223442,7 @@ self: { description = "Parse, format and convert W3C Date and Time"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "time-warp" = callPackage @@ -215658,6 +223481,7 @@ self: { description = "Distributed systems execution emulation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timecalc" = callPackage @@ -215671,14 +223495,15 @@ self: { executableHaskellDepends = [ base haskeline uu-parsinglib ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timeconsole" = callPackage ({ mkDerivation, base, process, time }: mkDerivation { pname = "timeconsole"; - version = "0.1.0.4"; - sha256 = "0kk16hpf7adb2bz4bs3rr4gv6gdw3jki3bz7ln5034b3hrzbf0a1"; + version = "0.1.0.5"; + sha256 = "1p4h007c4x7mybc4bx9bbnwrxhxn6s1nlkbwg5ixhdb4siknqasi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process time ]; @@ -215794,6 +223619,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timeout" = callPackage @@ -215811,6 +223637,7 @@ self: { description = "Generalized sleep and timeout functions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timeout-control" = callPackage @@ -215838,6 +223665,7 @@ self: { description = "Runs a time-limited computation alowing it to return intermediate results"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timeparsers" = callPackage @@ -215854,6 +223682,7 @@ self: { description = "Attoparsec parsers for various Date/Time formats"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timeplot" = callPackage @@ -215875,6 +223704,7 @@ self: { description = "A tool for visualizing time series from log files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timeprint" = callPackage @@ -215887,6 +223717,7 @@ self: { description = "Prints timestamps after each line evaluated"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timer-wheel" = callPackage @@ -215967,6 +223798,7 @@ self: { description = "tick based timers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timers-updatable" = callPackage @@ -215998,6 +223830,7 @@ self: { description = "Library for Time Series processing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timespan" = callPackage @@ -216010,6 +223843,7 @@ self: { description = "Useful timespan datatype and functions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timestamp" = callPackage @@ -216117,6 +223951,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timing-convenience" = callPackage @@ -216154,6 +223989,7 @@ self: { description = "A softer alternative to Haddock"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tiny-scheduler" = callPackage @@ -216166,6 +224002,7 @@ self: { description = "tiny no-brainer job scheduler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tinyMesh" = callPackage @@ -216182,6 +224019,7 @@ self: { description = "TinyMesh - communicating with auto-meshing sensor network"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tinyXml" = callPackage @@ -216207,6 +224045,7 @@ self: { description = "A fast DOM parser for a subset of XML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tinyfiledialogs" = callPackage @@ -216249,6 +224088,7 @@ self: { description = "A tiny text templating library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tip-haskell-frontend" = callPackage @@ -216274,6 +224114,7 @@ self: { description = "Convert from Haskell to Tip"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tip-lib" = callPackage @@ -216298,6 +224139,7 @@ self: { description = "tons of inductive problems - support library and tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tiphys" = callPackage @@ -216328,6 +224170,7 @@ self: { description = "Testing Infrastructure for Temporal AbstractioNs"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "titlecase" = callPackage @@ -216363,6 +224206,7 @@ self: { description = "Simple Presentation Utility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tkyprof" = callPackage @@ -216390,6 +224234,7 @@ self: { description = "A web-based visualizer for GHC Profiling Reports"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tld" = callPackage @@ -216494,6 +224339,7 @@ self: { description = "TLS extra default values and helpers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tls-session-manager" = callPackage @@ -216599,6 +224445,7 @@ self: { description = "A simple daily journal program"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tnet" = callPackage @@ -216626,6 +224473,7 @@ self: { description = "A type class and some utilities for generating Haskell code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "to-string-class" = callPackage @@ -216634,10 +224482,13 @@ self: { pname = "to-string-class"; version = "0.1.2"; sha256 = "0l2hj0cbc0dhd7m5bn6xqgzkdf2z4knirmv8c65hsjig9mpsvsxf"; + revision = "1"; + editedCabalFile = "1p5q59gswv86pk7hxpg1n81q4szhwx8rwfx5hsibdz9i9mgz2bbs"; libraryHaskellDepends = [ base ]; description = "Converting string-like types to Strings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "to-string-instances" = callPackage @@ -216650,6 +224501,7 @@ self: { description = "Instances for the ToString class"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "toboggan" = callPackage @@ -216669,6 +224521,7 @@ self: { description = "Twitter bot generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "todo" = callPackage @@ -216681,6 +224534,7 @@ self: { description = "A todo bottom"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "todos" = callPackage @@ -216707,6 +224561,7 @@ self: { description = "Easy-to-use TODOs manager"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tofromxml" = callPackage @@ -216726,6 +224581,7 @@ self: { description = "Reading and writing Haskell data from and to XML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "toilet" = callPackage @@ -216744,6 +224600,7 @@ self: { description = "Manage the toilet queue at the IMO"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "token-bucket" = callPackage @@ -216770,6 +224627,7 @@ self: { description = "A regex lexer"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tokenize" = callPackage @@ -216797,7 +224655,6 @@ self: { libraryHaskellDepends = [ base bytestring text ]; description = "An efficient and easy-to-use tokenizer monad"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tokenizer-streaming" = callPackage @@ -216829,6 +224686,7 @@ self: { description = "TokTok C code style checker"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "toktok" = callPackage @@ -216844,6 +224702,7 @@ self: { executableHaskellDepends = [ base bytestring gf iconv ]; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tokyocabinet-haskell" = callPackage @@ -216857,6 +224716,7 @@ self: { description = "Haskell binding of Tokyo Cabinet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) tokyocabinet;}; "tokyotyrant-haskell" = callPackage @@ -216870,7 +224730,9 @@ self: { librarySystemDepends = [ tokyocabinet tokyotyrant ]; description = "FFI bindings to libtokyotyrant"; license = stdenv.lib.licenses.bsd3; + platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;}; "tomato-rubato-openal" = callPackage @@ -216883,6 +224745,7 @@ self: { description = "Easy to use library for audio programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "toml" = callPackage @@ -216900,6 +224763,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "toml-parser" = callPackage @@ -216945,6 +224809,7 @@ self: { description = "Bidirectional TOML parser"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tomland_1_0_0" = callPackage @@ -216982,6 +224847,7 @@ self: { description = "Bidirectional TOML serialization"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tomlcheck" = callPackage @@ -217046,8 +224912,8 @@ self: { }: mkDerivation { pname = "tonatona-google-server-api"; - version = "0.1.1.0"; - sha256 = "094la1rd8527a398607rsq9z2hiay59biy9fnfiw7qyigwf4zlr0"; + version = "0.1.2.0"; + sha256 = "1pmpmmyqs41anm0b2cmf0fj75lz31w5s1bidjqjyqymznpna0i0j"; libraryHaskellDepends = [ base google-server-api monad-logger persistent persistent-sqlite resource-pool servant-client tonalude tonaparser tonatona @@ -217059,7 +224925,6 @@ self: { ]; description = "tonatona plugin for google-server-api"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tonatona-logger" = callPackage @@ -217121,8 +224986,8 @@ self: { }: mkDerivation { pname = "tonatona-servant"; - version = "0.1.0.1"; - sha256 = "1202fxvjkmvj9sgy576y0ghpcqdca1bhagsxrrz3hcdkyvd2lr9s"; + version = "0.1.0.2"; + sha256 = "1r0xh69wzzj8h846vi7kp8gkd9i0xfyrcjj8ggliz5h7pvrfwvbl"; libraryHaskellDepends = [ base exceptions http-types monad-logger rio servant servant-server tonaparser tonatona tonatona-logger wai wai-extra warp @@ -217152,8 +225017,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.1.3.0"; - sha256 = "0p73crss0jdn7qbz7qvhpvs988g0w6x819f9gyyx21lnkvm1qlhn"; + version = "0.1.3.1"; + sha256 = "0av2fr2y1b70rxfqsz1kfgkfj7i5j76zpn351r2s8navwa4pf116"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217178,39 +225043,43 @@ self: { description = "Cluster single cells and analyze cell clade relationships"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "toodles" = callPackage - ({ mkDerivation, aeson, base, blaze-html, cmdargs, directory, extra - , hspec, hspec-expectations, megaparsec, MissingH, regex-posix - , servant, servant-blaze, servant-server, strict, text, wai, warp + ({ mkDerivation, aeson, base, base64-bytestring, blaze-html + , bytestring, cmdargs, directory, extra, hspec, hspec-expectations + , megaparsec, MissingH, process, regex-posix, RSA, servant + , servant-blaze, servant-server, strict, text, time, wai, warp , yaml }: mkDerivation { pname = "toodles"; - version = "1.0.3"; - sha256 = "1nzrfdbwz5ykiim76jr3v1666acrhh76k4q4gwix9bixcm8al2zf"; + version = "1.1.1"; + sha256 = "0n1z99f2zr2xj55y90ll9dvqq51sv4r4zyhjx7qilqw34djzfn88"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base blaze-html cmdargs directory extra hspec - hspec-expectations megaparsec MissingH regex-posix servant - servant-blaze servant-server strict text wai warp yaml + aeson base base64-bytestring blaze-html bytestring cmdargs + directory extra megaparsec MissingH process regex-posix RSA servant + servant-blaze servant-server strict text time wai warp yaml ]; executableHaskellDepends = [ - aeson base blaze-html cmdargs directory extra hspec - hspec-expectations megaparsec MissingH regex-posix servant - servant-blaze servant-server strict text wai warp yaml + aeson base base64-bytestring blaze-html bytestring cmdargs + directory extra megaparsec MissingH process regex-posix RSA servant + servant-blaze servant-server strict text time wai warp yaml ]; testHaskellDepends = [ - aeson base blaze-html cmdargs directory extra hspec - hspec-expectations megaparsec MissingH regex-posix servant - servant-blaze servant-server strict text wai warp yaml + aeson base base64-bytestring blaze-html bytestring cmdargs + directory extra hspec hspec-expectations megaparsec MissingH + process regex-posix servant servant-blaze servant-server strict + text time wai warp yaml ]; description = "Manage the TODO entries in your code"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "toolshed" = callPackage @@ -217253,6 +225122,7 @@ self: { description = "Top (typed oriented protocol) API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "topkata" = callPackage @@ -217272,6 +225142,22 @@ self: { description = "OpenGL Arcade Game"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "topograph" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , vector + }: + mkDerivation { + pname = "topograph"; + version = "1"; + sha256 = "0vm7ja5f677lpphfmggx68h144k0fzj0n6r6ypf5474da405xad7"; + libraryHaskellDepends = [ + base base-compat base-orphans containers vector + ]; + description = "Directed acyclic graphs"; + license = stdenv.lib.licenses.bsd3; }) {}; "torch" = callPackage @@ -217284,6 +225170,7 @@ self: { description = "Simple unit test library (or framework)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "torrent" = callPackage @@ -217355,6 +225242,7 @@ self: { description = "Finitely represented /total/ maps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "total-maps" = callPackage @@ -217386,6 +225274,7 @@ self: { description = "Library (and cli) to execute a procedure on file change"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tower" = callPackage @@ -217429,6 +225318,7 @@ self: { description = "Haskell bindings to the C reference implementation of Tox"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {toxcore = null;}; "toxiproxy-haskell" = callPackage @@ -217449,6 +225339,7 @@ self: { description = "Client library for Toxiproxy: a TCP failure testing proxy"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "toysolver" = callPackage @@ -217501,6 +225392,7 @@ self: { description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tpar" = callPackage @@ -217538,6 +225430,7 @@ self: { description = "simple, parallel job scheduling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tpb" = callPackage @@ -217564,6 +225457,7 @@ self: { description = "Applications for interacting with the Pushbullet API"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tpdb" = callPackage @@ -217586,6 +225480,7 @@ self: { description = "Data Type for Rewriting Systems"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trace" = callPackage @@ -217603,6 +225498,7 @@ self: { description = "A monad transformer for tracing provenience of errors"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trace-call" = callPackage @@ -217615,6 +225511,7 @@ self: { description = "functions for logging the arguments and results of function calls"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trace-function-call" = callPackage @@ -217627,6 +225524,7 @@ self: { description = "Easy lightweight tracing of function arguments and results for ad hoc debugging"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "traced" = callPackage @@ -217639,6 +225537,7 @@ self: { description = "Simple evaluation trace"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tracer" = callPackage @@ -217669,6 +225568,7 @@ self: { description = "Visualize Haskell data structures as edge-labeled trees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tracker" = callPackage @@ -217681,6 +225581,7 @@ self: { description = "Client library for Tracker metadata database, indexer and search tool"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trackit" = callPackage @@ -217699,7 +225600,6 @@ self: { ]; description = "A command-line tool for live monitoring"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "traction" = callPackage @@ -217721,6 +225621,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tracy" = callPackage @@ -217733,6 +225634,7 @@ self: { description = "Convenience wrappers for non-intrusive debug tracing"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "traildb" = callPackage @@ -217757,6 +225659,7 @@ self: { description = "TrailDB bindings for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {Judy = null; traildb = null;}; "trajectory" = callPackage @@ -217780,6 +225683,7 @@ self: { description = "Tools and a library for working with Trajectory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "transaction" = callPackage @@ -217810,6 +225714,7 @@ self: { description = "Transactional events, based on Concurrent ML semantics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "transf" = callPackage @@ -217829,6 +225734,7 @@ self: { description = "Text transformer and interpreter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "transfer-db" = callPackage @@ -217858,6 +225764,7 @@ self: { description = "ODBC database transfer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "transformations" = callPackage @@ -217879,6 +225786,7 @@ self: { description = "Generic representation of tree transformations"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "transformers_0_4_3_0" = callPackage @@ -217970,6 +225878,7 @@ self: { description = "Arrow-like / category-like composition for transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "transformers-continue" = callPackage @@ -218000,6 +225909,7 @@ self: { description = "Sensible conversions between some of the monad transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "transformers-eff" = callPackage @@ -218072,6 +225982,8 @@ self: { ]; description = "Ad-hoc type classes for lifting"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "transformers-runnable" = callPackage @@ -218084,6 +225996,7 @@ self: { description = "A unified interface for the run operation of monad transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "transformers-supply" = callPackage @@ -218116,6 +226029,7 @@ self: { description = "composing programs with multithreading, events and distributed computing"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "transient-universe" = callPackage @@ -218149,6 +226063,7 @@ self: { description = "Remote execution and map-reduce: distributed computing for Transient"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "transient-universe-tls" = callPackage @@ -218166,6 +226081,7 @@ self: { description = "transient with secure communications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "translatable-intset" = callPackage @@ -218180,6 +226096,7 @@ self: { description = "Integer sets with a constant time translate operation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "translate" = callPackage @@ -218193,6 +226110,7 @@ self: { description = "Haskell binding to Google's AJAX Language API for Translation and Detection"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "translate-cli" = callPackage @@ -218211,6 +226129,7 @@ self: { description = "Translation cli tool"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trasa" = callPackage @@ -218233,6 +226152,7 @@ self: { description = "Type Safe Web Routing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trasa-client" = callPackage @@ -218255,6 +226175,7 @@ self: { description = "Type safe http requests"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trasa-reflex" = callPackage @@ -218294,6 +226215,7 @@ self: { description = "Type safe web server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "traverse-with-class" = callPackage @@ -218326,6 +226248,7 @@ self: { description = "A simple client implementation using Travis CI API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "travis-meta-yaml" = callPackage @@ -218356,6 +226279,7 @@ self: { description = ".travis.yml preprocessor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "travis-pogodi" = callPackage @@ -218389,6 +226313,7 @@ self: { description = "A tool for finding haddocks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "traypoweroff" = callPackage @@ -218404,6 +226329,7 @@ self: { description = "Tray Icon application to PowerOff / Reboot computer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tree-diff" = callPackage @@ -218466,6 +226392,7 @@ self: { description = "Functions and newtype wrappers for traversing Trees"; license = stdenv.lib.licenses.cc0; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tree-view" = callPackage @@ -218530,6 +226457,7 @@ self: { description = "Generates HTML for Data.Tree as TreeMap"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "treemap-html-tools" = callPackage @@ -218550,6 +226478,7 @@ self: { description = "Treemap related commands for producing foldable TreeMap HTML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "treersec" = callPackage @@ -218602,6 +226531,7 @@ self: { description = "Library for polling Tremulous servers"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trhsx" = callPackage @@ -218613,6 +226543,7 @@ self: { description = "Deprecated"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "triangulation" = callPackage @@ -218629,6 +226560,7 @@ self: { description = "triangulation of polygons"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trie-simple" = callPackage @@ -218647,6 +226579,7 @@ self: { description = "Simple Map-based Trie"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tries" = callPackage @@ -218677,6 +226610,7 @@ self: { description = "Various trie implementations in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trifecta" = callPackage @@ -218725,6 +226659,7 @@ self: { description = "Trigger is a cross platform file system watcher for super fast build-and-restart workflows"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trim" = callPackage @@ -218754,6 +226689,7 @@ self: { description = "Search for, annotate and trim poly-A tail"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tripLL" = callPackage @@ -218770,6 +226706,7 @@ self: { description = "A very simple triple store"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "triplesec" = callPackage @@ -218790,6 +226727,7 @@ self: { description = "TripleSec is a simple, triple-paranoid, symmetric encryption library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trivia" = callPackage @@ -218802,6 +226740,7 @@ self: { description = "The trivial monad and comonad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trivial-constraint" = callPackage @@ -218825,6 +226764,7 @@ self: { description = "A library for tropical mathematics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "true-name" = callPackage @@ -218852,6 +226792,8 @@ self: { executableHaskellDepends = [ base containers parseargs WAVE ]; description = "Audio file compressor-limiter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "trurl" = callPackage @@ -218875,6 +226817,7 @@ self: { description = "Haskell template code generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "truthful" = callPackage @@ -218900,6 +226843,7 @@ self: { description = "A Transaction Framework for Web Applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tsession-happstack" = callPackage @@ -218914,6 +226858,7 @@ self: { description = "A Transaction Framework for Happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tsetchan" = callPackage @@ -218940,6 +226885,7 @@ self: { description = "A Skip List Implementation in Software Transactional Memory (STM)"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tslib" = callPackage @@ -219008,6 +226954,7 @@ self: { description = "Real time TSP tour visualization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tsparse" = callPackage @@ -219026,6 +226973,7 @@ self: { description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tst" = callPackage @@ -219058,6 +227006,7 @@ self: { description = "Interacts with tesseract to ease reading of RAW Japanese manga"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tsv2csv" = callPackage @@ -219091,6 +227040,7 @@ self: { description = "Template tsv into SQL"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ttask" = callPackage @@ -219114,6 +227064,7 @@ self: { description = "This is task management tool for yourself, that inspired by scrum"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ttl-hashtables" = callPackage @@ -219178,6 +227129,7 @@ self: { description = "TheThingsNetwork client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ttrie" = callPackage @@ -219229,6 +227181,7 @@ self: { description = "Working with files for the Tiptoi® pen"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tubes" = callPackage @@ -219257,6 +227210,7 @@ self: { description = "Interface to TUN/TAP drivers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tuntap-simple" = callPackage @@ -219285,6 +227239,7 @@ self: { description = "Homogeneous tuples"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tuple" = callPackage @@ -219308,6 +227263,7 @@ self: { description = "Enum instances for tuples where the digits increase with the same speed"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tuple-generic" = callPackage @@ -219343,6 +227299,7 @@ self: { description = "Stock FieldN combos and generators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tuple-morph" = callPackage @@ -219357,6 +227314,7 @@ self: { description = "Morph between tuples, or convert them from and to HLists"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tuple-ops" = callPackage @@ -219369,6 +227327,7 @@ self: { description = "various operations on n-ary tuples via GHC.Generics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tuple-sop" = callPackage @@ -219404,6 +227363,7 @@ self: { description = "Functor, Applicative and Monad for n-ary tuples"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tuples-homogenous-h98" = callPackage @@ -219439,6 +227399,7 @@ self: { description = "A simple simulator for Turing machines"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "turing-music" = callPackage @@ -219469,6 +227430,7 @@ self: { description = "An implementation of Turing Machine and Automaton"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "turkish-deasciifier" = callPackage @@ -219548,6 +227510,7 @@ self: { description = "Collection of command line options and parsers for these options"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tw" = callPackage @@ -219573,6 +227536,7 @@ self: { description = "A library for incremental computing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twee" = callPackage @@ -219592,6 +227556,7 @@ self: { description = "An equational theorem prover"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twee-lib" = callPackage @@ -219636,6 +227601,7 @@ self: { description = "Command-line tool for twitter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twentefp" = callPackage @@ -219665,6 +227631,7 @@ self: { description = "Used as Lab Assignments Environment at the University of Twente"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twentefp-eventloop-trees" = callPackage @@ -219677,6 +227644,7 @@ self: { description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twentefp-graphs" = callPackage @@ -219689,6 +227657,7 @@ self: { description = "Lab Assignments Environment at Univeriteit Twente"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twentefp-number" = callPackage @@ -219715,6 +227684,7 @@ self: { description = "RoseTree type and show functions for lab assignment of University of Twente"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twentefp-trees" = callPackage @@ -219727,6 +227697,7 @@ self: { description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twentefp-websockets" = callPackage @@ -219746,6 +227717,7 @@ self: { description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twentyseven" = callPackage @@ -219776,6 +227748,7 @@ self: { description = "Rubik's cube solver"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twfy-api-client" = callPackage @@ -219802,6 +227775,7 @@ self: { description = "They Work For You API Client Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twhs" = callPackage @@ -219833,6 +227807,7 @@ self: { description = "CLI twitter client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twidge" = callPackage @@ -219854,6 +227829,7 @@ self: { description = "Unix Command-Line Twitter and Identica Client"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twilight-stm" = callPackage @@ -219866,6 +227842,7 @@ self: { description = "STM library with safe irrevocable I/O and inconsistency repair"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twilio" = callPackage @@ -219893,6 +227870,7 @@ self: { description = "Twilio REST API library for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twill" = callPackage @@ -219912,6 +227890,7 @@ self: { description = "Twilio API interaction"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twiml" = callPackage @@ -219945,6 +227924,7 @@ self: { description = "very simple template language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twisty" = callPackage @@ -219999,6 +227979,7 @@ self: { description = "A Haskell-based CLI Twitter client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twitter-conduit" = callPackage @@ -220032,7 +228013,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-enumerator" = callPackage @@ -220052,6 +228032,7 @@ self: { description = "Twitter API package with enumerator interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twitter-feed" = callPackage @@ -220074,6 +228055,7 @@ self: { description = "Client for fetching Twitter timeline via Oauth"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twitter-types" = callPackage @@ -220097,7 +228079,6 @@ self: { ]; description = "Twitter JSON parser and types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-types-lens" = callPackage @@ -220115,7 +228096,6 @@ self: { ]; description = "Twitter JSON types (lens powered)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tx" = callPackage @@ -220132,6 +228112,7 @@ self: { description = "Persistent transactions on top of STM"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "txt" = callPackage @@ -220140,8 +228121,8 @@ self: { }: mkDerivation { pname = "txt"; - version = "0.0.2.1"; - sha256 = "0cdng6qlskycpmr1yxvr25q5j876nji5iw3hlx2xb7n0rvk3ylh5"; + version = "0.0.3.0"; + sha256 = "0fi16fpzcskcffri7adpnbf6qj2ksv7vnxwyl8nw1qg55rlj3c5y"; libraryHaskellDepends = [ base bytestring deepseq utf8-string util ]; @@ -220149,6 +228130,7 @@ self: { description = "Text"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "txt-sushi" = callPackage @@ -220191,6 +228173,7 @@ self: { description = "Deprecated in favor of eros"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ty" = callPackage @@ -220216,6 +228199,7 @@ self: { description = "Provide proof witnesses for closed type family evaluation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typalyze" = callPackage @@ -220235,6 +228219,7 @@ self: { description = "Analyzes Haskell source files for easy reference"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-aligned" = callPackage @@ -220260,6 +228245,7 @@ self: { description = "Runtime type assertions for testing"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-booleans" = callPackage @@ -220287,6 +228273,7 @@ self: { description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-cereal" = callPackage @@ -220304,6 +228291,7 @@ self: { description = "Type-level serialization of type constructors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-combinators" = callPackage @@ -220316,6 +228304,7 @@ self: { description = "A collection of data types for type-level programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-combinators-quote" = callPackage @@ -220332,6 +228321,7 @@ self: { description = "Quasiquoters for the 'type-combinators' package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-combinators-singletons" = callPackage @@ -220344,6 +228334,7 @@ self: { description = "Interop between /type-combinators/ and /singletons/"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-digits" = callPackage @@ -220356,6 +228347,7 @@ self: { description = "Arbitrary-base type-level digits"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-eq" = callPackage @@ -220371,6 +228363,7 @@ self: { description = "Type equality evidence you can carry around"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-equality" = callPackage @@ -220450,6 +228443,7 @@ self: { description = "Queues with verified and unverified versions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-int" = callPackage @@ -220462,6 +228456,7 @@ self: { description = "Type Level 2s- and 16s- Complement Integers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-interpreter" = callPackage @@ -220475,6 +228470,7 @@ self: { description = "Interpreter for Template Haskell types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-iso" = callPackage @@ -220511,6 +228507,7 @@ self: { description = "type-level binary search trees in haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-level-integers" = callPackage @@ -220560,6 +228557,7 @@ self: { description = "High-level combinators for performing inductive operations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-level-natural-number-operations" = callPackage @@ -220572,6 +228570,7 @@ self: { description = "Basic operations on type-level natural numbers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-level-numbers" = callPackage @@ -220620,6 +228619,7 @@ self: { description = "Operations on type-level lists and tuples"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-map" = callPackage @@ -220654,6 +228654,7 @@ self: { description = "Type-level natural and proofs of their properties"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-of-html" = callPackage @@ -220700,6 +228701,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-operators_0_2_0_0" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "type-operators"; + version = "0.2.0.0"; + sha256 = "1cm3vfarjpwm885i5w5mjyg1ibg9bm5q34hbacpl3c9q9l1vwl4j"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "Various type-level operators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-ord" = callPackage ({ mkDerivation, base, template-haskell, type-digits, type-spine }: mkDerivation { @@ -220712,6 +228725,7 @@ self: { description = "Type-level comparison operator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-ord-spine-cereal" = callPackage @@ -220728,6 +228742,7 @@ self: { description = "Generic type-level comparison of types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-prelude" = callPackage @@ -220740,6 +228755,7 @@ self: { description = "Partial port of prelude to the type level. Requires GHC 7.6.1."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-settheory" = callPackage @@ -220756,6 +228772,7 @@ self: { description = "Sets and functions-as-relations in the type system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-spec" = callPackage @@ -220793,6 +228810,7 @@ self: { description = "A spine-view on types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-structure" = callPackage @@ -220820,6 +228838,7 @@ self: { description = "Type structure analysis"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-sub-th" = callPackage @@ -220845,6 +228864,7 @@ self: { description = "Substitute types for other types with Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "type-tree" = callPackage @@ -220894,6 +228914,7 @@ self: { description = "Automatic deriving of TypeableN instances with Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typed-admin" = callPackage @@ -220921,7 +228942,6 @@ self: { ]; description = "Admin console framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typed-duration" = callPackage @@ -220976,6 +228996,7 @@ self: { description = "Typed and composable spreadsheets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typed-streams" = callPackage @@ -220998,6 +229019,7 @@ self: { description = "A stream based replacement for lists"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typed-wire" = callPackage @@ -221023,6 +229045,7 @@ self: { description = "Language-independent type-safe communication"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typed-wire-utils" = callPackage @@ -221053,6 +229076,7 @@ self: { description = "Typed frontend to TensorFlow and higher-order deep learning"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typedquery" = callPackage @@ -221070,6 +229094,7 @@ self: { description = "Parser for SQL augmented with types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typehash" = callPackage @@ -221082,6 +229107,7 @@ self: { description = "Create a unique hash value for a type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typelevel" = callPackage @@ -221116,6 +229142,7 @@ self: { description = "Tensors whose ranks and dimensions type-inferred and type-checked"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typelits-witnesses" = callPackage @@ -221169,6 +229196,7 @@ self: { description = "Lens-like interface for type level parameters; allows unboxed unboxed vectors and supercompilation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typerep-map" = callPackage @@ -221212,6 +229240,7 @@ self: { description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typesafe-endian" = callPackage @@ -221232,8 +229261,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.2.1"; - sha256 = "1fdn7l9dayaii03n63cv3jgaqmblhskfyq3g3qrqw79z1jl755bk"; + version = "0.7.3.1"; + sha256 = "15wgcf0q3xj3npb1ivfj8b0w78dwcz90fyxqp75wcnxyv2ksvd3m"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -221243,6 +229272,7 @@ self: { description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typescript-docs" = callPackage @@ -221263,6 +229293,7 @@ self: { description = "A documentation generator for TypeScript Definition files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typical" = callPackage @@ -221300,7 +229331,6 @@ self: { ]; description = "Just let me draw nice text already"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typography-geometry" = callPackage @@ -221317,6 +229347,7 @@ self: { description = "Drawings for printed text documents"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tyro" = callPackage @@ -221338,6 +229369,7 @@ self: { description = "Type derived JSON parsing using Aeson"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tz" = callPackage @@ -221405,6 +229437,7 @@ self: { description = "Haskell Universal Two Factor helper toolbox library thing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uAgda" = callPackage @@ -221483,6 +229516,7 @@ self: { description = "Uber client for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uberlast" = callPackage @@ -221495,6 +229529,7 @@ self: { description = "Generate overloaded lenses from plain data declaration"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ucam-webauth" = callPackage @@ -221558,6 +229593,7 @@ self: { description = "String encoding conversion with ICU"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) icu;}; "udbus" = callPackage @@ -221619,6 +229655,7 @@ self: { license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) systemd;}; "udp-conduit" = callPackage @@ -221635,6 +229672,7 @@ self: { description = "Simple fire-and-forget conduit UDP wrappers"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "udp-streaming" = callPackage @@ -221687,6 +229725,7 @@ self: { description = "Part of UHC packaged as cabal/hackage installable library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uhc-util" = callPackage @@ -221707,6 +229746,7 @@ self: { description = "UHC utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uhexdump" = callPackage @@ -221721,6 +229761,7 @@ self: { description = "hex dumper for UTF-8 text"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uhttpc" = callPackage @@ -221758,6 +229799,7 @@ self: { description = "A framework for friendly commandline programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uid" = callPackage @@ -221833,6 +229875,7 @@ self: { description = "A fast, cache-efficient, concurrent bloom filter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unagi-chan" = callPackage @@ -221864,6 +229907,7 @@ self: { description = "Unagi Chan IO-Streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unamb" = callPackage @@ -221891,6 +229935,7 @@ self: { description = "Functional concurrency with unamb using a custom scheduler"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unbeliever" = callPackage @@ -221903,10 +229948,8 @@ self: { }: mkDerivation { pname = "unbeliever"; - version = "0.8.0.0"; - sha256 = "1cq7w09320nz6jcdg8gcapbsajlihx1836502m36rgm4w9vbxvqi"; - isLibrary = true; - isExecutable = true; + version = "0.9.2.0"; + sha256 = "0fy9slvc0gvxr6z7zmz1xyk5qkxrfq4nbs9q8z11viqp0qg0yssx"; libraryHaskellDepends = [ aeson async base bytestring Cabal chronologique containers deepseq directory exceptions fingertree hashable hourglass mtl @@ -221930,6 +229973,8 @@ self: { ]; description = "Opinionated Haskell Interoperability"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unbound" = callPackage @@ -221950,6 +229995,7 @@ self: { description = "Generic support for programming with names and binders"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unbound-generics" = callPackage @@ -221995,6 +230041,7 @@ self: { description = "Thread delays and timeouts using proper time units"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unboxed" = callPackage @@ -222018,6 +230065,7 @@ self: { description = "Self-optimizing unboxed sets using view patterns and data families"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unboxed-ref" = callPackage @@ -222051,6 +230099,7 @@ self: { description = "Secure and resilient remote file storage utility"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uncertain" = callPackage @@ -222196,6 +230245,7 @@ self: { description = "Graphs"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uni-htk" = callPackage @@ -222258,6 +230308,7 @@ self: { description = "Graphs binding"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uni-util" = callPackage @@ -222314,6 +230365,7 @@ self: { description = "Unicode normalization using the ICU library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) icu;}; "unicode-prelude" = callPackage @@ -222356,6 +230408,7 @@ self: { description = "print and show in unicode"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unicode-symbols" = callPackage @@ -222368,6 +230421,7 @@ self: { description = "Unicode alternatives for common functions and operators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unicode-transforms" = callPackage @@ -222453,6 +230507,7 @@ self: { description = "Uniform IO over files, network, anything"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) openssl;}; "uniform-pair" = callPackage @@ -222523,6 +230578,7 @@ self: { description = "Heterogeneous map by open unions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uniplate" = callPackage @@ -222618,7 +230674,6 @@ self: { ]; description = "Solve simple simultaneous equations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uniqueid" = callPackage @@ -222631,6 +230686,7 @@ self: { description = "Splittable Unique Identifier Supply"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uniquely-represented-sets" = callPackage @@ -222648,6 +230704,7 @@ self: { benchmarkHaskellDepends = [ base criterion random ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unit" = callPackage @@ -222693,7 +230750,6 @@ self: { ]; description = "A domain-specific type system for dimensional analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "units-attoparsec" = callPackage @@ -222710,6 +230766,7 @@ self: { description = "Attoparsec parsers for the units package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "units-defs" = callPackage @@ -222721,7 +230778,6 @@ self: { libraryHaskellDepends = [ base template-haskell units ]; description = "Definitions for use with the units package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "units-parser" = callPackage @@ -222752,6 +230808,7 @@ self: { description = "An extendable library for type-safe computations including units"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unity-testresult-parser" = callPackage @@ -222775,6 +230832,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unitym" = callPackage @@ -222813,6 +230871,7 @@ self: { description = "Implementation of the unity monad for the Yesod framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "universal" = callPackage @@ -222859,6 +230918,7 @@ self: { description = "Classes for types where we know all the values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "universe-base" = callPackage @@ -222901,6 +230961,7 @@ self: { description = "Universe instances for types from select extra packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "universe-instances-trans" = callPackage @@ -222956,6 +231017,7 @@ self: { description = "Construct a Dec's ancestor list"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "universum" = callPackage @@ -222983,6 +231045,7 @@ self: { description = "Custom prelude used in Serokell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unix_2_7_2_2" = callPackage @@ -223033,6 +231096,7 @@ self: { description = "Comprehensive bindings to fcntl(2)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unix-handle" = callPackage @@ -223045,6 +231109,7 @@ self: { description = "POSIX operations on Handles"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unix-io-extra" = callPackage @@ -223095,6 +231160,7 @@ self: { description = "Run processes on Unix systems, with a conduit interface (deprecated)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unix-pty-light" = callPackage @@ -223268,6 +231334,7 @@ self: { description = "A Library for the manipulation of images"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unmed2" = callPackage @@ -223347,6 +231414,7 @@ self: { description = "Rematch support for unordered containers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unordered-graphs" = callPackage @@ -223363,6 +231431,7 @@ self: { description = "Graph library using unordered-containers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unordered-intmap" = callPackage @@ -223380,6 +231449,7 @@ self: { description = "A specialization of `HashMap Int v`"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unpack-funcs" = callPackage @@ -223396,6 +231466,7 @@ self: { description = "Monad transformers that mirror worker-wrapper transformations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unpacked-containers" = callPackage @@ -223426,6 +231497,7 @@ self: { description = "An unpacked either data type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unpacked-maybe" = callPackage @@ -223439,6 +231511,7 @@ self: { description = "An unpacked maybe data type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unpacked-maybe-numeric" = callPackage @@ -223452,6 +231525,7 @@ self: { description = "maybes of numeric values with fewer indirections"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unpacked-these" = callPackage @@ -223469,6 +231543,7 @@ self: { description = "An unpacked these data type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unpacked-validation" = callPackage @@ -223486,6 +231561,7 @@ self: { description = "An unpacked validation data type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unparse-attoparsec" = callPackage @@ -223518,6 +231594,7 @@ self: { description = "Compiler plugin for loop unrolling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unsafe" = callPackage @@ -223555,6 +231632,7 @@ self: { description = "Flexible access control for unsafe operations and instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unsafeperformst" = callPackage @@ -223586,6 +231664,7 @@ self: { description = "Solve Boggle-like word games"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unsequential" = callPackage @@ -223605,6 +231684,7 @@ self: { description = "An extension removing the sequentiality from monads"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unusable-pkg" = callPackage @@ -223647,6 +231727,7 @@ self: { description = "A command line tool to identify unused code"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unwrapped-functors" = callPackage @@ -223677,6 +231758,7 @@ self: { description = "Units of measure as a GHC typechecker plugin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "up" = callPackage @@ -223695,6 +231777,7 @@ self: { description = "Command line tool to generate pathnames to facilitate moving upward in a file system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "up-grade" = callPackage @@ -223740,6 +231823,7 @@ self: { description = "A program to update fetchgit values in Nix expressions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "update-repos" = callPackage @@ -223779,6 +231863,7 @@ self: { description = "Haskell client for Uploadcare"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uploadtest" = callPackage @@ -223802,6 +231887,7 @@ self: { description = "Binding to upskirt"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ureader" = callPackage @@ -223826,6 +231912,7 @@ self: { description = "Minimalistic CLI RSS reader"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "urembed" = callPackage @@ -223847,6 +231934,7 @@ self: { description = "Ur/Web static content generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uri" = callPackage @@ -223859,6 +231947,7 @@ self: { description = "Library for working with URIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uri-bytestring" = callPackage @@ -223888,7 +231977,6 @@ self: { ]; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-bytestring-aeson" = callPackage @@ -223902,7 +231990,6 @@ self: { ]; description = "Aeson instances for URI Bytestring"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-conduit" = callPackage @@ -223921,6 +232008,7 @@ self: { description = "Read and write URIs (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uri-encode" = callPackage @@ -223954,6 +232042,7 @@ self: { description = "Read and write URIs (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uri-enumerator-file" = callPackage @@ -223973,6 +232062,7 @@ self: { description = "uri-enumerator backend for the file scheme (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uri-parse" = callPackage @@ -223990,6 +232080,7 @@ self: { description = "A simple library for parsing and generating URIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uri-template" = callPackage @@ -224005,6 +232096,7 @@ self: { description = "URI template library for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uri-templater" = callPackage @@ -224062,6 +232154,7 @@ self: { description = "Decoders for URL-encoding (aka Percent-encoding)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "url-generic" = callPackage @@ -224076,6 +232169,7 @@ self: { description = "Parse/format generic key/value URLs from record data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "urlcheck" = callPackage @@ -224094,6 +232188,7 @@ self: { description = "Parallel link checker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "urldecode" = callPackage @@ -224108,6 +232203,7 @@ self: { description = "Decode percent-encoded strings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "urldisp-happstack" = callPackage @@ -224120,6 +232216,7 @@ self: { description = "Simple, declarative, expressive URL routing -- on happstack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "urlencoded" = callPackage @@ -224129,13 +232226,12 @@ self: { pname = "urlencoded"; version = "0.4.2.0"; sha256 = "1i88qf5dq52ra7hl29ka1i0bhyfic3sg7ksm1n6bpb2hj38hr139"; - revision = "2"; - editedCabalFile = "1ylbxfd7p8kdlmsfbqsnisgdxk9livncin1bckp8m5a1mrw5ywk3"; + revision = "4"; + editedCabalFile = "0sq16qnc50hh4gyylm3vz1rdvx94ypmw08hsgjv30mcfzfsq6ch5"; libraryHaskellDepends = [ base mtl network network-uri split ]; testHaskellDepends = [ base network network-uri QuickCheck ]; description = "Generate or process x-www-urlencoded data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "urlpath" = callPackage @@ -224156,6 +232252,7 @@ self: { description = "Painfully simple URL deployment"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "urn" = callPackage @@ -224169,6 +232266,7 @@ self: { description = "Universal Resource Names"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "urn-random" = callPackage @@ -224186,6 +232284,7 @@ self: { description = "A package for updatable discrete distributions"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "urxml" = callPackage @@ -224204,6 +232303,7 @@ self: { description = "XML parser-printer supporting Ur/Web syntax extensions"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "usb" = callPackage @@ -224236,6 +232336,7 @@ self: { description = "Iteratee enumerators for the usb package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "usb-hid" = callPackage @@ -224250,6 +232351,7 @@ self: { description = "Parser and request Library for USB HIDs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "usb-id-database" = callPackage @@ -224270,6 +232372,7 @@ self: { description = "A database of USB identifiers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "usb-iteratee" = callPackage @@ -224287,6 +232390,7 @@ self: { description = "Iteratee enumerators for the usb package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "usb-safe" = callPackage @@ -224304,6 +232408,21 @@ self: { description = "Type-safe communication with USB devices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "useragents" = callPackage + ({ mkDerivation, base, random-fu, text }: + mkDerivation { + pname = "useragents"; + version = "1.0.0"; + sha256 = "1n4n4mhikzgx2a9qq8rify5wwhngnz0qip32fnhshham5yyldmy6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base random-fu text ]; + executableHaskellDepends = [ base random-fu text ]; + description = "A collection of user agents"; + license = stdenv.lib.licenses.mit; }) {}; "userid" = callPackage @@ -224354,6 +232473,7 @@ self: { description = "A mysql-haskell backend for the users library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "users-persistent" = callPackage @@ -224375,6 +232495,7 @@ self: { description = "A persistent backend for the users package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "users-postgresql-simple" = callPackage @@ -224423,6 +232544,7 @@ self: { description = "A pragmatic time and date library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "utf8-env" = callPackage @@ -224460,6 +232582,7 @@ self: { description = "Variants of Prelude and System.IO with UTF8 text I/O operations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "utf8-string" = callPackage @@ -224491,14 +232614,15 @@ self: { description = "Constant-space UTF8 validator for ByteStrings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "util" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "util"; - version = "0.1.11.0"; - sha256 = "16qi0w19hy7y4az4dxnsvn5cjc7lg5zb9vv0jjzifky9dkssbicb"; + version = "0.1.12.0"; + sha256 = "0qm7bm5dmcz7kn9p882fwpihj5azm2baxz68jnimmw1mp5w66fw2"; libraryHaskellDepends = [ base ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; @@ -224514,6 +232638,7 @@ self: { description = "Exceptional utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "util-plus" = callPackage @@ -224542,6 +232667,7 @@ self: { description = "Primitive memory-related utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "util-primitive-control" = callPackage @@ -224558,6 +232684,7 @@ self: { description = "Utilities for stateful primitive types and types based on them"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "util-universe" = callPackage @@ -224598,6 +232725,7 @@ self: { description = "Utilities for compiler construction: core functionality"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uu-cco-examples" = callPackage @@ -224612,6 +232740,7 @@ self: { description = "Utilities for compiler construction: example programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uu-cco-hut-parsing" = callPackage @@ -224624,6 +232753,7 @@ self: { description = "Utilities for compiler construction: Feedback wrapper around parser in uulib"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uu-cco-uu-parsinglib" = callPackage @@ -224636,6 +232766,7 @@ self: { description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uu-interleaved" = callPackage @@ -224695,8 +232826,8 @@ self: { }: mkDerivation { pname = "uuagc"; - version = "0.9.52.1"; - sha256 = "1191a1jr1s76wjdrfzafy1ibf7a7xpg54dvwhwz4kr1jrc9jn2cq"; + version = "0.9.52.2"; + sha256 = "1wqva95nmz9yx9b60jjwkpb73pq9m4g9l4iq739xnj6llwckpb8y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224706,7 +232837,6 @@ self: { executableHaskellDepends = [ base uuagc-cabal ]; description = "Attribute Grammar System of Universiteit Utrecht"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuagc-bootstrap" = callPackage @@ -224730,6 +232860,7 @@ self: { description = "Attribute Grammar System of Universiteit Utrecht"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uuagc-cabal" = callPackage @@ -224745,7 +232876,6 @@ self: { ]; description = "Cabal plugin for UUAGC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuagc-diagrams" = callPackage @@ -224758,6 +232888,7 @@ self: { description = "Utility for drawing attribute grammar pictures with the diagrams package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uuagd" = callPackage @@ -224815,6 +232946,7 @@ self: { description = "Aeson types for UUID instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uuid-crypto" = callPackage @@ -224905,7 +233037,6 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; description = "Haskell Utrecht Tools Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uvector" = callPackage @@ -224920,6 +233051,7 @@ self: { description = "Fast unboxed arrays with a flexible interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uvector-algorithms" = callPackage @@ -224932,6 +233064,7 @@ self: { description = "Efficient algorithms for uvector unboxed arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uxadt" = callPackage @@ -224944,6 +233077,7 @@ self: { description = "Cross-language extensible representation for algebraic data type instances"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uzbl-with-source" = callPackage @@ -224972,6 +233106,7 @@ self: { description = "interface to Video For Linux Two (V4L2)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "v4l2-examples" = callPackage @@ -224986,6 +233121,7 @@ self: { description = "video for linux two examples"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vabal" = callPackage @@ -225007,7 +233143,6 @@ self: { testHaskellDepends = [ base process ]; description = "the cabal companion"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vabal-lib" = callPackage @@ -225037,6 +233172,7 @@ self: { description = "Graph representation of the GHC heap"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vacuum-cairo" = callPackage @@ -225054,6 +233190,7 @@ self: { description = "Visualize live Haskell data structures using vacuum, graphviz and cairo"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vacuum-graphviz" = callPackage @@ -225066,6 +233203,7 @@ self: { description = "A library for transforming vacuum graphs into GraphViz output"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vacuum-opengl" = callPackage @@ -225086,6 +233224,7 @@ self: { description = "Visualize live Haskell data structures using vacuum, graphviz and OpenGL"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vacuum-ubigraph" = callPackage @@ -225098,6 +233237,7 @@ self: { description = "Visualize Haskell data structures using vacuum and Ubigraph"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vado" = callPackage @@ -225122,6 +233262,7 @@ self: { description = "Runs commands on remote machines using ssh"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "valid-names" = callPackage @@ -225134,6 +233275,7 @@ self: { description = "Valid operator/module characters"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "validate" = callPackage @@ -225165,6 +233307,7 @@ self: { description = "Input validation combinator library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "validated-literals" = callPackage @@ -225183,6 +233326,7 @@ self: { description = "Compile-time checking for partial smart-constructors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "validated-types" = callPackage @@ -225196,6 +233340,7 @@ self: { description = "Type-level constraints on strings and other input"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "validation" = callPackage @@ -225236,6 +233381,7 @@ self: { description = "A nice way to define field validations in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "validationt" = callPackage @@ -225253,14 +233399,16 @@ self: { ]; description = "Straightforward validation monad"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "validity" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; - version = "0.9.0.0"; - sha256 = "1rm0gw049v7f9i5rqn8f8ps4ksawmmggmhw9yclgh4qhhql7gz3q"; + version = "0.9.0.1"; + sha256 = "112wchq5l39fi9bkfkljic7bh1rd5gvz4lwjjw9pajg0zj51pyib"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; @@ -225287,8 +233435,8 @@ self: { ({ mkDerivation, base, bytestring, validity }: mkDerivation { pname = "validity-bytestring"; - version = "0.4.0.0"; - sha256 = "0zf722rm2s5p64bs1vl7fw1swa2svz2lk8w51bh235zds8bg11jc"; + version = "0.4.1.0"; + sha256 = "0jyqsvi12673pz2dz88v9j1i1vh0fxv77n0xyjh30lhl8s9y3vvd"; libraryHaskellDepends = [ base bytestring validity ]; description = "Validity instances for bytestring"; license = stdenv.lib.licenses.mit; @@ -225319,7 +233467,6 @@ self: { ]; description = "Validity instances for Path"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-primitive" = callPackage @@ -225445,6 +233592,7 @@ self: { description = "Analyze and visualize expression trees"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "var" = callPackage @@ -225463,6 +233611,7 @@ self: { description = "Mutable variables and tuples"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "var-monad" = callPackage @@ -225493,6 +233642,7 @@ self: { description = "Process mpileup output to identify significant differences"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "variable-precision" = callPackage @@ -225510,6 +233660,7 @@ self: { description = "variable-precision floating point"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "variables" = callPackage @@ -225523,6 +233674,7 @@ self: { description = "Monads with variables, without deep magic"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "variation" = callPackage @@ -225538,6 +233690,7 @@ self: { description = "nominal value with possible variations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "varying" = callPackage @@ -225588,6 +233741,7 @@ self: { description = "Client library for HashiCorp's Vault tool (via HTTP API)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vault-tool-server" = callPackage @@ -225608,6 +233762,7 @@ self: { description = "Utility library for spawning a HashiCorp Vault process"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vault-trans" = callPackage @@ -225625,6 +233780,7 @@ self: { description = "A monad transformer for vault-tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vaultaire-common" = callPackage @@ -225649,6 +233805,7 @@ self: { description = "Common types and instances for Vaultaire"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vcache" = callPackage @@ -225694,6 +233851,7 @@ self: { description = "A library for parsing/printing vCards from/to various formats"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vcatt" = callPackage @@ -225709,6 +233867,7 @@ self: { description = "Recursively check that a directory is under version control"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vcd" = callPackage @@ -225737,6 +233896,7 @@ self: { description = "A package to parse VCF files inspired in similar python libraries"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vcs-revision" = callPackage @@ -225783,6 +233943,7 @@ self: { description = "GUI library for source code management systems"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vcswrapper" = callPackage @@ -225807,6 +233968,7 @@ self: { description = "Wrapper for source code management systems"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vec" = callPackage @@ -225829,6 +233991,7 @@ self: { description = "Vec: length-indexed (sized) list"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vect" = callPackage @@ -225852,6 +234015,7 @@ self: { description = "A low-dimensional linear algebra library, operating on the Floating typeclass"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vect-floating-accelerate" = callPackage @@ -225866,6 +234030,7 @@ self: { description = "Accelerate instances for vect-floating types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vect-opengl" = callPackage @@ -225878,6 +234043,7 @@ self: { description = "OpenGL support for the `vect' low-dimensional linear algebra library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vector_0_10_9_3" = callPackage @@ -226014,6 +234180,7 @@ self: { description = "ByteStrings as type synonyms of Storable Vectors of Word8s"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vector-clock" = callPackage @@ -226034,6 +234201,7 @@ self: { description = "Vector clocks for versioning message flows"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vector-conduit" = callPackage @@ -226053,6 +234221,7 @@ self: { description = "Conduit utilities for vectors"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vector-extras" = callPackage @@ -226070,6 +234239,7 @@ self: { description = "Utilities for the \"vector\" library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vector-fftw" = callPackage @@ -226099,6 +234269,7 @@ self: { description = "vectors that perform the fmap operation in constant time"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vector-heterogenous" = callPackage @@ -226111,6 +234282,7 @@ self: { description = "A type-safe library for vectors whose elements can be of any type, or any type satisfying some constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vector-instances" = callPackage @@ -226140,6 +234312,7 @@ self: { description = "Instances of the Data.Collections classes for Data.Vector.*"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vector-mmap" = callPackage @@ -226168,6 +234341,7 @@ self: { description = "Generate vectors filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vector-read-instances" = callPackage @@ -226180,6 +234354,7 @@ self: { description = "(deprecated) Read instances for 'Data.Vector'"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vector-shuffling" = callPackage @@ -226263,6 +234438,7 @@ self: { description = "Instances of vector-space classes for OpenGL types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vector-space-points" = callPackage @@ -226276,7 +234452,6 @@ self: { libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-split" = callPackage @@ -226305,6 +234480,7 @@ self: { description = "Statically checked sizes on Data.Vector"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vector-strategies" = callPackage @@ -226375,6 +234551,7 @@ self: { description = "GIS Vector Tiles, as defined by Mapbox"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "verbalexpressions" = callPackage @@ -226387,6 +234564,7 @@ self: { description = "Regular expressions made easy"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "verbosity" = callPackage @@ -226400,6 +234578,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "verbosity_0_3_0_0" = callPackage + ({ mkDerivation, base, binary, data-default-class, deepseq, dhall + , generic-lens, serialise + }: + mkDerivation { + pname = "verbosity"; + version = "0.3.0.0"; + sha256 = "0wzhkzgd6yxzdkmd2n8hwhrfyh5n88xs0hkil9l98wjh3mnn1qja"; + libraryHaskellDepends = [ + base binary data-default-class deepseq dhall generic-lens serialise + ]; + description = "Simple enum that encodes application verbosity"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "verdict" = callPackage ({ mkDerivation, base, hspec, markdown-unlit, mtl, text , transformers @@ -226416,6 +234610,7 @@ self: { description = "Validation framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "verdict-json" = callPackage @@ -226437,6 +234632,7 @@ self: { description = "JSON instances and JSON Schema for verdict"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "verifiable-expressions" = callPackage @@ -226453,6 +234649,7 @@ self: { description = "An intermediate language for Hoare logic style verification"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "verify" = callPackage @@ -226476,6 +234673,7 @@ self: { description = "A new Haskeleton package"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "verilog" = callPackage @@ -226489,6 +234687,7 @@ self: { description = "Verilog preprocessor, parser, and AST"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "versioning" = callPackage @@ -226502,6 +234701,7 @@ self: { description = "Type-safe data versioning"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "versioning-servant" = callPackage @@ -226523,6 +234723,7 @@ self: { description = "Servant combinators for the versioning library"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "versions" = callPackage @@ -226565,6 +234766,7 @@ self: { description = "VFR waypoints, as published in the AIP (ERSA)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vgrep" = callPackage @@ -226595,6 +234797,7 @@ self: { description = "A pager for grep"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vhd" = callPackage @@ -226621,6 +234824,7 @@ self: { description = "Provides functions to inspect and manipulate virtual hard disk (VHD) files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vhdl" = callPackage @@ -226633,6 +234837,7 @@ self: { description = "VHDL AST and pretty printer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vicinity" = callPackage @@ -226649,6 +234854,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "viewprof" = callPackage @@ -226667,7 +234873,6 @@ self: { ]; description = "Text-based interactive GHC .prof viewer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "views" = callPackage @@ -226680,6 +234885,7 @@ self: { description = "Views allow you to run a State monad on part of a state"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vigilance" = callPackage @@ -226721,6 +234927,7 @@ self: { description = "An extensible dead-man's switch system"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vimeta" = callPackage @@ -226746,6 +234953,7 @@ self: { description = "Frontend for video metadata tagging tools"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vimus" = callPackage @@ -226776,6 +234984,7 @@ self: { description = "An MPD client with vim-like key bindings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ncurses;}; "vintage-basic" = callPackage @@ -226797,6 +235006,7 @@ self: { description = "Interpreter for microcomputer-era BASIC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vinyl" = callPackage @@ -226844,6 +235054,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vinyl-generics" = callPackage + ({ mkDerivation, aeson, base, generics-sop, hspec, hspec-core + , QuickCheck, records-sop, text, vinyl + }: + mkDerivation { + pname = "vinyl-generics"; + version = "0.1.0.0"; + sha256 = "1rxv1wgckq5a3c65lvniizmv5f55gbnngxx76wa93h8lgrhf6ac0"; + libraryHaskellDepends = [ base generics-sop records-sop vinyl ]; + testHaskellDepends = [ + aeson base generics-sop hspec hspec-core QuickCheck records-sop + text vinyl + ]; + description = "Convert plain records to vinyl (and vice versa), generically"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vinyl-gl" = callPackage ({ mkDerivation, base, containers, GLUtil, HUnit, linear, OpenGL , tagged, test-framework, test-framework-hunit, transformers @@ -226880,6 +235107,18 @@ self: { description = "Provide json instances automagically to vinyl types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "vinyl-named-sugar" = callPackage + ({ mkDerivation, base, vinyl }: + mkDerivation { + pname = "vinyl-named-sugar"; + version = "0.1.0.0"; + sha256 = "19wbdavf5zb967r4qkw6ksd2yakp4cnlq1hffzzywssm50zakc3h"; + libraryHaskellDepends = [ base vinyl ]; + description = "Syntax sugar for vinyl records using overloaded labels"; + license = stdenv.lib.licenses.mit; }) {}; "vinyl-operational" = callPackage @@ -226895,6 +235134,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vinyl-plus" = callPackage @@ -226915,6 +235155,7 @@ self: { description = "Vinyl records utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vinyl-utils" = callPackage @@ -226927,6 +235168,7 @@ self: { description = "Utilities for vinyl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vinyl-vectors" = callPackage @@ -226946,6 +235188,7 @@ self: { description = "Vectors for vinyl vectors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "virthualenv" = callPackage @@ -226966,6 +235209,7 @@ self: { description = "Virtual Haskell Environment builder"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "visibility" = callPackage @@ -226978,6 +235222,7 @@ self: { description = "Simple computation of visibility polygons"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vision" = callPackage @@ -227000,6 +235245,7 @@ self: { description = "An XMMS2 client"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "visual-graphrewrite" = callPackage @@ -227028,6 +235274,7 @@ self: { description = "Visualize the graph-rewrite steps of a Haskell program"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "visual-prof" = callPackage @@ -227047,6 +235294,7 @@ self: { description = "Create a visual profile of a program's source code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "visualize-cbn" = callPackage @@ -227067,6 +235315,7 @@ self: { description = "Visualize CBN reduction"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vivid" = callPackage @@ -227087,6 +235336,7 @@ self: { description = "Sound synthesis with SuperCollider"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vivid-osc" = callPackage @@ -227119,6 +235369,7 @@ self: { description = "Implementation of SuperCollider server specifications"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vk-aws-route53" = callPackage @@ -227137,6 +235388,7 @@ self: { description = "Amazon Route53 DNS service plugin for the aws package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vk-posix-pty" = callPackage @@ -227189,6 +235441,7 @@ self: { description = "Upload audio files to voicebase to get a transcription"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "void" = callPackage @@ -227215,6 +235468,7 @@ self: { description = "Reading of Vorbis comments from Ogg Vorbis files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vowpal-utils" = callPackage @@ -227227,6 +235481,7 @@ self: { description = "Vowpal Wabbit utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "voyeur" = callPackage @@ -227239,6 +235494,7 @@ self: { description = "Haskell bindings for libvoyeur"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vpq" = callPackage @@ -227256,24 +235512,24 @@ self: { description = "Priority queue based on vector"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vrpn" = callPackage - ({ mkDerivation, base, vrpn }: + ({ mkDerivation, base, quat, vrpn }: mkDerivation { pname = "vrpn"; - version = "0.2.1.4"; - sha256 = "11iiwzhb9dqhk83p9gcnj4q2ya5m35bnic30a23z3l9lhsnn49b4"; + version = "0.3.0.0"; + sha256 = "1wyp8dnjag53qlbiz83d21046190kf8hv2izqk1alrniva4vz1kp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ vrpn ]; + librarySystemDepends = [ quat vrpn ]; executableHaskellDepends = [ base ]; - executableSystemDepends = [ vrpn ]; + executableSystemDepends = [ quat vrpn ]; description = "Bindings to VRPN"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) vrpn;}; + }) {quat = null; inherit (pkgs) vrpn;}; "vt-utils" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring @@ -227315,7 +235571,8 @@ self: { description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) vte;}; + broken = true; + }) {inherit (pkgs) vte;}; "vtegtk3" = callPackage ({ mkDerivation, base, Cabal, glib, gtk2hs-buildtools, gtk3, pango @@ -227333,7 +235590,8 @@ self: { description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) vte;}; + broken = true; + }) {inherit (pkgs) vte;}; "vty" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers @@ -227388,6 +235646,7 @@ self: { description = "Examples programs using the vty library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vty-menu" = callPackage @@ -227402,6 +235661,7 @@ self: { description = "A lib for displaying a menu and getting a selection using VTY"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vty-ui" = callPackage @@ -227424,6 +235684,7 @@ self: { description = "An interactive terminal user interface library for Vty"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vty-ui-extras" = callPackage @@ -227436,6 +235697,7 @@ self: { description = "Extra vty-ui functionality not included in the core library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vulkan" = callPackage @@ -227449,6 +235711,7 @@ self: { description = "Bindings to the Vulkan graphics API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {vulkan = null;}; "vulkan-api" = callPackage @@ -227461,6 +235724,7 @@ self: { description = "Low-level low-overhead vulkan api bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "waargonaut" = callPackage @@ -227470,32 +235734,34 @@ self: { , hedgehog-fn, hoist-error, hw-balancedparens, hw-bits, hw-json , hw-prim, hw-rankselect, lens, mmorph, mtl, nats, natural, parsers , scientific, semigroupoids, semigroups, tagged, tasty - , tasty-expected-failure, tasty-hedgehog, tasty-hunit - , template-haskell, text, transformers, vector, witherable - , wl-pprint-annotated, zippers + , tasty-expected-failure, tasty-golden, tasty-hedgehog, tasty-hunit + , template-haskell, text, transformers, unordered-containers + , vector, witherable, wl-pprint-annotated, zippers }: mkDerivation { pname = "waargonaut"; - version = "0.5.2.2"; - sha256 = "06kkgn6p28c29f9i3qs2wxmbsg449d7awi4h7giakws6ny1min95"; + version = "0.6.1.0"; + sha256 = "0ygwwiq3nr8szp5vhs9306pwf9mqh7x75vsh1wfh369h6psqqp11"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base bifunctors bytestring containers contravariant digit - distributive errors generics-sop hoist-error hw-balancedparens - hw-bits hw-json hw-prim hw-rankselect lens mmorph mtl nats natural - parsers scientific semigroupoids semigroups tagged text - transformers vector witherable wl-pprint-annotated zippers + attoparsec base bifunctors bytestring containers contravariant + digit distributive errors generics-sop hoist-error + hw-balancedparens hw-bits hw-json hw-prim hw-rankselect lens mmorph + mtl nats natural parsers scientific semigroupoids semigroups tagged + text transformers unordered-containers vector witherable + wl-pprint-annotated zippers ]; testHaskellDepends = [ attoparsec base bytestring containers contravariant digit directory distributive doctest filepath generics-sop hedgehog hedgehog-fn lens mtl natural scientific semigroupoids semigroups tagged tasty - tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell - text vector zippers + tasty-expected-failure tasty-golden tasty-hedgehog tasty-hunit + template-haskell text unordered-containers vector zippers ]; description = "JSON wrangling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wacom-daemon" = callPackage @@ -227520,6 +235786,7 @@ self: { description = "Manage Wacom tablet settings profiles, including Intuos Pro ring modes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "waddle" = callPackage @@ -227543,6 +235810,7 @@ self: { description = "DOOM WAD file utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wahsp" = callPackage @@ -227564,6 +235832,7 @@ self: { description = "A haskell binding of the Web Audio API ala blank-canvas"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai" = callPackage @@ -227632,39 +235901,6 @@ self: { }) {}; "wai-app-static" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , containers, cryptonite, directory, file-embed, filepath, hspec - , http-date, http-types, memory, mime-types, mockery, network - , old-locale, optparse-applicative, template-haskell, temporary - , text, time, transformers, unix-compat, unordered-containers, wai - , wai-extra, warp, zlib - }: - mkDerivation { - pname = "wai-app-static"; - version = "3.1.6.2"; - sha256 = "0gnwq6ad5m8w8sqq4dzpz23l5rjdphfsf8h9h27lrvv1prkabc6h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring containers cryptonite - directory file-embed filepath http-date http-types memory - mime-types old-locale optparse-applicative template-haskell text - time transformers unix-compat unordered-containers wai wai-extra - warp zlib - ]; - executableHaskellDepends = [ - base bytestring containers directory mime-types text - ]; - testHaskellDepends = [ - base bytestring filepath hspec http-date http-types mime-types - mockery network old-locale temporary text time transformers - unix-compat wai wai-extra zlib - ]; - description = "WAI application for static serving"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-app-static_3_1_6_3" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , containers, cryptonite, directory, file-embed, filepath, hspec , http-date, http-types, memory, mime-types, mockery, network @@ -227697,7 +235933,6 @@ self: { ]; description = "WAI application for static serving"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-cli" = callPackage @@ -227805,6 +236040,7 @@ self: { description = "A web server for the development of WAI compliant web applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-digestive-functors" = callPackage @@ -227881,8 +236117,8 @@ self: { pname = "wai-extra"; version = "3.0.25"; sha256 = "0caz1miwnyjqg6gdfgv7ibyfdyjzlq2i8v07zhan1nniv9pj3w6y"; - revision = "1"; - editedCabalFile = "1i26cmmh1qc4krni21ixfhpp12bvkpxiplhdhk8qsksyp31zqmv4"; + revision = "2"; + editedCabalFile = "0gdg5rfxqfgwj922lxz7ya637nj1qhh1imskiaf453hdpj619aaf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227938,6 +236174,7 @@ self: { description = "Git http-backend CGI App of WAI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-graceful" = callPackage @@ -227950,6 +236187,7 @@ self: { description = "Graceful shutdown for WAI applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-handler-devel" = callPackage @@ -227971,6 +236209,7 @@ self: { description = "WAI server that automatically reloads code after modification. (deprecated)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-handler-fastcgi" = callPackage @@ -228011,6 +236250,7 @@ self: { description = "Wai handler to SCGI (deprecated)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-handler-snap" = callPackage @@ -228028,6 +236268,7 @@ self: { description = "Web Application Interface handler using snap-server. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-handler-webkit" = callPackage @@ -228041,6 +236282,7 @@ self: { description = "Turn WAI applications into standalone GUIs using QtWebkit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {QtWebKit = null;}; "wai-hastache" = callPackage @@ -228080,6 +236322,7 @@ self: { description = "hmac authentication tools for WAI apps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-http2-extra" = callPackage @@ -228112,6 +236355,7 @@ self: { description = "Lenses for WAI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-lite" = callPackage @@ -228128,6 +236372,22 @@ self: { description = "DEPCRECATED (use package \"simple\" instead) A minimalist web framework for WAI web applications"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "wai-log" = callPackage + ({ mkDerivation, aeson, base, http-types, log-base + , string-conversions, text, time, wai + }: + mkDerivation { + pname = "wai-log"; + version = "0.1.0.0"; + sha256 = "1a0fs008nj47pbr8cjf8wh5j4dqqpgrp0dg75k2x5gx8v28d6q3n"; + libraryHaskellDepends = [ + aeson base http-types log-base string-conversions text time wai + ]; + description = "A logging middleware for WAI applications"; + license = stdenv.lib.licenses.bsd3; }) {}; "wai-logger" = callPackage @@ -228169,6 +236429,7 @@ self: { description = "Buffer requets before logging them"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-logger-prefork" = callPackage @@ -228186,6 +236447,7 @@ self: { description = "A logging system for preforked WAI apps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-make-assets" = callPackage @@ -228216,6 +236478,7 @@ self: { description = "Compiling and serving assets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-middleware-auth" = callPackage @@ -228246,7 +236509,6 @@ self: { ]; description = "Authentication middleware that secures WAI application"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-brotli" = callPackage @@ -228296,6 +236558,7 @@ self: { description = "Caching middleware for WAI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-middleware-cache-redis" = callPackage @@ -228315,6 +236578,7 @@ self: { description = "Redis backend for wai-middleware-cache"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-middleware-caching" = callPackage @@ -228378,6 +236642,7 @@ self: { description = "Wai error catching middleware"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-middleware-consul" = callPackage @@ -228401,6 +236666,7 @@ self: { description = "Wai Middleware for Consul"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-middleware-content-type" = callPackage @@ -228434,6 +236700,7 @@ self: { description = "Route to different middlewares based on the incoming Accept header"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-middleware-crowd" = callPackage @@ -228492,6 +236759,7 @@ self: { description = "WAI middleware that delegates handling of requests"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-middleware-etag" = callPackage @@ -228510,6 +236778,7 @@ self: { description = "WAI ETag middleware for static files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-middleware-gunzip" = callPackage @@ -228537,6 +236806,7 @@ self: { description = "cors and addHeaders for WAI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-middleware-hmac" = callPackage @@ -228580,6 +236850,7 @@ self: { description = "WAI HMAC Authentication Middleware Client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-middleware-json-errors" = callPackage @@ -228620,7 +236891,6 @@ self: { ]; description = "A WAI middleware to collect EKG request metrics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-preprocessor" = callPackage @@ -228640,6 +236910,7 @@ self: { description = "WAI middleware for preprocessing static files"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-middleware-prometheus" = callPackage @@ -228674,6 +236945,7 @@ self: { description = "Middleware that communicates to Rollbar"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-middleware-route" = callPackage @@ -228695,6 +236967,7 @@ self: { description = "Wai dispatch middleware"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-middleware-slack-verify" = callPackage @@ -228755,6 +237028,7 @@ self: { description = "WAI middleware that serves requests to static files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-middleware-static-embedded" = callPackage @@ -228875,6 +237149,7 @@ self: { description = "Declarative request parsing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-responsible" = callPackage @@ -228887,6 +237162,7 @@ self: { description = "Response interface for WAI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-route" = callPackage @@ -228921,6 +237197,7 @@ self: { description = "Provides basic routing on URL paths for WAI"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-routes" = callPackage @@ -228946,6 +237223,7 @@ self: { description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-routing" = callPackage @@ -228973,6 +237251,7 @@ self: { description = "Declarative routing for WAI"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-secure-cookies" = callPackage @@ -228997,6 +237276,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-session" = callPackage @@ -229032,6 +237312,7 @@ self: { description = "An alternative session middleware for WAI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-session-clientsession" = callPackage @@ -229070,6 +237351,7 @@ self: { description = "MySQL backed Wai session store"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-session-postgresql" = callPackage @@ -229092,6 +237374,7 @@ self: { description = "PostgreSQL backed Wai session store"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-session-tokyocabinet" = callPackage @@ -229141,6 +237424,7 @@ self: { description = "A simple cache for serving static files in a WAI middleware"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-static-pages" = callPackage @@ -229185,6 +237469,7 @@ self: { description = "Thrift transport layer for Wai"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-throttler" = callPackage @@ -229201,6 +237486,7 @@ self: { description = "Wai middleware for request throttling"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wai-transformers" = callPackage @@ -229281,6 +237567,7 @@ self: { description = "A wrapping library for waitfree computation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "waitra" = callPackage @@ -229306,6 +237593,7 @@ self: { description = "A very simple Wai router"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "waldo" = callPackage @@ -229339,6 +237627,7 @@ self: { description = "A generator of comics based on some ascertainable data about the requester"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wallpaper" = callPackage @@ -229361,6 +237650,7 @@ self: { description = "A library and executable for creating wallpaper, frieze, and rosette patterns"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "warc" = callPackage @@ -229440,6 +237730,7 @@ self: { description = "Dynamic configurable warp HTTP server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "warp-grpc" = callPackage @@ -229479,6 +237770,7 @@ self: { description = "Static file server based on Warp and wai-app-static (deprecated)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "warp-tls" = callPackage @@ -229559,6 +237851,7 @@ self: { description = "WebAssembly Language Toolkit and Interpreter"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "watchdog" = callPackage @@ -229589,6 +237882,7 @@ self: { description = "Opinionated filesystem watcher"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "watchit" = callPackage @@ -229618,6 +237912,7 @@ self: { description = "File change watching utility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wavconvert" = callPackage @@ -229708,6 +238003,7 @@ self: { description = "Wavefront .obj file loader"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wavesurfer" = callPackage @@ -229725,6 +238021,7 @@ self: { description = "Parse WaveSurfer files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wavy" = callPackage @@ -229746,6 +238043,7 @@ self: { description = "Process WAVE files in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wcwidth" = callPackage @@ -229771,6 +238069,7 @@ self: { description = "Mutable bag backed by weak pointers to each item"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "weather-api" = callPackage @@ -229788,6 +238087,7 @@ self: { description = "Weather API implemented in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-browser-in-haskell" = callPackage @@ -229812,6 +238112,7 @@ self: { description = "Simple functions for CSS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-encodings" = callPackage @@ -229830,6 +238131,7 @@ self: { description = "Encapsulate multiple web encoding in a single package. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-fpco" = callPackage @@ -229846,6 +238148,7 @@ self: { description = "Wrappers for web frameworks to ease usage with the FP Complete environment"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-inv-route" = callPackage @@ -229866,7 +238169,6 @@ self: { testHaskellDepends = [ base bytestring HUnit network-uri text ]; description = "Composable, reversible, efficient web routing using invertible invariants and bijections"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-mongrel2" = callPackage @@ -229886,6 +238188,7 @@ self: { description = "Bindings for the Mongrel2 web server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-output" = callPackage @@ -229905,6 +238208,7 @@ self: { description = "Library to present content to an user via their browser"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-page" = callPackage @@ -229925,6 +238229,7 @@ self: { description = "Monoidally construct web pages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-plugins" = callPackage @@ -229959,6 +238264,7 @@ self: { description = "Send messages using Web Push protocol"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-routes" = callPackage @@ -230041,6 +238347,7 @@ self: { description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-routes-regular" = callPackage @@ -230053,6 +238360,7 @@ self: { description = "portable, type-safe URL routing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-routes-th" = callPackage @@ -230081,6 +238389,7 @@ self: { description = "Extends web-routes with some transformers instances for RouteT"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web-routes-wai" = callPackage @@ -230116,6 +238425,7 @@ self: { description = "simple routing library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "web3" = callPackage @@ -230150,6 +238460,7 @@ self: { description = "Ethereum API for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webapi" = callPackage @@ -230177,6 +238488,7 @@ self: { description = "WAI based library for web api"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webapp" = callPackage @@ -230200,6 +238512,7 @@ self: { description = "Haskell web app framework based on WAI & Warp"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webcloud" = callPackage @@ -230217,6 +238530,7 @@ self: { description = "Turn an optparse-applicative program into a CGI program!"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webcrank" = callPackage @@ -230245,6 +238559,7 @@ self: { description = "Webmachine inspired toolkit for building http applications and services"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webcrank-dispatch" = callPackage @@ -230261,6 +238576,7 @@ self: { description = "A simple request dispatcher"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webcrank-wai" = callPackage @@ -230279,6 +238595,7 @@ self: { description = "Build a WAI Application from Webcrank Resources"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webdriver" = callPackage @@ -230350,6 +238667,7 @@ self: { description = "a Haskell client for the Selenium WebDriver protocol (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webdriver-w3c" = callPackage @@ -230386,6 +238704,7 @@ self: { description = "Bindings to the WebDriver API"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webex-teams-api" = callPackage @@ -230483,6 +238802,7 @@ self: { description = "WebFinger client library"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webidl" = callPackage @@ -230525,6 +238845,7 @@ self: { description = "webfont generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webkit" = callPackage @@ -230545,7 +238866,7 @@ self: { description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; + }) {inherit (pkgs) webkit;}; "webkit-javascriptcore" = callPackage ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: @@ -230559,7 +238880,8 @@ self: { description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; + broken = true; + }) {inherit (pkgs) webkit;}; "webkit2gtk3-javascriptcore" = callPackage ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: @@ -230573,7 +238895,8 @@ self: { description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) webkitgtk;}; + broken = true; + }) {webkitgtk = null;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib @@ -230622,7 +238945,6 @@ self: { ]; description = "Organized and simple web page scaffold for blaze and lucid"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webrtc-vad" = callPackage @@ -230652,6 +238974,7 @@ self: { description = "HTTP server library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "websnap" = callPackage @@ -230728,6 +239051,7 @@ self: { description = "Simple streaming RPC mechanism using WebSockets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "websockets-simple" = callPackage @@ -230789,6 +239113,7 @@ self: { description = "Functional reactive web framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wedding-announcement" = callPackage @@ -230867,6 +239192,7 @@ self: { description = "Writer monad which uses semiring constraint"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "weighted-regexp" = callPackage @@ -230882,6 +239208,7 @@ self: { description = "Weighted Regular Expression Matcher"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "weighted-search" = callPackage @@ -230913,6 +239240,7 @@ self: { description = "Haskell web framework (because Scotty had trouble yodeling)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wembley" = callPackage @@ -230955,6 +239283,7 @@ self: { description = "A game engine for playing werewolf within an arbitrary chat client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "werewolf-slack" = callPackage @@ -230975,6 +239304,7 @@ self: { description = "A chat interface for playing werewolf in Slack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wheb-mongo" = callPackage @@ -230987,6 +239317,7 @@ self: { description = "MongoDB plugin for Wheb"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wheb-redis" = callPackage @@ -230999,6 +239330,7 @@ self: { description = "Redis connection for Wheb"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wheb-strapped" = callPackage @@ -231011,6 +239343,7 @@ self: { description = "Strapped templates for Wheb"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "while-lang-parser" = callPackage @@ -231023,6 +239356,7 @@ self: { description = "Parser for the While language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "whim" = callPackage @@ -231042,6 +239376,7 @@ self: { description = "A Haskell window manager"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "whiskers" = callPackage @@ -231054,6 +239389,7 @@ self: { description = "Mustache templates with Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "whitespace" = callPackage @@ -231069,6 +239405,7 @@ self: { description = "Whitespace, an esoteric programming language"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "whois" = callPackage @@ -231101,6 +239438,7 @@ self: { description = "Haskell support for the Why3 input format"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wide-word" = callPackage @@ -231118,6 +239456,8 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wigner-symbols" = callPackage @@ -231157,8 +239497,8 @@ self: { }: mkDerivation { pname = "wikicfp-scraper"; - version = "0.1.0.9"; - sha256 = "1qj28a53shcr4dq8i1fhyjbr4ybiyfb0kz3w0g439736mrnzsg4y"; + version = "0.1.0.10"; + sha256 = "1j6aizgsf387pm6ajr6zjj1l4nnaq8mryq4vr09jji91ix9zhnw7"; libraryHaskellDepends = [ attoparsec base bytestring scalpel-core text time ]; @@ -231185,6 +239525,7 @@ self: { description = "Wikipedia EPUB E-Book construction from Firefox history"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wild-bind" = callPackage @@ -231220,6 +239561,7 @@ self: { description = "Graphical indicator for WildBind"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wild-bind-task-x11" = callPackage @@ -231237,6 +239579,7 @@ self: { description = "Task to install and export everything you need to use WildBind in X11"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wild-bind-x11" = callPackage @@ -231294,6 +239637,7 @@ self: { description = "Domain Name Service (DNS) lookup via the /dnsapi.dll standard library"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {dnsapi = null;}; "windowslive" = callPackage @@ -231312,6 +239656,7 @@ self: { description = "Implements Windows Live Web Authentication and Delegated Authentication"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "winerror" = callPackage @@ -231324,6 +239669,7 @@ self: { description = "Error handling for foreign calls to the Windows API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "winery" = callPackage @@ -231379,6 +239725,7 @@ self: { description = "I/O library for Windows"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {kernel32 = null; ws2_32 = null;}; "wire-streams" = callPackage @@ -231422,6 +239769,7 @@ self: { description = "Functional reactive programming library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wiring" = callPackage @@ -231439,6 +239787,7 @@ self: { description = "Wiring, promotion and demotion of types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wiringPi" = callPackage @@ -231503,6 +239852,7 @@ self: { description = "Run computations that depend on one or more elements in a stream"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "witherable" = callPackage @@ -231590,6 +239940,7 @@ self: { description = "Parsec parsers and types for geographic data in well-known text (WKT) format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wkt-geom" = callPackage @@ -231600,8 +239951,8 @@ self: { }: mkDerivation { pname = "wkt-geom"; - version = "0.0.7"; - sha256 = "0lsasdlznsmfj6b9ky448fdkgvdqhldyzx9fbnj1jgd779hlammb"; + version = "0.0.8"; + sha256 = "123y2xl22gmg28dcj244gk9bsbw0chz32gim48dz4bmqnkmvl7wl"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers geojson scientific trifecta utf8-string vector @@ -231657,6 +240008,7 @@ self: { description = "ANSI Terminal support with wl-pprint-extras"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wl-pprint-console" = callPackage @@ -231691,7 +240043,6 @@ self: { ]; description = "A free monad based on the Wadler/Leijen pretty printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wl-pprint-terminfo" = callPackage @@ -231710,6 +240061,7 @@ self: { description = "A color pretty printer with terminfo support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wl-pprint-text" = callPackage @@ -231740,6 +240092,7 @@ self: { description = "Haskell bindings for the wlc library"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) wlc;}; "wobsurv" = callPackage @@ -231776,6 +240129,7 @@ self: { description = "A simple and highly performant HTTP file server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "woffex" = callPackage @@ -231792,6 +240146,7 @@ self: { description = "Web Open Font Format (WOFF) unpacker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wol" = callPackage @@ -231829,6 +240184,7 @@ self: { description = "Amazon Simple Workflow Service Wrapper"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "woot" = callPackage @@ -231942,6 +240298,7 @@ self: { description = "Reading word2vec binary models"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "word8" = callPackage @@ -231982,6 +240339,7 @@ self: { description = "Get word counts and distributions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wordcloud" = callPackage @@ -232046,6 +240404,7 @@ self: { description = "Dictionary-based password generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wordpress-auth" = callPackage @@ -232091,6 +240450,7 @@ self: { description = "A word search solver library and executable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wordsetdiff" = callPackage @@ -232124,6 +240484,7 @@ self: { description = "A library for parsing a chat-based work hour reporting scheme"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "workdays" = callPackage @@ -232137,6 +240498,7 @@ self: { description = "Workday calculations"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "workflow-extra" = callPackage @@ -232160,6 +240522,7 @@ self: { description = "Utilities (e.g. Googling the clipboard contents) for the `workflow` pacakge"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "workflow-osx" = callPackage @@ -232180,6 +240543,7 @@ self: { description = "a \"Desktop Workflow\" monad with Objective-C bindings"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "workflow-pure" = callPackage @@ -232203,6 +240567,7 @@ self: { description = "manipulate `workflow-types:Workflow`'s"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "workflow-types" = callPackage @@ -232222,6 +240587,7 @@ self: { description = "Automate keyboard\/mouse\/clipboard\/application interaction"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "workflow-windows" = callPackage @@ -232237,6 +240603,7 @@ self: { description = "Automate keyboard/mouse/clipboard/application interaction"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "world-peace" = callPackage @@ -232267,6 +240634,7 @@ self: { description = "Subscribe to a wiki's RSS feed and archive external links"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wrap" = callPackage @@ -232310,6 +240678,7 @@ self: { description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wrecker" = callPackage @@ -232349,6 +240718,7 @@ self: { description = "An HTTP Performance Benchmarker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wrecker-ui" = callPackage @@ -232382,6 +240752,7 @@ self: { description = "A web interface for Wrecker, the HTTP Performance Benchmarker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wreq" = callPackage @@ -232499,6 +240870,7 @@ self: { description = "An easy-to-use HTTP client library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wreq-stringless" = callPackage @@ -232528,6 +240900,7 @@ self: { description = "Colour space transformations and metrics"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "write-buffer-core" = callPackage @@ -232563,8 +240936,8 @@ self: { }: mkDerivation { pname = "writer-cps-exceptions"; - version = "0.1.0.0"; - sha256 = "1s44h5d0f847w3j65frvjq2g6khz2ipsch109qnq5h2vcbgxid4v"; + version = "0.1.0.1"; + sha256 = "0hzfqmndlhqhb3l84fa1g51ydkf3py5vip5c1l6rzqak7b2ms6ls"; libraryHaskellDepends = [ base exceptions transformers writer-cps-transformers ]; @@ -232580,12 +240953,16 @@ self: { pname = "writer-cps-full"; version = "0.1.0.0"; sha256 = "15ay19hmfzx994aqylk379584c5f9jpz4yfi1zbyc2s7958xylds"; + revision = "1"; + editedCabalFile = "01zizhxk6kk5z3sqv5r7dp2yxbv5q87h5wgb5kbss60ncf042661"; libraryHaskellDepends = [ base writer-cps-lens writer-cps-morph writer-cps-mtl writer-cps-transformers ]; description = "WriteT and RWST monad transformers (Reexport with all dependencies)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "writer-cps-lens" = callPackage @@ -232602,6 +240979,8 @@ self: { ]; description = "Lens instances for the stricter CPS WriterT and RWST"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "writer-cps-monads-tf" = callPackage @@ -232617,6 +240996,8 @@ self: { ]; description = "MonadWriter orphan instances for writer-cps-transformers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "writer-cps-morph" = callPackage @@ -232630,6 +241011,8 @@ self: { libraryHaskellDepends = [ base mmorph writer-cps-transformers ]; description = "MFunctor instance for CPS style WriterT and RWST"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "writer-cps-mtl" = callPackage @@ -232637,8 +241020,8 @@ self: { }: mkDerivation { pname = "writer-cps-mtl"; - version = "0.1.1.5"; - sha256 = "09snvqwwhp39vmiiz3jpnfyjfhvpcj8ykbnhmii0yclxxsjgamqm"; + version = "0.1.1.6"; + sha256 = "0dnx2h4pqmvbkg2hh9c6vhayn6hyzyvs12c0s7rjdba1vihgpy86"; libraryHaskellDepends = [ base mtl transformers writer-cps-transformers ]; @@ -232650,9 +241033,10 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "writer-cps-transformers"; - version = "0.1.1.4"; - sha256 = "1zc5048spzf52gvski34ffvapw5s5yfdj7znv29yr71r4178pw6n"; + version = "0.5.6.0"; + sha256 = "132qd8rvvksjr8klvgr3y2acmlsw9jvirlfl8hdm3ipi4i7hy4fr"; libraryHaskellDepends = [ base transformers ]; + doHaddock = false; description = "WriteT and RWST monad transformers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -232692,6 +241076,7 @@ self: { description = "A simple CLI utility for interacting with a websocket"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ws-chans" = callPackage @@ -232734,6 +241119,7 @@ self: { description = "WSDL parsing in Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wsedit" = callPackage @@ -232752,6 +241138,26 @@ self: { description = "A small tool to list, add and remove webseeds from a torrent file"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "wshterm" = callPackage + ({ mkDerivation, async, base, binary, bytestring, file-embed + , posix-pty, process, wai, wai-app-static, wai-websockets, warp + , websockets + }: + mkDerivation { + pname = "wshterm"; + version = "0.1.0.1"; + sha256 = "09gxc8i4j236yvmvr31w3l05k0d1pqjgm6i88yn7hw16anjn23qq"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base binary bytestring file-embed posix-pty process wai + wai-app-static wai-websockets warp websockets + ]; + description = "Terminal emulator over websockets"; + license = stdenv.lib.licenses.bsd3; }) {}; "wsjtx-udp" = callPackage @@ -232791,6 +241197,7 @@ self: { description = "A-little-higher-level WebSocket client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wtk" = callPackage @@ -232803,6 +241210,7 @@ self: { description = "Wojcik Tool Kit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wtk-gtk" = callPackage @@ -232819,6 +241227,7 @@ self: { description = "GTK tools within Wojcik Tool Kit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wumpus-basic" = callPackage @@ -232835,6 +241244,7 @@ self: { description = "Basic objects and system code built on Wumpus-Core"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wumpus-core" = callPackage @@ -232849,6 +241259,7 @@ self: { description = "Pure Haskell PostScript and SVG generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wumpus-drawing" = callPackage @@ -232865,6 +241276,7 @@ self: { description = "High-level drawing objects built on Wumpus-Basic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wumpus-microprint" = callPackage @@ -232881,6 +241293,7 @@ self: { description = "Microprints - \"greek-text\" pictures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wumpus-tree" = callPackage @@ -232898,6 +241311,7 @@ self: { description = "Drawing trees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wuss" = callPackage @@ -232940,6 +241354,7 @@ self: { description = "Try to avoid the asteroids with your space ship"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wxFruit" = callPackage @@ -232955,6 +241370,7 @@ self: { description = "An implementation of Fruit using wxHaskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wxSimpleCanvas" = callPackage @@ -232967,6 +241383,7 @@ self: { description = "Simple zoomable canvas for wxHaskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wxc" = callPackage @@ -233030,6 +241447,7 @@ self: { description = "helper tool for building wxHaskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wxhnotepad" = callPackage @@ -233045,6 +241463,7 @@ self: { description = "An example of how to implement a basic notepad with wxHaskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wxturtle" = callPackage @@ -233061,6 +241480,7 @@ self: { description = "turtle like LOGO with wxHaskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wybor" = callPackage @@ -233101,6 +241521,7 @@ self: { description = "An autoresponder for Dragon Go Server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "x-dsp" = callPackage @@ -233118,6 +241539,7 @@ self: { description = "A embedded DSL for manipulating DSP languages in Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "x11-xim" = callPackage @@ -233263,6 +241685,7 @@ self: { description = "Runtime code generation for x86 64 bit machine code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xattr" = callPackage @@ -233281,7 +241704,7 @@ self: { ]; description = "Haskell extended file attributes interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) attr;}; "xbattbar" = callPackage @@ -233306,7 +241729,6 @@ self: { libraryHaskellDepends = [ base containers mtl pretty xml ]; description = "Parses XML files used by the XCB project"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xcffib" = callPackage @@ -233355,6 +241777,7 @@ self: { description = "XChat"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xcp" = callPackage @@ -233371,6 +241794,7 @@ self: { description = "Partial implementation of the XCP protocol with ethernet as transport layer"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xdcc" = callPackage @@ -233397,6 +241821,7 @@ self: { description = "A wget-like utility for retrieving files from XDCC bots on IRC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xdg-basedir" = callPackage @@ -233443,6 +241868,7 @@ self: { description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xeno" = callPackage @@ -233499,6 +241925,7 @@ self: { description = "FFI bindings to xfconf"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {libxfconf = null;}; "xformat" = callPackage @@ -233512,6 +241939,7 @@ self: { description = "Extensible, type-safe formatting with scanf- and printf-like functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xgboost-haskell" = callPackage @@ -233543,6 +241971,7 @@ self: { description = "Replaces/Enhances Text.Regex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xhb" = callPackage @@ -233560,6 +241989,7 @@ self: { description = "X Haskell Bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xhb-atom-cache" = callPackage @@ -233576,6 +242006,7 @@ self: { description = "Atom cache for XHB"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xhb-ewmh" = callPackage @@ -233593,6 +242024,7 @@ self: { description = "EWMH utilities for XHB"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xhtml_3000_2_2_1" = callPackage @@ -233636,6 +242068,7 @@ self: { description = "The Lava system for Xilinx FPGA design with layout combinators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xine" = callPackage @@ -233651,6 +242084,7 @@ self: { description = "Bindings to xine-lib"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {libxine = null; xine = null;}; "xing-api" = callPackage @@ -233675,6 +242109,7 @@ self: { description = "Wrapper for the XING API, v1"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xinput-conduit" = callPackage @@ -233715,6 +242150,7 @@ self: { description = "Haskell bindings for libxkbcommon"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libxkbcommon;}; "xkcd" = callPackage @@ -233733,6 +242169,7 @@ self: { description = "Downloads the most recent xkcd comic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xleb" = callPackage @@ -233749,6 +242186,7 @@ self: { description = "A simple monadic language for parsing XML structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xls" = callPackage @@ -233794,6 +242232,7 @@ self: { description = "Streaming Excel file generation and parsing"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xlsx" = callPackage @@ -233857,6 +242296,7 @@ self: { description = "Simple and incomplete Excel file templater"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml" = callPackage @@ -233903,6 +242343,7 @@ self: { description = "Parse XML catalog files (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-conduit_1_7_1_2" = callPackage @@ -233970,6 +242411,7 @@ self: { description = "Historical cursors & decoding on top of xml-conduit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-conduit-parse" = callPackage @@ -234034,6 +242476,7 @@ self: { description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-enumerator-combinators" = callPackage @@ -234052,6 +242495,7 @@ self: { description = "Parser combinators for xml-enumerator and compatible XML parsers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-extractors" = callPackage @@ -234113,6 +242557,7 @@ self: { description = "Optics for xml-conduit and html-conduit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-html-qq" = callPackage @@ -234209,6 +242654,7 @@ self: { description = "Monadic extensions to the xml package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-parsec" = callPackage @@ -234221,6 +242667,7 @@ self: { description = "Parsing XML with Parsec"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-picklers" = callPackage @@ -234250,6 +242697,7 @@ self: { description = "XML parser which uses simple-pipe"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-prettify" = callPackage @@ -234265,6 +242713,7 @@ self: { description = "Pretty print XML"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-push" = callPackage @@ -234286,6 +242735,7 @@ self: { description = "Push XML from/to client to/from server over XMPP or HTTP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-query" = callPackage @@ -234298,6 +242748,7 @@ self: { description = "A parser-agnostic declarative API for querying XML-documents"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-query-xml-conduit" = callPackage @@ -234315,6 +242766,7 @@ self: { description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-query-xml-types" = callPackage @@ -234339,6 +242791,7 @@ self: { description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-to-json" = callPackage @@ -234396,6 +242849,7 @@ self: { description = "Typed XML encoding for an xml-conduit backend"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-tydom-core" = callPackage @@ -234408,6 +242862,7 @@ self: { description = "Typed XML encoding (core library)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml-types" = callPackage @@ -234460,6 +242915,7 @@ self: { description = "translate xml to json"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xml2x" = callPackage @@ -234479,6 +242935,7 @@ self: { description = "Convert BLAST output in XML format to CSV or HTML"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmlbf" = callPackage @@ -234521,7 +242978,6 @@ self: { ]; description = "xeno backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmlbf-xmlhtml" = callPackage @@ -234543,7 +242999,6 @@ self: { ]; description = "xmlhtml backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmlgen" = callPackage @@ -234612,6 +243067,7 @@ self: { description = "Show tv channels in the terminal"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmms2-client" = callPackage @@ -234629,6 +243085,7 @@ self: { description = "An XMMS2 client library"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmms2-client-glib" = callPackage @@ -234642,6 +243099,7 @@ self: { description = "An XMMS2 client library — GLib integration"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmobar" = callPackage @@ -234685,7 +243143,7 @@ self: { ]; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;}; @@ -234735,6 +243193,7 @@ self: { description = "A tiling window manager"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmonad-contrib" = callPackage @@ -234774,6 +243233,7 @@ self: { description = "Third party extensions for xmonad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmonad-contrib-gpl" = callPackage @@ -234786,6 +243246,7 @@ self: { description = "Third party extensions for xmonad"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmonad-entryhelper" = callPackage @@ -234819,6 +243280,7 @@ self: { description = "Module for evaluation Haskell expressions in the running xmonad instance"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmonad-extras" = callPackage @@ -234849,7 +243311,6 @@ self: { libraryHaskellDepends = [ base gtk xmonad ]; description = "Workspaces screenshooting utility for XMonad"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmonad-spotify" = callPackage @@ -234898,6 +243359,7 @@ self: { description = "Custom xmonad, which builds with stack or cabal"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmonad-volume" = callPackage @@ -234942,6 +243404,7 @@ self: { description = "A library to automatically put named windows into the DynamicLog"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmpipe" = callPackage @@ -234959,6 +243422,7 @@ self: { description = "XMPP implementation using simple-PIPE"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xorshift" = callPackage @@ -235018,6 +243482,7 @@ self: { description = "text builder for xournal file format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xournal-convert" = callPackage @@ -235040,6 +243505,7 @@ self: { description = "convert utility for xoj files"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xournal-parser" = callPackage @@ -235060,6 +243526,7 @@ self: { description = "Xournal file parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xournal-render" = callPackage @@ -235078,6 +243545,7 @@ self: { description = "Xournal file renderer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xournal-types" = callPackage @@ -235096,6 +243564,7 @@ self: { description = "Data types for programs for xournal file format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xpathdsv" = callPackage @@ -235130,6 +243599,7 @@ self: { description = "Cluster EST sequences"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xsd" = callPackage @@ -235147,6 +243617,7 @@ self: { description = "XML Schema data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xsha1" = callPackage @@ -235171,6 +243642,7 @@ self: { description = "Binding to libxslt"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {xslt = null;}; "xss-sanitize" = callPackage @@ -235204,6 +243676,7 @@ self: { description = "eXtended & Typed Controls for wxHaskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xtest" = callPackage @@ -235249,6 +243722,7 @@ self: { description = "A Haskell implementation of the xxHash algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xxhash-ffi" = callPackage @@ -235286,6 +243760,7 @@ self: { description = "#plaimi's all-encompassing bot"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yabi" = callPackage @@ -235294,6 +243769,8 @@ self: { pname = "yabi"; version = "0.2.0.0"; sha256 = "1iihmhq87z5k9wzv8j8ydyy100m0401yqm576z27fk01i1a6fq3x"; + revision = "1"; + editedCabalFile = "0hbmp3hbr2f64vpnqf7hg2li4yasiv7fzmafqf50wypz3zixbgmp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base word8 ]; @@ -235318,6 +243795,7 @@ self: { description = "Yet Another Brainfuck Interpreter"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yackage" = callPackage @@ -235342,6 +243820,7 @@ self: { description = "Personal Hackage replacement for testing new packages"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yahoo-finance-api" = callPackage @@ -235364,6 +243843,7 @@ self: { description = "Read quotes from Yahoo Finance API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yahoo-finance-conduit" = callPackage @@ -235380,6 +243860,7 @@ self: { description = "Streaming aproach to the yahoo finance api"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yahoo-web-search" = callPackage @@ -235392,6 +243873,7 @@ self: { description = "Yahoo Web Search Services"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yajl" = callPackage @@ -235406,6 +243888,7 @@ self: { description = "Bindings for YAJL, an event-based JSON implementation"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) yajl;}; "yajl-enumerator" = callPackage @@ -235422,6 +243905,7 @@ self: { description = "Enumerator-based interface to YAJL, an event-based JSON implementation"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yak" = callPackage @@ -235430,15 +243914,14 @@ self: { }: mkDerivation { pname = "yak"; - version = "0.1.0.0"; - sha256 = "1zw522pijmad87986m663myzfkvm40y7w3g04z0f67yfzby4s19a"; + version = "0.2.0.0"; + sha256 = "1k27361n0jbixrshlf9757gvlnm7z3safkl28zg4lqflmfq95mai"; libraryHaskellDepends = [ attoparsec base bytestring lens template-haskell text time ]; testHaskellDepends = [ base bytestring hspec ]; description = "A strongly typed IRC library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yall" = callPackage @@ -235453,37 +243936,6 @@ self: { }) {}; "yam" = callPackage - ({ mkDerivation, base, base16-bytestring, binary, bytestring - , data-default, fast-logger, hspec, http-client, http-types, lens - , monad-logger, mtl, mwc-random, QuickCheck, reflection, salak - , scientific, servant-client, servant-server, servant-swagger - , servant-swagger-ui, swagger2, text, unliftio-core - , unordered-containers, vault, vector, wai, warp - }: - mkDerivation { - pname = "yam"; - version = "0.5.11"; - sha256 = "0k9y8zg1sbdxb6c3fdmlz0dswb8yam5x812avfw6rg3as8sp1pcf"; - libraryHaskellDepends = [ - base base16-bytestring binary bytestring data-default fast-logger - http-client http-types lens monad-logger mtl mwc-random reflection - salak scientific servant-client servant-server servant-swagger - servant-swagger-ui swagger2 text unliftio-core unordered-containers - vault vector wai warp - ]; - testHaskellDepends = [ - base base16-bytestring binary bytestring data-default fast-logger - hspec http-client http-types lens monad-logger mtl mwc-random - QuickCheck reflection salak scientific servant-client - servant-server servant-swagger servant-swagger-ui swagger2 text - unliftio-core unordered-containers vault vector wai warp - ]; - description = "Yam Web"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yam_0_5_13" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring , data-default, fast-logger, hspec, http-client, http-types, lens , menshen, monad-logger, mtl, mwc-random, QuickCheck, reflection @@ -235493,8 +243945,8 @@ self: { }: mkDerivation { pname = "yam"; - version = "0.5.13"; - sha256 = "1l671m59vkgqv4acvg8x49wkfbzdy17bww3p3b5a8l8md1ab258r"; + version = "0.5.14"; + sha256 = "1ynd1ak1zljmvfsviz1mkpngm56ifwklfinbsgwn7qqivc7kdhl7"; libraryHaskellDepends = [ aeson base base16-bytestring binary bytestring data-default fast-logger http-client http-types lens menshen monad-logger mtl @@ -235513,6 +243965,7 @@ self: { description = "Yam Web"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yam-app" = callPackage @@ -235560,30 +244013,15 @@ self: { }: mkDerivation { pname = "yam-datasource"; - version = "0.5.11"; - sha256 = "170xpd1kw403g9zds795zbxkaz0qy7lfgzppx4q0ri42ky59z8pl"; - libraryHaskellDepends = [ - base conduit persistent resource-pool resourcet unliftio-core yam - ]; - description = "Yam DataSource Middleware"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yam-datasource_0_5_13" = callPackage - ({ mkDerivation, base, conduit, persistent, resource-pool - , resourcet, unliftio-core, yam - }: - mkDerivation { - pname = "yam-datasource"; - version = "0.5.13"; - sha256 = "0vbw575g7qdha9siiyrnv3kpjw6ysz09m4qady90s9j75ymzdgnm"; + version = "0.5.14"; + sha256 = "0yc1hrpqpvfvn5ldnnyrj7l49b9v20f24c5k8lcf70wh7bxmwx1i"; libraryHaskellDepends = [ base conduit persistent resource-pool resourcet unliftio-core yam ]; description = "Yam DataSource Middleware"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yam-job" = callPackage @@ -235595,6 +244033,7 @@ self: { libraryHaskellDepends = [ base cron yam-app ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yam-logger" = callPackage @@ -235627,6 +244066,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yam-transaction" = callPackage @@ -235660,6 +244100,7 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yam-transaction-postgresql" = callPackage @@ -235704,6 +244145,7 @@ self: { description = "Yam Web"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yamemo" = callPackage @@ -235824,6 +244266,7 @@ self: { description = "Extra functionality for pretty printing Yaml documents"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yaml-rpc" = callPackage @@ -235843,6 +244286,7 @@ self: { description = "Simple library for network (HTTP REST-like) YAML RPC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yaml-rpc-scotty" = callPackage @@ -235860,6 +244304,7 @@ self: { description = "Scotty server backend for yaml-rpc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yaml-rpc-snap" = callPackage @@ -235877,6 +244322,7 @@ self: { description = "Snap server backend for yaml-rpc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yaml-union" = callPackage @@ -235922,6 +244368,7 @@ self: { description = "Generate OWL schema from YAML syntax, and an RDFa template"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yamlkeysdiff" = callPackage @@ -235954,6 +244401,7 @@ self: { description = "blank-canvas frontend for Yampa"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yampa-glfw" = callPackage @@ -235972,20 +244420,22 @@ self: { description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yampa-gloss" = callPackage ({ mkDerivation, base, gloss, Yampa }: mkDerivation { pname = "yampa-gloss"; - version = "0.1.0.0"; - sha256 = "1h9x76swrq64add2v6935542gh5l5rpf5nqdy1nl2q78ksk6r04g"; + version = "0.2"; + sha256 = "0dbp5a4mvqvdc6pq9qdaw3656n0pspmjjg5z4a1b5q8s6dbv62zx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base gloss Yampa ]; description = "A GLOSS backend for Yampa"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yampa-glut" = callPackage @@ -236004,6 +244454,7 @@ self: { description = "Connects Yampa and GLUT"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yampa-sdl2" = callPackage @@ -236023,6 +244474,7 @@ self: { description = "Yampa and SDL2 made easy"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yampa-test" = callPackage @@ -236042,6 +244494,7 @@ self: { description = "Testing library for Yampa"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yampa2048" = callPackage @@ -236056,6 +244509,7 @@ self: { description = "2048 game clone using Yampa/Gloss"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yandex-translate" = callPackage @@ -236074,6 +244528,7 @@ self: { description = "Bindings to Yandex translate API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yaop" = callPackage @@ -236088,6 +244543,7 @@ self: { description = "Yet another option parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yap" = callPackage @@ -236100,6 +244556,7 @@ self: { description = "yet another prelude - a simplistic refactoring with algebraic classes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yarn-lock" = callPackage @@ -236122,6 +244579,7 @@ self: { description = "Represent and parse yarn.lock files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yarn2nix" = callPackage @@ -236175,6 +244633,7 @@ self: { description = "Yet another array library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yarr-image-io" = callPackage @@ -236188,6 +244647,7 @@ self: { description = "Image IO for Yarr library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libdevil;}; "yate" = callPackage @@ -236208,6 +244668,7 @@ self: { description = "Yet Another Template Engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yavie" = callPackage @@ -236228,6 +244689,7 @@ self: { description = "yet another visual editor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yaya" = callPackage @@ -236251,6 +244713,7 @@ self: { description = "Total recursion schemes"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yaya-hedgehog" = callPackage @@ -236262,6 +244725,8 @@ self: { libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; description = "Hedgehog testing support for the Yaya recursion scheme library"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yaya-unsafe" = callPackage @@ -236279,6 +244744,7 @@ self: { description = "Non-total extensions to the Yaya recursion scheme library"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ycextra" = callPackage @@ -236294,6 +244760,7 @@ self: { description = "Additional utilities to work with Yhc Core"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yeganesh" = callPackage @@ -236338,6 +244805,7 @@ self: { description = "A Yeller Client For Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yes-precure5-command" = callPackage @@ -236430,6 +244898,7 @@ self: { description = "YesQL-style SQL database abstraction (postgresql-simple backend)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod_1_4_5" = callPackage @@ -236509,6 +244978,7 @@ self: { description = "Angular JS integratoin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-angular-ui" = callPackage @@ -236529,6 +244999,7 @@ self: { description = "Angular Helpers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-articles" = callPackage @@ -236552,37 +245023,10 @@ self: { description = "Automatically generate article previews for a yesod site"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, bytestring, conduit, conduit-extra, containers - , cryptonite, data-default, email-validate, file-embed, http-client - , http-client-tls, http-conduit, http-types, memory, network-uri - , nonce, persistent, random, safe, shakespeare, template-haskell - , text, time, transformers, unliftio, unliftio-core - , unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.6.5"; - sha256 = "1crpqcx8zynwmas4ja5yv1jg4xvcv0hw7h11d5m8vld4fcs9dpdr"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup bytestring conduit - conduit-extra containers cryptonite data-default email-validate - file-embed http-client http-client-tls http-conduit http-types - memory network-uri nonce persistent random safe shakespeare - template-haskell text time transformers unliftio unliftio-core - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-auth_1_6_6" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers @@ -236608,7 +245052,6 @@ self: { ]; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-account" = callPackage @@ -236632,6 +245075,7 @@ self: { description = "An account authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-account-fork" = callPackage @@ -236657,6 +245101,7 @@ self: { description = "An account authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-basic" = callPackage @@ -236674,6 +245119,7 @@ self: { description = "Yesod Middleware for HTTP Basic Authentication"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-bcrypt" = callPackage @@ -236691,6 +245137,7 @@ self: { description = "BCrypt salted and hashed passwords in a database as auth for yesod"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-bcryptdb" = callPackage @@ -236708,6 +245155,7 @@ self: { description = "Authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-deskcom" = callPackage @@ -236730,6 +245178,7 @@ self: { description = "Desk.com remote authentication support for Yesod apps."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-fb" = callPackage @@ -236748,6 +245197,7 @@ self: { description = "Authentication backend for Yesod using Facebook"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-hashdb" = callPackage @@ -236792,6 +245242,7 @@ self: { description = "An account authentication plugin for yesod with encrypted token transfer"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-kerberos" = callPackage @@ -236810,6 +245261,7 @@ self: { description = "Kerberos Authentication for Yesod"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-ldap" = callPackage @@ -236827,6 +245279,7 @@ self: { description = "LDAP Authentication for Yesod"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-ldap-mediocre" = callPackage @@ -236843,6 +245296,7 @@ self: { description = "Very simlple LDAP auth for yesod"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-ldap-native" = callPackage @@ -236861,6 +245315,7 @@ self: { description = "Yesod LDAP authentication plugin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-nopassword" = callPackage @@ -236878,6 +245333,7 @@ self: { description = "A plugin for Yesod to provide email-only authentication"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-oauth" = callPackage @@ -236903,8 +245359,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.6.1.0"; - sha256 = "148w2cn6f0mn6qyymxr2zlw8jnhyjqhzhszhy1faca8ziqsi9mas"; + version = "0.6.1.1"; + sha256 = "19y5m94njn26vglnyrpzy59614dj7f7wbgnc354syr8qmdiliczp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236915,7 +245371,6 @@ self: { testHaskellDepends = [ base hspec uri-bytestring ]; description = "OAuth 2.0 authentication plugins"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-pam" = callPackage @@ -236932,6 +245387,7 @@ self: { description = "Provides PAM authentication module"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-smbclient" = callPackage @@ -236949,6 +245405,7 @@ self: { description = "Authentication plugin for Yesod using smbclient"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-auth-zendesk" = callPackage @@ -236968,6 +245425,7 @@ self: { description = "Zendesk remote authentication support for Yesod apps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-bin" = callPackage @@ -237018,6 +245476,7 @@ self: { description = "Bootstrap widgets for yesod"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-colonnade" = callPackage @@ -237028,13 +245487,14 @@ self: { pname = "yesod-colonnade"; version = "1.3.0.1"; sha256 = "1x5m3xv4jq2x49fnvxw3v8bvbsx4hdccykcn32fz3cwavp4p1q1p"; + revision = "1"; + editedCabalFile = "0cgxpqqpaqy3009k5l8v7f1z4jm4162k69y9q5xb3dk1925nfqyp"; libraryHaskellDepends = [ base blaze-html blaze-markup colonnade conduit conduit-extra text yesod-core yesod-elements ]; description = "Helper functions for using yesod with colonnade"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-comments" = callPackage @@ -237054,6 +245514,7 @@ self: { description = "A generic comments interface for a Yesod application"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-content-pdf" = callPackage @@ -237064,8 +245525,8 @@ self: { }: mkDerivation { pname = "yesod-content-pdf"; - version = "0.2.0.4"; - sha256 = "1n51prhxbbjrkvnvf2v4nk6vs8zxvwrnb1826r2vkhq0j1pyyi2k"; + version = "0.2.0.5"; + sha256 = "0cfg4jvqq5ix9csla7fzawiiivhcvwh2lqmydz5rii95rfys6kww"; libraryHaskellDepends = [ base blaze-builder blaze-html bytestring conduit data-default directory network-uri process temporary transformers yesod-core @@ -237076,6 +245537,7 @@ self: { description = "PDF Content Type for Yesod"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-continuations" = callPackage @@ -237095,6 +245557,7 @@ self: { description = "Continuations for Yesod"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-core_1_4_37_3" = callPackage @@ -237143,42 +245606,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, fast-logger, gauge, hspec, hspec-expectations - , http-types, HUnit, monad-logger, mtl, network, parsec - , path-pieces, primitive, random, resourcet, rio, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , unix-compat, unliftio, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.11"; - sha256 = "1cpl8g2sdvv751vvs68169w9nki43h6rmj2i2wqkfzijwgd8djwr"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types monad-logger mtl - parsec path-pieces primitive random resourcet rio shakespeare - template-haskell text time transformers unix-compat unliftio - unordered-containers vector wai wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_12" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, byteable, bytestring, case-insensitive, cereal , clientsession, conduit, conduit-extra, containers, cookie @@ -237212,7 +245639,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -237231,6 +245657,7 @@ self: { description = "Generic administrative CRUD operations as a Yesod subsite"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-crud-persist" = callPackage @@ -237250,6 +245677,7 @@ self: { description = "Flexible CRUD subsite usable with Yesod and Persistent"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-csp" = callPackage @@ -237298,6 +245726,7 @@ self: { description = "Yesod plugin for DataTables (jQuery grid plugin)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-default" = callPackage @@ -237336,6 +245765,7 @@ self: { description = "DSL for generating Yesod subsite to manage an RDBMS;"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-elements" = callPackage @@ -237389,6 +245819,7 @@ self: { description = "Example programs using the Yesod Web Framework. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) sqlite;}; "yesod-fast-devel" = callPackage @@ -237411,6 +245842,7 @@ self: { description = "Fast live-reloading for yesod applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-fay" = callPackage @@ -237431,6 +245863,7 @@ self: { description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-fb" = callPackage @@ -237560,6 +245993,7 @@ self: { description = "Various rich-text WYSIWYG editors for Yesod forms"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-gitrepo" = callPackage @@ -237579,19 +246013,20 @@ self: { }) {}; "yesod-gitrev" = callPackage - ({ mkDerivation, aeson, base, gitrev, template-haskell, yesod-core + ({ mkDerivation, aeson, base, githash, template-haskell, yesod-core }: mkDerivation { pname = "yesod-gitrev"; - version = "0.2.0.0"; - sha256 = "0lp0zraj6015bl8pcgi9b9w4d1yf0lb4awy25jv5xrcrc173g7yz"; - revision = "1"; - editedCabalFile = "1b0df34lz569gnwbbz0p20dml6bi2nbva9wfdsxyvva0dhvxjaz5"; + version = "0.2.1"; + sha256 = "0wd6xvq9aa11n8y4hna0a5ivqfxnbg8w2bq5lramm895xs7c8d7w"; libraryHaskellDepends = [ - aeson base gitrev template-haskell yesod-core + aeson base githash template-haskell yesod-core ]; + testHaskellDepends = [ base yesod-core ]; description = "A subsite for displaying git information"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-goodies" = callPackage @@ -237609,6 +246044,7 @@ self: { description = "A collection of various small helpers useful in any yesod application"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-ip" = callPackage @@ -237617,10 +246053,8 @@ self: { }: mkDerivation { pname = "yesod-ip"; - version = "0.5.0"; - sha256 = "0ad03220gh8l91vr8yrb8jffsrbgcf3c5dnfv81qrd4lqs05955n"; - revision = "1"; - editedCabalFile = "10qagnsbld7nw8rd3vqfsad4xkkzj3ijpfg4k01dqsb9y1gxqz15"; + version = "0.5.1"; + sha256 = "1gla2w9xi88y9d149n2r18xj5y1bmaykf258nl7x4hrkl0zgdq62"; libraryHaskellDepends = [ base http-api-data ip path-pieces persistent text yesod-core yesod-form @@ -237628,6 +246062,7 @@ self: { description = "Code for using the ip package with yesod"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-job-queue" = callPackage @@ -237650,6 +246085,7 @@ self: { description = "Background jobs library for Yesod"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-json" = callPackage @@ -237673,6 +246109,7 @@ self: { description = "A typeclass which simplifies creating link widgets throughout your site"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-lucid" = callPackage @@ -237685,6 +246122,7 @@ self: { description = "Lucid support for Yesod"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-mangopay" = callPackage @@ -237705,6 +246143,7 @@ self: { description = "Yesod library for MangoPay API access"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-markdown" = callPackage @@ -237740,7 +246179,6 @@ self: { ]; description = "Simple display of media types, served by yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-newsfeed" = callPackage @@ -237769,6 +246207,7 @@ self: { description = "Pagination for Yesod sites"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-pagination" = callPackage @@ -237788,6 +246227,7 @@ self: { description = "Pagination in Yesod"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-paginator" = callPackage @@ -237822,6 +246262,7 @@ self: { description = "Yesod plugin to use PayPal with the paypal-rest-client library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-persistent_1_4_3" = callPackage @@ -237935,6 +246376,7 @@ self: { description = "Meta package for Yesod (deprecated)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-pnotify" = callPackage @@ -237956,6 +246398,7 @@ self: { description = "Yet another getMessage/setMessage using pnotify jquery plugins"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-pure" = callPackage @@ -237968,6 +246411,7 @@ self: { description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-purescript" = callPackage @@ -237988,6 +246432,7 @@ self: { description = "PureScript integration for Yesod"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-raml" = callPackage @@ -238012,6 +246457,7 @@ self: { description = "RAML style route definitions for Yesod"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-raml-bin" = callPackage @@ -238035,6 +246481,7 @@ self: { description = "The raml helper executable"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-raml-docs" = callPackage @@ -238052,6 +246499,7 @@ self: { description = "A html documentation generator library for RAML"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-raml-mock" = callPackage @@ -238076,6 +246524,7 @@ self: { description = "A mock-handler generator library from RAML"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-recaptcha" = callPackage @@ -238095,6 +246544,7 @@ self: { description = "Dead simple support for reCAPTCHA on Yesod applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-recaptcha2" = callPackage @@ -238133,6 +246583,7 @@ self: { description = "Efficient routing for Yesod. (deprecated)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-routes-flow" = callPackage @@ -238150,6 +246601,7 @@ self: { description = "Generate Flow routes for Yesod"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-routes-typescript" = callPackage @@ -238167,6 +246619,7 @@ self: { description = "generate TypeScript routes for Yesod"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-rst" = callPackage @@ -238184,6 +246637,7 @@ self: { description = "Tools for using reStructuredText (RST) in a yesod application"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-s3" = callPackage @@ -238201,6 +246655,7 @@ self: { description = "Simple Helper Library for using Amazon's Simple Storage Service (S3) with Yesod"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-sass" = callPackage @@ -238218,6 +246673,7 @@ self: { description = "A simple quasiquoter to include sass code in yesod"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-session-redis" = callPackage @@ -238236,6 +246692,7 @@ self: { description = "Redis-Powered Sessions for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-sitemap" = callPackage @@ -238345,6 +246802,7 @@ self: { description = "Yesod generators for embedding AngularJs code into yesod-static at compile time"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-table" = callPackage @@ -238441,6 +246899,7 @@ self: { description = "Utility functions for testing JSON web services written in Yesod"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-text-markdown" = callPackage @@ -238474,6 +246933,7 @@ self: { description = "Provides main functions using warp-tls for yesod projects"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-transloadit" = callPackage @@ -238519,6 +246979,7 @@ self: { description = "Simple CRUD classes for easy view creation for Yesod"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yesod-websockets" = callPackage @@ -238567,6 +247028,7 @@ self: { description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yet-another-logger" = callPackage @@ -238615,6 +247077,7 @@ self: { description = "Executable specifications of composable cryptographic protocols"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yhccore" = callPackage @@ -238627,6 +247090,7 @@ self: { description = "Yhc's Internal Core language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi" = callPackage @@ -238650,6 +247114,7 @@ self: { description = "Yi editor"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-contrib" = callPackage @@ -238669,6 +247134,7 @@ self: { description = "Add-ons to Yi, the Haskell-Scriptable Editor"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-core" = callPackage @@ -238700,6 +247166,7 @@ self: { description = "Yi editor core library"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-dynamic-configuration" = callPackage @@ -238717,6 +247184,7 @@ self: { description = "Dynamic configuration support for Yi"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-emacs-colours" = callPackage @@ -238748,6 +247216,7 @@ self: { description = "Pango frontend for Yi editor"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-frontend-vty" = callPackage @@ -238766,6 +247235,7 @@ self: { description = "Vty frontend for Yi editor"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-fuzzy-open" = callPackage @@ -238785,6 +247255,7 @@ self: { description = "Fuzzy open plugin for yi"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-gtk" = callPackage @@ -238813,6 +247284,7 @@ self: { description = "Yi editor incremental reader"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-keymap-cua" = callPackage @@ -238829,6 +247301,7 @@ self: { description = "Cua keymap for Yi editor"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-keymap-emacs" = callPackage @@ -238847,6 +247320,7 @@ self: { description = "Emacs keymap for Yi editor"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-keymap-vim" = callPackage @@ -238874,6 +247348,7 @@ self: { description = "Vim keymap for Yi editor"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-language" = callPackage @@ -238919,6 +247394,7 @@ self: { description = "Yi editor miscellaneous modes"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-mode-haskell" = callPackage @@ -238937,6 +247413,7 @@ self: { description = "Yi editor haskell mode"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-mode-javascript" = callPackage @@ -238956,6 +247433,7 @@ self: { description = "Yi editor javascript mode"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-monokai" = callPackage @@ -238968,6 +247446,7 @@ self: { description = "Monokai colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-rope" = callPackage @@ -239008,6 +247487,7 @@ self: { description = "Snippet support for yi"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-solarized" = callPackage @@ -239020,6 +247500,7 @@ self: { description = "Solarized colour theme for the Yi text editor"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-spolsky" = callPackage @@ -239032,6 +247513,7 @@ self: { description = "Spolsky colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yi-vty" = callPackage @@ -239056,6 +247538,7 @@ self: { description = "Haskell programming interface to Yices SMT solver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yices-easy" = callPackage @@ -239107,6 +247590,7 @@ self: { description = "CUI FTP client like 'ftp', 'ncftp'"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yjftp-libs" = callPackage @@ -239121,6 +247605,7 @@ self: { description = "CUI FTP client like 'ftp', 'ncftp'"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yjsvg" = callPackage @@ -239184,6 +247669,7 @@ self: { description = "Parser combinators for young padawans"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yoga" = callPackage @@ -239217,6 +247703,7 @@ self: { description = "Generic Programming with Disbanded Data Types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "york-lava" = callPackage @@ -239229,6 +247716,7 @@ self: { description = "A library for digital circuit description"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "youtube" = callPackage @@ -239270,6 +247758,7 @@ self: { description = "A YQL engine to execute Open Data Tables"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yst" = callPackage @@ -239280,8 +247769,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.7"; - sha256 = "1dvny64v5v3qrahymn647jsjjdraa0mrkpvmqiwihh8n9xbnq1s7"; + version = "0.7.0.1"; + sha256 = "1cmdx2bghp508qm26xydnljswgldvvv5rapmzcivmnn8pzp9g9kl"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -239293,6 +247782,7 @@ self: { description = "Builds a static website from templates and data in YAML or CSV files"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yu-auth" = callPackage @@ -239320,6 +247810,7 @@ self: { description = "The core of Yu"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yu-launch" = callPackage @@ -239336,6 +247827,7 @@ self: { description = "The launcher for Yu"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yu-tool" = callPackage @@ -239354,6 +247846,7 @@ self: { description = "Tool for Yu"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yu-utils" = callPackage @@ -239413,6 +247906,7 @@ self: { description = "A transcendental HTML parser gently wrapping the HXT library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yx" = callPackage @@ -239426,6 +247920,7 @@ self: { description = "Row-major coordinates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yxdb-utils" = callPackage @@ -239465,6 +247960,7 @@ self: { description = "Utilities for reading and writing Alteryx .yxdb files"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "z3" = callPackage @@ -239494,6 +247990,7 @@ self: { description = "High-level assertion encoding to Z3 solver"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "z85" = callPackage @@ -239518,6 +248015,7 @@ self: { description = "Implementation of the z85 binary codec"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zabt" = callPackage @@ -239531,6 +248029,7 @@ self: { description = "Simple-minded abstract binding trees"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zalgo" = callPackage @@ -239561,6 +248060,7 @@ self: { description = "A tool for checking how much work is done on group projects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zasni-gerna" = callPackage @@ -239573,6 +248073,7 @@ self: { description = "lojban parser (zasni gerna)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zcache" = callPackage @@ -239619,6 +248120,20 @@ self: { description = "Zendesk API for Haskell programming language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "zenhack-prelude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "zenhack-prelude"; + version = "0.1.1.0"; + sha256 = "07njs4zb976zxyiwg03ijvn1wvmx188ys49gckwybg1kl824x11f"; + libraryHaskellDepends = [ base ]; + description = "@zenhack's personal custom prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zeno" = callPackage @@ -239639,6 +248154,7 @@ self: { description = "An automated proof system for Haskell programs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zephyr" = callPackage @@ -239676,6 +248192,7 @@ self: { description = "Zephyr tree shaking for PureScript Language"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zero" = callPackage @@ -239727,6 +248244,7 @@ self: { description = "Bindings to ZeroMQ 2.1.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) zeromq;}; "zeromq3-conduit" = callPackage @@ -239744,6 +248262,7 @@ self: { description = "Conduit bindings for zeromq3-haskell"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zeromq3-haskell" = callPackage @@ -239767,6 +248286,7 @@ self: { description = "Bindings to ZeroMQ 3.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) zeromq;}; "zeromq4-clone-pattern" = callPackage @@ -239794,6 +248314,7 @@ self: { description = "Haskell implementation of the ZeroMQ clone pattern"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zeromq4-conduit" = callPackage @@ -239813,6 +248334,7 @@ self: { description = "Conduit wrapper around zeromq4-haskell"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zeromq4-haskell" = callPackage @@ -239835,6 +248357,30 @@ self: { description = "Bindings to ZeroMQ 4.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) zeromq;}; + + "zeromq4-haskell_0_8_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, exceptions + , monad-control, QuickCheck, semigroups, tasty, tasty-hunit + , tasty-quickcheck, transformers, transformers-base, zeromq + }: + mkDerivation { + pname = "zeromq4-haskell"; + version = "0.8.0"; + sha256 = "0sznvz842ycbd73y8q09s6hs4i3yj1b5qm00n06f69p1i5jrkgnk"; + libraryHaskellDepends = [ + async base bytestring containers exceptions monad-control + semigroups transformers transformers-base + ]; + libraryPkgconfigDepends = [ zeromq ]; + testHaskellDepends = [ + async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Bindings to ZeroMQ 4.x"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) zeromq;}; "zeromq4-patterns" = callPackage @@ -239859,6 +248405,7 @@ self: { description = "Haskell implementation of several ZeroMQ patterns"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zeromq4-simple" = callPackage @@ -239875,6 +248422,7 @@ self: { description = "More constrained extensions to zeromq4-haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zeroth" = callPackage @@ -239899,6 +248447,7 @@ self: { description = "ZeroTH - remove unnecessary TH dependencies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zifter" = callPackage @@ -239923,6 +248472,7 @@ self: { description = "zifter"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zifter-cabal" = callPackage @@ -239939,6 +248489,7 @@ self: { description = "zifter-cabal"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zifter-git" = callPackage @@ -239951,6 +248502,7 @@ self: { description = "zifter-git"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zifter-google-java-format" = callPackage @@ -239967,6 +248519,7 @@ self: { description = "zifter-google-java-format"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zifter-hindent" = callPackage @@ -239983,6 +248536,7 @@ self: { description = "zifter-hindent"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zifter-hlint" = callPackage @@ -239998,6 +248552,7 @@ self: { description = "zifter-hlint"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zifter-stack" = callPackage @@ -240018,6 +248573,7 @@ self: { description = "zifter-stack"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zigbee-znet25" = callPackage @@ -240035,6 +248591,7 @@ self: { description = "XBee ZNet 2.5 (ZigBee) wireless modem communications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zim-parser" = callPackage @@ -240141,6 +248698,7 @@ self: { description = "Working with zip archives via conduits"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zip-stream" = callPackage @@ -240178,6 +248736,7 @@ self: { description = "Create simple list editor interfaces"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zipkin" = callPackage @@ -240194,6 +248753,7 @@ self: { description = "Zipkin-style request tracing monad"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zipper" = callPackage @@ -240258,6 +248818,7 @@ self: { description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ziptastic-core" = callPackage @@ -240278,6 +248839,7 @@ self: { description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zlib" = callPackage @@ -240339,6 +248901,7 @@ self: { description = "Enumerator interface for zlib compression"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zlib-lens" = callPackage @@ -240373,6 +248936,7 @@ self: { description = "Language independent, reproducible, absolute types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zmcat" = callPackage @@ -240388,6 +248952,7 @@ self: { description = "Command-line tool for ZeroMQ"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zmidi-core" = callPackage @@ -240417,6 +248982,7 @@ self: { description = "Representing MIDI a simple score"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zmqat" = callPackage @@ -240447,6 +249013,7 @@ self: { description = "ZoneInfo library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zoom" = callPackage @@ -240466,6 +249033,7 @@ self: { description = "A rake/thor-like task runner written in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zoom-cache" = callPackage @@ -240498,6 +249066,7 @@ self: { description = "A streamable, seekable, zoomable cache file format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zoom-cache-pcm" = callPackage @@ -240515,6 +249084,7 @@ self: { description = "Library for zoom-cache PCM audio codecs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zoom-cache-sndfile" = callPackage @@ -240535,6 +249105,7 @@ self: { description = "Tools for generating zoom-cache-pcm files"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zoom-refs" = callPackage @@ -240547,6 +249118,7 @@ self: { description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zot" = callPackage @@ -240592,6 +249164,7 @@ self: { description = "ZRE protocol implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zsh-battery" = callPackage @@ -240606,6 +249179,7 @@ self: { description = "Ascii bars representing battery status"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zstd" = callPackage @@ -240627,6 +249201,7 @@ self: { description = "Haskell bindings to the Zstandard compression algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zsyntax" = callPackage @@ -240642,6 +249217,7 @@ self: { description = "Automated theorem prover for the Zsyntax biochemical calculus"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ztail" = callPackage @@ -240684,6 +249260,7 @@ self: { description = "Creating and extracting arbitrary archives"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zuramaru" = callPackage @@ -240723,6 +249300,7 @@ self: { description = "A lisp processor, An inline-lisp, in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zxcvbn-c" = callPackage @@ -240735,6 +249313,7 @@ self: { description = "Password strength estimation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; } diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 9f18db1e6e95..41ce20373d62 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -181,6 +181,8 @@ rec { enableStaticLibraries = drv: overrideCabal drv (drv: { enableStaticLibraries = true; }); disableStaticLibraries = drv: overrideCabal drv (drv: { enableStaticLibraries = false; }); + enableSeparateBinOutput = drv: overrideCabal drv (drv: { enableSeparateBinOutput = true; }); + appendPatch = drv: x: appendPatches drv [x]; appendPatches = drv: xs: overrideCabal drv (drv: { patches = (drv.patches or []) ++ xs; }); diff --git a/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch b/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch new file mode 100644 index 000000000000..ebadd215cb76 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch @@ -0,0 +1,82 @@ +diff --git a/src/Servant/Client/Core/Internal/HasClient.hs b/src/Servant/Client/Core/Internal/HasClient.hs +index 712007006..6be92ec6d 100644 +--- a/src/Servant/Client/Core/Internal/HasClient.hs ++++ b/src/Servant/Client/Core/Internal/HasClient.hs +@@ -16,6 +16,8 @@ module Servant.Client.Core.Internal.HasClient where + import Prelude () + import Prelude.Compat + ++import Control.Concurrent.MVar ++ (modifyMVar, newMVar) + import qualified Data.ByteString as BS + import qualified Data.ByteString.Lazy as BL + import Data.Foldable +@@ -36,13 +38,14 @@ import qualified Network.HTTP.Types as H + import Servant.API + ((:<|>) ((:<|>)), (:>), AuthProtect, BasicAuth, BasicAuthData, + BuildHeadersTo (..), Capture', CaptureAll, Description, +- EmptyAPI, FramingUnrender (..), FromSourceIO (..), Header', +- Headers (..), HttpVersion, IsSecure, MimeRender (mimeRender), ++ EmptyAPI, FramingRender (..), FramingUnrender (..), ++ FromSourceIO (..), Header', Headers (..), HttpVersion, ++ IsSecure, MimeRender (mimeRender), + MimeUnrender (mimeUnrender), NoContent (NoContent), QueryFlag, + QueryParam', QueryParams, Raw, ReflectMethod (..), RemoteHost, + ReqBody', SBoolI, Stream, StreamBody', Summary, ToHttpApiData, +- Vault, Verb, WithNamedContext, contentType, getHeadersHList, +- getResponse, toQueryParam, toUrlPiece) ++ ToSourceIO (..), Vault, Verb, WithNamedContext, contentType, ++ getHeadersHList, getResponse, toQueryParam, toUrlPiece) + import Servant.API.ContentTypes + (contentTypes) + import Servant.API.Modifiers +@@ -538,7 +541,7 @@ instance (MimeRender ct a, HasClient m api) + hoistClientMonad pm (Proxy :: Proxy api) f (cl a) + + instance +- ( HasClient m api ++ ( HasClient m api, MimeRender ctype chunk, FramingRender framing, ToSourceIO chunk a + ) => HasClient m (StreamBody' mods framing ctype a :> api) + where + +@@ -547,7 +550,39 @@ instance + hoistClientMonad pm _ f cl = \a -> + hoistClientMonad pm (Proxy :: Proxy api) f (cl a) + +- clientWithRoute _pm Proxy _req _body = error "HasClient @StreamBody" ++ clientWithRoute pm Proxy req body ++ = clientWithRoute pm (Proxy :: Proxy api) ++ $ setRequestBody (RequestBodyStreamChunked givesPopper) (contentType ctypeP) req ++ where ++ ctypeP = Proxy :: Proxy ctype ++ framingP = Proxy :: Proxy framing ++ ++ sourceIO = framingRender ++ framingP ++ (mimeRender ctypeP :: chunk -> BL.ByteString) ++ (toSourceIO body) ++ ++ -- not pretty. ++ givesPopper :: (IO BS.ByteString -> IO ()) -> IO () ++ givesPopper needsPopper = S.unSourceT sourceIO $ \step0 -> do ++ ref <- newMVar step0 ++ ++ -- Note sure we need locking, but it's feels safer. ++ let popper :: IO BS.ByteString ++ popper = modifyMVar ref nextBs ++ ++ needsPopper popper ++ ++ nextBs S.Stop = return (S.Stop, BS.empty) ++ nextBs (S.Error err) = fail err ++ nextBs (S.Skip s) = nextBs s ++ nextBs (S.Effect ms) = ms >>= nextBs ++ nextBs (S.Yield lbs s) = case BL.toChunks lbs of ++ [] -> nextBs s ++ (x:xs) | BS.null x -> nextBs step' ++ | otherwise -> return (step', x) ++ where ++ step' = S.Yield (BL.fromChunks xs) s + + + diff --git a/pkgs/development/haskell-modules/patches/xattr-fix-build.patch b/pkgs/development/haskell-modules/patches/xattr-fix-build.patch new file mode 100644 index 000000000000..4b4f370b17f2 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/xattr-fix-build.patch @@ -0,0 +1,16 @@ +diff --git a/System/Xattr.hsc b/System/Xattr.hsc +index adaf9cb..9b49996 100644 +--- a/System/Xattr.hsc ++++ b/System/Xattr.hsc +@@ -45,11 +45,7 @@ module System.Xattr + where + + #include +-#ifdef __APPLE__ + #include +-#else +-#include +-#endif + + import Data.Functor ((<$>)) + import Foreign.C diff --git a/pkgs/development/haskell-modules/stack-hook.sh b/pkgs/development/haskell-modules/stack-hook.sh index d942662294c2..44c184a5624a 100644 --- a/pkgs/development/haskell-modules/stack-hook.sh +++ b/pkgs/development/haskell-modules/stack-hook.sh @@ -1,11 +1,11 @@ addStackArgs () { - if [ -d "$1/lib" ] && [[ "$STACK_IN_NIX_EXTRA_ARGS" != *"--extra-lib-dirs=$1/lib"* ]]; then + if [ -n "$(echo $1/lib/lib*)" ]; then STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$1/lib" fi - if [ -d "$1/include" ] && [[ "$STACK_IN_NIX_EXTRA_ARGS" != *"--extra-include-dirs=$1/include"* ]]; then + if [ -d "$1/include" ]; then STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$1/include" fi } -addEnvHooks "$hostOffset" addStackArgs +addEnvHooks "$targetOffset" addStackArgs diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix index f395bcd95d7c..4e1d2f9c82eb 100644 --- a/pkgs/development/idris-modules/idris-wrapper.nix +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -1,4 +1,4 @@ -{ lib, symlinkJoin, makeWrapper, idris-no-deps, gcc, gmp }: +{ stdenv, lib, symlinkJoin, makeWrapper, idris-no-deps, gmp }: symlinkJoin { inherit (idris-no-deps) name src meta; @@ -6,7 +6,9 @@ symlinkJoin { buildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/idris \ - --run 'export IDRIS_CC=''${IDRIS_CC:-${lib.getBin gcc}/bin/gcc}' \ - --suffix LIBRARY_PATH : ${lib.makeLibraryPath [ gmp ]} + --run 'export IDRIS_CC=''${IDRIS_CC:-${stdenv.cc}/bin/cc}' \ + --set NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST 1 \ + --prefix NIX_CFLAGS_COMPILE " " "-I${lib.getDev gmp}/include" \ + --prefix NIX_CFLAGS_LINK " " "-L${lib.getLib gmp}/lib" ''; } diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 0bed5efe4f79..b1175c2fa459 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -3,8 +3,6 @@ , lua , stdenv , wrapLua -, unzip -, writeText # Whether the derivation provides a lua module or not. , toLuaModule }: @@ -117,14 +115,16 @@ builtins.removeAttrs attrs ["disabled" "checkInputs"] // { cat > ${luarocks_config} <&2 + fi + ${postShellHook} + ''; + +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index b664cf0b14f4..98322312f7f3 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -17,6 +17,7 @@ let setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python; }; + pyproject-specific = import ./build-python-package-pyproject.nix { inherit lib python; }; flit-specific = import ./build-python-package-flit.nix { inherit python flit; }; wheel-specific = import ./build-python-package-wheel.nix { }; common = import ./build-python-package-common.nix { inherit python; }; @@ -37,7 +38,8 @@ format ? "setuptools" let formatspecific = - if format == "setuptools" then common (setuptools-specific attrs) + if format == "pyproject" then common (pyproject-specific attrs) + else if format == "setuptools" then common (setuptools-specific attrs) else if format == "flit" then common (flit-specific attrs) else if format == "wheel" then common (wheel-specific attrs) else if format == "other" then {} diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix index ccb366903c5c..9e38e8250748 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ lnl7 chaoflow domenkozar ]; + maintainers = with stdenv.lib.maintainers; [ lnl7 domenkozar ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 249c4ac9cf79..505929df8ef0 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -79,20 +79,6 @@ let sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57"; }) - # "`type_getattro()` calls `tp_descr_get(self, obj, type)` without actually owning a reference to "self". - # In very rare cases, this can cause a segmentation fault if "self" is deleted by the descriptor." - # https://github.com/python/cpython/pull/6118 - (fetchpatch { - name = "type_getattro.patch"; - url = "file://${./type_getattro.patch}"; - sha256 = "11v9yx20hs3jmw0wggzvmw39qs4mxay4kb8iq2qjydwy9ya61nrd"; - }) - - (fetchpatch { - name = "CVE-2018-1000802.patch"; - url = "https://github.com/python/cpython/pull/8985.patch"; - sha256 = "1c8nq2c9sjqa8ipl62hiandg6a7lzrwwfhi3ky6jd3pxgyalrh97"; - }) ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ diff --git a/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch b/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch deleted file mode 100644 index c69c86b642b4..000000000000 --- a/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/Objects/typeobject.c -+++ b/Objects/typeobject.c -@@ -3137,6 +3137,7 @@ - PyTypeObject *metatype = Py_TYPE(type); - PyObject *meta_attribute, *attribute; - descrgetfunc meta_get; -+ PyObject* res; - - if (!PyUnicode_Check(name)) { - PyErr_Format(PyExc_TypeError, -@@ -3158,6 +3159,7 @@ - meta_attribute = _PyType_Lookup(metatype, name); - - if (meta_attribute != NULL) { -+ Py_INCREF(meta_attribute); - meta_get = Py_TYPE(meta_attribute)->tp_descr_get; - - if (meta_get != NULL && PyDescr_IsData(meta_attribute)) { -@@ -3165,10 +3167,11 @@ - * writes. Assume the attribute is not overridden in - * type's tp_dict (and bases): call the descriptor now. - */ -- return meta_get(meta_attribute, (PyObject *)type, -- (PyObject *)metatype); -+ res = meta_get(meta_attribute, (PyObject *)type, -+ (PyObject *)metatype); -+ Py_DECREF(meta_attribute); -+ return res; - } -- Py_INCREF(meta_attribute); - } - - /* No data descriptor found on metatype. Look in tp_dict of this -@@ -3176,6 +3179,7 @@ - attribute = _PyType_Lookup(type, name); - if (attribute != NULL) { - /* Implement descriptor functionality, if any */ -+ Py_INCREF(attribute); - descrgetfunc local_get = Py_TYPE(attribute)->tp_descr_get; - - Py_XDECREF(meta_attribute); -@@ -3183,11 +3187,12 @@ - if (local_get != NULL) { - /* NULL 2nd argument indicates the descriptor was - * found on the target object itself (or a base) */ -- return local_get(attribute, (PyObject *)NULL, -- (PyObject *)type); -+ res = local_get(attribute, (PyObject *)NULL, -+ (PyObject *)type); -+ Py_DECREF(attribute); -+ return res; - } - -- Py_INCREF(attribute); - return attribute; - } - ---- /dev/null -+++ b/Misc/NEWS.d/next/Core and Builtins/2018-03-14-21-42-17.bpo-25750.lxgkQz.rst -@@ -0,0 +1,2 @@ -+Fix rare Python crash due to bad refcounting in ``type_getattro()`` if a -+descriptor deletes itself from the class. diff --git a/pkgs/development/interpreters/python/cpython/3.5/force_bytecode_determinism.patch b/pkgs/development/interpreters/python/cpython/3.5/force_bytecode_determinism.patch new file mode 100644 index 000000000000..c263cdbff4db --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.5/force_bytecode_determinism.patch @@ -0,0 +1,17 @@ +--- a/Lib/py_compile.py ++++ b/Lib/py_compile.py +@@ -139,3 +139,4 @@ + source_stats = loader.path_stats(file) ++ source_mtime = 1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'] + bytecode = importlib._bootstrap_external._code_to_bytecode( +- code, source_stats['mtime'], source_stats['size']) ++ code, source_mtime, source_stats['size']) +--- a/Lib/importlib/_bootstrap_external.py ++++ b/Lib/importlib/_bootstrap_external.py +@@ -485,5 +485,5 @@ + if source_stats is not None: + try: +- source_mtime = int(source_stats['mtime']) ++ source_mtime = 1 + except KeyError: + pass diff --git a/pkgs/development/interpreters/python/cpython/3.5/python-3.x-distutils-C++.patch b/pkgs/development/interpreters/python/cpython/3.5/python-3.x-distutils-C++.patch new file mode 100644 index 000000000000..01356020b394 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.5/python-3.x-distutils-C++.patch @@ -0,0 +1,237 @@ +Source: https://bugs.python.org/file47046/python-3.x-distutils-C++.patch +--- a/Lib/distutils/cygwinccompiler.py ++++ b/Lib/distutils/cygwinccompiler.py +@@ -125,8 +125,10 @@ + # dllwrap 2.10.90 is buggy + if self.ld_version >= "2.10.90": + self.linker_dll = "gcc" ++ self.linker_dll_cxx = "g++" + else: + self.linker_dll = "dllwrap" ++ self.linker_dll_cxx = "dllwrap" + + # ld_version >= "2.13" support -shared so use it instead of + # -mdll -static +@@ -140,9 +142,13 @@ + self.set_executables(compiler='gcc -mcygwin -O -Wall', + compiler_so='gcc -mcygwin -mdll -O -Wall', + compiler_cxx='g++ -mcygwin -O -Wall', ++ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', + linker_exe='gcc -mcygwin', + linker_so=('%s -mcygwin %s' % +- (self.linker_dll, shared_option))) ++ (self.linker_dll, shared_option)), ++ linker_exe_cxx='g++ -mcygwin', ++ linker_so_cxx=('%s -mcygwin %s' % ++ (self.linker_dll_cxx, shared_option))) + + # cygwin and mingw32 need different sets of libraries + if self.gcc_version == "2.91.57": +@@ -166,8 +172,12 @@ + raise CompileError(msg) + else: # for other files use the C-compiler + try: +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + +@@ -302,9 +312,14 @@ + self.set_executables(compiler='gcc -O -Wall', + compiler_so='gcc -mdll -O -Wall', + compiler_cxx='g++ -O -Wall', ++ compiler_so_cxx='g++ -mdll -O -Wall', + linker_exe='gcc', + linker_so='%s %s %s' + % (self.linker_dll, shared_option, ++ entry_point), ++ linker_exe_cxx='g++', ++ linker_so_cxx='%s %s %s' ++ % (self.linker_dll_cxx, shared_option, + entry_point)) + # Maybe we should also append -mthreads, but then the finished + # dlls need another dll (mingwm10.dll see Mingw32 docs) +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -184,9 +184,11 @@ + _osx_support.customize_compiler(_config_vars) + _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' + +- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ +- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', +- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') ++ (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ ++ get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', ++ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') ++ ++ cxxflags = cflags + + if 'CC' in os.environ: + newcc = os.environ['CC'] +@@ -201,19 +204,27 @@ + cxx = os.environ['CXX'] + if 'LDSHARED' in os.environ: + ldshared = os.environ['LDSHARED'] ++ if 'LDCXXSHARED' in os.environ: ++ ldcxxshared = os.environ['LDCXXSHARED'] + if 'CPP' in os.environ: + cpp = os.environ['CPP'] + else: + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] + if 'CFLAGS' in os.environ: +- cflags = opt + ' ' + os.environ['CFLAGS'] ++ cflags = os.environ['CFLAGS'] + ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ if 'CXXFLAGS' in os.environ: ++ cxxflags = os.environ['CXXFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] + cflags = cflags + ' ' + os.environ['CPPFLAGS'] ++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] + ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] + if 'AR' in os.environ: + ar = os.environ['AR'] + if 'ARFLAGS' in os.environ: +@@ -222,13 +233,17 @@ + archiver = ar + ' ' + ar_flags + + cc_cmd = cc + ' ' + cflags ++ cxx_cmd = cxx + ' ' + cxxflags + compiler.set_executables( + preprocessor=cpp, + compiler=cc_cmd, + compiler_so=cc_cmd + ' ' + ccshared, +- compiler_cxx=cxx, ++ compiler_cxx=cxx_cmd, ++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, + linker_so=ldshared, + linker_exe=cc, ++ linker_so_cxx=ldcxxshared, ++ linker_exe_cxx=cxx, + archiver=archiver) + + compiler.shared_lib_extension = shlib_suffix +--- a/Lib/distutils/unixccompiler.py ++++ b/Lib/distutils/unixccompiler.py +@@ -52,14 +52,17 @@ + # are pretty generic; they will probably have to be set by an outsider + # (eg. using information discovered by the sysconfig about building + # Python extensions). +- executables = {'preprocessor' : None, +- 'compiler' : ["cc"], +- 'compiler_so' : ["cc"], +- 'compiler_cxx' : ["cc"], +- 'linker_so' : ["cc", "-shared"], +- 'linker_exe' : ["cc"], +- 'archiver' : ["ar", "-cr"], +- 'ranlib' : None, ++ executables = {'preprocessor' : None, ++ 'compiler' : ["cc"], ++ 'compiler_so' : ["cc"], ++ 'compiler_cxx' : ["c++"], ++ 'compiler_so_cxx' : ["c++"], ++ 'linker_so' : ["cc", "-shared"], ++ 'linker_exe' : ["cc"], ++ 'linker_so_cxx' : ["c++", "-shared"], ++ 'linker_exe_cxx' : ["c++"], ++ 'archiver' : ["ar", "-cr"], ++ 'ranlib' : None, + } + + if sys.platform[:6] == "darwin": +@@ -108,12 +111,19 @@ + + def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): + compiler_so = self.compiler_so ++ compiler_so_cxx = self.compiler_so_cxx + if sys.platform == 'darwin': + compiler_so = _osx_support.compiler_fixup(compiler_so, + cc_args + extra_postargs) ++ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, ++ cc_args + extra_postargs) + try: +- self.spawn(compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + +@@ -171,22 +181,16 @@ + ld_args.extend(extra_postargs) + self.mkpath(os.path.dirname(output_filename)) + try: +- if target_desc == CCompiler.EXECUTABLE: +- linker = self.linker_exe[:] ++ if target_lang == "c++": ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe_cxx[:] ++ else: ++ linker = self.linker_so_cxx[:] + else: +- linker = self.linker_so[:] +- if target_lang == "c++" and self.compiler_cxx: +- # skip over environment variable settings if /usr/bin/env +- # is used to set up the linker's environment. +- # This is needed on OSX. Note: this assumes that the +- # normal and C++ compiler have the same environment +- # settings. +- i = 0 +- if os.path.basename(linker[0]) == "env": +- i = 1 +- while '=' in linker[i]: +- i += 1 +- linker[i] = self.compiler_cxx[i] ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe[:] ++ else: ++ linker = self.linker_so[:] + + if sys.platform == 'darwin': + linker = _osx_support.compiler_fixup(linker, ld_args) +--- a/Lib/_osx_support.py ++++ b/Lib/_osx_support.py +@@ -14,13 +14,13 @@ + # configuration variables that may contain universal build flags, + # like "-arch" or "-isdkroot", that may need customization for + # the user environment +-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', +- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', +- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', +- 'PY_CORE_CFLAGS') ++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', ++ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', ++ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', ++ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') + + # configuration variables that may contain compiler calls +-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') ++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') + + # prefix added to original configuration variable names + _INITPRE = '_OSX_SUPPORT_INITIAL_' +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -538,7 +538,7 @@ + *\ -s*|s*) quiet="-q";; \ + *) quiet="";; \ + esac; \ +- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ ++ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \ + _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build diff --git a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch b/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch new file mode 100644 index 000000000000..243313f76548 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch @@ -0,0 +1,248 @@ +--- a/Lib/_osx_support.py ++++ b/Lib/_osx_support.py +@@ -14,13 +14,13 @@ __all__ = [ + # configuration variables that may contain universal build flags, + # like "-arch" or "-isdkroot", that may need customization for + # the user environment +-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', +- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', +- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', +- 'PY_CORE_CFLAGS', 'PY_CORE_LDFLAGS') ++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', ++ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', ++ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', ++ 'PY_CPPFLAGS', 'PY_CORE_LDFLAGS', 'PY_CORE_CFLAGS') + + # configuration variables that may contain compiler calls +-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') ++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') + + # prefix added to original configuration variable names + _INITPRE = '_OSX_SUPPORT_INITIAL_' +--- a/Lib/distutils/cygwinccompiler.py ++++ b/Lib/distutils/cygwinccompiler.py +@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler): + # dllwrap 2.10.90 is buggy + if self.ld_version >= "2.10.90": + self.linker_dll = "gcc" ++ self.linker_dll_cxx = "g++" + else: + self.linker_dll = "dllwrap" ++ self.linker_dll_cxx = "dllwrap" + + # ld_version >= "2.13" support -shared so use it instead of + # -mdll -static +@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler): + self.set_executables(compiler='gcc -mcygwin -O -Wall', + compiler_so='gcc -mcygwin -mdll -O -Wall', + compiler_cxx='g++ -mcygwin -O -Wall', ++ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', + linker_exe='gcc -mcygwin', + linker_so=('%s -mcygwin %s' % +- (self.linker_dll, shared_option))) ++ (self.linker_dll, shared_option)), ++ linker_exe_cxx='g++ -mcygwin', ++ linker_so_cxx=('%s -mcygwin %s' % ++ (self.linker_dll_cxx, shared_option))) + + # cygwin and mingw32 need different sets of libraries + if self.gcc_version == "2.91.57": +@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler): + raise CompileError(msg) + else: # for other files use the C-compiler + try: +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + +@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler): + self.set_executables(compiler='gcc -O -Wall', + compiler_so='gcc -mdll -O -Wall', + compiler_cxx='g++ -O -Wall', ++ compiler_so_cxx='g++ -mdll -O -Wall', + linker_exe='gcc', + linker_so='%s %s %s' + % (self.linker_dll, shared_option, ++ entry_point), ++ linker_exe_cxx='g++', ++ linker_so_cxx='%s %s %s' ++ % (self.linker_dll_cxx, shared_option, + entry_point)) + # Maybe we should also append -mthreads, but then the finished + # dlls need another dll (mingwm10.dll see Mingw32 docs) +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -170,9 +170,11 @@ def customize_compiler(compiler): + _osx_support.customize_compiler(_config_vars) + _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' + +- (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ +- get_config_vars('CC', 'CXX', 'CFLAGS', +- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') ++ (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ ++ get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', ++ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') ++ ++ cxxflags = cflags + + if 'CC' in os.environ: + newcc = os.environ['CC'] +@@ -187,19 +189,27 @@ def customize_compiler(compiler): + cxx = os.environ['CXX'] + if 'LDSHARED' in os.environ: + ldshared = os.environ['LDSHARED'] ++ if 'LDCXXSHARED' in os.environ: ++ ldcxxshared = os.environ['LDCXXSHARED'] + if 'CPP' in os.environ: + cpp = os.environ['CPP'] + else: + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] + if 'CFLAGS' in os.environ: +- cflags = cflags + ' ' + os.environ['CFLAGS'] ++ cflags = os.environ['CFLAGS'] + ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ if 'CXXFLAGS' in os.environ: ++ cxxflags = os.environ['CXXFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] + cflags = cflags + ' ' + os.environ['CPPFLAGS'] ++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] + ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] + if 'AR' in os.environ: + ar = os.environ['AR'] + if 'ARFLAGS' in os.environ: +@@ -208,13 +218,17 @@ def customize_compiler(compiler): + archiver = ar + ' ' + ar_flags + + cc_cmd = cc + ' ' + cflags ++ cxx_cmd = cxx + ' ' + cxxflags + compiler.set_executables( + preprocessor=cpp, + compiler=cc_cmd, + compiler_so=cc_cmd + ' ' + ccshared, +- compiler_cxx=cxx, ++ compiler_cxx=cxx_cmd, ++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, + linker_so=ldshared, + linker_exe=cc, ++ linker_so_cxx=ldcxxshared, ++ linker_exe_cxx=cxx, + archiver=archiver) + + compiler.shared_lib_extension = shlib_suffix +--- a/Lib/distutils/unixccompiler.py ++++ b/Lib/distutils/unixccompiler.py +@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler): + # are pretty generic; they will probably have to be set by an outsider + # (eg. using information discovered by the sysconfig about building + # Python extensions). +- executables = {'preprocessor' : None, +- 'compiler' : ["cc"], +- 'compiler_so' : ["cc"], +- 'compiler_cxx' : ["cc"], +- 'linker_so' : ["cc", "-shared"], +- 'linker_exe' : ["cc"], +- 'archiver' : ["ar", "-cr"], +- 'ranlib' : None, ++ executables = {'preprocessor' : None, ++ 'compiler' : ["cc"], ++ 'compiler_so' : ["cc"], ++ 'compiler_cxx' : ["c++"], ++ 'compiler_so_cxx' : ["c++"], ++ 'linker_so' : ["cc", "-shared"], ++ 'linker_exe' : ["cc"], ++ 'linker_so_cxx' : ["c++", "-shared"], ++ 'linker_exe_cxx' : ["c++"], ++ 'archiver' : ["ar", "-cr"], ++ 'ranlib' : None, + } + + if sys.platform[:6] == "darwin": +@@ -110,12 +113,19 @@ class UnixCCompiler(CCompiler): + + def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): + compiler_so = self.compiler_so ++ compiler_so_cxx = self.compiler_so_cxx + if sys.platform == 'darwin': + compiler_so = _osx_support.compiler_fixup(compiler_so, + cc_args + extra_postargs) ++ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, ++ cc_args + extra_postargs) + try: +- self.spawn(compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + +@@ -173,30 +183,16 @@ class UnixCCompiler(CCompiler): + ld_args.extend(extra_postargs) + self.mkpath(os.path.dirname(output_filename)) + try: +- if target_desc == CCompiler.EXECUTABLE: +- linker = self.linker_exe[:] ++ if target_lang == "c++": ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe_cxx[:] ++ else: ++ linker = self.linker_so_cxx[:] + else: +- linker = self.linker_so[:] +- if target_lang == "c++" and self.compiler_cxx: +- # skip over environment variable settings if /usr/bin/env +- # is used to set up the linker's environment. +- # This is needed on OSX. Note: this assumes that the +- # normal and C++ compiler have the same environment +- # settings. +- i = 0 +- if os.path.basename(linker[0]) == "env": +- i = 1 +- while '=' in linker[i]: +- i += 1 +- +- if os.path.basename(linker[i]) == 'ld_so_aix': +- # AIX platforms prefix the compiler with the ld_so_aix +- # script, so we need to adjust our linker index +- offset = 1 ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe[:] + else: +- offset = 0 +- +- linker[i+offset] = self.compiler_cxx[i] ++ linker = self.linker_so[:] + + if sys.platform == 'darwin': + linker = _osx_support.compiler_fixup(linker, ld_args) +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -584,10 +584,10 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o + *\ -s*|s*) quiet="-q";; \ + *) quiet="";; \ + esac; \ +- echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ ++ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \ + _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ +- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ ++ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \ + _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build + diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index ed6c8c9893b4..49a1c399ff5e 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -87,6 +87,9 @@ in with passthru; stdenv.mkDerivation { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). (./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch") + ] ++ optionals (isPy35 || isPy36) [ + # Determinism: Write null timestamps when compiling python files. + ./3.5/force_bytecode_determinism.patch ] ++ optionals isPy35 [ # Backports support for LD_LIBRARY_PATH from 3.6 ./3.5/ld_library_path.patch @@ -101,10 +104,19 @@ in with passthru; stdenv.mkDerivation { # Upstream distutils is calling C compiler to compile C++ code, which # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. - (fetchpatch { - url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch"; - sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2"; - }) + ( + if isPy35 then + ./3.5/python-3.x-distutils-C++.patch + else if isPy37 then + ./3.7/python-3.x-distutils-C++.patch + else + if isPy37 + then null # TODO: apply the patch + else fetchpatch { + url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch"; + sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2"; + } + ) ]; postPatch = '' @@ -161,8 +173,8 @@ in with passthru; stdenv.mkDerivation { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" export MACOSX_DEPLOYMENT_TARGET=10.6 '' + optionalString (isPy3k && pythonOlder "3.7") '' - # Determinism: The interpreter is patched to write null timestamps when compiling python files. - # This way python does not try to update them when we freeze timestamps in nix store. + # Determinism: The interpreter is patched to write null timestamps when compiling Python files + # so Python doesn't try to update the bytecode when seeing frozen timestamps in Nix's store. export DETERMINISTIC_BUILD=1; '' + optionalString stdenv.hostPlatform.isMusl '' export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000" diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index 3885b43960f5..7727b984d969 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/python27/html ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index d8dde17ac66a..0c9673b7d7a9 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/python27/pdf-a4 ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index 32581cd229a9..9b0018e7cd78 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/python27/pdf-letter ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index 590192383016..b7bcfb51d29a 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/python27/text ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/docs/template.nix b/pkgs/development/interpreters/python/cpython/docs/template.nix index cc92f71bc1ea..4a0c84fb272e 100644 --- a/pkgs/development/interpreters/python/cpython/docs/template.nix +++ b/pkgs/development/interpreters/python/cpython/docs/template.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/pythonMAJORMINOR/TYPE ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index f1461d784be0..58b192306572 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -50,10 +50,10 @@ in { sourceVersion = { major = "2"; minor = "7"; - patch = "15"; + patch = "16"; suffix = ""; }; - sha256 = "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92"; + sha256 = "1mqfcqp5y8r0bfyr7ppl74n0lig45p9mc4b8adlcpvj74rhfy8pj"; inherit (darwin) CF configd; inherit passthruFun; }; @@ -63,10 +63,10 @@ in { sourceVersion = { major = "3"; minor = "5"; - patch = "6"; + patch = "7"; suffix = ""; }; - sha256 = "0pqmf51zy2lzhbaj4yya2py2qr653j9152d0rg3p7wi1yl2dwp7m"; + sha256 = "1p67pnp2ca5przx2s45r8m55dcn6f5hsm0l4s1zp7mglkf4r4n18"; inherit (darwin) CF configd; inherit passthruFun; }; @@ -76,10 +76,10 @@ in { sourceVersion = { major = "3"; minor = "6"; - patch = "8"; + patch = "9"; suffix = ""; }; - sha256 = "14qi6n5gpcjnwy165wi9hkfcmbadc95ny6bxxldknxwmx50n4i1m"; + sha256 = "1nkh70azbv866aw5a9bbxsxarsf40233vrzpjq17z3rz9ramybsy"; inherit (darwin) CF configd; inherit passthruFun; }; @@ -89,10 +89,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "2"; + patch = "4"; suffix = ""; }; - sha256 = "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq"; + sha256 = "0gxiv5617zd7dnqm5k9r4q2188lk327nf9jznwq9j6b8p0s92ygv"; inherit (darwin) CF configd; inherit passthruFun; }; @@ -153,4 +153,4 @@ in { ncurses = ncurses5; }; -}) \ No newline at end of file +}) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 4951ae4499f8..d986490310bc 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -33,6 +33,9 @@ # DEPRECATED: use propagatedBuildInputs , pythonPath ? [] +# Enabled to detect some (native)BuildInputs mistakes +, strictDeps ? true + # used to disable derivation, useful for specific python versions , disabled ? false @@ -87,6 +90,10 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr # Propagate python and setuptools. We should stop propagating setuptools. propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; + inherit strictDeps; + + LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; + # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; doInstallCheck = doCheck; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 2d4008d69b98..9d65997ffe5a 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,9 +1,12 @@ { stdenv, fetchurl, makeFontsConf, makeWrapper +, cacert , cairo, coreutils, fontconfig, freefont_ttf , glib, gmp , gtk3 , libedit, libffi , libiconv +, libGL +, libGLU , libjpeg , libpng, libtool, mpfr, openssl, pango, poppler , readline, sqlite @@ -27,6 +30,8 @@ let gtk3 gsettings-desktop-schemas libedit + libGL + libGLU libjpeg libpng mpfr @@ -60,7 +65,7 @@ stdenv.mkDerivation rec { (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ cacert wrapGAppsHook ]; buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 947f05809034..1b40c71e2ea5 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -7,7 +7,7 @@ with pythonPackages; stdenv.mkDerivation rec { name = "renpy-${version}"; - version = "7.1.3"; + version = "7.2.0"; meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; - sha256 = "0z6s1vzjb5jh0i79pv5kgynfrzqj1a1f3afrpmp2aaqbrljkidbn"; + sha256 = "1pnzxmh37zzldvlyklk2wgc8xbh3hm3wwmbl70zdphybjrxvc7i5"; }; patches = [ diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 2a2392011d13..e7aedfc07505 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -215,18 +215,18 @@ in { }; ruby_2_5 = generic { - version = rubyVersion "2" "5" "3" ""; + version = rubyVersion "2" "5" "5" ""; sha256 = { - src = "0v4442aqqlzxwc792kbkfs2k61qg97r680is6gx20z63a8wd0a4q"; - git = "0r9mgvqk6gj8pc9q6qmy7j2kbln7drc8wy67sb2ij8ciclcw9nn2"; + src = "0k2in88jymqh727s88yjsv7wrqs2hdj9h2w9zh2bmrj0ygylba98"; + git = "0l7b7xv48gvvlqs27gghfi645qvc1nwiz8ym4j8w100rzzzfy6zz"; }; }; ruby_2_6 = generic { - version = rubyVersion "2" "6" "1" ""; + version = rubyVersion "2" "6" "2" ""; sha256 = { - src = "1f0w37jz2ryvlx260rw3s3wl0wg7dkzphb54lpvrqg90pfvly0hp"; - git = "07gp7df1izw9rdbp9ciw4q5kq8icx3zd5w1xrhwsw0dfbsmmnsrj"; + src = "1as97d2j0d21g8mldp8fmdjah96jakrxyw1v0crg7ln2y8mmsh50"; + git = "0f4mnrd7733353kx1jjha770kvm0wlc59z7id9h23kmjdg6k76nl"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index fae76c706121..9f2a8b1b9fe5 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -11,11 +11,14 @@ rec { "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.5.3" = ops useRailsExpress [ + "2.5.5" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "2.6.1" = ops useRailsExpress [ # no Rails Express patchset yet (2019-01-30) + "2.6.2" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" + "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch" ]; } diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 1598cbc56e1d..95b38fc8ebd5 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "ba5a3c6f972e1b957b4b3fe28b5730ef0e27bff3"; - sha256 = "0sjmhhb8hshxa58x062j44w0xdck8ykgpsg33wjr0wv9npwpkwrz"; + rev = "e6e12c2c32ff184e0409d8f9f2a870f2dfbd06a3"; + sha256 = "0n71h2ip1k18icb3bcr1jz4161lh6vr6i3f7b45jswg77c4rrxcy"; } diff --git a/pkgs/development/interpreters/wasmtime/cargo-lock.patch b/pkgs/development/interpreters/wasmtime/cargo-lock.patch new file mode 100644 index 000000000000..be5bd0ab3d3e --- /dev/null +++ b/pkgs/development/interpreters/wasmtime/cargo-lock.patch @@ -0,0 +1,1481 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..f702de1 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,1475 @@ ++[[package]] ++name = "aho-corasick" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "arrayvec" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bindgen" ++version = "0.49.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clang-sys 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "capstone" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "capstone-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "capstone-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cast" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cc" ++version = "1.0.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cexpr" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "chrono" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "clang-sys" ++version = "0.28.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cmake" ++version = "0.1.38" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-bforest" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-codegen" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-bforest 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen-meta 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-codegen-meta" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-entity" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cranelift-frontend" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-native" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cranelift-wasm" ++version = "0.30.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-frontend 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "docopt" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dynasm" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dynasmrt" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "either" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "env_logger" ++version = "0.5.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "env_logger" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "errno" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "errno-dragonfly" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "faerie" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "goblin 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "string-interner 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt-derive 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fallible-iterator" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "file-per-thread-logger" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "gcc" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "gimli" ++version = "0.17.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fallible-iterator 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "glob" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "goblin" ++version = "0.0.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hashmap_core" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "heck" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "humantime" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "indexmap" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "itertools" ++version = "0.7.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazy_static" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.51" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libloading" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lightbeam" ++version = "0.0.0" ++dependencies = [ ++ "capstone 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dynasm 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dynasmrt 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quickcheck 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mach" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "matrixmultiply" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rawpointer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memmap" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memoffset" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memoffset" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "multi_mut" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ndarray" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matrixmultiply 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-complex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "nodrop" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "nom" ++version = "4.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-complex" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.39" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "num_cpus" ++version = "1.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "owning_ref" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "peeking_take_while" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "plain" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "pretty_env_logger" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "0.4.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "quickcheck" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "0.6.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "raw-cpuid" ++version = "6.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rawpointer" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rayon" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rayon-core" ++version = "1.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.54" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "redox_termios" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "1.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "region" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ryu" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scopeguard" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scroll" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "scroll_derive" ++version = "0.9.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.90" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.90" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.39" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "shlex" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "smallvec" ++version = "0.6.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "stable_deref_trait" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "string-interner" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "strsim" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ndarray 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "structopt" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt-derive 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "0.15.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "take_mut" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "target-lexicon" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termion" ++version = "1.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "traitobject" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "typemap" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ucd-util" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unsafe-any" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "version_check" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wabt" ++version = "0.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wabt-sys 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wabt-sys" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasmparser" ++version = "0.29.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasmtime-debug" ++version = "0.1.0" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gimli 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-environ" ++version = "0.1.0" ++dependencies = [ ++ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lightbeam 0.0.0", ++ "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasmtime-jit" ++version = "0.1.0" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-frontend 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "region 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-debug 0.1.0", ++ "wasmtime-environ 0.1.0", ++ "wasmtime-runtime 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-obj" ++version = "0.1.0" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-runtime" ++version = "0.1.0" ++dependencies = [ ++ "bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "region 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.1.0", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasmtime-tools" ++version = "0.1.0" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-native 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-debug 0.1.0", ++ "wasmtime-environ 0.1.0", ++ "wasmtime-jit 0.1.0", ++ "wasmtime-obj 0.1.0", ++ "wasmtime-runtime 0.1.0", ++ "wasmtime-wasi 0.0.0", ++ "wasmtime-wast 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-wasi" ++version = "0.0.0" ++dependencies = [ ++ "bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.1.0", ++ "wasmtime-jit 0.1.0", ++ "wasmtime-runtime 0.1.0", ++] ++ ++[[package]] ++name = "wasmtime-wast" ++version = "0.1.0" ++dependencies = [ ++ "cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-native 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.1.0", ++ "wasmtime-jit 0.1.0", ++ "wasmtime-runtime 0.1.0", ++] ++ ++[[package]] ++name = "which" ++version = "2.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wincolor" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[metadata] ++"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c" ++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" ++"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" ++"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" ++"checksum backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f106c02a3604afcdc0df5d36cc47b44b55917dbaf3d808f71c163a0ddba64637" ++"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" ++"checksum bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "33e1b67a27bca31fd12a683b2a3618e275311117f48cfcc892e18403ff889026" ++"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" ++"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" ++"checksum capstone 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00be9d203fa0e078b93b24603633fb081851dfe0c1086364431f52587a47157e" ++"checksum capstone-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc8d32bc5c1e6d0fcde10af411c98b07d93498d51654f678757f08fa2acd6a6" ++"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" ++"checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83" ++"checksum cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af" ++"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4" ++"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" ++"checksum clang-sys 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4227269cec09f5f83ff160be12a1e9b0262dd1aa305302d5ba296c2ebd291055" ++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "96210eec534fc3fbfc0452a63769424eaa80205fda6cea98e5b61cb3d97bcec8" ++"checksum cranelift-bforest 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5a357d20666bf4a8c2d626a19f1b59dbca66cd844fb1e66c5612254fd0f7505" ++"checksum cranelift-codegen 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab00cb149a5bb0f7e6dd391357356a5d71c335a431e8eece94f32da2d5a043f7" ++"checksum cranelift-codegen-meta 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3797a2f450ac71297e083dd440d0cdd0d3bceabe4a3ca6bcb9e4077e9c0327d" ++"checksum cranelift-entity 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b66e28877b75b3d2b31250f780bb5db8f68ae3df681cd56add803b2567ac4fd" ++"checksum cranelift-frontend 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b72d55fd732b1f7a99d043a36c54a5679b6ec8bc777c8d954fb97c4fa0fce7eb" ++"checksum cranelift-native 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0239f34836621a127c2132980b2f5c32a1be1c40e2d1a9a1a9bd5af33c12aee" ++"checksum cranelift-wasm 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)" = "740ebfba28c8433f06750f84819f1eb663ea9f5e4b9a81c01f4e52262d868b56" ++"checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3" ++"checksum crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150" ++"checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9" ++"checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" ++"checksum dynasm 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f36d49ab6f8ecc642d2c6ee10fda04ba68003ef0277300866745cdde160e6b40" ++"checksum dynasmrt 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c408a211e7f5762829f5e46bdff0c14bc3b1517a21a4bb781c716bf88b0c68" ++"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" ++"checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" ++"checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a" ++"checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e" ++"checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" ++"checksum faerie 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f48412f92b56015a240e249847295b38b0a731435806c21a199403b2c317272c" ++"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" ++"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" ++"checksum fallible-iterator 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eb7217124812dc5672b7476d0c2d20cfe9f7c0f1ba0904b674a9762a0212f72e" ++"checksum file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8505b75b31ef7285168dd237c4a7db3c1f3e0927e7d314e670bc98e854272fe9" ++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" ++"checksum gimli 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eb3243218ca3773e9aa00d27602f35bd1daca3be1b7112ea5fc23b2899f1a4f3" ++"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" ++"checksum goblin 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6a4013e9182f2345c6b7829b9ef6e670bce0dfca12c6f974457ed2160c2c7fe9" ++"checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da" ++"checksum hashmap_core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8e04cb7a5051270ef3fa79f8c7604d581ecfa73d520e74f554e45541c4b5881a" ++"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" ++"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" ++"checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" ++"checksum itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0d47946d458e94a1b7bcabbf6521ea7c037062c81f534615abcad76e84d4970d" ++"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" ++"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b" ++"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" ++"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917" ++"checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2" ++"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" ++"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" ++"checksum matrixmultiply 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "dcad67dcec2d58ff56f6292582377e6921afdf3bfbd533e26fb8900ae575e002" ++"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" ++"checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff" ++"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" ++"checksum memoffset 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7efacc914ca612fc1022f27b7dc51585e1a9f94c08fd5d322cfd741399260ce0" ++"checksum multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "816df386e5557ac1843a96f1ba8a7cbf4ab175d05ccc15c87a3cda27b4fbdece" ++"checksum ndarray 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7cf380a8af901ad627594013a3bbac903ae0a6f94e176e47e46b5bbc1877b928" ++"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" ++"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" ++"checksum num-complex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "107b9be86cd2481930688277b675b0114578227f034674726605b8a482d8baf8" ++"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" ++"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" ++"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba" ++"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" ++"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" ++"checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" ++"checksum pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8b3f4e0475def7d9c2e5de8e5a1306949849761e107b360d03e98eafaffd61" ++"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915" ++"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" ++"checksum quickcheck 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4537d3e4edf73a15dd059b75bed1c292d17d3ea7517f583cebe716794fcf816" ++"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" ++"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" ++"checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum raw-cpuid 6.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "30a9d219c32c9132f7be513c18be77c9881c7107d2ab5569d205a6a0f0e6dc7d" ++"checksum rawpointer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebac11a9d2e11f2af219b8b8d833b76b1ea0e054aa0e8d8e9e4cbde353bdf019" ++"checksum rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "373814f27745b2686b350dd261bfd24576a6fb0e2c5919b3a2b6005f820b0473" ++"checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356" ++"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" ++"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" ++"checksum regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0" ++"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" ++"checksum region 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ace21a7fc79cffefeb66f2cc3ef22c7687015023bf7f85bec8840f0d46cb51cc" ++"checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288" ++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" ++"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" ++"checksum scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f84d114ef17fd144153d608fba7c446b0145d038985e7a8cc5d08bb0ce20383" ++"checksum scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1aa96c45e7f5a91cb7fabe7b279f02fea7126239fc40b732316e8b6a2d0fcb" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "aa5f7c20820475babd2c077c3ab5f8c77a31c15e16ea38687b4c02d3e48680f4" ++"checksum serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "58fc82bec244f168b23d1963b45c8bf5726e9a15a9d146a067f9081aeed2de79" ++"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d" ++"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" ++"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" ++"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" ++"checksum string-interner 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "abb38a0d8fe673c40b10b6b75abcb076a958cc10fb894f14993d9737c4c87000" ++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++"checksum strsim 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34ac666ab1423aa93bbd4cd47b6e62db5a846df4e28b959d823776eed5b57643" ++"checksum structopt 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "3d0760c312538987d363c36c42339b55f5ee176ea8808bbe4543d484a291c8d1" ++"checksum structopt-derive 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "528aeb7351d042e6ffbc2a6fb76a86f9b622fdf7c25932798e7a82cb03bc94c6" ++"checksum syn 0.15.31 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b4cfac95805274c6afdb12d8f770fa2d27c045953e7b630a81801953699a9a" ++"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" ++"checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" ++"checksum target-lexicon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6923974ce4eb5bd28814756256d8ab71c28dd6e7483313fe7ab6614306bf633" ++"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" ++"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" ++"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" ++"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" ++"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1" ++"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" ++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" ++"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" ++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" ++"checksum wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "74e463a508e390cc7447e70f640fbf44ad52e1bd095314ace1fdf99516d32add" ++"checksum wabt-sys 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a6265b25719e82598d104b3717375e37661d41753e2c84cde3f51050c7ed7e3c" ++"checksum wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)" = "981a8797cf89762e0233ec45fae731cb79a4dfaee12d9f0fe6cee01e4ac58d00" ++"checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" ++"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix new file mode 100644 index 000000000000..fb99db6be77d --- /dev/null +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -0,0 +1,31 @@ +{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang }: + +rustPlatform.buildRustPackage rec { + name = "wasmtime-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "CraneStation"; + repo = "wasmtime"; + rev = "07a6ca8f4e1136ecd9f4af8d1f03a01aade60407"; + sha256 = "1cq6nz90kaf023mcyblca90bpvbzhq8xjq01laa28v7r50lagcn5"; + fetchSubmodules = true; + }; + + cargoSha256 = "0xy8vazb4nc4q1098ws92j1yfwp9w7q30z0yk2gindkn898603bc"; + + cargoPatches = [ ./cargo-lock.patch ]; + + nativeBuildInputs = [ python cmake clang ]; + buildInputs = [ llvmPackages.libclang ]; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + meta = with lib; { + description = "Standalone JIT-style runtime for WebAsssembly, using Cranelift"; + homepage = https://github.com/CraneStation/wasmtime; + license = licenses.asl20; + maintainers = with maintainers; [ asymmetric matthewbauer ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 8ef8353e4e0c..cb22c9ee790b 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, gtk3 , pkgconfig, gnome3, dbus, xvfb_run }: let version = "5.0.0"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - gnome3.gtk + gtk3 ]; doCheck = stdenv.isLinux; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 5b9b4beed7ab..f59a3fd713f9 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "appstream-${version}"; - version = "0.12.5"; + version = "0.12.6"; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1h68raflp04r79c58vyy3mmcixs5bqffm2d1js7mxfypmi4mvv6r"; + sha256 = "0hbl26aw3g2hag7z4di9z59qz057qcywrxpnnmp86z7rngvjbqpx"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index dc98de1c2cb6..e147a05d3cd8 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -55,7 +55,7 @@ in ++ stdenv.lib.optional enableUsb libusb ++ stdenv.lib.optional enablePacketSocket audit ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] - ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.defaultIconTheme ]; + ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.adwaita-icon-theme ]; preAutoreconf = ''./autogen.sh''; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index cff960b29a73..dfef2154032f 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: +{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: let parquet-testing = fetchFromGitHub { @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { ./darwin.patch ]; - nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]; + nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ boost double-conversion glog python.pkgs.python python.pkgs.numpy ]; preConfigure = '' diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index d0e93337a390..5c3c6272f83d 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -1,7 +1,19 @@ -{ stdenv, fetchurl, fetchpatch, perl +{ stdenv, fetchurl, fetchpatch, fetchzip, perl , searchNixProfiles ? true }: +let + + # Source for u-deva.cmap and u-deva.cset: use the Marathi + # dictionary like Debian does. + devaMapsSource = fetchzip { + name = "aspell-u-deva"; + url = "ftp://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-0.10-0.tar.bz2"; + sha256 = "1v8cdl8x2j1d4vbvsq1xrqys69bbccd6mi03fywrhkrrljviyri1"; + }; + +in + stdenv.mkDerivation rec { name = "aspell-0.60.6.1"; @@ -33,6 +45,13 @@ stdenv.mkDerivation rec { ); ''; + # Include u-deva.cmap and u-deva.cset in the aspell package + # to avoid conflict between 'mr' and 'hi' dictionaries as they + # both include those files. + postInstall = '' + cp ${devaMapsSource}/u-deva.{cmap,cset} $out/lib/aspell/ + ''; + meta = { description = "Spell checker for many languages"; homepage = http://aspell.net/; diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 4e23001fc9f9..992119faf65e 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, aspell, which}: +{lib, stdenv, fetchurl, aspell, which, writeScript}: with lib; @@ -53,6 +53,57 @@ let } // (args.meta or {}); } // removeAttrs args [ "meta" ]); + + buildOfficialDict = + {language, version, filename, fullName, sha256, ...}@args: + let buildArgs = { + shortName = "${language}-${version}"; + + src = fetchurl { + url = "mirror://gnu/aspell/dict/${language}/${filename}-${language}-${version}.tar.bz2"; + inherit sha256; + }; + + /* Remove any instances of u-deva.cmap and u-deva.cset since + they are included in the main aspell package and can + cause conflicts otherwise. */ + postInstall = '' + rm -f $out/lib/aspell/u-deva.{cmap,cset} + ''; + + passthru.updateScript = writeScript "update-aspellDict-${language}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p nix curl gnused common-updater-scripts + set -eu -o pipefail + + # List tarballs in the dictionary's subdirectory via HTTPS and + # the simple list method of Apache's mod_autoindex. + # + # Catalan dictionary has an exception where an earlier version + # compares as newer because the versioning scheme has changed. + versions=$( + echo '['; + curl -s 'https://ftp.gnu.org/gnu/aspell/dict/${language}/?F=0' | \ + sed -r 's/.* href="${filename}-${language}-([A-Za-z0-9_+.-]+)\.tar\.bz2".*/"\1"/;t;d' | \ + if [ '${language}' = "ca" ]; then grep -v 20040130-1; else cat; fi; \ + echo ']') + + # Sort versions in descending order using Nix's and take the first as the latest. + sortVersions="(with builtins; head (sort (a: b: compareVersions a b > 0) $versions))" + # nix-instantiate outputs Nix strings (with quotes), so remove them to get + # a result similar to `nix eval --raw`. + latestVersion=$(nix-instantiate --eval --expr "$sortVersions" | tr -d '"') + + update-source-version aspellDicts.${language} "$latestVersion" + ''; + + meta = { + homepage = "http://ftp.gnu.org/gnu/aspell/dict/0index.html"; + } // (args.meta or {}); + + } // removeAttrs args [ "language" "filename" "sha256" "meta" ]; + in buildDict buildArgs; + /* Function to compile txt dict files into Aspell dictionaries. */ buildTxtDict = {langInputs ? [], ...}@args: @@ -109,206 +160,736 @@ in rec { ### Languages - ca = buildDict rec { - shortName = "ca-2.1.5-1"; + af = buildOfficialDict rec { + language = "af"; + version = "0.50-0"; + fullName = "Afrikaans"; + filename = "aspell"; + sha256 = "00p6k2ndi0gzfr5fkbvx4hkcpj223pidjvmxg0r384arrap00q4x"; + }; + + am = buildOfficialDict rec { + language = "am"; + version = "0.03-1"; + fullName = "Amharic"; + filename = "aspell6"; + sha256 = "11ylp7gjq94wfacyawvp391lsq26rl1b84f268rjn7l7z0hxs9xz"; + }; + + ar = buildOfficialDict rec { + language = "ar"; + version = "1.2-0"; + fullName = "Arabic"; + filename = "aspell6"; + sha256 = "1avw40bp8yi5bnkq64ihm2rldgw34lk89yz281q9bmndh95a47h4"; + }; + + ast = buildOfficialDict rec { + language = "ast"; + version = "0.01"; + fullName = "Asturian"; + filename = "aspell6"; + sha256 = "14hg85mxcyvdigf96yvslk7f3v9ngdsxn85qpgwkg31k3k83xwj3"; + }; + + az = buildOfficialDict rec { + language = "az"; + version = "0.02-0"; + fullName = "Azerbaijani"; + filename = "aspell6"; + sha256 = "1hs4h1jscpxf9f9iyk6mvjqsnhkf0yslkbjhjkasqqcx8pn7cc86"; + }; + + be = buildOfficialDict rec { + language = "be"; + version = "0.01"; + fullName = "Belarusian"; + filename = "aspell5"; + sha256 = "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm"; + }; + + bg = buildOfficialDict rec { + language = "bg"; + version = "4.1-0"; + fullName = "Bulgarian"; + filename = "aspell6"; + sha256 = "1alacmgpfk0yrgq83y23d16fhav1bxmb98kg8d2a5r9bvh2h0mvl"; + }; + + bn = buildOfficialDict rec { + language = "bn"; + version = "0.01.1-1"; + fullName = "Bengali"; + filename = "aspell6"; + sha256 = "1nc02jd67iggirwxnhdvlvaqm0xfyks35c4psszzj3dhzv29qgxh"; + }; + + br = buildOfficialDict rec { + language = "br"; + version = "0.50-2"; + fullName = "Breton"; + filename = "aspell"; + sha256 = "0fradnm8424bkq9a9zhpl2132dk7y95xmw45sy1c0lx6rinjl4n2"; + }; + + ca = buildOfficialDict rec { + language = "ca"; + version = "2.1.5-1"; fullName = "Catalan"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/ca/aspell6-${shortName}.tar.bz2"; - sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; - }; + filename = "aspell6"; + sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; }; - cs = buildDict rec { - shortName = "cs-20040614-1"; + cs = buildOfficialDict rec { + language = "cs"; + version = "20040614-1"; fullName = "Czech"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/cs/aspell6-${shortName}.tar.bz2"; - sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; - }; + filename = "aspell6"; + sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; }; - da = buildDict rec { - shortName = "da-1.4.42-1"; + csb = buildOfficialDict rec { + language = "csb"; + version = "0.02-0"; + fullName = "Kashubian"; + filename = "aspell6"; + sha256 = "1612ypkm684wjvc7n081i87mlrrzif9simc7kyn177hfsl3ssrn1"; + }; + + cy = buildOfficialDict rec { + language = "cy"; + version = "0.50-3"; + fullName = "Welsh"; + filename = "aspell"; + sha256 = "15vq601lzz1gi311xym4bv9lv1k21xcfn50jmzamw7h6f36rsffm"; + }; + + da = buildOfficialDict rec { + language = "da"; + version = "1.4.42-1"; fullName = "Danish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/da/aspell5-${shortName}.tar.bz2"; - sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; - }; + filename = "aspell5"; + sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; }; - de = buildDict rec { - shortName = "de-20030222-1"; + de = buildOfficialDict rec { + language = "de"; + version = "20030222-1"; fullName = "German"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/de/aspell6-${shortName}.tar.bz2"; - sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; - }; + filename = "aspell6"; + sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; }; - en = buildDict rec { - shortName = "en-2018.04.16-0"; + de-alt = buildOfficialDict rec { + language = "de-alt"; + version = "2.1-1"; + fullName = "German - Old Spelling"; + filename = "aspell6"; + sha256 = "0wwc2l29svv3fv041fh6vfa5m3hi9q9pkbxibzq1ysrsfin3rl9n"; + }; + + el = buildOfficialDict rec { + language = "el"; + version = "0.08-0"; + fullName = "Greek"; + filename = "aspell6"; + sha256 = "1ljcc30zg2v2h3w5h5jr5im41mw8jbsgvvhdd2cii2yzi8d0zxja"; + }; + + en = buildOfficialDict rec { + language = "en"; + version = "2018.04.16-0"; fullName = "English"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/en/aspell6-${shortName}.tar.bz2"; - sha256 = "0bxxdzkk9g27plg22y9qzsx9cfjw3aa29w5bmzs561qc9gkp247i"; - }; + filename = "aspell6"; + sha256 = "0bxxdzkk9g27plg22y9qzsx9cfjw3aa29w5bmzs561qc9gkp247i"; }; - es = buildDict rec { - shortName = "es-1.11-2"; - fullName = "Spanish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/es/aspell6-${shortName}.tar.bz2"; - sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; - }; - }; - - eo = buildDict rec { - shortName = "eo-2.1.20000225a-2"; + eo = buildOfficialDict rec { + language = "eo"; + version = "2.1.20000225a-2"; fullName = "Esperanto"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/eo/aspell6-${shortName}.tar.bz2"; - sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; - }; + filename = "aspell6"; + sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; }; - fr = buildDict rec { - shortName = "fr-0.50-3"; + es = buildOfficialDict rec { + language = "es"; + version = "1.11-2"; + fullName = "Spanish"; + filename = "aspell6"; + sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; + }; + + et = buildOfficialDict rec { + language = "et"; + version = "0.1.21-1"; + fullName = "Estonian"; + filename = "aspell6"; + sha256 = "0jdjfa2fskirhnb70fy86xryp9r6gkl729ib8qcjmsma7nm5gs5i"; + }; + + fa = buildOfficialDict rec { + language = "fa"; + version = "0.11-0"; + fullName = "Persian"; + filename = "aspell6"; + sha256 = "0nz1ybwv56q7nl9ip12hfmdch1vyyq2j55bkjcns13lshzm2cba8"; + }; + + fi = buildOfficialDict rec { + language = "fi"; + version = "0.7-0"; + fullName = "Finnish"; + filename = "aspell6"; + sha256 = "07d5s08ba4dd89cmwy9icc01i6fjdykxlb9ravmhdrhi8mxz1mzq"; + }; + + fo = buildOfficialDict rec { + language = "fo"; + version = "0.2.16-1"; + fullName = "Faroese"; + filename = "aspell5"; + sha256 = "022yz5lll20xrzizcyb7wksm3fgwklnvgnir5la5qkxv770dvq7p"; + }; + + fr = buildOfficialDict rec { + language = "fr"; + version = "0.50-3"; fullName = "French"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/fr/aspell-${shortName}.tar.bz2"; - sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; - }; + filename = "aspell"; + sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; }; - it = buildDict rec { - shortName = "it-2.2_20050523-0"; + fy = buildOfficialDict rec { + language = "fy"; + version = "0.12-0"; + fullName = "Frisian"; + filename = "aspell6"; + sha256 = "1almi6n4ni91d0rzrk8ig0473m9ypbwqmg56hchz76j51slwyirl"; + }; + + ga = buildOfficialDict rec { + language = "ga"; + version = "4.5-0"; + fullName = "Irish"; + filename = "aspell5"; + sha256 = "0y869mmvfb3bzadfgajwa2rfb0xfhi6m9ydwgxkb9v2claydnps5"; + }; + + gd = buildOfficialDict rec { + language = "gd"; + version = "0.1.1-1"; + fullName = "Scottish Gaelic"; + filename = "aspell5"; + sha256 = "0a89irv5d65j5m9sb0k36851x5rs0wij12gb2m6hv2nsfn5a05p3"; + }; + + gl = buildOfficialDict rec { + language = "gl"; + version = "0.5a-2"; + fullName = "Galician"; + filename = "aspell6"; + sha256 = "12pwghmy18fcdvf9hvhb4q6shi339hb1kwxpkz0bhw0yjxjwzkdk"; + }; + + grc = buildOfficialDict rec { + language = "grc"; + version = "0.02-0"; + fullName = "Ancient Greek"; + filename = "aspell6"; + sha256 = "1zxr8958v37v260fkqd4pg37ns5h5kyqm54hn1hg70wq5cz8h512"; + }; + + gu = buildOfficialDict rec { + language = "gu"; + version = "0.03-0"; + fullName = "Gujarati"; + filename = "aspell6"; + sha256 = "04c38jnl74lpj2jhjz4zpqbs2623vwc71m6wc5h4b1karid14b23"; + }; + + gv = buildOfficialDict rec { + language = "gv"; + version = "0.50-0"; + fullName = "Manx Gaelic"; + filename = "aspell"; + sha256 = "1rknf4yaw9s29c77sdzg98nhnmjwpicdb69igmz1n768npz2drmv"; + }; + + he = buildOfficialDict rec { + language = "he"; + version = "1.0-0"; + fullName = "Hebrew"; + filename = "aspell6"; + sha256 = "13bhbghx5b8g0119g3wxd4n8mlf707y41vlf59irxjj0kynankfn"; + }; + + hi = buildOfficialDict rec { + language = "hi"; + version = "0.02-0"; + fullName = "Hindi"; + filename = "aspell6"; + sha256 = "0drs374qz4419zx1lf2k281ydxf2750jk5ailafj1x0ncz27h1ys"; + }; + + hil = buildOfficialDict rec { + language = "hil"; + version = "0.11-0"; + fullName = "Hiligaynon"; + filename = "aspell5"; + sha256 = "1s482fsfhzic9qa80al4418q3ni3gfn2bkwkd2y46ydrs17kf2jp"; + }; + + hr = buildOfficialDict rec { + language = "hr"; + version = "0.51-0"; + fullName = "Croatian"; + filename = "aspell"; + sha256 = "09aafyf1vqhaxvcf3jfzf365k394b5pf0iivsr2ix5npah1h7i1a"; + }; + + hsb = buildOfficialDict rec { + language = "hsb"; + version = "0.02-0"; + fullName = "Upper Sorbian"; + filename = "aspell6"; + sha256 = "0bi2vhz7n1vmg43wbbh935pmzihv80iyz9z65j94lxf753j2m7wd"; + }; + + hu = buildOfficialDict rec { + language = "hu"; + version = "0.99.4.2-0"; + fullName = "Hungarian"; + filename = "aspell6"; + sha256 = "1d9nybip2k1dz69zly3iv0npbi3yxgfznh1py364nxzrbjsafd9k"; + }; + + hus = buildOfficialDict rec { + language = "hus"; + version = "0.03-1"; + fullName = "Huastec"; + filename = "aspell6"; + sha256 = "09glipfpkz9xch17z11zw1yn2z7jx1f2svfmjn9l6wm1s5qz6a3d"; + }; + + hy = buildOfficialDict rec { + language = "hy"; + version = "0.10.0-0"; + fullName = "Armenian"; + filename = "aspell6"; + sha256 = "1w5wq8lfl2xp1nid30b1j5qmya4vjyidq0vpr4y3gf53jc08vsid"; + }; + + ia = buildOfficialDict rec { + language = "ia"; + version = "0.50-1"; + fullName = "Interlingua"; + filename = "aspell"; + sha256 = "0bqcpgsa72pga24fv4fkw38b4qqdvqsw97jvzvw7q03dc1cwp5sp"; + }; + + id = buildOfficialDict rec { + language = "id"; + version = "1.2-0"; + fullName = "Indonesian"; + filename = "aspell5"; + sha256 = "023knfg0q03f7y5w6xnwa1kspnrcvcnky8xvdms93n2850414faj"; + }; + + is = buildOfficialDict rec { + language = "is"; + version = "0.51.1-0"; + fullName = "Icelandic"; + filename = "aspell"; + sha256 = "1mp3248lhbr13cj7iq9zs7h5ix0dcwlprp5cwrkcwafrv8lvsd9h"; + }; + + it = buildOfficialDict rec { + language = "it"; + version = "2.2_20050523-0"; fullName = "Italian"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/it/aspell6-${shortName}.tar.bz2"; - sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; - }; + filename = "aspell6"; + sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; }; - la = buildDict rec { - shortName = "la-20020503-0"; + kn = buildOfficialDict rec { + language = "kn"; + version = "0.01-1"; + fullName = "Kannada"; + filename = "aspell6"; + sha256 = "10sk0wx4x4ds1403kf9dqxv9yjvh06w8qqf4agx57y0jlws0n0fb"; + }; + + ku = buildOfficialDict rec { + language = "ku"; + version = "0.20-1"; + fullName = "Kurdi"; + filename = "aspell5"; + sha256 = "09va98krfbgdaxl101nmd85j3ysqgg88qgfcl42c07crii0pd3wn"; + }; + + ky = buildOfficialDict rec { + language = "ky"; + version = "0.01-0"; + fullName = "Kirghiz"; + filename = "aspell6"; + sha256 = "0kzv2syjnnn6pnwx0d578n46hg2l0j62977al47y6wabnhjjy3z1"; + }; + + la = buildOfficialDict rec { + language = "la"; + version = "20020503-0"; fullName = "Latin"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/la/aspell6-${shortName}.tar.bz2"; - sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; - }; + filename = "aspell6"; + sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; }; - nb = buildDict rec { - shortName = "nb-0.50.1-0"; + lt = buildOfficialDict rec { + language = "lt"; + version = "1.2.1-0"; + fullName = "Lithuanian"; + filename = "aspell6"; + sha256 = "1asjck911l96q26zj36lmz0jp4b6pivvrf3h38zgc8lc85p3pxgn"; + }; + + lv = buildOfficialDict rec { + language = "lv"; + version = "0.5.5-1"; + fullName = "Latvian"; + filename = "aspell6"; + sha256 = "12pvs584a6437ijndggdqpp5s7d0w607cimpkxsjwasnx83f4c1w"; + }; + + mg = buildOfficialDict rec { + language = "mg"; + version = "0.03-0"; + fullName = "Malagasy"; + filename = "aspell5"; + sha256 = "0hdhbk9b5immjp8l5h4cy82gwgsqzcqbb0qsf7syw333w4rgi0ji"; + }; + + mi = buildOfficialDict rec { + language = "mi"; + version = "0.50-0"; + fullName = "Maori"; + filename = "aspell"; + sha256 = "12bxplpd348yx8d2q8qvahi9dlp7qf28qmanzhziwc7np8rixvmy"; + }; + + mk = buildOfficialDict rec { + language = "mk"; + version = "0.50-0"; + fullName = "Macedonian"; + filename = "aspell"; + sha256 = "0wcr9n882xi5b7a7ln1hnhq4vfqd5gpqqp87v01j0gb7zf027z0m"; + }; + + ml = buildOfficialDict rec { + language = "ml"; + version = "0.03-1"; + fullName = "Malayalam"; + filename = "aspell6"; + sha256 = "1zcn4114gwia085fkz77qk13z29xrbp53q2qvgj2cvcbalg5bkg4"; + }; + + mn = buildOfficialDict rec { + language = "mn"; + version = "0.06-2"; + fullName = "Mongolian"; + filename = "aspell6"; + sha256 = "150j9y5c9pw80fwp5rzl5q31q9vjbxixaqljkfwxjb5q93fnw6rg"; + }; + + mr = buildOfficialDict rec { + language = "mr"; + version = "0.10-0"; + fullName = "Marathi"; + filename = "aspell6"; + sha256 = "0cvgb2l40sppqbi842ivpznsh2xzp1d4hxc371dll8z0pr05m8yk"; + }; + + ms = buildOfficialDict rec { + language = "ms"; + version = "0.50-0"; + fullName = "Malay"; + filename = "aspell"; + sha256 = "0vr4vhipcfhsxqfs8dim2ph7iiixn22gmlmlb375bx5hgd9y7i1w"; + }; + + mt = buildOfficialDict rec { + language = "mt"; + version = "0.50-0"; + fullName = "Maltese"; + filename = "aspell"; + sha256 = "1d2rl1nlfjq6rfywblvx8m88cyy2x0mzc0mshzbgw359c2nwl3z0"; + }; + + nb = buildOfficialDict rec { + language = "nb"; + version = "0.50.1-0"; fullName = "Norwegian Bokmal"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/nb/aspell-${shortName}.tar.bz2"; - sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; - }; + filename = "aspell"; + sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; }; - nl = buildDict rec { - shortName = "nl-0.50-2"; + nds = buildOfficialDict rec { + language = "nds"; + version = "0.01-0"; + fullName = "Low Saxon"; + filename = "aspell6"; + sha256 = "1nkjhwzn45dizi89d19q4bqyd87cim8xyrgr655fampgkn31wf6f"; + }; + + nl = buildOfficialDict rec { + language = "nl"; + version = "0.50-2"; fullName = "Dutch"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/nl/aspell-${shortName}.tar.bz2"; - sha256 = "0ffb87yjsh211hllpc4b9khqqrblial4pzi1h9r3v465z1yhn3j4"; - }; + filename = "aspell"; + sha256 = "0ffb87yjsh211hllpc4b9khqqrblial4pzi1h9r3v465z1yhn3j4"; # Emacs expects a language called "nederlands". postInstall = '' echo "add nl.rws" > $out/lib/aspell/nederlands.multi ''; }; - nn = buildDict rec { - shortName = "nn-0.50.1-1"; + nn = buildOfficialDict rec { + language = "nn"; + version = "0.50.1-1"; fullName = "Norwegian Nynorsk"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/nn/aspell-${shortName}.tar.bz2"; - sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; - }; + filename = "aspell"; + sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; }; - pl = buildDict rec { - shortName = "pl-6.0_20061121-0"; + ny = buildOfficialDict rec { + language = "ny"; + version = "0.01-0"; + fullName = "Chichewa"; + filename = "aspell5"; + sha256 = "0gjb92vcg60sfgvrm2f6i89sfkgb179ahvwlgs649fx3dc7rfvqp"; + }; + + or = buildOfficialDict rec { + language = "or"; + version = "0.03-1"; + fullName = "Oriya"; + filename = "aspell6"; + sha256 = "0kzj9q225z0ccrlbkijsrafy005pbjy14qcnxb6p93ciz1ls7zyn"; + }; + + pa = buildOfficialDict rec { + language = "pa"; + version = "0.01-1"; + fullName = "Punjabi"; + filename = "aspell6"; + sha256 = "0if93zk10pyrs38wwj3vpcdm01h51m5z9gm85h3jxrpgqnqspwy7"; + }; + + pl = buildOfficialDict rec { + language = "pl"; + version = "6.0_20061121-0"; fullName = "Polish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/pl/aspell6-${shortName}.tar.bz2"; - sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; - }; + filename = "aspell6"; + sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; }; - pt_BR = buildDict rec { - shortName = "pt_BR-20090702-0"; + pt_BR = buildOfficialDict rec { + language = "pt_BR"; + version = "20090702-0"; fullName = "Brazilian Portuguese"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/pt_BR/aspell6-${shortName}.tar.bz2"; - sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; - }; + filename = "aspell6"; + sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; }; - pt_PT = buildDict rec { - shortName = "pt_PT-20070510-0"; + pt_PT = buildOfficialDict rec { + language = "pt_PT"; + version = "20070510-0"; fullName = "Portuguese"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/pt_PT/aspell6-${shortName}.tar.bz2"; - sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; - }; + filename = "aspell6"; + sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; }; - ro = buildDict rec { - shortName = "ro-3.3-2"; + qu = buildOfficialDict rec { + language = "qu"; + version = "0.02-0"; + fullName = "Quechua"; + filename = "aspell6"; + sha256 = "009z0zsvzq7r3z3m30clyibs94v77b92h5lmzmzxlns2p0lpd5w0"; + }; + + ro = buildOfficialDict rec { + language = "ro"; + version = "3.3-2"; fullName = "Romanian"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/ro/aspell5-${shortName}.tar.bz2"; - sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; - }; + filename = "aspell5"; + sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; }; - ru = buildDict rec { - shortName = "ru-0.99f7-1"; + ru = buildOfficialDict rec { + language = "ru"; + version = "0.99f7-1"; fullName = "Russian"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/ru/aspell6-${shortName}.tar.bz2"; - sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; - }; + filename = "aspell6"; + sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; }; - sv = buildDict rec { - shortName = "sv-0.51-0"; - fullName = "Swedish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/sv/aspell-${shortName}.tar.bz2"; - sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; - }; + rw = buildOfficialDict rec { + language = "rw"; + version = "0.50-0"; + fullName = "Kinyarwanda"; + filename = "aspell"; + sha256 = "10gh8g747jbrvfk2fn3pjxy1nhcfdpwgmnvkmrp4nd1k1qp101il"; }; - sk = buildDict rec { - shortName = "sk-2.01-2"; + sc = buildOfficialDict rec { + language = "sc"; + version = "1.0"; + fullName = "Sardinian"; + filename = "aspell5"; + sha256 = "0hl7prh5rccsyljwrv3m1hjcsphyrrywk2qvnj122irbf4py46jr"; + }; + + sk = buildOfficialDict rec { + language = "sk"; + version = "2.01-2"; fullName = "Slovak"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/sk/aspell6-${shortName}.tar.bz2"; - sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; - }; + filename = "aspell6"; + sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; }; - tr = buildDict rec { - shortName = "tr-0.50-0"; + sl = buildOfficialDict rec { + language = "sl"; + version = "0.50-0"; + fullName = "Slovenian"; + filename = "aspell"; + sha256 = "1l9kc5g35flq8kw9jhn2n0bjb4sipjs4qkqzgggs438kywkx2rp5"; + }; + + sr = buildOfficialDict rec { + language = "sr"; + version = "0.02"; + fullName = "Serbian"; + filename = "aspell6"; + sha256 = "12cj01p4nj80cpf7m3s4jsaf0rsfng7s295j9jfchcq677xmhpkh"; + }; + + sv = buildOfficialDict rec { + language = "sv"; + version = "0.51-0"; + fullName = "Swedish"; + filename = "aspell"; + sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; + }; + + sw = buildOfficialDict rec { + language = "sw"; + version = "0.50-0"; + fullName = "Swahili"; + filename = "aspell"; + sha256 = "15zjh7hdj2b4dgm5bc12w1ims9q357p1q3gjalspnyn5gl81zmby"; + }; + + ta = buildOfficialDict rec { + language = "ta"; + version = "20040424-1"; + fullName = "Tamil"; + filename = "aspell6"; + sha256 = "0sj8ygjsyvnr93cs6324y7az7k2vyw7rjxdc9vnm7z60lbqm5xaj"; + }; + + te = buildOfficialDict rec { + language = "te"; + version = "0.01-2"; + fullName = "Telugu"; + filename = "aspell6"; + sha256 = "0pgcgxz7dz34zxp9sb85jjzbg3ky6il5wmhffz6ayrbsfn5670in"; + }; + + tet = buildOfficialDict rec { + language = "tet"; + version = "0.1.1"; + fullName = "Tetum"; + filename = "aspell5"; + sha256 = "17n0y4fhjak47j9qnqf4m4z6zra6dn72rwhp7ig0hhlgqk4ldmcx"; + }; + + tk = buildOfficialDict rec { + language = "tk"; + version = "0.01-0"; + fullName = "Turkmen"; + filename = "aspell5"; + sha256 = "02vad4jqhr0xpzqi5q5z7z0xxqccbn8j0c5dhpnm86mnr84l5wl6"; + }; + + tl = buildOfficialDict rec { + language = "tl"; + version = "0.02-1"; + fullName = "Tagalog"; + filename = "aspell5"; + sha256 = "1kca6k7qnpfvvwjnq5r1n242payqsjy96skmw78m7ww6d0n5vdj8"; + }; + + tn = buildOfficialDict rec { + language = "tn"; + version = "1.0.1-0"; + fullName = "Setswana"; + filename = "aspell5"; + sha256 = "0q5x7c6z88cn0kkpk7q1craq34g4g03v8x3xcj5a5jia3l7c5821"; + }; + + tr = buildOfficialDict rec { + language = "tr"; + version = "0.50-0"; fullName = "Turkish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/tr/aspell-${shortName}.tar.bz2"; - sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; - }; + filename = "aspell"; + sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; }; - uk = buildDict rec { - shortName = "uk-1.4.0-0"; + uk = buildOfficialDict rec { + language = "uk"; + version = "1.4.0-0"; fullName = "Ukrainian"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/uk/aspell6-${shortName}.tar.bz2"; - sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; - }; + filename = "aspell6"; + sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; + }; + + uz = buildOfficialDict rec { + language = "uz"; + version = "0.6-0"; + fullName = "Uzbek"; + filename = "aspell6"; + sha256 = "0sg3wlyply1idpq5ypyj7kgnaadaiskci1sqs811yhg2gzyc3092"; + }; + + vi = buildOfficialDict rec { + language = "vi"; + version = "0.01.1-1"; + fullName = "Vietnamese"; + filename = "aspell6"; + sha256 = "05vwgvf1cj45azhflywx69javqdvqd1f20swrc2d3c32pd9mvn1w"; + }; + + wa = buildOfficialDict rec { + language = "wa"; + version = "0.50-0"; + fullName = "Walloon"; + filename = "aspell"; + sha256 = "1r1zwz7xkx40dga9vf5wc9ja3jwk1dkpcr1kaa7wryvslf5al5ss"; + }; + + yi = buildOfficialDict rec { + language = "yi"; + version = "0.01.1-1"; + fullName = "Yiddish"; + filename = "aspell6"; + sha256 = "0mi842l4038bx3ll2wx9nz44nqrg1x46h5b02zigi1hbbddd6ycq"; + }; + + zu = buildOfficialDict rec { + language = "zu"; + version = "0.50-0"; + fullName = "Zulu"; + filename = "aspell"; + sha256 = "15k7gaxrnqnssdyk9l6g27dq317dqp9jz5yzafd25ri01g6mb8iz"; }; ### Jargons diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index b6203a159e6c..78763ca29e2a 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build ''; - configureFlags = [ + wafConfigureFlags = [ "--boost-includes=${boost.dev}/include" "--boost-libs=${boost.out}/lib" ]; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index fc67035ce204..ed9b5e188729 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perlPackages +{ fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages , expat, gettext, intltool, glib, libiconv , gtk3Support ? false, gtk3 ? null , qt4 ? null @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap"; }; - patches = [ ./no-mkdir-localstatedir.patch ]; + patches = [ + ./no-mkdir-localstatedir.patch + (fetchpatch { + name ="CVE-2017-6519-CVE-2018-100084.patch"; + url = https://github.com/lathiat/avahi/commit/e111def44a7df4624a4aa3f85fe98054bffb6b4f.patch; + sha256 = "06n7b7kz6xcc35c7xjfc1kj3k2llyjgi09nhy0ci32l1bhacjw0q"; + }) + ]; buildInputs = [ libdaemon dbus glib expat libiconv ] ++ (with perlPackages; [ perl XMLParser ]) diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index e741305f9913..9d5063d8f07d 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -1,6 +1,6 @@ { stdenv, autoconf, automake, libtool, gnome3, which, fetchgit, libgtop, libwnck3, glib, vala, pkgconfig , libstartup_notification, gobject-introspection, gtk-doc, docbook_xsl -, xorgserver, dbus, python2 }: +, xorgserver, dbus, python2, wrapGAppsHook }: stdenv.mkDerivation rec { name = "bamf-${version}"; @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { python2.pkgs.libxml2 dbus xorgserver + wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch b/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch new file mode 100644 index 000000000000..f8163f6d2718 --- /dev/null +++ b/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch @@ -0,0 +1,45 @@ +diff --git a/tools/build/src/tools/python.jam b/tools/build/src/tools/python.jam +index 273b28a..2d2031e 100644 +--- a/tools/build/v2/tools/python.jam ++++ b/tools/build/v2/tools/python.jam +@@ -428,13 +428,7 @@ local rule windows-installed-pythons ( version ? ) + + local rule darwin-installed-pythons ( version ? ) + { +- version ?= $(.version-countdown) ; +- +- local prefix +- = [ GLOB /System/Library/Frameworks /Library/Frameworks +- : Python.framework ] ; +- +- return $(prefix)/Versions/$(version)/bin/python ; ++ return ; + } + + +@@ -890,25 +884,6 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : + + # See if we can find a framework directory on darwin. + local framework-directory ; +- if $(target-os) = darwin +- { +- # Search upward for the framework directory. +- local framework-directory = $(libraries[-1]) ; +- while $(framework-directory:D=) && $(framework-directory:D=) != Python.framework +- { +- framework-directory = $(framework-directory:D) ; +- } +- +- if $(framework-directory:D=) = Python.framework +- { +- debug-message framework directory is \"$(framework-directory)\" ; +- } +- else +- { +- debug-message "no framework directory found; using library path" ; +- framework-directory = ; +- } +- } + + local dll-path = $(libraries) ; + diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index dd383bd01231..8ce44b878d07 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -104,7 +104,10 @@ stdenv.mkDerivation { patchFlags = ""; patches = patches - ++ optional stdenv.isDarwin ./darwin-no-system-python.patch; + ++ optional stdenv.isDarwin ( + if version == "1.55.0" + then ./darwin-1.55-no-system-python.patch + else ./darwin-no-system-python.patch); meta = { homepage = http://boost.org/; diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix index da9d1122cc54..df75d3a1f1da 100644 --- a/pkgs/development/libraries/cgui/default.nix +++ b/pkgs/development/libraries/cgui/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, texinfo, allegro, perl }: +{ stdenv, fetchurl, texinfo, allegro, perl, libX11 }: stdenv.mkDerivation rec { name = "cgui-${version}"; - version="2.0.3"; + version="2.1.0"; src = fetchurl { url = "mirror://sourceforge/project/cgui/${version}/${name}.tar.gz"; - sha256 = "00kk4xaw68m44awy8zq4g5plx372swwccvzshn68a0a8f3f2wi4x"; + sha256 = "1pp1hvidpilq37skkmbgba4lvzi01rasy04y0cnas9ck0canv00s"; }; - buildInputs = [ texinfo allegro perl ]; + buildInputs = [ texinfo allegro perl libX11 ]; configurePhase = '' sh fix.sh unix diff --git a/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch b/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch new file mode 100644 index 000000000000..47f419727459 --- /dev/null +++ b/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch @@ -0,0 +1,55 @@ +From 06b2c6dd6439c01bfb5a4c7b0ec6909c349a66b1 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Thu, 28 Feb 2019 16:25:49 +0100 +Subject: [PATCH] allow setting paths in makefile + +and install headers and libs +--- + Makefile | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index b507e2b0..d21e5c56 100644 +--- a/Makefile ++++ b/Makefile +@@ -19,13 +19,13 @@ BUILD_DIR = out + # http://www.gnu.org/prep/standards/html_node/Directory-Variables.html + PREFIX ?= /usr/local + EXEC_PREFIX = $(PREFIX) +-BINDIR = $(EXEC_PREFIX)/bin ++BINDIR ?= $(EXEC_PREFIX)/bin + DATAROOTDIR = $(PREFIX)/share + DOCDIR = $(DATAROOTDIR)/doc/$(CPROG) + SYSCONFDIR = $(PREFIX)/etc + HTMLDIR = $(DOCDIR) +-INCLUDEDIR = $(DESTDIR)$(PREFIX)/include +-LIBDIR = $(DESTDIR)$(EXEC_PREFIX)/lib ++INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include ++LIBDIR ?= $(DESTDIR)$(EXEC_PREFIX)/lib + + # build tools + MKDIR = mkdir -p +@@ -270,17 +270,17 @@ build: $(CPROG) $(CXXPROG) + unit_test: $(UNIT_TEST_PROG) + + ifeq ($(CAN_INSTALL),1) +-install: $(HTMLDIR)/index.html $(SYSCONFDIR)/civetweb.conf ++install: install-headers install-slib $(HTMLDIR)/index.html $(SYSCONFDIR)/civetweb.conf + install -d -m 755 "$(DOCDIR)" + install -m 644 *.md "$(DOCDIR)" + install -d -m 755 "$(BINDIR)" + install -m 755 $(CPROG) "$(BINDIR)/" + + install-headers: +- install -m 644 $(HEADERS) "$(INCLUDEDIR)" ++ install -m 644 $(HEADERS) "$(INCLUDEDIR)/" + + install-lib: lib$(CPROG).a +- install -m 644 $< "$(LIBDIR)" ++ install -m 644 $< "$(LIBDIR)/" + + install-slib: lib$(CPROG).so + $(eval version=$(shell grep -w "define CIVETWEB_VERSION" include/civetweb.h | sed 's|.*VERSION "\(.*\)"|\1|g')) +-- +2.19.2 + diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/development/libraries/civetweb/default.nix new file mode 100644 index 000000000000..3f8de005ff81 --- /dev/null +++ b/pkgs/development/libraries/civetweb/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "civetweb"; + version = "1.11"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256:1drnid6gs97cp9zpvsxz42yfj8djmgx98fg9p2993x9mpi547vzv"; + }; + + makeFlags = [ + "WITH_CPP=1" + "PREFIX=${placeholder "out"}" + "LIBDIR=${placeholder "out"}/lib" + "INCLUDEDIR=${placeholder "dev"}/include" + ]; + + patches = [ + ./0001-allow-setting-paths-in-makefile.patch + ]; + + strictDeps = true; + + outputs = [ "out" "dev" ]; + + preInstall = '' + mkdir -p $dev/include + mkdir -p $out/lib + ''; + + meta = { + description = "Embedded C/C++ web server"; + homepage = https://github.com/civetweb/civetweb; + license = [ stdenv.lib.licenses.mit ]; + }; +} diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 428114986d1b..9577bfe9e8a2 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,17 +1,17 @@ -{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3 }: +{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk_pixbuf }: let pname = "clutter-gst"; - version = "3.0.26"; + version = "3.0.27"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0fnblqm4igdx4rn3681bp1gm1y2i00if3iblhlm0zv6ck9nqlqfq"; + sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy"; }; - propagatedBuildInputs = [ clutter gtk3 glib cogl ]; + propagatedBuildInputs = [ clutter gtk3 glib cogl gdk_pixbuf ]; nativeBuildInputs = [ pkgconfig ]; postBuild = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index a88b3f1b9b68..67a56855bb79 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,5 +1,8 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, libpng, libjpeg , guiSupport ? false, libX11 + + # see http://dlib.net/compile.html +, avxSupport ? true }: stdenv.mkDerivation rec { @@ -17,6 +20,8 @@ stdenv.mkDerivation rec { rm -rf dlib/external ''; + cmakeFlags = [ "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; + enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11; diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 96375fcd5beb..04fd04a564f8 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "double-conversion-${version}"; - version = "3.1.1"; + version = "3.1.3"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "123rb2p4snqagrybw66vnapchqdwn2rfpr1wcq0ya9gwbyl7xccx"; + sha256 = "082w15xq8f4c422a71phvcahgc8vmqrig97av9g9628q5n2ybbgg"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 7e4d46c012dd..915fbf8d5498 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "expat-2.2.6"; @@ -8,6 +8,15 @@ stdenv.mkDerivation rec { sha256 = "1wl1x93b5w457ddsdgj0lh7yjq4q6l7wfbgwhagkc8fm2qkkrd0p"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-20843.patch"; + url = "https://github.com/libexpat/libexpat/commit/11f8838bf99ea0a6f0b76f9760c43704d00c4ff6.patch"; + sha256 = "1i7bq9sp2k5348dvbfv26bprzv6ka1abf0j5ixjaff9alndm4f19"; + stripLen = 1; + }) + ]; + outputs = [ "out" "dev" ]; # TODO: fix referrers outputBin = "dev"; diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 04a6b9c53545..be752b060beb 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -12,6 +12,30 @@ stdenv.mkDerivation rec { sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl"; }; + patches = let + fp = { ver ? "2.8.8-3", pname, name ? (pname + ".patch"), sha256 }: fetchurl { + url = "https://salsa.debian.org/multimedia-team/faad2/raw/debian/${ver}" + + "/debian/patches/${pname}.patch?inline=false"; + inherit name sha256; + }; + in [ + (fp { + # critical bug addressed in vlc 3.0.7 (but we use system-provided faad) + pname = "0004-Fix-a-couple-buffer-overflows"; + sha256 = "1mwycdfagz6wpda9j3cp7lf93crgacpa8rwr58p3x0i5cirnnmwq"; + }) + (fp { + name = "CVE-2018-20362.patch"; + pname = "0009-syntax.c-check-for-syntax-element-inconsistencies"; + sha256 = "1z849l5qyvhyn5pvm6r07fa50nrn8nsqnrka2nnzgkhxlhvzpa81"; + }) + (fp { + name = "CVE-2018-20194.patch"; + pname = "0010-sbr_hfadj-sanitize-frequency-band-borders"; + sha256 = "1b1kbz4mv0zhpq8h3djnvqafh1gn12nikk9v3jrxyryywacirah4"; + }) + ]; + configureFlags = [] ++ optional drmSupport "--with-drm"; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index e0cd1227f7ea..0975e0b1f4cf 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm +{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -97,7 +97,7 @@ , libXv ? null # Xlib support , libXext ? null # Xlib support , lzma ? null # xz-utils -, nvenc ? false, nvidia-video-sdk ? null, nv-codec-headers ? null # NVIDIA NVENC support +, nvenc ? false, nv-codec-headers ? null # NVIDIA NVENC support , callPackage # needed for NVENC to access external ffmpeg nvidia headers , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code @@ -227,16 +227,20 @@ assert libxcbxfixesExtlib -> libxcb != null; assert libxcbshapeExtlib -> libxcb != null; assert openglExtlib -> libGLU_combined != null; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; -assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.1"; + version = "4.1.4"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "150rrm549fy1x71c9whmyi5knyd9sliwvmcsm438bdgg4v8c93m3"; + sha256 = "1qd7a10gs12ifcp31gramcgqjl77swskjfp7cijibgyg5yl4kw7i"; }; + patches = [(fetchpatch { # remove on update + name = "fix-hardcoded-tables.diff"; + url = "http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/c8232e50074f"; + sha256 = "0jlksks4fjajby8fjk7rfp414gxfdgd6q9khq26i52xvf4kg2dw6"; + })]; prePatch = '' patchShebangs . @@ -416,13 +420,13 @@ stdenv.mkDerivation rec { ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] - ++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ] + ++ optional nvenc nv-codec-headers ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration - libiconv ]; + libiconv cf-private /* For _OBJC_EHTYPE_$_NSException */ ]; - # Build qt-faststart executable - buildPhase = optional qtFaststartProgram ''make tools/qt-faststart''; + buildFlags = [ "all" ] + ++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable # Hacky framework patching technique borrowed from the phantomjs2 package postInstall = optionalString qtFaststartProgram '' diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index f8343e668a67..5db1e0a47cfc 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.4.5"; - sha256 = "0cbzysj9pskxh1kfdwmq2848fn6gi4pvh5y3insv10pdhpcjp8a3"; + branch = "3.4.6"; + sha256 = "1s20wzgxxrm56gckyb8cf1lh36hdnkdxvmmnnvdxvia4zb3grf1b"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 9821357de3b9..811c5ae03993 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,12 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.1"; - sha256 = "19d16dhb4gx3akhbqd8844awx1axxli91bsjwsm4qp2a4i1zp15n"; + branch = "4.1.4"; + sha256 = "01w44ygm5bvc243hlhfnvb2lxfb0blz2cxnphxqgw30vj3c1prx7"; + patches = [(fetchpatch { # remove on update + name = "fix-hardcoded-tables.diff"; + url = "http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/c8232e50074f"; + sha256 = "0jlksks4fjajby8fjk7rfp414gxfdgd6q9khq26i52xvf4kg2dw6"; + })]; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix new file mode 100644 index 000000000000..f3d06f7a01ab --- /dev/null +++ b/pkgs/development/libraries/flatcc/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "flatcc"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "dvidelabs"; + repo = "flatcc"; + rev = "v${version}"; + sha256 = "sha256:0cb6s9q1cbigss1q7dra0ix2a0iqlh2xxwncbrnmqv17h4lwvglr"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DFLATCC_INSTALL=on" + "-DCMAKE_BUILD_TYPE=Release" + ]; + + meta = { + description = "FlatBuffers Compiler and Library in C for C "; + homepage = https://github.com/dvidelabs/flatcc; + license = [ stdenv.lib.licenses.asl20 ]; + }; +} diff --git a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch new file mode 100644 index 000000000000..79257fd6be50 --- /dev/null +++ b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch @@ -0,0 +1,15 @@ +diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c +index 6e23d9f2..8c621ec4 100644 +--- a/icon-validator/validate-icon.c ++++ b/icon-validator/validate-icon.c +@@ -149,8 +149,8 @@ rerun_in_sandbox (const char *arg_width, + "--unshare-ipc", + "--unshare-net", + "--unshare-pid", +- "--ro-bind", "/usr", "/usr", +- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", ++ "--ro-bind", "@storeDir@", "@storeDir@", ++ "--ro-bind", "/run/current-system", "/run/current-system", + "--ro-bind", validate_icon, validate_icon, + NULL); + diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index ebf55dcd194c..a4a0bd1a263c 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.1.3"; + version = "1.2.4"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "12xqhszx50pmw2nx7n1pym7n47z95ddwwkyx35bfgmxsd9hjpmh2"; + sha256 = "1qf3ys84fzv11z6f6li59rxjdjbyrv7cyi9539k73r9i9pckjr8v"; }; patches = [ @@ -25,9 +25,14 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; p11 = p11-kit; }) + (substituteAll { + src = ./bubblewrap-paths.patch; + inherit (builtins) storeDir; + }) # patch taken from gtk_doc ./respect-xml-catalog-files-var.patch ./use-flatpak-from-path.patch + ./unset-env-vars.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/development/libraries/flatpak/unset-env-vars.patch new file mode 100644 index 000000000000..798e388b23c2 --- /dev/null +++ b/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -0,0 +1,10 @@ +--- a/common/flatpak-run.c ++++ b/common/flatpak-run.c +@@ -1192,6 +1192,7 @@ static const ExportData default_exports[] = { + {"PERLLIB", NULL}, + {"PERL5LIB", NULL}, + {"XCURSOR_PATH", NULL}, ++ {"GDK_PIXBUF_MODULE_FILE", NULL}, + }; + + static const ExportData no_ld_so_cache_exports[] = { diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 1c88235b9257..2ee0af8cfc13 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -4,6 +4,7 @@ runCommand "fc-cache" rec { buildInputs = [ fontconfig.bin ]; preferLocalBuild = true; + allowSubstitutes = false; passAsFile = [ "fontDirs" ]; fontDirs = '' diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index cb7f2621353d..0fdf0a09be6c 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which , librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw -, libwebp, gnome3, libintl }: +, gexiv2, libwebp, gnome3, libintl }: let version = "0.4.12"; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libpng cairo libjpeg librsvg pango gtk bzip2 - libraw libwebp gnome3.gexiv2 + libraw libwebp gexiv2 ]; propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index 2d308add87ad..ebb9b354ff1d 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib }: +{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: stdenv.mkDerivation rec { pname = "geocode-glib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a"; }; - nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; - buildInputs = with gnome3; [ glib libsoup json-glib ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; + buildInputs = [ glib libsoup json-glib ]; patches = [ ./installed-tests-path.patch diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index e0255be666e9..47ee617ea088 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -86,6 +86,17 @@ stdenv.mkDerivation rec { url = https://gitlab.gnome.org/GNOME/glib/commit/30ccbc386026cecac6ef3a77d8fa4f3c24ac68d7.patch; sha256 = "04y3pxgzlx92cppwibx4rlsyvwxb37aq52x2lr6ajfgykv2nzpr3"; }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/commit/d8f8f4d637ce43f8699ba94c9b7648beda0ca174.patch"; + name = "CVE-2019-12450.patch"; + sha256 = "03ris8lllbb7i18qvbpqaf7xdwfz1dkskx8mb533dmwlp2ll69hg"; + }) + # https://gitlab.gnome.org/GNOME/glib/issues/1658 + (fetchpatch { + name = "CVE-2019-13012.patch"; + url = "https://gitlab.gnome.org/GNOME/glib/commit/5e4da714f00f6bfb2ccd6d73d61329c6f3a08429.patch"; + sha256 = "0ykfx9i1ipz06n7hvz27qw0l9hy9jslg5gqqxyfiivy81q4p7lnl"; + }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index e46985d3fca8..444d6c458fb6 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -2,6 +2,7 @@ , withLinuxHeaders ? true , profilingLibraries ? false , withGd ? false +, buildPackages }: callPackage ./common.nix { inherit stdenv; } { @@ -55,9 +56,29 @@ callPackage ./common.nix { inherit stdenv; } { fi ''; - postInstall = '' + postInstall = (if stdenv.hostPlatform == stdenv.buildPlatform then '' echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales + '' else stdenv.lib.optionalString stdenv.buildPlatform.isLinux '' + # This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html + # Instead of using their patch to build a build-native localedef, + # we simply use the one from buildPackages + pushd ../glibc-2*/localedata + export I18NPATH=$PWD GCONV_PATH=$PWD/../iconvdata + mkdir -p $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale + ${stdenv.lib.getBin buildPackages.glibc}/bin/localedef \ + --alias-file=../intl/locale.alias \ + -i locales/C \ + -f charmaps/UTF-8 \ + --prefix $NIX_BUILD_TOP \ + ${if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then + "--little-endian" + else + "--big-endian"} \ + C.UTF-8 + cp -r $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale $out/lib + popd + '') + '' test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index 2b20c17d4500..0dc191974155 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -26,6 +26,8 @@ callPackage ./common.nix { inherit stdenv; } { '' mkdir -p $TMPDIR/"${buildPackages.stdenv.cc.libc.out}/lib/locale" + echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED + # Hack to allow building of the locales (needed since glibc-2.12) sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile '' diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 2da5474eb9d1..269071434d57 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchFromGitHub, automake, autoconf, libtool +{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook , openblas, gfortran, openssh, openmpi } : @@ -15,11 +15,22 @@ in stdenv.mkDerivation { sha256 = "07i2idaas7pq3in5mdqq5ndvxln5q87nyfgk3vzw85r72c4fq5jh"; }; - nativeBuildInputs = [ automake autoconf libtool ]; + # upstream patches for openmpi-4 compatibility + patches = [ (fetchpatch { + name = "MPI_Type_struct-was-deprecated-in-MPI-2"; + url = "https://github.com/GlobalArrays/ga/commit/36e6458993b1df745f43b7db86dc17087758e0d2.patch"; + sha256 = "058qi8x0ananqx980p03yxpyn41cnmm0ifwsl50qp6sc0bnbnclh"; + }) + (fetchpatch { + name = "MPI_Errhandler_set-was-deprecated-in-MPI-2"; + url = "https://github.com/GlobalArrays/ga/commit/f1ea5203d2672c1a1d0275a012fb7c2fb3d033d8.patch"; + sha256 = "06n7ds9alk5xa6hd7waw3wrg88yx2azhdkn3cjs2k189iw8a7fqk"; + })]; + + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openmpi openblas gfortran openssh ]; preConfigure = '' - autoreconf -ivf configureFlagsArray+=( "--enable-i8" \ "--with-mpi" \ "--with-mpi3" \ diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index 1c6dfc4a8524..b373095a8148 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/jstedfast/gmime/; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index d036140567fe..699d2854f3db 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/jstedfast/gmime/; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gnutls/3.6.nix b/pkgs/development/libraries/gnutls/3.6.nix index 513f20fd835a..b05624ee0b28 100644 --- a/pkgs/development/libraries/gnutls/3.6.nix +++ b/pkgs/development/libraries/gnutls/3.6.nix @@ -1,11 +1,11 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.6.6"; + version = "3.6.7"; src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "19rcfgsfxb01cyz8jxmmgkjqc7y5s97amajzyknk1i1amywcm6mv"; + sha256 = "1ql8l6l5bxks2pgpwb1602zc0j6ivhpy27hdfc49h8xgbanhjd2v"; }; # Skip some tests: diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 3b4cc86aaaa4..77773e91e174 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.19.1"; name = "grpc-${version}"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0pf8q1z3qhlljlj6h7isvqvsxhh4612z780xcbv1h9lj7cdpr77m"; + sha256 = "0c0jra4qnd86gyr4rlblic3igb5dpgrldac35myk5i5ia547fdhj"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" + "-DBUILD_SHARED_LIBS=ON" ]; # CMake creates a build directory by default, this conflicts with the @@ -26,6 +27,10 @@ stdenv.mkDerivation rec { rm -vf BUILD ''; + preBuild = '' + export LD_LIBRARY_PATH=$(pwd):$LD_LIBRARY_PATH + ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option"; enableParallelBuilds = true; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 52f1f5574dd9..19abca1cabb6 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes -, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection -, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3 +, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection, fribidi +, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux @@ -13,20 +13,20 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - version = "3.24.4"; + version = "3.24.5"; in stdenv.mkDerivation rec { name = "gtk+3-${version}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "176bl1pm5d5xkhmiwldzw833akna7shp59glkl6cjz580bzmjkyq"; + sha256 = "0bxhvnixc1hjxbzx063lghmix0wmv282khsqmckdxhrb606zpr8b"; }; outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ pkgconfig gettext gobject-introspection perl makeWrapper ]; + nativeBuildInputs = [ pkgconfig gettext gobject-introspection perl makeWrapper autoreconfHook ]; patches = [ ./3.0-immodules.cache.patch @@ -35,8 +35,15 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - # 3.24.3: https://gitlab.gnome.org/GNOME/gtk/merge_requests/505 (fetchpatch { + name = "fix-fribidi-linking.patch"; + url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch; + sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr"; + }) + (fetchpatch { + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/505 already merged + # but isn't in 3.24.5 + name = "export-missing-symbols.patch"; url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch; sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl"; }) @@ -50,7 +57,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon epoxy json-glib isocodes ] ++ optional stdenv.isDarwin AppKit; propagatedBuildInputs = with xorg; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas + [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas fribidi libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index f7fda1a382fe..c62b2d63b429 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus -, glib, libgudev, udisks2, libgcrypt, libcap, polkit +, glib, libgudev, udisks2, libgcrypt, libcap, polkit, fetchpatch , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp , gnomeSupport ? false, gnome, gcr, wrapGAppsHook @@ -9,15 +9,42 @@ let pname = "gvfs"; - version = "1.38.1"; + version = "1.38.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "18311pn5kp9b4kf5prvhcjs0cwf7fm3mqh6s6p42avcr5j26l4zd"; + sha256 = "0nw6mv5qq0d79d72x28db0vwihv4isny6m8q7vdim11ngk10hgwh"; }; + patches = [ + # CVE-2019-12448 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gvfs/commit/a1c2e7ecab0d6457fa2227d92e3569c08516eac5.patch"; + sha256 = "03fwlpj1vbi80661bbhzv8ddx3czkzv9i1q4h3gqyxi5f1i0xfz4"; + }) + # CVE-2019-12447 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gvfs/commit/0f25dea30d01d920443ab72b0c254560ec40e14c.patch"; + sha256 = "1p7c48nsx1lkv2qpkyrsm9qfa77xwd28gczwcpv2kbji3ws5qgj5"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gvfs/commit/272e6bdac33309672955e8f8bf1b8f5f1e51fa0a.patch"; + sha256 = "0zxbhmgqxxw987ag8fh6yjzjn9jl55fqbn814jh9kwrk7x4prx9x"; + }) + # CVE-2019-12449 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gvfs/commit/bed1e9685c9f65f6a3ff3b39dd8547db3e7e77f6.patch"; + sha256 = "0hfybfaz2gfx3yyw5ymx6q0pqwkx2r1i7gzprfp80bplwslq0d4h"; + }) + # CVE-2019-12795 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gvfs/commit/e3808a1b4042761055b1d975333a8243d67b8bfe.patch"; + sha256 = "1lx6yxykx24mnq5izijqk744zj6rgww6ba76z0qjal4y0z3gsdqp"; + }) + ]; + postPatch = '' # patchShebangs requires executable file chmod +x codegen.py meson_post_install.py diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 7368cb2c2362..7c364c0fcdf5 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation { postPatch = '' patchShebangs src/gen-def.py patchShebangs test + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # ApplicationServices.framework headers have cast-align warnings. + substituteInPlace src/hb.hh \ + --replace '#pragma GCC diagnostic error "-Wcast-align"' "" ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/hiredis-vip/default.nix b/pkgs/development/libraries/hiredis-vip/default.nix new file mode 100644 index 000000000000..59e168115a86 --- /dev/null +++ b/pkgs/development/libraries/hiredis-vip/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "hiredis-vip"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "vipshop"; + repo = "hiredis-vip"; + rev = version; + sha256 = "1z9zry635pxqv6d2cgk3dghb5qfpg9m7dz34ld4djw9b53hjr2z2"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "A C client library for the Redis database"; + homepage = https://github.com/vipshop/hiredis-vip; + license = lib.licenses.bsd3; + }; + +} diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 7a42ff94fc0f..37f01372005c 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper -, perlPackages, libxml2 }: +, perlPackages, libxml2, libiconv }: stdenv.mkDerivation rec { name = "hivex-${version}"; @@ -15,12 +15,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoreconfHook makeWrapper libxml2 - ] ++ (with perlPackages; [ perl IOStringy ]); + ] + ++ (with perlPackages; [ perl IOStringy ]) + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; postInstall = '' - for bin in $out/bin/*; do - wrapProgram "$bin" --prefix "PATH" : "$out/bin" - done + wrapProgram $out/bin/hivexregedit \ + --set PERL5LIB "$out/${perlPackages.perl.libPrefix}" \ + --prefix "PATH" : "$out/bin" + + wrapProgram $out/bin/hivexml \ + --prefix "PATH" : "$out/bin" ''; meta = with stdenv.lib; { @@ -28,6 +33,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2; homepage = https://github.com/libguestfs/hivex; maintainers = with maintainers; [offline]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index a6281156afa1..e476bc22eca2 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}: +{stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}: stdenv.mkDerivation { name = "imlib-1.9.15"; @@ -7,6 +7,14 @@ stdenv.mkDerivation { sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; }; + patches = [ + (fetchpatch { + name = "CVE-2007-3568.patch"; + url = https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch; + sha256 = "0lxfibi094gki39sq1w4p0hcx25xlk0875agbhjkjngzx862wvbg"; + }) + ]; + configureFlags = [ "--disable-shm" "--x-includes=${libX11.dev}/include" diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index eb9282274328..946bc17e7643 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jasper-${version}"; - version = "2.0.14"; + version = "2.0.16"; src = fetchFromGitHub { repo = "jasper"; owner = "mdadams"; rev = "version-${version}"; - sha256 = "0aarg8nbik9wrm7fx0451sbm5ypfdfr6i169pxzi354mpdp8gg7f"; + sha256 = "05l75yd1zsxwv25ykwwwjs8961szv7iywf16nc6vc6qpby27ckv6"; }; patches = [ diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index ce41ffa4929f..f240ad124c8b 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.54/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.54/ ) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index fc3a8d64a473..197911be0d41 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "heimdal-${version}"; - version = "7.5.0"; + version = "7.6.0"; src = fetchFromGitHub { owner = "heimdal"; repo = "heimdal"; rev = "heimdal-${version}"; - sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d"; + sha256 = "1i70xas6wddkw2840lk0ah9w6ddx0dzrslby1ggxlwfmcax8rcgp"; }; outputs = [ "out" "dev" "man" "info" ]; diff --git a/pkgs/development/libraries/leptonica/CVE-2018-3836.patch b/pkgs/development/libraries/leptonica/CVE-2018-3836.patch new file mode 100644 index 000000000000..f1b4170fbaae --- /dev/null +++ b/pkgs/development/libraries/leptonica/CVE-2018-3836.patch @@ -0,0 +1,95 @@ +--- a/src/allheaders.h ++++ b/src/allheaders.h +@@ -2600,6 +2600,7 @@ + LEPT_DLL extern char * stringReverse ( const char *src ); + LEPT_DLL extern char * strtokSafe ( char *cstr, const char *seps, char **psaveptr ); + LEPT_DLL extern l_int32 stringSplitOnToken ( char *cstr, const char *seps, char **phead, char **ptail ); ++LEPT_DLL extern l_int32 stringCheckForChars ( const char *src, const char *chars, l_int32 *pfound ); + LEPT_DLL extern char * stringRemoveChars ( const char *src, const char *remchars ); + LEPT_DLL extern l_int32 stringFindSubstr ( const char *src, const char *sub, l_int32 *ploc ); + LEPT_DLL extern char * stringReplaceSubstr ( const char *src, const char *sub1, const char *sub2, l_int32 *pfound, l_int32 *ploc ); +--- a/src/gplot.c ++++ b/src/gplot.c +@@ -141,9 +141,10 @@ + const char *xlabel, + const char *ylabel) + { +-char *newroot; +-char buf[L_BUF_SIZE]; +-GPLOT *gplot; ++char *newroot; ++char buf[L_BUF_SIZE]; ++l_int32 badchar; ++GPLOT *gplot; + + PROCNAME("gplotCreate"); + +@@ -152,6 +153,9 @@ + if (outformat != GPLOT_PNG && outformat != GPLOT_PS && + outformat != GPLOT_EPS && outformat != GPLOT_LATEX) + return (GPLOT *)ERROR_PTR("outformat invalid", procName, NULL); ++ stringCheckForChars(rootname, "`;&|><\"?*", &badchar); ++ if (badchar) /* danger of command injection */ ++ return (GPLOT *)ERROR_PTR("invalid rootname", procName, NULL); + + if ((gplot = (GPLOT *)LEPT_CALLOC(1, sizeof(GPLOT))) == NULL) + return (GPLOT *)ERROR_PTR("gplot not made", procName, NULL); +--- a/src/utils2.c ++++ b/src/utils2.c +@@ -42,6 +42,7 @@ + * l_int32 stringSplitOnToken() + * + * Find and replace string and array procs ++ * l_int32 stringCheckForChars() + * char *stringRemoveChars() + * l_int32 stringFindSubstr() + * char *stringReplaceSubstr() +@@ -701,6 +702,48 @@ + /*--------------------------------------------------------------------* + * Find and replace procs * + *--------------------------------------------------------------------*/ ++/*! ++ * \brief stringCheckForChars() ++ * ++ * \param[in] src input string; can be of zero length ++ * \param[in] chars string of chars to be searched for in %src ++ * \param[out] pfound 1 if any characters are found; 0 otherwise ++ * \return 0 if OK, 1 on error ++ * ++ * 
++ * Notes:
++ *      (1) This can be used to sanitize an operation by checking for
++ *          special characters that don't belong in a string.
++ *
++ */ ++l_int32 ++stringCheckForChars(const char *src, ++ const char *chars, ++ l_int32 *pfound) ++{ ++char ch; ++l_int32 i, n; ++ ++ PROCNAME("stringCheckForChars"); ++ ++ if (!pfound) ++ return ERROR_INT("&found not defined", procName, 1); ++ *pfound = FALSE; ++ if (!src || !chars) ++ return ERROR_INT("src and chars not both defined", procName, 1); ++ ++ n = strlen(src); ++ for (i = 0; i < n; i++) { ++ ch = src[i]; ++ if (strchr(chars, ch)) { ++ *pfound = TRUE; ++ break; ++ } ++ } ++ return 0; ++} ++ ++ + /*! + * \brief stringRemoveChars() + * diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index b9b6c3c7c24f..1bcde3401287 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig -, giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib +, giflib, libjpeg, libpng, libtiff, libwebp, openjpeg, zlib, which, gnuplot }: stdenv.mkDerivation rec { @@ -11,12 +11,34 @@ stdenv.mkDerivation rec { sha256 = "0qpcidvv6igybrrhj0m6j47g642c8sk1qn4dpj82mgd38xx52skl"; }; - patches = stdenv.lib.singleton (fetchpatch { - # configure: Support pkg-config - url = "https://github.com/DanBloomberg/leptonica/commit/" - + "4476d162cc191a0fefb2ce434153e12bbf188664.patch"; - sha256 = "1razzp2g49shfaravfqpxm3ivcd1r92lvqysll6nnf6d1wp9865s"; - }); + patches = [ + (fetchpatch { + # configure: Support pkg-config + url = "https://github.com/DanBloomberg/leptonica/commit/" + + "4476d162cc191a0fefb2ce434153e12bbf188664.patch"; + sha256 = "1razzp2g49shfaravfqpxm3ivcd1r92lvqysll6nnf6d1wp9865s"; + }) + # stripped down copy of upstream commit b88c821f8d347bce0aea86d606c710303919f3d2 + ./CVE-2018-3836.patch + (fetchpatch { + # CVE-2018-7186 + url = "https://github.com/DanBloomberg/leptonica/commit/" + + "ee301cb2029db8a6289c5295daa42bba7715e99a.patch"; + sha256 = "0cgb7mvz2px1rg5i80wk1wxxjvzjga617d8q6j7qygkp7jm6495d"; + }) + (fetchpatch { + # CVE-2018-7247 + url = "https://github.com/DanBloomberg/leptonica/commit/" + + "c1079bb8e77cdd426759e466729917ca37a3ed9f.patch"; + sha256 = "1z4iac5gwqggh7aa8cvyp6nl9fwd1v7wif26caxc9y5qr3jj34qf"; + }) + (fetchpatch { + # CVE-2018-7440 + url = "https://github.com/DanBloomberg/leptonica/commit/" + + "49ecb6c2dfd6ed5078c62f4a8eeff03e3beced3b.patch"; + sha256 = "1hjmva98iaw9xj7prg7aimykyayikcwnk4hk0380007hqb35lqmy"; + }) + ]; postPatch = '' # Remove the AC_SUBST() macros on *_LIBS, because the *_LIBS variables will @@ -34,6 +56,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ]; + checkInputs = [ which gnuplot ]; + doCheck = true; + meta = { description = "Image processing and analysis library"; homepage = http://www.leptonica.org/; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 029be971ac17..f2a1c500a8be 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -17,6 +17,21 @@ stdenv.mkDerivation rec { sha256 = "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms"; }; + patches = [ + (fetchpatch { + # details: https://github.com/libarchive/libarchive/pull/1105 + name = "cve-2018-1000877.diff"; # CVE-2018-1000877..80 + url = "https://github.com/libarchive/libarchive/pull/1105.diff"; + sha256 = "0mxcawfdy9m40mykzwhkl39a6vnh4ypgy0ipcz74qm4bi72x0gyf"; + }) + (fetchpatch { + # details: https://github.com/libarchive/libarchive/pull/1120 + name = "cve-2019-1000019_cve-2019-1000020.diff"; + url = "https://github.com/libarchive/libarchive/pull/1120.diff"; + sha256 = "1mgx92v8hm7hw9j34nbfriqfkxshh3cy25rhavr7kl7lz4x5a6g4"; + }) + ]; + outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 3d236ab5851a..a0bd7d864548 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.96"; + name = "libdrm-2.4.97"; src = fetchurl { url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "14xkip83qgljjaahzq40qgl60j54q7k00la1hbf5kk5lgg7ilmhd"; + sha256 = "08yimlp6jir1rs5ajgdx74xa5qdzcqahpdzdk0rmkmhh7vdcrl3p"; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 5adafece3535..7570c01872b5 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "libelf-0.8.13"; src = fetchurl { - url = "http://www.mr511.de/software/${name}.tar.gz"; + url = "https://fossies.org/linux/misc/old/${name}.tar.gz"; sha256 = "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr"; }; diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index d77337c912b2..922207f1ccea 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libev-${version}"; - version="4.24"; + version="4.25"; src = fetchurl { url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz"; - sha256 = "08gqsza1czx0nf62nkk183jb0946yzjsymaacxbzdgcs8z9r6dcp"; + sha256 = "1295q0lkkbrlpd5dl5i48bh1rm8mjzh9y795jlvjz3bp4wf7wxbq"; }; meta = { diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 9bf03f25c9c9..cab04438dd38 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee , overrideCC, gcc6 , mysqlSupport ? false, mysql ? null , postgresSupport ? false, postgresql ? null @@ -24,7 +24,7 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ]; - buildInputs = with stdenv.lib; [ gtk3 openssl gnome3.libgee ] + buildInputs = with stdenv.lib; [ gtk3 openssl libgee ] ++ optional (mysqlSupport) mysql.connector-c ++ optional (postgresSupport) postgresql; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index f22cc568a97c..3f20236d17f4 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; - buildInputs = with gnome3; - [ libsoup libxml2 glib liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ]; + buildInputs = [ gnome3.libsoup libxml2 glib liboauth gcr gnome3.gnome-online-accounts p11-kit openssl uhttpmock ]; propagatedBuildInputs = [ json-glib ]; diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index 498858d52e91..e3a6580038a2 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgit2-glib"; - version = "0.27.7"; + version = "0.27.8"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hpgs8dx0dk25mc8jsizi2cwwhnmahrn3dyry9p7a1g48mnxyc8i"; + sha256 = "0d8rwgf69424ijy6fjbk3m863y9ml5bq7mshlqw7xqk9zngdd6f1"; }; postPatch = '' diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index 20a9bb91604e..0951ab1fe0c0 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libgnomekbd"; - version = "3.26.0"; + version = "3.26.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; + sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"; }; passthru = { diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 07c0f8cb1b46..e3d7741ba869 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -85,6 +85,5 @@ stdenv.mkDerivation rec { homepage = http://libguestfs.org/; maintainers = with maintainers; [offline]; platforms = platforms.linux; - hydraPlatforms = []; }; } diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix new file mode 100644 index 000000000000..d5d35678b4fb --- /dev/null +++ b/pkgs/development/libraries/libgumath/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitHub +, libndtypes +, libxnd +}: + +stdenv.mkDerivation rec { + name = "libgumath-${version}"; + version = "unstable-2018-11-27"; + + src = fetchFromGitHub { + owner = "plures"; + repo = "gumath"; + rev = "5a9d27883b40432246d6a93cd6133157267fd166"; + sha256 = "0w2qzp7anxd1wzkvv5r2pdkkpgrnqzgrq47lrvpqc1i1wqzcwf0w"; + }; + + buildInputs = [ libndtypes libxnd ]; + + # Override linker with cc (symlink to either gcc or clang) + # Library expects to use cc for linking + configureFlags = [ + "LD=${stdenv.cc.targetPrefix}cc" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Library supporting function dispatch on general data containers. C base and Python wrapper"; + homepage = https://xnd.io/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 9fb0b776e6fd..3fad34ce0d0a 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -7,7 +7,7 @@ let pname = "libhandy"; - version = "0.0.7"; + version = "0.0.8"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "1k9v6q2dz9x8lfcyzmsksrkq6md7m9jdkjlfan7nqlcj3mqhd7m9"; + sha256 = "04jyllwdrapw24f34pjc2gbmfapjfin8iw0g3qfply7ciy08k1wj"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libheif/1.3.2-CVE-2019-11471.patch b/pkgs/development/libraries/libheif/1.3.2-CVE-2019-11471.patch new file mode 100644 index 000000000000..cc597b78a4ff --- /dev/null +++ b/pkgs/development/libraries/libheif/1.3.2-CVE-2019-11471.patch @@ -0,0 +1,15 @@ +Adapted from upstream commit 995a4283d8ed2d0d2c1ceb1a577b993df2f0e014 +--- a/libheif/heif_context.cc ++++ b/libheif/heif_context.cc +@@ -566,6 +566,11 @@ + image->set_is_alpha_channel_of(refs[0]); + + auto master_iter = m_all_images.find(refs[0]); ++ if (master_iter == m_all_images.end()) { ++ return Error(heif_error_Invalid_input, ++ heif_suberror_Nonexisting_item_referenced, ++ "Non-existing alpha image referenced"); ++ } + master_iter->second->set_alpha_channel(image); + } + diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 25cee4ef8daa..ce7c35d96715 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w"; }; + patches = [ ./1.3.2-CVE-2019-11471.patch ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libde265 x265 libpng libjpeg ]; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 3ff6b6001934..b79cad7cb69b 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libidn2-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "mirror://gnu/gnu/libidn/${name}.tar.gz"; - sha256 = "0chxs75212qknd72l6vvai48hwg3czlr938sym1sydwmmbdrh8q3"; + sha256 = "1cbq439dzf14jjpayk5mk0yyq32k3c27acg1d4ra364j6a060hcm"; }; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index f4eafcdaace4..83a500c13802 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -3,15 +3,15 @@ stdenv.mkDerivation rec { pname = "libimobiledevice"; - version = "2018-07-24"; + version = "2019-04-04"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "d7a2e04d2e7880c56116fd35489a7f98755501b7"; - sha256 = "0cj0j10lmfr28c7nh79n2mcmy31xx50g93h0bqs0l7y76ph4dqkc"; + rev = "eea4f1be9107c8ab621fd71460e47d0d38e55d71"; + sha256 = "0wh6z5f5znlqs0grh7c8jj1s411azgyy45klmql5kj3p8qqybqrs"; }; outputs = [ "out" "dev" ]; @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 17632c678c46..021cfbb1bb48 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,24 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }: +{ stdenv, fetchurl, pkgconfig, glib, python3, systemd, libgudev }: stdenv.mkDerivation rec { - name = "libmbim-1.16.2"; + pname = "libmbim"; + version = "1.18.0"; src = fetchurl { - url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "0qmjvjbgs9m8qsaiq5arikzglgaas9hh1968bi7sy3905kp4yjgb"; + url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; + sha256 = "10mjjy860aakfd3h1yaj9l1jw816amrpwmyqlx37j21xv0l03x3c"; }; outputs = [ "out" "dev" "man" ]; - preConfigure = '' - patchShebangs . - ''; + configureFlags = [ + "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib udev libgudev python ]; + nativeBuildInputs = [ + pkgconfig + python3 + ]; + + buildInputs = [ + glib + libgudev + systemd + ]; + + doCheck = true; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/software/libmbim/; + homepage = https://www.freedesktop.org/wiki/Software/libmbim/; description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index 925154e1d459..51e4deed462c 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -1,27 +1,28 @@ -{ lib -, stdenv +{ stdenv , fetchFromGitHub }: stdenv.mkDerivation rec { name = "libndtypes-${version}"; - version = "0.2.0dev3"; + version = "unstable-2018-11-27"; src = fetchFromGitHub { owner = "plures"; repo = "ndtypes"; - rev = "v${version}"; - sha256 = "0dpvv13mrid8l5zkjlz18qvirz3nr0v98agx9bcvkqbiahlfgjli"; + rev = "4d810d0c4d54c81a7136f313f0ae6623853d574a"; + sha256 = "1kk1sa7f17ffh49jc1qlizlsj536fr3s4flb6x4rjyi81rp7psb9"; }; # Override linker with cc (symlink to either gcc or clang) # Library expects to use cc for linking configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; - meta = { + doCheck = true; + + meta = with stdenv.lib; { description = "Dynamic types for data description and in-memory computations"; homepage = https://xnd.io/; - license = lib.licenses.bsdOriginal; - maintainers = with lib.maintainers; [ costrouc ]; + license = licenses.bsdOriginal; + maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 0d6e3b8db6e0..d622584c9da4 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -5,15 +5,15 @@ let in stdenv.mkDerivation rec { pname = "libplist"; - version = "2018-07-25"; + version = "2019-04-04"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "db68a9d1070b363eee93147f072f46526064acbc"; - sha256 = "0lxyb35jjg31m8dxhsv1jr2ccy5s19fsqzisy7lfjk46w7brs4h5"; + rev = "42bb64ba966082b440cb68cbdadf317f44710017"; + sha256 = "19yw80yblq29i2jx9yb7bx0lfychy9dncri3fk4as35kq5bf26i8"; }; outputs = ["bin" "dev" "out" "py"]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "A library to handle Apple Property List format in binary or XML"; homepage = https://github.com/libimobiledevice/libplist; license = licenses.lgpl21Plus; - maintainers = [ ]; + maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 206472187b01..765f03d9825d 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -18,8 +18,7 @@ in stdenv.mkDerivation rec { url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; sha256 = "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc"; }; - patches = if !stdenv.hostPlatform.isAarch64 then null # temporarily avoid rebuild - else [ + patches = [ (fetchurl { # https://github.com/glennrp/libpng/issues/266 url = "https://salsa.debian.org/debian/libpng1.6/raw/0e1348f3d/debian/patches/272.patch"; sha256 = "1d36khgryq2p27bdx10xrr4kcjr7cdfdj2zhdcjzznpnpns97s6n"; diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index cb30a890f401..3c29dc96d69b 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, autoreconfHook, boost, python2, libgsf, +{ stdenv, fetchurl, autoreconfHook, boost, libgsf, pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { name = "libpst-0.6.71"; src = fetchurl { - url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; - sha256 = "130nksrwgi3ih32si5alvxwzd5kmlg8yi7p03w0h7w9r3b90i4pv"; - }; + url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; + sha256 = "130nksrwgi3ih32si5alvxwzd5kmlg8yi7p03w0h7w9r3b90i4pv"; + }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ boost python2 libgsf bzip2 + buildInputs = [ + boost libgsf bzip2 xmlto gettext imagemagick doxygen ]; + configureFlags = [ + "--enable-python=no" + ]; + doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 99383fe6450c..083b5c8bc851 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,26 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }: +{ stdenv, fetchurl, pkgconfig, glib, python3, libgudev, libmbim }: stdenv.mkDerivation rec { - name = "libqmi-1.20.2"; + pname = "libqmi"; + version = "1.22.2"; src = fetchurl { - url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "0i6aw8jyxv84d5x8lj2g9lb8xxf1dyad8n3q0kw164pyig55jd67"; + url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; + sha256 = "09w20dsgr16bgbqw5ds7r6j2s6ihwyalh9zpbjhcn7cvm0afbwgi"; }; outputs = [ "out" "dev" "devdoc" ]; - preBuild = '' - patchShebangs . - ''; + configureFlags = [ + "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib python libgudev libmbim ]; + nativeBuildInputs = [ + pkgconfig + python3 + ]; - configureFlags = ["--enable-mbim-qmux" ]; + buildInputs = [ + glib + libgudev + libmbim + ]; + + doCheck = true; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/libqmi/; + homepage = https://www.freedesktop.org/wiki/Software/libqmi/; description = "Modem protocol helper library"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libr3/default.nix b/pkgs/development/libraries/libr3/default.nix new file mode 100644 index 000000000000..cf848d02a048 --- /dev/null +++ b/pkgs/development/libraries/libr3/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetchFromGitHub +, pcre +, pkgconfig +, check +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "r3"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "c9s"; + repo = "r3"; + rev = version; + sha256 = "09cixbms817p6nb77wz3rxp0znnac8ybycvsrrzgwlbfn58a3zwl"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ check ]; + propagatedBuildInputs = [ pcre ]; + + strictDeps = true; + + meta = { + description = "A high-performance path dispatching library"; + homepage = https://github.com/c9s/r3; + license = [ stdenv.lib.licenses.mit ]; + }; + +} diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 11ed2eb0044a..fb4b1ac54a9f 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib }: +{ stdenv, fetchurl, lib, cmake }: let @@ -11,7 +11,17 @@ let inherit sha256; }; - configureFlags = [ "--enable-nc" ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DENABLE_NC=ON" "-DBUILD_SHARED_LIBS=ON" ]; + + # The autoconf build is broken as of 2.9.1, resulting in the following error: + # libressl-2.9.1/tls/.libs/libtls.a', needed by 'handshake_table'. + # Fortunately LibreSSL provides a CMake build as well, so opt for CMake by + # removing ./configure pre-config. + preConfigure = '' + rm configure + ''; enableParallelBuilding = true; @@ -19,6 +29,8 @@ let postFixup = '' moveToOutput "bin/nc" "$nc" + moveToOutput "bin/openssl" "$bin" + moveToOutput "bin/ocspcheck" "$bin" moveToOutput "share/man/man1/nc.1${lib.optionalString (dontGzipMan==null) ".gz"}" "$nc" ''; @@ -35,18 +47,13 @@ let in { - libressl_2_7 = generic { - version = "2.7.5"; - sha256 = "0h60bcx7k72171dwpx4vsbsrxxz9c18v75lh5fj600gghn6h7rdy"; - }; - libressl_2_8 = generic { version = "2.8.3"; sha256 = "0xw4z4z6m7lyf1r4m2w2w1k7as791c04ygnfk4d7d0ki0h9hnr4v"; }; libressl_2_9 = generic { - version = "2.9.0"; - sha256 = "1x1wl6b449m6hfhyxxzxbf2v8yfb5q92q6d01hdg28xp1222jpzb"; + version = "2.9.2"; + sha256 = "1m6mz515dcbrbnyz8hrpdfjzdmj1c15vbgnqxdxb89g3z9kq3iy4"; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 4f9619bdf56a..9cd68cacfe7b 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -5,14 +5,14 @@ let pname = "librsvg"; - version = "2.44.11"; + version = "2.44.12"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "17mgl7is0k236i61fnjj9nw5h1ykl4ff6vk30qp49bsg2zp6wnp4"; + sha256 = "1h3qnqhr0l7pd2bxg69ki6ckl4srdwgr471dpp4jq9i4784hp0v6"; }; outputs = [ "out" "dev" "installedTests" ]; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 54108e1a007b..ce43ed734324 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0w6v1xa00jvfyk4b29ir7dfkhiq72anz015gg580bi7x3n7saz28"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-19827.patch"; + url = "https://github.com/sass/libsass/commit/b21fb9f84096d9927780b86fa90629a096af358d.patch"; + sha256 = "0ix12x9plmpgs3xda2fjdcykca687h16qfwqr57i5qphjr9vp33l"; + }) + ]; + preConfigure = '' export LIBSASS_VERSION=${version} ''; diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 1f188f98f038..0571cc5b3ac5 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.3.3"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "0mdiyfljrkfl50q1m3ws8yfcyfjwf1zgkvcva8ffcwncji18zhkz"; + sha256 = "0paj1szszpf8plykrd66jqg1x3kmqs395rbjskahld2bnplcfx1f"; }; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index b050dede8c61..d4205981499c 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurlBoot, openssl, zlib, windows }: +{ stdenv, fetchurl, openssl, zlib, windows }: stdenv.mkDerivation rec { - name = "libssh2-1.8.0"; + pname = "libssh2"; + version = "1.9.0"; - src = fetchurlBoot { - url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr"; + src = fetchurl { + url = "${meta.homepage}/download/${pname}-${version}.tar.gz"; + sha256 = "1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 8430c462ca6e..1131830ea4c1 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, json_c, hidapi }: stdenv.mkDerivation rec { - name = "libu2f-host-1.1.7"; + name = "libu2f-host-1.1.8"; src = fetchurl { url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz"; - sha256 = "1zyws91b1fsbfwn3f23ry9a9zr0i1a1hqmhk3v1qnlvp56gjayli"; + sha256 = "17fs0rjbs1apvvagal2bppc689wn5k9874axad2dhprbrwrgwz6l"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index 08aeba1254e5..d9e008af9770 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "libusbmuxd"; - version = "2018-07-23"; + version = "2019-03-23"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "78df9be5fc8222ed53846cb553de9b5d24c85c6c"; - sha256 = "05hbn0mbmv5ln9hfsvnf7i1mnp6ncbyfnl5w331kg4fi12wjshc5"; + rev = "873252dc8b4e469c7dc692064ac616104fca5f65"; + sha256 = "0qx3q0n1f2ajfm3vnairikayzln6iyb2y0i7sqfl8mj45ahl6wyj"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/libimobiledevice/libusbmuxd; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 10a2124199b2..0a75fcbeda6c 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.24.1"; - name = "libuv-${version}"; + version = "1.26.0"; + pname = "libuv"; src = fetchFromGitHub { - owner = "libuv"; - repo = "libuv"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "0lpq8anmy69pcmkhk8giyp78q8dadcy2562g4krqaq8a5xy825ab"; + sha256 = "08jvjyn5bp4xnzd5g4pi534mklm6hz5pw6wbzbaq3cnwb6a04iwj"; }; postPatch = let diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 85b8b128d208..704eeda990f3 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit -, pkgconfig, makeWrapper, libtool, autoconf, automake +, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor @@ -33,6 +33,46 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "4.10.0-CVE-2019-10132-1.patch"; + url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=8d12118171a250150f2cb16448c49271a1dcb077"; + sha256 = "1s8xm0zn63wciaxzrcf5ld9d3r2hn9k31p41addhyrxivgvkvk4d"; + }) + (fetchpatch { + name = "4.10.0-CVE-2019-10132-2.patch"; + url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=a712f01682078f48d3c258bff8cd523ab9100b0d"; + sha256 = "12wzv190l7gp3fpa1qirgy5l6w674pfpw06jb15gifrwhy7x9j06"; + }) + (fetchpatch { + name = "4.10.0-CVE-2019-10132-3.patch"; + url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=f8d8a7a182c0854fa50d3976077b3a3d8de8980f"; + sha256 = "08306952a32khl8mkw1xarh084dqp9vxhl6hwm2cmf30zkp8jlff"; + }) + ] ++ optionals (!stdenv.isDarwin) [ # this patch appears to be broken on darwin + (fetchpatch { + name = "4.10.0-CVE-2019-10161.patch"; + url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=3572564893d1710beb1862797fe32cc2e9cb1e38"; + sha256 = "118541d8w1jg92kqzrjhf631f753wncx6xm64jwzhnc096l7swsj"; + }) + ] ++ [ + (fetchpatch { + name = "4.10.0-CVE-2019-10166.patch"; + url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=3f744efec31959f7643849f6a3708198bcdfc6ae"; + sha256 = "0alkw14iwcdy32r6g2lm660ss6fax9c1d9l53s5788vkjfw3jnz0"; + }) + (fetchpatch { + name = "4.10.0-CVE-2019-10167.patch"; + url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=d238f132e6e0432a42d3cdff4571730dae3a85eb"; + sha256 = "0pnvzdhdiqd4hvc5ip59iszahkfrwvf7f99p2v2lb438z9c5bb32"; + }) + (fetchpatch { + name = "4.10.0-CVE-2019-10168.patch"; + url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=09c2635d0deec198de0f250abc2958f2d1c09eaa"; + sha256 = "0s4hc3hsjncx1852ndjas1nng9v23pxf4mi1jxcajsqvhw89la0g"; + }) + ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index 6b9375c73815..cb93ec63e670 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -6,23 +6,32 @@ stdenv.mkDerivation rec { name = "libxnd-${version}"; - version = "0.2.0dev3"; + version = "unstable-2018-11-27"; src = fetchFromGitHub { owner = "plures"; repo = "xnd"; - rev = "v${version}"; - sha256 = "0byq7jspyr2wxrhihw4q7nf0y4sb6j5ax0ndd5dnq5dz88c7qqm2"; + rev = "8a9f3bd1d01d872828b40bc9dbd0bc0184524da3"; + sha256 = "10jh2kqvhpzwy50adayh9az7z2lm16yxy4flrh99alzzbqdyls44"; }; buildInputs = [ libndtypes ]; # Override linker with cc (symlink to either gcc or clang) # Library expects to use cc for linking - configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; + configureFlags = [ + # Override linker with cc (symlink to either gcc or clang) + # Library expects to use cc for linking + "LD=${stdenv.cc.targetPrefix}cc" + # needed for tests + "--with-includes=${libndtypes}/include" + "--with-libs=${libndtypes}/lib" + ]; + + doCheck = true; meta = { - description = "General container that maps a wide range of Python values directly to memory"; + description = "C library for managing typed memory blocks and Python container module"; homepage = https://xnd.io/; license = lib.licenses.bsdOriginal; maintainers = with lib.maintainers; [ costrouc ]; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index ce79b2ac5ff9..2dde7fe32efb 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2, libgcrypt +{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2, libgcrypt , cryptoSupport ? false , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform }: @@ -18,6 +18,24 @@ stdenv.mkDerivation rec { sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf"; }; + patches = [ + (fetchpatch { + name = "CVE-2019-11068.patch"; + url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch"; + sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxslt/commit/c5eb6cf3aba0af048596106ed839b4ae17ecbcb1.patch"; + name = "CVE-2019-13117.patch"; + sha256 = "0ynfq8y5h623cypj1426iiz7796n3mqbjqa24ndvh2am6rl5lw15"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxslt/commit/6ce8de69330783977dd14f6569419489875fb71b.patch"; + name = "CVE-2019-13118.patch"; + sha256 = "0bglz9m9sh2vi50qxcm06iqrazw3h45ycgxnp15iankq95z283iq"; + }) + ]; + outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; buildInputs = [ libxml2.dev ] diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 31056d0a4ed6..531261a58ca5 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -3,14 +3,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { name = "live555-${version}"; - version = "2018.12.14"; + version = "2019.02.03"; src = fetchurl { # the upstream doesn't provide a stable URL urls = [ "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" ]; - sha256 = "0irafygp23m2xmjv06qgs1sccymbwqvn51wggk0c60lnj1v1zhwd"; + sha256 = "04474r1drvgjpk33yjj79dq2hq15ncw8y3w6g9625zryan8qv4qw"; }; postPatch = '' diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 047a74f08409..9d57d4721820 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -18,7 +18,11 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - makeFlags = [ "prefix=$(out)" "CC=cc" ] + makeFlags = [ + "prefix=$(out)" + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + ] ++ stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so"; doCheck = true; diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 0c88cff77732..4df40a964d33 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { prefixKey = "PREFIX="; + preConfigure = '' + patchShebangs ./configure + ''; + configureFlags = [ "BOOST_INCLUDES=${boost.dev}/include" "BOOST_LIBS=${boost.out}/lib" diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9747d8cf5770..5bc1dfaf8783 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "18.3.3"; + version = "18.3.4"; branch = head (splitString "." version); in @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "16b2jgrmlqajsyz0qkr4b2v68538bs941cn3pk635ib6d5m8idia"; + sha256 = "01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index ea94a55a6199..e32c83af8a75 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.0.2"; name = "mpfr-${version}"; src = fetchurl { - url = "mirror://gnu/mpfr/${name}.tar.xz"; - sha256 = "0vp1lrc08gcmwdaqck6bpzllkrykvp06vz5gnqpyw0v3h9h4m1v7"; + urls = [ + #"https://www.mpfr.org/${name}/${name}.tar.xz" + "mirror://gnu/mpfr/${name}.tar.xz" + ]; + sha256 = "12m3amcavhpqygc499s3fzqlb8f2j2rr7fkqsm10xbjfc04fffqx"; }; outputs = [ "out" "dev" "doc" "info" ]; diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix new file mode 100644 index 000000000000..8808ccefeaf1 --- /dev/null +++ b/pkgs/development/libraries/multipart-parser-c/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "multipart-parser-c"; + version = "unstable-2015-12-14"; + + src = fetchFromGitHub { + owner = "iafonov"; + repo = pname; + rev = "772639cf10db6d9f5a655ee9b7eb20b815fab396"; + sha256 = "sha256:056r63vj8f1rwf3wk7jmwhm8ba25l6h1gs6jnkh0schbwcvi56xl"; + }; + + buildPhase = '' + make solib + ''; + + installPhase = '' + mkdir -p $out/lib + mv lib*${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/ + + mkdir -p $out/include + mv *.h $out/include/ + ''; + + meta = { + description = "Http multipart parser implemented in C "; + homepage = https://github.com/iafonov/multipart-parser-c; + license = [ stdenv.lib.licenses.mit ]; + }; + +} diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index 923bc61f67da..cbe1f9840593 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx]; - configureFlags = [ + wafConfigureFlags = [ "--with-openssl=${openssl.dev}" "--boost-includes=${boost.dev}/include" "--boost-libs=${boost.out}/lib" diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index fdc21b26271f..971c70c4f2cc 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -18,11 +18,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.35.1"; + version = "1.36.0"; src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "020k9xkca386yfs47zypb4x83f4l6vqpf8qw1xrhmrd29x4wxvam"; + sha256 = "1sqwwwhlrbp3wcikf9v07k5j4xvflwy297lq4cg92qj087bk99qn"; }; outputs = [ "bin" "out" "dev" "lib" ]; diff --git a/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch b/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch new file mode 100644 index 000000000000..d7fec73910fb --- /dev/null +++ b/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch @@ -0,0 +1,84 @@ +From e5cc8f7c387e3238ebb8239e2555c933a41502c0 Mon Sep 17 00:00:00 2001 +From: Graham Christensen +Date: Thu, 7 Mar 2019 08:11:32 -0500 +Subject: [PATCH] Makefile: use SOURCE_DATE_EPOCH for reproducibility + +--- + nspr/lib/ds/Makefile.in | 4 ++-- + nspr/lib/libc/src/Makefile.in | 4 ++-- + nspr/lib/prstreams/Makefile.in | 4 ++-- + nspr/pr/src/Makefile.in | 6 +++--- + 4 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/nspr/lib/ds/Makefile.in b/nspr/lib/ds/Makefile.in +index e737791..d56b0a7 100644 +--- a/nspr/lib/ds/Makefile.in ++++ b/nspr/lib/ds/Makefile.in +@@ -101,8 +101,8 @@ ECHO = echo + TINC = $(OBJDIR)/_pl_bld.h + PROD = $(notdir $(SHARED_LIBRARY)) + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) + SUF = i64 +diff --git a/nspr/lib/libc/src/Makefile.in b/nspr/lib/libc/src/Makefile.in +index e8a6d9f..0485737 100644 +--- a/nspr/lib/libc/src/Makefile.in ++++ b/nspr/lib/libc/src/Makefile.in +@@ -103,8 +103,8 @@ ECHO = echo + TINC = $(OBJDIR)/_pl_bld.h + PROD = $(notdir $(SHARED_LIBRARY)) + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) + SUF = i64 +diff --git a/nspr/lib/prstreams/Makefile.in b/nspr/lib/prstreams/Makefile.in +index aeb2944..83ae423 100644 +--- a/nspr/lib/prstreams/Makefile.in ++++ b/nspr/lib/prstreams/Makefile.in +@@ -105,8 +105,8 @@ ECHO = echo + TINC = $(OBJDIR)/_pl_bld.h + PROD = $(notdir $(SHARED_LIBRARY)) + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(OS_ARCH), WINNT) + SUF = i64 +diff --git a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in +index 19c5a69..989cc8c 100644 +--- a/nspr/pr/src/Makefile.in ++++ b/nspr/pr/src/Makefile.in +@@ -46,7 +46,7 @@ MKSHLIB += -M $(MAPFILE) + endif + # + # In Solaris 2.6 or earlier, -lrt is called -lposix4. +-# ++# + LIBRT_TEST=$(firstword $(sort 5.7 $(OS_RELEASE))) + ifeq (5.7, $(LIBRT_TEST)) + LIBRT=-lrt +@@ -311,8 +311,8 @@ PROD = $(notdir $(SHARED_LIBRARY)) + endif + + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) + SUF = i64 +-- +2.19.2 + diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 56804d546673..4772f1111aca 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -2,16 +2,20 @@ , CoreServices ? null , buildPackages }: -let version = "4.20"; in +let version = "4.21"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c"; + sha256 = "0nkbgk0x31nfm4xl8la0a3vrnpa8gzkh7g4k65p7n880n73k5shm"; }; + patches = [ + ./0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch + ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 57eab750695b..9233ac1ec23e 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.42"; + version = "3.44.1"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz"; - sha256 = "04rg0yar0plbx1sajrzywprqyhlskczkqxxsgxmcc0qqy64y8g2x"; + sha256 = "1y0jvva4s3j7cjz22kqw2lsml0an1295bgpc2raf7kc9r60cpr7w"; }; buildInputs = [ perl zlib sqlite ] diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 1d92a15ce005..b667dea8d49f 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, icu, catch2 }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2 }: stdenv.mkDerivation rec { name = "nuspell-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "0gcw3p1agnx474r7kv27y9jyab20p4j4xx7j9a2yssg54qabm71j"; + sha256 = "17khkb1sxn1p6rfql72l7a4lxafbxj0dwi95hsmyi6wajvfrg9sy"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ boost icu ]; enableParallelBuilding = true; - preBuild = '' - ln -s ${catch2}/include/catch2/*.hpp tests/ + postPatch = '' + rm -rf external/Catch2 + ln -sf ${catch2.src} external/Catch2 ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/nv-codec-headers/default.nix b/pkgs/development/libraries/nv-codec-headers/default.nix index 07ec502cd12a..73ed932afb63 100644 --- a/pkgs/development/libraries/nv-codec-headers/default.nix +++ b/pkgs/development/libraries/nv-codec-headers/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "FFmpeg version of headers for NVENC"; homepage = http://ffmpeg.org/; - license = stdenv.lib.licenses.gpl3Plus; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.MP2E ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 6a4a033e1c27..c8c66969ef9b 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "openfst"; - version = "1.6.9"; + version = "1.7.1"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; - sha256 = "1nlbk7qarz2qv3apz1cxf5avjhlqfq2r8kxad0095kfyqz05jnfy"; + sha256 = "0x9wfcqd8hq4h349s7j77sr60h8xjdfshqw1m3a2n6z5bdr9qkm1"; }; meta = { description = "Library for working with finite-state transducers"; diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix index 3aa2fdf0dd25..24f3752ef435 100644 --- a/pkgs/development/libraries/openjpeg/2.x.nix +++ b/pkgs/development/libraries/openjpeg/2.x.nix @@ -1,10 +1,10 @@ { callPackage, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2.3.0"; + version = "2.3.1"; branch = "2.3"; revision = "v${version}"; - sha256 = "08plxrnfl33sn2vh5nwbsngyv6b1sfpplvx881crm1v1ai10m2lz"; + sha256 = "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb"; extraFlags = [ "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}" @@ -12,20 +12,16 @@ callPackage ./generic.nix (args // rec { ]; patches = [ - (fetchpatch { - name = "CVE-2018-7648.patch"; - url = "https://github.com/uclouvain/openjpeg/commit/cc3824767bde397fedb8a1ae4786a222ba860c8d.patch"; - sha256 = "1j5nxmlgyfkxldk2f1ij6h850xw45q3b5brxqa04dxsfsv8cdj5j"; - }) - (fetchpatch { - name = "CVE-2017-17480+CVE-2018-18088.patch"; - url = "https://github.com/uclouvain/openjpeg/commit/92023cd6c377e0384a7725949b25655d4d94dced.patch"; - sha256 = "0rrxxqcp3vjkmvywxj9ac766m3fppy0x0nszrkf8irrqy1gnp38k"; - }) - (fetchpatch { - url = https://github.com/uclouvain/openjpeg/commit/24fd3ce777a64b8b315cfe1ee642ec7b1cc6aa97.patch; - sha256 = "1sl5wplgdfiqw8qbd8s5j5hq3ynbwgsnv8nxqfrk5s7vyrzx9pxv"; - }) ./fix-cmake-config-includedir.patch + (fetchpatch { + url = "https://github.com/uclouvain/openjpeg/commit/21399f6b7d318fcdf4406d5e88723c4922202aa3.patch"; + name = "CVE-2019-12973-1.patch"; + sha256 = "161yvnfbzy2016qqapm0ywfgglgs1v8ljnk6fj8d2bwdh1cxxz8f"; + }) + (fetchpatch { + url = "https://github.com/uclouvain/openjpeg/commit/3aef207f90e937d4931daf6d411e092f76d82e66.patch"; + name = "CVE-2019-12973-2.patch"; + sha256 = "1jkkfw13l7nx4hxdhc7z17f4vfgqcaf09zpl235kypbxx1ygc7vq"; + }) ]; }) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 345dffa87f5b..cd60e0edca1c 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, gfortran, perl, libnl, rdma-core, zlib -, numactl +{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl +, rdma-core, zlib, numactl, libevent, hwloc # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -9,22 +9,30 @@ }: let - version = "3.1.3"; + version = "4.0.0"; in stdenv.mkDerivation rec { name = "openmpi-${version}"; src = with stdenv.lib.versions; fetchurl { url = "http://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2"; - sha256 = "1dks11scivgaskjs5955y9wprsl12wr3gn5r7wfl0l8gq03l7q4b"; + sha256 = "0srnjwzsmyhka9hhnmqm86qck4w3xwjm8g6sbns58wzbrwv8l2rg"; }; + patches = [ (fetchpatch { + # Fix a bug that ignores OMPI_MCA_rmaps_base_oversubscribe (upstream patch). + # This bug breaks the test from libs, such as scalapack, + # on machines with less than 4 cores. + url = https://github.com/open-mpi/ompi/commit/98c8492057e6222af6404b352430d0dd7553d253.patch; + sha256 = "1mpd8sxxprgfws96qqlzvqf58pn2vv2d0qa8g8cpv773sgw3b3gj"; + }) ]; + postPatch = '' patchShebangs ./ ''; buildInputs = with stdenv; [ gfortran zlib ] - ++ lib.optionals isLinux [ libnl numactl ] + ++ lib.optionals isLinux [ libnl numactl libevent hwloc ] ++ lib.optional (isLinux || isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0954e1b70bb7..1c0d124b5c02 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -120,8 +120,8 @@ let in { openssl_1_0_2 = common { - version = "1.0.2q"; - sha256 = "115nisqy7kazbg6br2wrcra9nphyph1l4dgp563b9cf2rv5wyi2p"; + version = "1.0.2r"; + sha256 = "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf"; patches = [ ./1.0.2/nix-ssl-cert-file.patch @@ -132,10 +132,15 @@ in { }; openssl_1_1 = common { - version = "1.1.1a"; - sha256 = "0hcz7znzznbibpy3iyyhvlqrq44y88plxwdj32wjzgbwic7i687w"; + version = "1.1.1b"; + sha256 = "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw"; patches = [ ./1.1/nix-ssl-cert-file.patch + (fetchurl { + name = "long-chacha-nonce.patch"; + url = "https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=f426625b6ae9a7831010750490a5f0ad689c5ba3"; + sha256= "02ghqg3vzmzx3s1dwwwbm1p1l4asaiampyg4k9vfrjwficvgpdgp"; + }) (if stdenv.hostPlatform.isDarwin then ./1.1/use-etc-ssl-certs-darwin.patch diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 981ec2f0a3a5..a1e7215fd9a2 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, gnome3, gobject-introspection, pkgconfig, stdenv }: +{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }: stdenv.mkDerivation rec { name = "osm-gps-map-${version}"; @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib gobject-introspection - ] ++ (with gnome3; [ - gnome-common gtk libsoup - ]); + gnome3.gnome-common gtk3 gnome3.libsoup + ]; meta = with stdenv.lib; { description = "Gtk+ widget for displaying OpenStreetMap tiles"; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 7b1d69ed42b0..0f028ded3498 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz -, libintl, gobject-introspection, darwin, fribidi, gnome3 +, libintl, gobject-introspection, darwin, fribidi, gnome3, fetchpatch , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf }: @@ -16,6 +16,14 @@ in stdenv.mkDerivation rec { sha256 = "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx"; }; + patches = [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/pango/commit/490f8979a260c16b1df055eab386345da18a2d54.patch"; + name = "CVE-2019-1010238.patch"; + sha256 = "1s0qclbaknkx3dkc3n6mlmx3fnhlr2pkncqjkywprpvahmmypr7k"; + }) + ]; + outputs = [ "bin" "dev" "out" "devdoc" ]; nativeBuildInputs = [ pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ]; diff --git a/pkgs/development/libraries/physics/applgrid/bad_code.patch b/pkgs/development/libraries/physics/applgrid/bad_code.patch index c1c8f618fbb3..e90000efe2db 100644 --- a/pkgs/development/libraries/physics/applgrid/bad_code.patch +++ b/pkgs/development/libraries/physics/applgrid/bad_code.patch @@ -37,3 +37,14 @@ index d25288e..be354df 100644 }; typedef double (igrid::*transform_t)(double) const; +diff --git a/src/lumi_pdf.cxx b/src/lumi_pdf.cxx +--- a/src/lumi_pdf.cxx ++++ b/src/lumi_pdf.cxx +@@ -235,6 +235,6 @@ void lumi_pdf::write(const std::string& filename) const { + // std::string lumi_pdf::summary(std::ostream& s=std::cout) const { + std::string lumi_pdf::summary() const { + std::stringstream s; +- s << "lumi_pdf::lumi_pdf() " << s << "\tsize " << m_combinations.size() << " lookup size " << m_lookup.size() << " " << this; ++ s << "lumi_pdf::lumi_pdf() " << "\tsize " << m_combinations.size() << " lookup size " << m_lookup.size() << " " << this; + return s.str(); + } diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 01214878cd8b..40ccd8cfd20b 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "12mlj2j1glidjhiaxlr25qz2vfb865wip1vwwg8vlyd3yzisf533"; + sha256 = "1bxcb99a3l5d2gl93zgfzgw6v95kx1ss5045mkz3ciyw8w5nmb9l"; }; patches = [ @@ -17,12 +17,16 @@ stdenv.mkDerivation rec { scheme-basic collection-pstricks collection-fontsrecommended + l3kernel + l3packages mathastext pgf relsize sfmath + siunitx xcolor xkeyval + xstring ;}; buildInputs = [ hepmc imagemagick python2 latex makeWrapper ]; propagatedBuildInputs = [ fastjet ghostscript gsl yoda ]; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 6e4ffb9745d0..7a89d61753d1 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "0fl9y1mh48xkjmqc76rfhvr3vs4v4lzybh06bwxyflzy82ylwi71"; + sha256 = "0w9s3qv87hrmpq4dkrxcrl2hn2vcsbvy8ml99w85404wksw1dwrx"; }; pythonPath = []; # python wrapper support diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix new file mode 100644 index 000000000000..23c8257ac8fe --- /dev/null +++ b/pkgs/development/libraries/prometheus-cpp/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromGitHub +, cmake +, gbenchmark +, gtest +, civetweb +, zlib +, curl +}: + +stdenv.mkDerivation rec { + pname = "prometheus-cpp"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "jupp0r"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256:1a0gpfmk0z9wgsbzvx823aqbs7w836l0j0rnsxl9ifwgdxnxbl6m"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ gbenchmark civetweb gtest zlib curl ]; + + strictDeps = true; + + cmakeFlags = [ + "-DUSE_THIRDPARTY_LIBRARIES=OFF" + "-DCIVETWEB_INCLUDE_DIR=${civetweb.dev}/include" + "-DCIVETWEB_CXX_LIBRARY=${civetweb}/lib/libcivetweb${stdenv.targetPlatform.extensions.sharedLibrary}" + ]; + + NIX_LDFLAGS = [ "-ldl" ]; + + meta = { + description = "Prometheus Client Library for Modern C++"; + homepage = https://github.com/jupp0r/prometheus-cpp; + license = [ stdenv.lib.licenses.mit ]; + }; + +} diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 1730f9b733ca..74c6e8ef1b30 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -1,14 +1,24 @@ -{ stdenv, fetchurl, cmake, shared ? false }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }: stdenv.mkDerivation rec { name = "pugixml-${version}"; version = "1.9"; - src = fetchurl { - url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz"; - sha256 = "19nv3zhik3djp4blc4vrjwrl8dfhzmal8b21sq7y907nhddx6mni"; + src = fetchFromGitHub { + owner = "zeux"; + repo = "pugixml"; + rev = "v${version}"; + sha256 = "0iraznwm78pyyzc9snvd3dyz8gddvmxsm1b3kpw7wixkvcawdviv"; }; + patches = [ + # To be removed after a version newer than 1.9 is released + (fetchpatch { + url = "https://github.com/zeux/pugixml/pull/193.patch"; + sha256 = "0s4anqlr2ppfibxyl29nrqbcprrg89k7il6303dm91s6620ydmka"; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index b6e24c632224..daa5684a72e1 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -64,8 +64,16 @@ let qttools = [ ./qttools.patch ]; qtwebengine = [ ./qtwebengine-no-build-skip.patch ] ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch - ++ optional stdenv.isDarwin ./qtwebengine-darwin-sdk-10.10.patch; - qtwebkit = [ ./qtwebkit.patch ]; + ++ optionals stdenv.isDarwin [ + ./qtwebengine-darwin-no-platform-check.patch + ./qtwebengine-darwin-sdk-10.10.patch + ./qtwebengine-darwin-old-sdk.patch + ]; + qtwebkit = [ ./qtwebkit.patch ] + ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; }; mkDerivation = diff --git a/pkgs/development/libraries/qt-5/5.11/fetch.sh b/pkgs/development/libraries/qt-5/5.11/fetch.sh index dc1088fc371c..2ab3dd71c24f 100644 --- a/pkgs/development/libraries/qt-5/5.11/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.11/fetch.sh @@ -1,2 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/ \ - -A '*.tar.xz' ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch new file mode 100644 index 000000000000..3e1a8762b361 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch @@ -0,0 +1,37 @@ +diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf +--- a/mkspecs/features/platform.prf ++++ b/mkspecs/features/platform.prf +@@ -38,10 +38,6 @@ defineTest(isPlatformSupported) { + return(false) + } + } else:osx { +- !isMinXcodeVersion(7, 3) { +- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 7.3 is required to build Qt WebEngine.") +- return(false) +- } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") + return(false) +@@ -52,10 +48,6 @@ defineTest(isPlatformSupported) { + skipBuild("Building Qt WebEngine requires macOS version 10.11 or newer.") + return(false) + } +- !isMinOSXSDKVersion(10, 10): { +- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.11 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) +- } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") + return(false) +diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri +--- a/src/core/config/mac_osx.pri ++++ b/src/core/config/mac_osx.pri +@@ -5,8 +5,6 @@ load(functions) + # otherwise query for it. + QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) + isEmpty(QMAKE_MAC_SDK_VERSION) { +- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") +- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") + } + + QMAKE_CLANG_DIR = "/usr" diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patch new file mode 100644 index 000000000000..b065c2211017 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patch @@ -0,0 +1,21 @@ +diff --git a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm +--- a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm ++++ b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm +@@ -45,7 +45,7 @@ NSString *RTCFieldTrialTrendlineFilterValue( + return [NSString stringWithFormat:format, windowSize, smoothingCoeff, thresholdGain]; + } + +-void RTCInitFieldTrialDictionary(NSDictionary *fieldTrials) { ++void RTCInitFieldTrialDictionary(NSDictionary *fieldTrials) { + if (!fieldTrials) { + RTCLogWarning(@"No fieldTrials provided."); + return; +diff --git a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h +--- a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h ++++ b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h +@@ -40,4 +40,4 @@ RTC_EXTERN NSString *RTCFieldTrialTrendlineFilterValue( + * Must be called before any other call into WebRTC. See: + * webrtc/system_wrappers/include/field_trial_default.h + */ +-RTC_EXTERN void RTCInitFieldTrialDictionary(NSDictionary *fieldTrials); ++RTC_EXTERN void RTCInitFieldTrialDictionary(NSDictionary *fieldTrials); diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-qos-classes.patch b/pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-qos-classes.patch new file mode 100644 index 000000000000..a7087f517623 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-qos-classes.patch @@ -0,0 +1,11 @@ +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) + endif () + + if (APPLE) +- SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) + endif () + + if (ENABLE_MATHML) diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-readline.patch new file mode 100644 index 000000000000..26d189d86019 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-readline.patch @@ -0,0 +1,45 @@ +diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt +--- a/Source/JavaScriptCore/shell/CMakeLists.txt ++++ b/Source/JavaScriptCore/shell/CMakeLists.txt +@@ -9,7 +9,6 @@ set(JSC_LIBRARIES + ) + + if (WTF_OS_MAC_OS_X) +- list(APPEND JSC_LIBRARIES edit) + endif () + + if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -563,7 +563,6 @@ + #if PLATFORM(IOS) + + #define HAVE_NETWORK_EXTENSION 1 +-#define HAVE_READLINE 1 + #if USE(APPLE_INTERNAL_SDK) + #define USE_CFNETWORK 1 + #endif +@@ -650,7 +649,6 @@ + #define HAVE_MADV_DONTNEED 1 + #define HAVE_MERGESORT 1 + #define HAVE_PTHREAD_SETNAME_NP 1 +-#define HAVE_READLINE 1 + #define HAVE_SYS_TIMEB_H 1 + + #if !PLATFORM(GTK) && !PLATFORM(QT) +diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake +--- a/Source/WTF/wtf/PlatformMac.cmake ++++ b/Source/WTF/wtf/PlatformMac.cmake +@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) + + find_library(COCOA_LIBRARY Cocoa) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) +-find_library(READLINE_LIBRARY Readline) + list(APPEND WTF_LIBRARIES + ${COREFOUNDATION_LIBRARY} + ${COCOA_LIBRARY} +- ${READLINE_LIBRARY} + libicucore.dylib + ) + diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 4b002837c3d5..aa2dcff33f77 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -60,8 +60,16 @@ let qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; - qtwebengine = [ ./qtwebengine-no-build-skip.patch ]; - qtwebkit = [ ./qtwebkit.patch ]; + qtwebengine = [ + ./qtwebengine-no-build-skip.patch + ./qtwebengine-CVE-2019-5786.patch + ] + ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; + qtwebkit = [ ./qtwebkit.patch ] + ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; }; mkDerivation = diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh index b77a58cafa2e..aa3a0fe94898 100644 --- a/pkgs/development/libraries/qt-5/5.12/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh @@ -1,2 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ \ - -A '*.tar.xz' ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch new file mode 100644 index 000000000000..ec9a432ea708 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch @@ -0,0 +1,26 @@ +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc +@@ -135,14 +135,16 @@ + if (!raw_data_ || error_code_) + return nullptr; + +- DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer()); +- if (finished_loading_) { +- array_buffer_result_ = result; +- AdjustReportedMemoryUsageToV8( +- -1 * static_cast(raw_data_->ByteLength())); +- raw_data_.reset(); ++ if (!finished_loading_) { ++ return DOMArrayBuffer::Create( ++ ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength())); + } +- return result; ++ array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer()); ++ AdjustReportedMemoryUsageToV8(-1 * ++ static_cast(raw_data_->ByteLength())); ++ ++ raw_data_.reset(); ++ return array_buffer_result_; + } + + String FileReaderLoader::StringResult() { diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch new file mode 100644 index 000000000000..364330169bf1 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch @@ -0,0 +1,21 @@ +diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf +--- a/mkspecs/features/platform.prf ++++ b/mkspecs/features/platform.prf +@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { + } else:osx { + # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 + !isMinXcodeVersion(8, 3, 3) { +- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") +- return(false) + } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") +@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { + return(false) + } + !isMinOSXSDKVersion(10, 12): { +- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) + } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch b/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch new file mode 100644 index 000000000000..a7087f517623 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch @@ -0,0 +1,11 @@ +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) + endif () + + if (APPLE) +- SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) + endif () + + if (ENABLE_MATHML) diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch new file mode 100644 index 000000000000..26d189d86019 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch @@ -0,0 +1,45 @@ +diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt +--- a/Source/JavaScriptCore/shell/CMakeLists.txt ++++ b/Source/JavaScriptCore/shell/CMakeLists.txt +@@ -9,7 +9,6 @@ set(JSC_LIBRARIES + ) + + if (WTF_OS_MAC_OS_X) +- list(APPEND JSC_LIBRARIES edit) + endif () + + if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -563,7 +563,6 @@ + #if PLATFORM(IOS) + + #define HAVE_NETWORK_EXTENSION 1 +-#define HAVE_READLINE 1 + #if USE(APPLE_INTERNAL_SDK) + #define USE_CFNETWORK 1 + #endif +@@ -650,7 +649,6 @@ + #define HAVE_MADV_DONTNEED 1 + #define HAVE_MERGESORT 1 + #define HAVE_PTHREAD_SETNAME_NP 1 +-#define HAVE_READLINE 1 + #define HAVE_SYS_TIMEB_H 1 + + #if !PLATFORM(GTK) && !PLATFORM(QT) +diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake +--- a/Source/WTF/wtf/PlatformMac.cmake ++++ b/Source/WTF/wtf/PlatformMac.cmake +@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) + + find_library(COCOA_LIBRARY Cocoa) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) +-find_library(READLINE_LIBRARY Readline) + list(APPEND WTF_LIBRARIES + ${COREFOUNDATION_LIBRARY} + ${COCOA_LIBRARY} +- ${READLINE_LIBRARY} + libicucore.dylib + ) + diff --git a/pkgs/development/libraries/qt-5/5.6/fetch.sh b/pkgs/development/libraries/qt-5/5.6/fetch.sh index ee3a5ddf8deb..bb9eb66a01dc 100644 --- a/pkgs/development/libraries/qt-5/5.6/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.6/fetch.sh @@ -1,3 +1,2 @@ WGET_ARGS=( http://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/ \ - http://download.qt.io/community_releases/5.6/5.6.3/ \ - -A '*.tar.xz' ) + http://download.qt.io/community_releases/5.6/5.6.3/ ) diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 589f175efd9c..be84691e6c33 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -43,7 +43,9 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; - qtwebengine = [ ./qtwebengine-no-build-skip.patch ]; + qtwebengine = [ ./qtwebengine-no-build-skip.patch ] + ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch + ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ ./qtwebkit.patch ]; qtvirtualkeyboard = [ (fetchpatch { diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh index e631d3ae9b00..17ebe1e532df 100644 --- a/pkgs/development/libraries/qt-5/5.9/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh @@ -1,2 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.7/submodules/ \ - -A '*.tar.xz' ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.7/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch b/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch new file mode 100644 index 000000000000..cf082cddd11a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch @@ -0,0 +1,38 @@ +Fix a following build error: + +In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7: +In file included from ../../3rdparty/chromium/base/bind.h:8: +../../3rdparty/chromium/base/bind_internal.h:214:31: error: cannot initialize a parameter of type 'NSError *' with an lvalue of type 'const long' + return (receiver.*method)(std::forward(args)...); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~ +../../3rdparty/chromium/base/bind_internal.h:285:20: note: in instantiation of function template specialization 'base::internal::FunctorTraits::Invoke' requested here + return Traits::Invoke(std::forward(functor), + ^ +../../3rdparty/chromium/base/bind_internal.h:361:43: note: in instantiation of function template specialization 'base::internal::InvokeHelper::MakeItSo' requested here + return InvokeHelper::MakeItSo( + ^ +../../3rdparty/chromium/base/bind_internal.h:339:12: note: in instantiation of function template specialization 'base::internal::Invoker, long>, void ()>::RunImpl, long> &, 0, 1>' requested here + return RunImpl(storage->functor_, + ^ +../../3rdparty/chromium/base/bind.h:62:45: note: in instantiation of member function 'base::internal::Invoker, long>, void ()>::Run' requested here + PolymorphicInvoke invoke_func = &Invoker::Run; + ^ +../../3rdparty/chromium/base/bind.h:77:10: note: in instantiation of function template specialization 'base::BindRepeating, long>' requested here + return BindRepeating(std::forward(functor), + ^ +../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:241:15: note: in instantiation of function template specialization 'base::Bind, long>' requested here + base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, + +--- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm ++++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm +@@ -239,7 +239,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic( + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, + base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, +- base::Unretained(this), nil)); ++ base::Unretained(this), nullptr)); + } + } + diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch new file mode 100644 index 000000000000..7156c41c5ec1 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch @@ -0,0 +1,50 @@ +diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf +--- a/mkspecs/features/configure.prf ++++ b/mkspecs/features/configure.prf +@@ -194,9 +194,6 @@ defineTest(runConfigure) { + } else { + log("Native Spellchecker .............. Not enabled (Default, enable with WEBENGINE_CONFIG+=use_native_spellchecker)$${EOL}") + } +- !isMinOSXSDKVersion(10, 10, 3) { +- log(" Force Touch API usage .............. Not enabled (Because the OS X SDK version to be used \"$${WEBENGINE_OSX_SDK_PRODUCT_VERSION}\" is lower than the required \"10.10.3\")$${EOL}") +- } + } + } + +diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf +--- a/mkspecs/features/functions.prf ++++ b/mkspecs/features/functions.prf +@@ -38,10 +38,6 @@ defineTest(isPlatformSupported) { + return(false) + } + } else:osx { +- !isMinXcodeVersion(5, 1) { +- skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.") +- return(false) +- } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") + return(false) +@@ -52,10 +48,6 @@ defineTest(isPlatformSupported) { + skipBuild("Qt WebEngine requires OS X version 10.10 or newer.") + return(false) + } +- !isMinOSXSDKVersion(10, 10): { +- skipBuild("Qt WebEngine requires an OS X SDK version of 10.10 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) +- } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and OS X.") + return(false) +diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri +--- a/src/core/config/mac_osx.pri ++++ b/src/core/config/mac_osx.pri +@@ -5,8 +5,6 @@ load(functions) + # otherwise query for it. + QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) + isEmpty(QMAKE_MAC_SDK_VERSION) { +- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") +- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") + } + + QMAKE_CLANG_DIR = "/usr" diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch index c78cb58f564b..718bda361943 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch @@ -1,16 +1,3 @@ -diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri -index 69e4cd1f3..3f729a75e 100644 ---- a/Source/WTF/WTF.pri -+++ b/Source/WTF/WTF.pri -@@ -12,7 +12,7 @@ mac { - # Mac OS does ship libicu but not the associated header files. - # Therefore WebKit provides adequate header files. - INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH -- LIBS += -licucore -+ LIBS += /usr/lib/libicucore.dylib - } else:!use?(wchar_unicode): { - win32 { - CONFIG(static, static|shared) { diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp index a923d49aa..46772a4bb 100644 --- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index ddb828323371..91b7acf43654 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -67,32 +67,12 @@ qtModule { src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc '' + optionalString stdenv.isDarwin ('' - # Remove annoying xcode check - substituteInPlace mkspecs/features/platform.prf \ - --replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false \ - --replace "/usr/bin/xcodebuild" "xcodebuild" - - substituteInPlace src/3rdparty/chromium/build/mac_toolchain.py \ - --replace "/usr/bin/xcode-select" "xcode-select" - substituteInPlace src/core/config/mac_osx.pri \ - --replace /usr ${stdenv.cc} \ - --replace "isEmpty(QMAKE_MAC_SDK_VERSION)" false - + --replace /usr ${stdenv.cc} '' - # TODO remove when new Apple SDK is in - + (if lib.versionOlder qtCompatVersion "5.11" then '' - substituteInPlace src/3rdparty/chromium/base/mac/foundation_util.mm \ - --replace "NSArray*" "NSArray*" - substituteInPlace src/3rdparty/chromium/base/mac/sdk_forward_declarations.h \ - --replace "NSDictionary*" "NSDictionary*" \ - --replace "NSArray*" "NSArray*" \ - --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption" - '' else '' - substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm \ - --replace "NSDictionary *" "NSDictionary*" - substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h \ - --replace "NSDictionary *" "NSDictionary*" + + (optionalString (lib.versionAtLeast qtCompatVersion "5.11") '' + substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ + --replace '$sysroot/usr' "${darwin.xnu}" '') + '' @@ -114,9 +94,6 @@ print('sdk_platform_path=""') print('sdk_build="17B41"') EOF - substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ - --replace '$sysroot/usr' "${darwin.xnu}" - # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 526fc2b8b2d1..6b43f6ed25c0 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -8,7 +8,7 @@ }: let - inherit (lib) optional optionals getLib; + inherit (lib) optional optionals getDev getLib; hyphen = stdenv.mkDerivation rec { name = "hyphen-2.8.8"; src = fetchurl { @@ -20,28 +20,30 @@ let ''; buildInputs = [ perl ]; }; + usingAnnulenWebkitFork = lib.versionAtLeast qtbase.version "5.11.0"; in qtModule { name = "qtwebkit"; qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ] ++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia - ++ optional (lib.versionAtLeast qtbase.version "5.11.0") qtwebchannel; + ++ optional usingAnnulenWebkitFork qtwebchannel; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ] - ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private OpenGL ]) - ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ hyphen ]; + ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private ICU OpenGL ]) + ++ optional usingAnnulenWebkitFork hyphen; nativeBuildInputs = [ bison2 flex gdb gperf perl pkgconfig python2 ruby - ] ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ cmake ]; + ] ++ optional usingAnnulenWebkitFork cmake; - cmakeFlags = optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-DPORT=Qt" ]; - - __impureHostDeps = optionals (stdenv.isDarwin) [ - "/usr/lib/libicucore.dylib" - ]; + cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ] + ++ optionals stdenv.isDarwin [ + "-DQt5Multimedia_DIR=${getDev qtmultimedia}/lib/cmake/Qt5Multimedia" + "-DQt5MultimediaWidgets_DIR=${getDev qtmultimedia}/lib/cmake/Qt5MultimediaWidgets" + "-DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF" + ]); # QtWebKit overrides qmake's default_pre and default_post features, # so its custom qmake files must be found first at the front of QMAKEPATH. - preConfigure = '' + preConfigure = stdenv.lib.optionalString (!usingAnnulenWebkitFork) '' QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" fixQtBuiltinPaths . '*.pr?' # Fix hydra's "Log limit exceeded" diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 2e5371e285bc..3de84d859111 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, qt4 ? null +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4 ? null , withQt5 ? false, qtbase ? null, qttools ? null , darwin ? null +, libsecret }: assert withQt5 -> qtbase != null; @@ -22,11 +23,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] + ++ stdenv.lib.optional (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret + ; - buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ] + buildInputs = stdenv.lib.optional (!stdenv.isDarwin) [ libsecret ] + ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]) ++ stdenv.lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreFoundation Security + CoreFoundation Security ]) ; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 3784d82dcc15..39f7fa91b02e 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, libX11, libXext, qttools }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem, libX11, libXext, qttools }: stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "0.10.8"; + version = "0.10.9"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0w4iqpkagrwvhahdl280ni06b7x1i621n3z740g84ysp2n3dv09l"; + sha256 = "1zpq6wsl57kfx0jf0rkxf15ic22ihazj03i3kfiqb07vcrs2cka9"; }; nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase qtsvg qtx11extras libX11 libXext ]; + buildInputs = [ qtbase qtsvg qtx11extras kwindowsystem libX11 libXext ]; sourceRoot = "source/Kvantum"; diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix index e1155c4a3bcb..07209be0dce0 100644 --- a/pkgs/development/libraries/qtwebkit-plugins/default.nix +++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ qtwebkit hunspell ]; postPatch = '' - sed -i "s,-lhunspell,-lhunspell-1.6," src/spellcheck/spellcheck.pri + sed -i "s,-lhunspell,-lhunspell-${stdenv.lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro ''; diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix new file mode 100644 index 000000000000..99f880916907 --- /dev/null +++ b/pkgs/development/libraries/rapidxml/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + pname = "rapidxml"; + version = "1.13"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.zip"; + sha256 = "0w9mbdgshr6sh6a5jr10lkdycjyvapbj7wxwz8hbp0a96y3biw63"; + }; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/include/${pname} + cp * $out/include/${pname} + ''; + + meta = with stdenv.lib; { + description = "Fast XML DOM-style parser in C++"; + homepage = "http://rapidxml.sourceforge.net/"; + license = licenses.boost; + platforms = platforms.unix; + maintainers = with maintainers; [ cpages ]; + }; +} diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index cbe6c083cb44..f9a20a535cb3 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./link-against-ncurses.patch ./no-arch_only-6.3.patch - ] + ] ++ stdenv.lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch ++ (let patch = nr: sha256: diff --git a/pkgs/development/libraries/readline/android.patch b/pkgs/development/libraries/readline/android.patch new file mode 100644 index 000000000000..7e81774be369 --- /dev/null +++ b/pkgs/development/libraries/readline/android.patch @@ -0,0 +1,16 @@ +diff --git histlib.h histlib.h +index c938a10..925ab72 100644 +--- histlib.h ++++ histlib.h +@@ -51,9 +51,9 @@ + #endif + + #ifndef member +-# ifndef strchr ++# if !defined (strchr) && !defined (__STDC__) + extern char *strchr (); +-# endif ++# endif /* !strchr && !__STDC__ */ + #define member(c, s) ((c) ? ((char *)strchr ((s), (c)) != (char *)NULL) : 0) + #endif + diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index d09e45a2d1e9..daa499061c5b 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, path }: +{ stdenv, fetchurl, path, runtimeShell }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "safefile"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = '' - #!${stdenv.shell} + #!${runtimeShell} cd ${toString ./.} ${toString path}/pkgs/build-support/upstream-updater/update-walker.sh default.nix ''; diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index 7a653a58eb2a..40dbfc53e2cb 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -8,21 +8,20 @@ , ocl-icd , opencl-headers , Accelerate, CoreGraphics, CoreVideo, OpenCL -, gtest }: stdenv.mkDerivation rec { - name = "clblas-${version}"; + name = "clblas-${version}"; version = "2.12"; src = fetchFromGitHub { - owner = "clMathLibraries"; + owner = "clMathLibraries"; repo = "clBLAS"; rev = "v${version}"; sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs"; - }; + }; - patches = [ ./platform.patch ]; + patches = [ ./platform.patch ]; postPatch = '' sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt @@ -33,7 +32,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DUSE_SYSTEM_GTEST=ON" + "-DBUILD_TEST=OFF" ]; buildInputs = [ @@ -42,7 +41,6 @@ stdenv.mkDerivation rec { blas python boost - gtest ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ ocl-icd opencl-headers @@ -61,7 +59,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/clMathLibraries/clBLAS"; description = "A software library containing BLAS functions written in OpenCL"; longDescription = '' - This package contains a library of BLAS functions on top of OpenCL. + This package contains a library of BLAS functions on top of OpenCL. ''; license = licenses.asl20; maintainers = with maintainers; [ artuuge ]; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index f4a97b7cf854..489883e644c7 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -58,6 +58,7 @@ let BINARY = 64; TARGET = setTarget "ATHLON"; DYNAMIC_ARCH = true; + NO_AVX512 = true; USE_OPENMP = true; }; }; @@ -126,7 +127,13 @@ stdenv.mkDerivation rec { NO_STATIC = true; CROSS = stdenv.hostPlatform != stdenv.buildPlatform; HOSTCC = "cc"; - NO_BINARY_MODE = stdenv.hostPlatform != stdenv.buildPlatform; + # Makefile.system only checks defined status + # This seems to be a bug in the openblas Makefile: + # on x86_64 it expects NO_BINARY_MODE= + # but on aarch64 it expects NO_BINARY_MODE=0 + NO_BINARY_MODE = if stdenv.isx86_64 + then toString (stdenv.hostPlatform != stdenv.buildPlatform) + else stdenv.hostPlatform != stdenv.buildPlatform; }); doCheck = true; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 3f37bf49de38..53f9af7a98ac 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c"; }; + # patch to rename outdated MPI functions + patches = [ ./openmpi4.patch ]; + nativeBuildInputs = [ cmake openssh ]; buildInputs = [ mpi gfortran openblasCompat ]; @@ -41,8 +44,8 @@ stdenv.mkDerivation rec { homepage = http://www.netlib.org/scalapack/; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; license = licenses.bsd3; - platforms = platforms.linux; - maintainers = [ maintainers.costrouc ]; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ costrouc markuskowa ]; }; } diff --git a/pkgs/development/libraries/science/math/scalapack/openmpi4.patch b/pkgs/development/libraries/science/math/scalapack/openmpi4.patch new file mode 100644 index 000000000000..5d0afb58c027 --- /dev/null +++ b/pkgs/development/libraries/science/math/scalapack/openmpi4.patch @@ -0,0 +1,143 @@ +diff --git a/BLACS/SRC/blacs_get_.c b/BLACS/SRC/blacs_get_.c +index e979767..d4b04cf 100644 +--- a/BLACS/SRC/blacs_get_.c ++++ b/BLACS/SRC/blacs_get_.c +@@ -23,7 +23,7 @@ F_VOID_FUNC blacs_get_(int *ConTxt, int *what, int *val) + case SGET_MSGIDS: + if (BI_COMM_WORLD == NULL) Cblacs_pinfo(val, &val[1]); + iptr = &val[1]; +- ierr=MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val); ++ ierr=MPI_Comm_get_attr(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val); + val[0] = 0; + val[1] = *iptr; + break; +diff --git a/BLACS/SRC/cgamn2d_.c b/BLACS/SRC/cgamn2d_.c +index 2db6ccb..6958f32 100644 +--- a/BLACS/SRC/cgamn2d_.c ++++ b/BLACS/SRC/cgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC cgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/cgamx2d_.c b/BLACS/SRC/cgamx2d_.c +index 707c0b6..f802d01 100644 +--- a/BLACS/SRC/cgamx2d_.c ++++ b/BLACS/SRC/cgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC cgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/dgamn2d_.c b/BLACS/SRC/dgamn2d_.c +index dff23b4..a2627ac 100644 +--- a/BLACS/SRC/dgamn2d_.c ++++ b/BLACS/SRC/dgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC dgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/dgamx2d_.c b/BLACS/SRC/dgamx2d_.c +index a51f731..2a644d0 100644 +--- a/BLACS/SRC/dgamx2d_.c ++++ b/BLACS/SRC/dgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC dgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/igamn2d_.c b/BLACS/SRC/igamn2d_.c +index 16bc003..f6a7859 100644 +--- a/BLACS/SRC/igamn2d_.c ++++ b/BLACS/SRC/igamn2d_.c +@@ -218,7 +218,7 @@ F_VOID_FUNC igamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/igamx2d_.c b/BLACS/SRC/igamx2d_.c +index 8165cbe..a7cfcc6 100644 +--- a/BLACS/SRC/igamx2d_.c ++++ b/BLACS/SRC/igamx2d_.c +@@ -218,7 +218,7 @@ F_VOID_FUNC igamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/sgamn2d_.c b/BLACS/SRC/sgamn2d_.c +index d6c95e5..569c797 100644 +--- a/BLACS/SRC/sgamn2d_.c ++++ b/BLACS/SRC/sgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC sgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/sgamx2d_.c b/BLACS/SRC/sgamx2d_.c +index 4b0af6f..8897ece 100644 +--- a/BLACS/SRC/sgamx2d_.c ++++ b/BLACS/SRC/sgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC sgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/zgamn2d_.c b/BLACS/SRC/zgamn2d_.c +index 9de2b23..37897df 100644 +--- a/BLACS/SRC/zgamn2d_.c ++++ b/BLACS/SRC/zgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC zgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/zgamx2d_.c b/BLACS/SRC/zgamx2d_.c +index 414c381..0e9d474 100644 +--- a/BLACS/SRC/zgamx2d_.c ++++ b/BLACS/SRC/zgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC zgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; diff --git a/pkgs/development/libraries/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns3/default.nix index d5c3ca2457aa..5218de075093 100644 --- a/pkgs/development/libraries/science/networking/ns3/default.nix +++ b/pkgs/development/libraries/science/networking/ns3/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { patchShebangs doc/ns3_html_theme/get_version.sh ''; - configureFlags = with stdenv.lib; [ + wafConfigureFlags = with stdenv.lib; [ "--enable-modules=${stdenv.lib.concatStringsSep "," modules}" "--with-python=${pythonEnv.interpreter}" ] diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 0a63f5e778a6..f0390486b10e 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "sqlite-analyzer-${version}"; - version = "3.26.0"; + version = "3.28.0"; src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; - sha256 = "0ysgi2jrl348amdfifsl3cx90d04bijm4pn4xnvivmi3m1dq4hp0"; + url = "https://sqlite.org/2019/sqlite-src-${archiveVersion version}.zip"; + sha256 = "15v57b113bpgcshfsx5jw93szar3da94rr03i053xhl15la7jllh"; }; nativeBuildInputs = [ unzip ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool that shows statistics about SQLite databases"; downloadPage = http://sqlite.org/download.html; - homepage = http://www.sqlite.org; + homepage = https://www.sqlite.org; license = licenses.publicDomain; maintainers = with maintainers; [ pesterhazy ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 100f7fec06aa..ea1c38ea476b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { name = "sqlite-${version}"; - version = "3.26.0"; + version = "3.28.0"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { - url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx"; + url = "https://sqlite.org/2019/sqlite-autoconf-${archiveVersion version}.tar.gz"; + sha256 = "1hxpi45crbqp6lacl7z611lna02k956m9bsy2bjzrbb2y23546yn"; }; outputs = [ "bin" "dev" "out" ]; @@ -75,8 +75,8 @@ stdenv.mkDerivation rec { meta = { description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; - downloadPage = http://sqlite.org/download.html; - homepage = http://www.sqlite.org/; + downloadPage = https://sqlite.org/download.html; + homepage = https://www.sqlite.org/; license = licenses.publicDomain; maintainers = with maintainers; [ eelco np ]; platforms = platforms.unix ++ platforms.windows; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index b33180cec428..abe444c63c32 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "0xfk0icsi63yi1dby4rn02ppwkzfykciw6q03bk454gdia9xcmk6"; + sha256 = "19ca4nmlf6i9ijqcibyvpprxzsdfnackgjs6dw51fq13gg1f2398"; }; preConfigure = '' diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 1fbbecf71a6b..5a8ebe84ba69 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pkgconfig, readline, libxslt , docbook_xsl, docbook_xml_dtd_42, fixDarwinDylibNames -, buildPackages +, wafHook }: stdenv.mkDerivation rec { @@ -11,23 +11,22 @@ stdenv.mkDerivation rec { sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di"; }; - nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python + nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python wafHook docbook_xsl docbook_xml_dtd_42 ]; buildInputs = [ readline libxslt ]; - prePatch = '' - patchShebangs buildtools/bin/waf - ''; + wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--enable-talloc-compat1" "--bundled-libraries=NONE" "--builtin-libraries=replace" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-compile" - "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; - configurePlatforms = []; + + # this must not be exported before the ConfigurePhase otherwise waf whines + preBuild = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + export NIX_CFLAGS_LINK="-no-pie -shared"; + ''; postInstall = '' ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 21f062998b40..4df80140aa5d 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, python2, pkgconfig, readline, libxslt -, docbook_xsl, docbook_xml_dtd_42, buildPackages +{ stdenv, fetchurl, wafHook, pkgconfig, readline, libxslt +, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { @@ -10,23 +10,17 @@ stdenv.mkDerivation rec { sha256 = "1ibcz466xwk1x6xvzlgzd5va4lyrjzm3rnjak29kkwk7cmhw4gva"; }; - nativeBuildInputs = [ pkgconfig python2 ]; + nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ readline libxslt docbook_xsl docbook_xml_dtd_42 ]; - preConfigure = '' - patchShebangs buildtools/bin/waf - ''; + wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-compile" - "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; - configurePlatforms = [ ]; meta = with stdenv.lib; { description = "The trivial database"; diff --git a/pkgs/development/libraries/ticpp/default.nix b/pkgs/development/libraries/ticpp/default.nix new file mode 100644 index 000000000000..e46bf2418bcf --- /dev/null +++ b/pkgs/development/libraries/ticpp/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation { + pname = "ticpp"; + version = "unstable-2019-01-09"; + + src = fetchFromGitHub { + owner = "wxFormBuilder"; + repo = "ticpp"; + rev = "eb79120ea16b847ce9f483a298a394050f463d6b"; + sha256 = "sha256:0xk4cy0xbkr6326cqd1vd6b2x0rfsx4iz2sq8f5jz3yl3slxgjm2"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_TICPP_DLL=1" ]; + + installPhase = '' + cd .. + mkdir -p $out/lib + install build/*.{a,so} $out/lib + mkdir -p $out/include + install *.h $out/include + ''; + + meta = { + description = "Interface to TinyXML"; + license = stdenv.lib.licenses.mit; + homepage = https://github.com/wxFormBuilder/ticpp; + }; + +} diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 2d3af9b70c57..7121b6fed02d 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "vapoursynth-${version}"; - version = "R44"; + version = "R45.1"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "1270cggvk9nvy5g2z289nwhyvl4364yzirfn5jsa9i9ljfp00qml"; + sha256 = "09fj4k75cksx1imivqfyr945swlr8k392kkdgzldwc4404qv82s6"; }; nativeBuildInputs = [ pkgconfig autoreconfHook nasm ]; diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 9eb3254001d5..8af33c10319c 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv }: +{ stdenv, fetchurl, libiconv, fetchpatch }: stdenv.mkDerivation rec { name = "wavpack-${version}"; @@ -13,6 +13,64 @@ stdenv.mkDerivation rec { sha256 = "0i19c6krc0p9krwrqy9s5xahaafigqzxcn31piidmlaqadyn4f8r"; }; + patches = [ + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/26cb47f99d481ad9b93eeff80d26e6b63bbd7e15.patch"; + name = "CVE-2018-10536-CVE-2018-10537.patch"; + sha256 = "0s0fyycd4x7pw4vl1yp2vp4zrlk04j85idvnxz5h96fj6196anw6"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/6f8bb34c2993a48ab9afbe353e6d0cff7c8d821d.patch"; + name = "CVE-2018-10538-CVE-2018-10539-CVE-2018-10540.patch"; + sha256 = "03qzmaq9mwiqbzrx1lvkgkhz3cjv7dky1b4lka3d5q2rwdlyw5qk"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/d5bf76b5a88d044a1be1d5656698e3ba737167e5.patch"; + name = "CVE-2018-6767.patch"; + sha256 = "158c60i188kbxl0hzb7g74g21pknz7fk429vnbbx9zk1mlyyyl5b"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/bf408e95f43fafdcef42c3f5f9c9d0e6ab0331b9.patch"; + name = "CVE-2019-11498-1.patch"; + sha256 = "161dw759v1lzbhj7daw2gbmcji8s0njpa65xmqhqw73bwpzb3xkd"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/cd353bccafb1274a525c3536aaff8c48c3a33aa0.patch"; + name = "CVE-2019-11498-2.patch"; + sha256 = "120sb1iqkq2gadh0qydqvca4vwx31zb7gk1d0nm0y5agav2ai0dk"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/4c0faba32fddbd0745cbfaf1e1aeb3da5d35b9fc.patch"; + name = "CVE-2019-11498-3.patch"; + sha256 = "12744yn1035mf7wzgqrkyadw5mwqf9v34ckj2m5sirk97k47k0wa"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/bc6cba3f552c44565f7f1e66dc1580189addb2b4.patch"; + name = "CVE-2019-11498-4.patch"; + sha256 = "0qdw071b14hmxkjw6kn83d8hzq89l3hqh64pl1f1wb8m51w5xfg7"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/070ef6f138956d9ea9612e69586152339dbefe51.patch"; + name = "CVE-2018-19840.patch"; + sha256 = "08y27py8hnki74ad8wbknnd36vj5pzzcm2vk3ngcbsjnj7x5mffz"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/bba5389dc598a92bdf2b297c3ea34620b6679b5b.patch"; + name = "CVE-2018-19841.patch"; + sha256 = "08gx5xx51bi86cqqy7cv1d25k669a7wnkksasjspphwkpwkcxymy"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/f68a9555b548306c5b1ee45199ccdc4a16a6101b.patch"; + name = "CVE-2019-1010317.patch"; + sha256 = "0v748nd9408v6ah37cn8wr0k0m0ny1g884q8q92j1dhwad69kfid"; + }) + (fetchpatch { + url = "https://github.com/dbry/WavPack/commit/33a0025d1d63ccd05d9dbaa6923d52b1446a62fe.patch"; + name = "CVE-2019-1010319.patch"; + sha256 = "011sqdgpykilaj2c4ns298z7aad03yprpva0dqr39nx88ji6jnrb"; + }) + ]; + meta = with stdenv.lib; { description = "Hybrid audio compression format"; homepage = http://www.wavpack.com/; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 25cbde63129b..8a5a5dc070ed 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf"; }; + separateDebugInfo = true; + configureFlags = [ "--disable-documentation" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index aa05161d19c0..2ccc9b7c2b4b 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gettext, gobject-introspection, libnotify, gnutls, libgcrypt , gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit -, libidn, libedit, readline, libGLU_combined, libintl +, libidn, libedit, readline, libGLU_combined, libintl, openjpeg , enableGeoLocation ? true, geoclue2, sqlite , enableGtk2Plugins ? false, gtk2 ? null , gst-plugins-base, gst-plugins-bad, woff2 @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.22.6"; + version = "2.24.1"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z"; + sha256 = "0v9riwrmwi9wxbb8hlvcbyyxa9zxhcdk6s1xcspalk6asam8xjsk"; }; patches = optionals stdenv.isDarwin [ @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { buildInputs = [ libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2 - libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit + libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit openjpeg sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core ] ++ optional enableGeoLocation geoclue2 ++ optional enableGtk2Plugins gtk2 diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 6e7090a9c5b7..d3b2d78bf0a6 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -6,7 +6,7 @@ let pname = "wlroots"; - version = "0.3"; + version = "0.5.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "1iz5lxpiba1lcmkz3hz56r8j6ra3535zgckazqshi4c364nx94zs"; + sha256 = "1phiidyddzgaxy4gbqwmykxn0y8za6y5mp66l9dpd9i6fml153yq"; }; # $out for the library, $bin for rootston, and $examples for the example diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index cf331f014567..76c345c6b7e9 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -18,6 +18,8 @@ let doCheck = true; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; + # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' @@ -29,7 +31,7 @@ let description = "Search engine library"; homepage = https://xapian.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }; diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch new file mode 100644 index 000000000000..72a7c3e721f4 --- /dev/null +++ b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch @@ -0,0 +1,33 @@ +diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc +--- xapian-core.old/tests/api_db.cc ++++ xapian-core.new/tests/api_db.cc +@@ -998,6 +998,7 @@ + + // test for keepalives + DEFINE_TESTCASE(keepalive1, remote) { ++ SKIP_TEST("Fails in darwin nix build environment"); + Xapian::Database db(get_remote_database("apitest_simpledata", 5000)); + + /* Test that keep-alives work */ +diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc +--- xapian-core.old/tests/api_scalability.cc ++++ xapian-core.new/tests/api_scalability.cc +@@ -53,6 +53,7 @@ + } + + DEFINE_TESTCASE(bigoaddvalue1, writable) { ++ SKIP_TEST("Fails in darwin nix build environment"); + // O(n*n) is bad, but O(n*log(n)) is acceptable. + test_scalability(bigoaddvalue1_helper, 5000, O_N_LOG_N); + return true; +diff -Naur xapian-core.old/tests/api_serialise.cc xapian-core.new/tests/api_serialise.cc +--- xapian-core.old/tests/api_serialise.cc ++++ xapian-core.new/tests/api_serialise.cc +@@ -110,6 +110,7 @@ + + // Test for serialising a document obtained from a database. + DEFINE_TESTCASE(serialise_document2, writable) { ++ SKIP_TEST("Fails in darwin nix build environment"); + Xapian::Document origdoc; + origdoc.add_term("foo", 2); + origdoc.add_posting("foo", 10); diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix index adace96afad8..31c31164e010 100644 --- a/pkgs/development/libraries/xavs/default.nix +++ b/pkgs/development/libraries/xavs/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0drw16wm95dqszpl7j33y4gckz0w0107lnz6wkzb66f0dlbv48cf"; }; + enableParallelBuilding = true; + patchPhase = '' patchShebangs configure patchShebangs config.sub @@ -18,7 +20,16 @@ stdenv.mkDerivation rec { patchShebangs tools/patcheck patchShebangs tools/regression-test.pl patchShebangs tools/xavs-format - ''; + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace config.guess --replace 'uname -p' 'uname -m' + substituteInPlace configure \ + --replace '-O4' '-O3' \ + --replace ' -s ' ' ' \ + --replace 'LDFLAGS -s' 'LDFLAGS' \ + --replace '-dynamiclib' ' ' \ + --replace '-falign-loops=16' ' ' + substituteInPlace Makefile --replace '-Wl,-soname,' ' ' + ''; configureFlags = [ "--enable-pic" @@ -31,7 +42,7 @@ stdenv.mkDerivation rec { description = "AVS encoder and decoder"; homepage = http://xavs.sourceforge.net/; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ codyopel ]; }; } diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index f48320148dac..28fa6a9ebd97 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1djgsp3n10w6lamwwjn64p9722lvxpalj26h19zscbspnhfldb4f"; + sha256 = "1vgnsahljzrjcdjzv1dxhp2rf709pnf8595an82llnylwa8rdp1j"; }; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 80699188fe2e..0fdcb684b2d5 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, acl, dbus, fuse, wrapGAppsHook, gnome3 }: +{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.1.0"; + version = "1.2.0"; outputs = [ "out" "installedTests" ]; @@ -10,20 +10,19 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "10dv628gci6vcs0rbyp4wb6yvigw2i1jj9x7ii6ckxjir5rff5dx"; + sha256 = "1gjyif4gly0mkdx6ir6wc4vhfh1raah9jq03q28i88hr7phjdy71"; }; patches = [ ./respect-path-env-var.patch - # https://github.com/flatpak/xdg-desktop-portal/pull/263 - (fetchpatch { - url = https://github.com/flatpak/xdg-desktop-portal/commit/5e5993b64ea43f7ba77335f98e3d6c5bf99a51b9.patch; - sha256 = "1i753q35dgihj6vp3961i0hn2sxy2pyfx0dbqa385z0y6wz8k9xq"; + (substituteAll { + src = ./fix-paths.patch; + inherit flatpak; }) ]; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; - buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gnome3.gsettings-desktop-schemas ]; + buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gsettings-desktop-schemas ]; doCheck = true; # XXX: investigate! diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch new file mode 100644 index 000000000000..f4b103eb38b1 --- /dev/null +++ b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/notification.c b/src/notification.c +index 1367114..72ba033 100644 +--- a/src/notification.c ++++ b/src/notification.c +@@ -401,7 +401,7 @@ validate_icon_more (GVariant *v) + int status; + g_autofree char *err = NULL; + g_autoptr(GError) error = NULL; +- const char *icon_validator = LIBEXECDIR "/flatpak-validate-icon"; ++ const char *icon_validator = "@flatpak@/libexec/flatpak-validate-icon"; + const char *args[6]; + + if (G_IS_THEMED_ICON (icon)) diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index cbe32da64457..51f883a020be 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xxHash-${version}"; - version = "0.6.4.20171222"; + version = "0.6.5"; src = fetchFromGitHub { - sha256 = "1az5vm14rdc3pa3l0wj180wpii14if16diril3gz8q9ip1215gwj"; - rev = "7caf8bd76440c75dfe1070d3acfbd7891aea8fca"; - repo = "xxHash"; owner = "Cyan4973"; + repo = "xxHash"; + rev = "v${version}"; + sha256 = "137hifc3f3cb4ib64rd6y83arc9hmbyncgrij2v8m94mx66g2aks"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 9fc0c4ac2306..1d56742ba1c4 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zeromq-${version}"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "0z7ka82ihlsncqmf8jj4lnjyr418dzxfs0psx5mccqb09yx9shgm"; + sha256 = "1q37z05i76ili31j6jlw8988iy6vxadlmd306f99phxfdpqa6bn9"; }; nativeBuildInputs = [ cmake asciidoc ]; diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index 21d8a7babb3c..d3dc41371de3 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://hardysimpson.github.com/zlog; license = licenses.lgpl21; platforms = platforms.linux; # cannot test on something else - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 6aede4e9653f..010c73336b92 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,4 +1,4 @@ -{ docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib }: +{ docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib, fetchpatch }: stdenv.mkDerivation rec { name = "zziplib-${version}"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0i052a7shww0fzsxrdp3rd7g4mbzx7324a8ysbc0br7frpblcql4"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-17828.patch"; + url = "https://github.com/gdraheim/zziplib/commit/f609ae8971f3c0ce6.diff"; + sha256 = "0jhiz4fgr93wzh6q03avn95b2nsf6402jaki6hxirxyhs5v9ahry"; + }) + ]; postPatch = '' sed -i -e s,--export-dynamic,, configure ''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index face797fe2a3..3343f22b7b0b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -10,11 +10,13 @@ in { stumpwm = x:{ overrides = y: (x.overrides y) // { + linkedSystems = []; preConfigure = '' export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh"; ''; postInstall = '' - export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm '(function stumpwm:stumpwm)'" + export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm \ + '(function stumpwm:stumpwm)' '$linkedSystems'" "$out/bin/stumpwm-lisp-launcher.sh" cp "$out/lib/common-lisp/stumpwm/stumpwm" "$out/bin" diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 7da4a9eeddf3..b36eb02e6554 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5,7 +5,7 @@ nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modul These packages are manually refined in lua-overrides.nix */ -{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; { @@ -70,26 +70,6 @@ basexx = buildLuarocksPackage { }; }; }; -cqueues = buildLuarocksPackage { - pname = "cqueues"; - version = "20171014.52-0"; - - src = fetchurl { - url = https://luarocks.org/cqueues-20171014.52-0.src.rock; - sha256 = "0q3iy1ja20nq2sn2n6badzhjq5kni86pfc09n5g2c46q9ja3vfzx"; - }; - disabled = ( lua.luaversion != "5.2"); - propagatedBuildInputs = [lua ]; - buildType="make"; - - meta = { - homepage = "http://25thandclement.com/~william/projects/cqueues.html"; - description="Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix."; - license = { - fullName = "MIT/X11"; - }; - }; -}; dkjson = buildLuarocksPackage { pname = "dkjson"; version = "2.5-2"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index b78f7f9c0079..a0ea365c7a56 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -5,19 +5,6 @@ with super; ##########################################3 #### manual fixes for generated packages ##########################################3 - cqueues = super.cqueues.override({ - nativeBuildInputs = [ pkgs.gnum4 ]; - buildInputs = [ pkgs.openssl ]; - extraConfig = with pkgs; '' - variables={ - CRYPTO_INCDIR="${openssl.dev}/include"; - CRYPTO_LIBDIR="${openssl.out}/lib"; - OPENSSL_INCDIR="${openssl.dev}/include"; - OPENSSL_LIBDIR="${openssl.out}/lib"; - } - ''; - }); - lgi = super.lgi.overrideAttrs(oa: { nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; oa.buildInputs ++ [ glib gobjectIntrospection]; @@ -68,4 +55,17 @@ with super; install -D completions/zsh/_busted $out/share/zsh/site-functions/_busted ''; }); + + luuid = super.luuid.override({ + buildInputs = [ pkgs.libuuid ]; + extraConfig = '' + variables = { + LIBUUID_INCDIR="${pkgs.lib.getDev pkgs.libuuid}/include"; + LIBUUID_LIBDIR="${pkgs.lib.getLib pkgs.libuuid}/lib"; + } + ''; + meta = { + platforms = pkgs.lib.platforms.linux; + }; + }); } diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index 4ddab380825d..c88b780d164a 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, runtimeShell }: stdenv.mkDerivation { name = "avr8-burn-omat-2.1.2"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { mkdir -p $out/{nix-support,bin} mv *.jar license_gpl-3.0.txt lib *.xml *.png $out/nix-support cat >> $out/bin/avr8-burn-omat << EOF - #!${stdenv.shell} - cd $out/nix-support; exec java -jar AVR8_Burn_O_Mat.jar + #!${runtimeShell} + cd $out/nix-support; exec java -jar AVR8_Burn_O_Mat.jar EOF chmod +x $out/bin/avr8-burn-omat ''; diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index fbe48803f2db..e66bb6fe2118 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev. sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex - substitutateInPlace Makefile \ + substituteInPlace Makefile \ --replace "--specs=nano.specs" "" ''; diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index 102b1eb8048d..683883ddbce9 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { sed -ri "s/-j *[0-9]+//" Makefile # Eliminate parallel build args in submakes sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex - substitutateInPlace Makefile \ + substituteInPlace Makefile \ --replace "--specs=nano.specs" "" ''; diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 31820eff7e53..89ba7cec32f7 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -2,50 +2,50 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.5.3) + cocoapods (1.6.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.5.3) + cocoapods-core (= 1.6.1) cocoapods-deintegrate (>= 1.0.2, < 2.0) - cocoapods-downloader (>= 1.2.0, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (~> 2.0.1) + fourflusher (>= 2.2.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.5) + molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 1.1) - xcodeproj (>= 1.5.7, < 2.0) - cocoapods-core (1.5.3) + ruby-macho (~> 1.4) + xcodeproj (>= 1.8.1, < 2.0) + cocoapods-core (1.6.1) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.2) - cocoapods-downloader (1.2.1) + cocoapods-deintegrate (1.0.3) + cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) - cocoapods-stats (1.0.0) + cocoapods-stats (1.1.0) cocoapods-trunk (1.3.1) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.4) escape (0.0.4) - fourflusher (2.0.1) + fourflusher (2.2.0) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) @@ -55,11 +55,11 @@ GEM nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) - ruby-macho (1.2.0) + ruby-macho (1.4.0) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.6.0) + xcodeproj (1.8.1) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -73,4 +73,4 @@ DEPENDENCIES cocoapods BUNDLED WITH - 1.16.3 + 1.17.2 diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index 5fcbe59603b9..8cd829d56abb 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -1,12 +1,14 @@ { activesupport = { dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; + sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4"; type = "gem"; }; - version = "4.2.10"; + version = "4.2.11"; }; atomos = { source = { @@ -34,37 +36,45 @@ }; cocoapods = { dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5cz19p0j9k1hvn35lxnv3dn8i65n4qvi5nzjaf53pdgh52401h"; + sha256 = "0sjipdbybs2ikjz9drpwfq1msisha3cbf3508ywaj5w3i481av37"; type = "gem"; }; - version = "1.5.3"; + version = "1.6.1"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnxcd2xnvf60f8w27glq5jcn9wdhzch9nkdb24ihhmpxfgj3f39"; + sha256 = "03g31gn8k9q8ky1qhg9i2xawg6xdpl8x3mq4fdah17jclsg8y0sh"; type = "gem"; }; - version = "1.5.3"; + version = "1.6.1"; }; cocoapods-deintegrate = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10b49glw3jd0r1vj36zb0vz2idwgziq8qgzf7yjkrsm41xm098zz"; + sha256 = "0m3hi4va9cr7anxkjf44as14j1hsrvw00bzvz7c906hyb8qcm4fp"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; cocoapods-downloader = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g1v3k52g2mjlml8miq06c61764lqdy0gc0h2f4ymajz0pqg1zik"; + sha256 = "09fd4zaqkz8vz3djplacngcs4n0j6j956wgq43s1y6bwl0zyjmd3"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; cocoapods-plugins = { dependencies = ["nap"]; @@ -84,12 +94,14 @@ version = "1.0.0"; }; cocoapods-stats = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfcwq2vq6cadj1811jdjys3d28pmk2r2a83px6w94rz6i19axid"; + sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; @@ -117,12 +129,14 @@ version = "3.1.2"; }; concurrent-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.4"; }; escape = { source = { @@ -133,12 +147,14 @@ version = "0.0.4"; }; fourflusher = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dzmkxyzrk475c1yk5zddwhhj28b6fnj4jkk1h5gr1c2mrar72d5"; + sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3"; type = "gem"; }; - version = "2.0.1"; + version = "2.2.0"; }; fuzzy_match = { source = { @@ -206,12 +222,14 @@ version = "0.11.0"; }; ruby-macho = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xi0ll217h3caiamplqaypmipmrkriqrvmq207ngyzhgmh1jfc8q"; + sha256 = "0lhdjn91jkifsy2hzq2hgcm0pp8pbik87m58zmw1ifh6hkp9adjb"; type = "gem"; }; - version = "1.2.0"; + version = "1.4.0"; }; thread_safe = { source = { @@ -232,11 +250,13 @@ }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f4shbzff3wsk1jq0v9bs10496qdx69k2jfpf11p4q2ik3jdnsv7"; + sha256 = "13z3109lwq632vhazndqjlccpwadljg58sflbyl0m57j9d4blv2y"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.1"; }; } \ No newline at end of file diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/mobile/cocoapods/update index 58a7bd4a4539..8215d1abe4fd 100755 --- a/pkgs/development/mobile/cocoapods/update +++ b/pkgs/development/mobile/cocoapods/update @@ -1,10 +1,11 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p bash ruby bundler bundix -rm Gemfile.lock -bundler install -bundix +BUNDIX_CACHE="$(mktemp -d)" -if [ "clean" == "$1" ]; then - rm -rf ~/.gem -fi +rm -f Gemfile.lock +bundler package --path "$BUNDIX_CACHE" +bundix --bundle-pack-path="$BUNDIX_CACHE" + +rm -rf "$BUNDIX_CACHE" +rm -rf .bundle diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index aac94fe6130b..9e19afb24429 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -40,8 +40,7 @@ in stdenv.mkDerivation ({ name = stdenv.lib.replaceChars [" "] [""] name; - buildInputs = [ nodejs titanium alloy python which file jdk ] - ++ stdenv.lib.optional (target == "iphone") xcodewrapper; + buildInputs = [ nodejs titanium alloy python which file jdk ]; buildPhase = '' ${preBuild} @@ -91,6 +90,10 @@ stdenv.mkDerivation ({ ''} '' else if target == "iphone" then '' + # Be sure that the Xcode wrapper has priority over everything else. + # When using buildInputs this does not seem to be the case. + export PATH=${xcodewrapper}/bin:$PATH + # Configure the path to Xcode titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir} @@ -173,7 +176,7 @@ stdenv.mkDerivation ({ echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products ${stdenv.lib.optionalString enableWirelessDistribution '' - appname="$(basename "$out/*.ipa" .ipa)" + appname="$(basename $out/*.ipa .ipa)" bundleId=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g') version=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g') diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix index cff1d73d3024..5c1cd0a265ab 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix @@ -87,6 +87,11 @@ stdenv.mkDerivation { # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle + # Patch the strip frameworks script in the iPhone build template to not let + # it skip the strip phase. This is caused by an assumption on the file + # permissions in which Nix deviates from the standard. + sed -i -e "s|-perm +111|-perm /111|" iphone/templates/build/strip-frameworks.sh + # Patch some executables ${if stdenv.system == "i686-linux" then diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index b88f806d5866..05ddf5366c72 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation ({ ${codeSignIdentity} provisioningProfiles - ${stdenv.lib.toLower bundleId} + ${bundleId} $PROVISIONING_PROFILE signingStyle @@ -129,9 +129,9 @@ stdenv.mkDerivation ({ ${stdenv.lib.optionalString enableWirelessDistribution '' # Add another hacky build product that enables wireless adhoc installations - appname="$(basename "$out/*.ipa" .ipa)" - sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/$appname.html - echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products + appname="$(basename "$(echo $out/*.ipa)" .ipa)" + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/''${appname}.html + echo "doc install \"$out/''${appname}.html\"" >> $out/nix-support/hydra-build-products ''} ''} ${stdenv.lib.optionalString generateXCArchive '' diff --git a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix index dea1b77211bd..f1941e051bc2 100644 --- a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation { ln -s /usr/bin/xcrun ln -s /usr/bin/plutil ln -s /usr/bin/clang + ln -s /usr/bin/lipo + ln -s /usr/bin/file + ln -s /usr/bin/rev ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild" ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator" diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix deleted file mode 100644 index ce42bfa7ba3d..000000000000 --- a/pkgs/development/node-packages/composition-v6.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; - inherit nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages-v6.nix { - inherit (pkgs) fetchurl fetchgit; - inherit nodeEnv; -} \ No newline at end of file diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 816db45375dd..3df201dd96e3 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -4,6 +4,5 @@ set -eu -o pipefail rm -f node-env.nix -node2nix -6 -i node-packages-v6.json -o node-packages-v6.nix -c composition-v6.nix node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index e3e056f54426..c6047f4ea1b7 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "atd"; version = "2.0.0"; + minimumOCamlVersion = "4.02"; + src = fetchFromGitHub { owner = "mjambon"; repo = pname; diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix index fd3e7d58ae31..38673fb9ddc4 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix @@ -1,6 +1,7 @@ { buildDunePackage, bisect_ppx, ocamlbuild }: buildDunePackage rec { + minimumOCamlVersion = "4.02"; inherit (bisect_ppx) version src meta; pname = "bisect_ppx-ocamlbuild"; propagatedBuildInputs = [ ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index a5164ab7fa9b..87d9ac7a324d 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "dtoa"; version = "0.3.1"; - minimumOCamlVersion = "4.01"; + minimumOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 9f2227327e49..8da00b76393a 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,27 +1,38 @@ -{ stdenv, fetchurl, pkgconfig, ocaml, findlib, gtk3, gtkspell3, gtksourceview }: +{ stdenv,lib, fetchFromGitHub, pkgconfig, ocaml, findlib, dune, gtk3, cairo2 }: -if !stdenv.lib.versionAtLeast ocaml.version "4.05" +if !lib.versionAtLeast ocaml.version "4.05" then throw "lablgtk3 is not available for OCaml ${ocaml.version}" else +# This package uses the dune.configurator library +# It thus needs said library to be compiled with this OCaml compiler +let __dune = dune; in +let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; }; in + stdenv.mkDerivation rec { - version = "3.0.beta3"; - name = "ocaml${ocaml.version}-lablgtk3-${version}"; - src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1775/lablgtk-3.0.beta3.tar.gz; - sha256 = "174mwwdz1s91a6ycbas7nc0g87c2l6zqv68zi5ab33yb76l46a6w"; + version = "3.0.beta4"; + pname = "lablgtk3"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "garrigue"; + repo = "lablgtk"; + rev = version; + sha256 = "1lppb7k4xb1a35i7klm9mz98hw8l2f8s7rivgzysi1sviqy1ds5d"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib gtk3 gtkspell3 gtksourceview ]; + buildInputs = [ ocaml findlib dune gtk3 ]; + propagatedBuildInputs = [ cairo2 ]; - buildFlags = "world"; + buildPhase = "dune build -p ${pname}"; + inherit (dune) installPhase; meta = { description = "OCaml interface to gtk+-3"; homepage = "http://lablgtk.forge.ocamlcore.org/"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix new file mode 100644 index 000000000000..7e898be74901 --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix @@ -0,0 +1,8 @@ +{ buildDunePackage, gtkspell3, lablgtk3 }: + +buildDunePackage rec { + pname = "lablgtk3-gtkspell3"; + buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs; + propagatedBuildInputs = [ lablgtk3 ]; + inherit (lablgtk3) src version meta nativeBuildInputs; +} diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix new file mode 100644 index 000000000000..7e8807576eeb --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix @@ -0,0 +1,9 @@ +{ stdenv, ocaml, gtksourceview, lablgtk3 }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-lablgtk3-sourceview3-${version}"; + buildPhase = "dune build -p lablgtk3-sourceview3"; + buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ]; + propagatedBuildInputs = [ lablgtk3 ]; + inherit (lablgtk3) src version meta nativeBuildInputs installPhase; +} diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/pkgs/development/ocaml-modules/opti/default.nix index 7b084e61688b..f6552d57683f 100644 --- a/pkgs/development/ocaml-modules/opti/default.nix +++ b/pkgs/development/ocaml-modules/opti/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "opti"; version = "1.0.3"; + minimumOCamlVersion = "4.02"; + src = fetchurl { url = "https://github.com/magnusjonsson/opti/releases/download/${version}/opti-${version}.tbz"; sha256 = "ed9ba56dc06e9d2b1bf097964cc65ea37db787d4f239c13d0dd74693f5b50a1e"; diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix index 7f3686abb51a..4c820d13808d 100644 --- a/pkgs/development/ocaml-modules/wtf8/default.nix +++ b/pkgs/development/ocaml-modules/wtf8/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "wtf8"; version = "1.0.1"; - minimumOCamlVersion = "4.01"; + minimumOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; diff --git a/pkgs/development/perl-modules/DBD-Oracle/default.nix b/pkgs/development/perl-modules/DBD-Oracle/default.nix new file mode 100644 index 000000000000..9db926bf94da --- /dev/null +++ b/pkgs/development/perl-modules/DBD-Oracle/default.nix @@ -0,0 +1,15 @@ +{ fetchurl, buildPerlPackage, DBI, TestNoWarnings, oracle-instantclient }: + +buildPerlPackage rec { + name = "DBD-Oracle-1.76"; + + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZA/ZARQUON/${name}.tar.gz"; + sha256 = "b6db7f43c6252179274cfe99c1950b93e248f8f0fe35b07e50388c85d814d5f3"; + }; + + ORACLE_HOME = "${oracle-instantclient}/lib"; + + buildInputs = [ TestNoWarnings oracle-instantclient ] ; + propagatedBuildInputs = [ DBI ]; +} diff --git a/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch b/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch deleted file mode 100644 index 7b513f21a29f..000000000000 --- a/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- File-Slurp-9999.19.orig/lib/File/Slurp.pm 2011-05-30 21:58:53.000000000 +0200 -+++ File-Slurp-9999.19/lib/File/Slurp.pm 2017-04-28 10:05:59.047681755 +0200 -@@ -4,6 +4,7 @@ - - use strict; - use warnings ; -+no warnings 'deprecated'; - - use Carp ; - use Exporter ; diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index a87e0c616fd8..a4bdc1dc1cc1 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, perl }: +{ lib, stdenv, perl, toPerlModule }: { nativeBuildInputs ? [], name, ... } @ attrs: -stdenv.mkDerivation ( +toPerlModule(stdenv.mkDerivation ( ( lib.recursiveUpdate { @@ -39,4 +39,4 @@ stdenv.mkDerivation ( nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ]; inherit perl; } -) +)) diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 76e52692383f..47773c209545 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -13,6 +13,7 @@ , libuuid , autoreconfHook , gcc48 +, runtimeShell , ... }: { name, src, version, source-date, source-url, ... }: @@ -114,7 +115,7 @@ stdenv.mkDerivation rec { # Create the script cat > "$out/bin/${cmd}" < 3.5 - postPatch = '' - substituteInPlace requirements.txt \ - --replace "typing" "" - ''; - checkPhase = '' export LANG=en_US.UTF-8 py.test altair --doctest-modules @@ -33,6 +32,6 @@ buildPythonPackage rec { homepage = https://github.com/altair-viz/altair; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index fc984d40cc61..54b6e87a1cea 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "amqp"; - version = "2.3.2"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "073dd02fdd73041bffc913b767866015147b61f2a9bc104daef172fc1a0066eb"; + sha256 = "6816eed27521293ee03aa9ace300a07215b11fee4e845588a9b863a7ba30addb"; }; checkInputs = [ pytest case pytest-sugar ]; diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 6cd4c030767c..7525df60575b 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -2,12 +2,12 @@ asn1crypto, click, pydot, ipython, pyqt5, pyperclip }: buildPythonPackage rec { - version = "3.3.4"; + version = "3.3.5"; pname = "androguard"; src = fetchPypi { inherit pname version; - sha256 = "1hinfbvha7f1py1jnvxih7lx0p4z2nyaiq9bvg8v3bykwrd9jff2"; + sha256 = "f0655ca3a5add74c550951e79bd0bebbd1c5b239178393d30d8db0bd3202cda2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 8e6fc6682043..bd535a972d15 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools_scm }: +, pytest_3, setuptools_scm }: buildPythonPackage rec { pname = "apipkg"; @@ -10,8 +10,8 @@ buildPythonPackage rec { sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6"; }; - buildInputs = [ setuptools_scm ]; - checkInputs = [ pytest ]; + nativeBuildInputs = [ setuptools_scm ]; + checkInputs = [ pytest_3 ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 78cd2fca8376..a0acadd8db75 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -23,9 +23,8 @@ buildPythonPackage rec { ./tests.patch ]; postPatch = "rm testParser2.py"; - buildInputs = [ + nativeBuildInputs = [ sphinx - pytest py3to2 ]; propagatedBuildInputs = [ @@ -33,7 +32,7 @@ buildPythonPackage rec { isodate numpy openpyxl - ] ++ lib.optional gui [ + ] ++ lib.optionals gui [ tkinter ]; @@ -53,7 +52,11 @@ buildPythonPackage rec { (cd apidocs && make html && cp -r _build $doc) ''; - doCheck = if gui then true else false; + doCheck = false; + + checkPhase = '' + py.test + ''; meta = with lib; { description = '' diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index 120928656b4c..187e795416cd 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -1,30 +1,33 @@ { cffi , six +, enum34 , hypothesis , pytest , wheel , buildPythonPackage , fetchPypi +, isPy3k +, lib }: buildPythonPackage rec { pname = "argon2_cffi"; - version = "18.3.0"; - name = "${pname}-${version}"; + version = "19.1.0"; src = fetchPypi { inherit pname version; - sha256 = "003f588de43a817af6ecc1c06103fa0801de63849db3cb0f37576bb2da29043d"; + sha256 = "81548a27b919861040cb928a350733f4f9455dd67c7d1ba92eb5960a1d7f8b26"; }; - propagatedBuildInputs = [ cffi six ]; + propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34; checkInputs = [ hypothesis pytest wheel ]; checkPhase = '' pytest tests ''; - meta = { + meta = with lib; { description = "Secure Password Hashes for Python"; homepage = https://argon2-cffi.readthedocs.io/; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 65f4ae79f4b3..0a8e7e6f4823 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -1,21 +1,22 @@ { stdenv, buildPythonPackage, fetchPypi , nose, chai, simplejson, backports_functools_lru_cache -, dateutil }: +, dateutil, pytz +}: buildPythonPackage rec { pname = "arrow"; - version = "0.12.1"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "a558d3b7b6ce7ffc74206a86c147052de23d3d4ef0e17c210dd478c53575c4cd"; + sha256 = "6f54d9f016c0b7811fac9fb8c2c7fa7421d80c54dbdd75ffb12913c55db60b8a"; }; checkPhase = '' nosetests --cover-package=arrow ''; - checkInputs = [ nose chai simplejson ]; + checkInputs = [ nose chai simplejson pytz ]; propagatedBuildInputs = [ dateutil backports_functools_lru_cache ]; postPatch = '' diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix index 29dae1fd663a..6af5b3da8808 100644 --- a/pkgs/development/python-modules/asn1ate/default.nix +++ b/pkgs/development/python-modules/asn1ate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for translating ASN.1 into other forms"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ leenaars ]; }; } diff --git a/pkgs/development/python-modules/aspy.yaml/default.nix b/pkgs/development/python-modules/aspy.yaml/default.nix index 4f07c09e1598..c6d06772c9ba 100644 --- a/pkgs/development/python-modules/aspy.yaml/default.nix +++ b/pkgs/development/python-modules/aspy.yaml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aspy.yaml"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1ajb97kn044ximkzq2090h4yblrhw77540pwiw345cp7mwzy4xqa"; + sha256 = "5eaaacd0886e8b581f0e4ff383fb6504720bb2b3c7be17307724246261a41adf"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 3c5839267bde..75f0b632e877 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "astral"; - version = "1.9.2"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "179f72a086cee96487e60514bab81e821966953fc2e2f7091500d3d2c314e38b"; + sha256 = "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1"; }; propagatedBuildInputs = [ pytz requests ]; diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix index 703a6e68167f..8dbb4da70603 100644 --- a/pkgs/development/python-modules/astunparse/default.nix +++ b/pkgs/development/python-modules/astunparse/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "astunparse"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "d27b16fb33dea0778c5a2c01801554eae0d3f8a8d6f604f15627589c3d6f11ca"; + sha256 = "dab3e426715373fd76cd08bb1abe64b550f5aa494cf1e32384f26fd60961eb67"; }; propagatedBuildInputs = [ six wheel ]; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 82723163a5e8..bea0857f0cf5 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "1.14.0"; + version = "1.15.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "0f1i5a760a3jylkj00bxkshnylzyhyqz50v8mb8s9ygllpzja058"; + sha256 = "f2065a8b3af0c514c8de264e7b01f08df5213b707bacb7e7c080bd46c3e3bc35"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index 187e0924ccac..020ba9df8b00 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "asynctest"; - version = "0.12.2"; + version = "0.12.3"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "77520850ae21620ec31738f4a7b467acaa44de6d3752d8ac7a9f4dcf55d77853"; + sha256 = "bbeb45bb41344d2cbb814b4c89c04f2c568742352736cabf7af6fcbed06f66cc"; }; postPatch = '' diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index 0a7dbf561a0f..fdaebda089ff 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "atom"; - version = "0.4.1"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "0awzja4k3f32y01gd068yyxvh35km62m4wka0vbg1yyy37ahgjmv"; + sha256 = "ce96fb50326a3bfa084463dbde1cf2e02c92735e5bc324d836355c25af87e0ae"; }; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix index 44eb1b09d83a..e34f937b5090 100644 --- a/pkgs/development/python-modules/atomicwrites/default.nix +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "atomicwrites"; - version = "1.2.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ec9ae8adaae229e4f8446952d204a3e4b5fdd2d099f9be3aaf556120135fb3ee"; + sha256 = "75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index ce4408b84412..d2a25cf738a5 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "1.2.3"; + version = "1.2.4"; pname = "atomman"; src = fetchPypi { inherit pname version; - sha256 = "9eb6acc5497263cfa89be8d0f383a9a69f0726b4ac6798c1b1d96f26705ec09c"; + sha256 = "c204d52cdfb2a7cc4d7d2c4f7a89c215a9fd63b92495a83adf25ae4e820cea3e"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix index c6a9151d9111..29e3ca09cc51 100644 --- a/pkgs/development/python-modules/attrdict/default.nix +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "attrdict"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1lrailzxy40dx6sn1hbpnpqfbg7ar75dfj41kx0480wyh39vdbl6"; + sha256 = "35c90698b55c683946091177177a9e9c0713a0860f0e049febd72649ccd77b70"; }; propagatedBuildInputs = [ coverage nose six ]; diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index 633daab7d4e3..9a6952c88f08 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -8,13 +8,19 @@ buildPythonPackage rec { pname = "audio-metadata"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1jd0wzhh9as2qyiwggqmvsbsm5nlb73qnxix2mcar53cddvwrvj7"; + sha256 = "a881f0f3b82752d306ac0a7850ed0e31bad275a399f63097733b4890986084b2"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "bidict>=0.17,<0.18" "bidict" \ + --replace "more-itertools>=4.0,<5.0" "more-itertools" + ''; + propagatedBuildInputs = [ attrs bidict diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 0174bb3a0290..d2d1e48b4c62 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "autobahn"; - version = "18.10.1"; + version = "19.1.1"; src = fetchPypi { inherit pname version; - sha256 = "b5767bebd94ba13fc286604f889f208e7babc77d72d9f372d331bc14c89c5a40"; + sha256 = "aebbadb700c13792a2967c79002855d1153b9ec8f2949d169e908388699596ff"; }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++ diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index f736b9f8623f..84c9b21f933e 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -2,24 +2,25 @@ , buildPythonPackage , fetchPypi , nose -, pillow , numpy , ffmpeg_4 -, git , libav , pkgconfig }: buildPythonPackage rec { pname = "av"; - version = "6.1.0"; + version = "6.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0h5d6yy6mjaflzh9z8fv3j1rjwijmzqfrpz88zxk0qfmbprdc91z"; + sha256 = "eebbb56eeae650b1fc551f94d51aee39b487bf4df73c39daea186c5d2950650f"; }; - buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ]; + checkInputs = [ nose numpy ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ffmpeg_4 ]; # Tests require downloading files from internet doCheck = false; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index d02ffc4770c1..cf619e6021ef 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -9,19 +9,23 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.5.6"; + version = "0.8.4"; src = fetchPypi { inherit pname version; - sha256 = "c6b84d2356c8b1af955054bbef088c61bf87f68e062e866fa8d9ea5cb871389f"; + sha256 = "7016dc02d15b8797b59a461ccc8d218f37c335b97fa6b376638c0edd4ffc9de2"; }; - buildInputs = [ pytestrunner h5py ]; - checkInputs = [ pytest ]; + nativeBuildInputs = [ pytestrunner ]; + checkInputs = [ pytest h5py ]; propagatedBuildInputs = [ numpy ]; + checkPhase = '' + py.test + ''; + meta = with lib; { - description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy."; + description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy"; homepage = https://github.com/scikit-hep/awkward-array; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index dc7e3148400e..9e761b3698d6 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -2,12 +2,12 @@ , pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }: buildPythonPackage rec { - version = "1.12.2"; + version = "1.12.3"; pname = "aws-adfs"; src = fetchPypi { inherit pname version; - sha256 = "e35fbd33e1878310099346a95b7eb5244831c9f5f6554bca7193ac50dcd41aa3"; + sha256 = "b7df3fbe0572eb12294b2e072327ca97fd94d435b39cc10612e460cde914b831"; }; # Relax version constraint diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix new file mode 100644 index 000000000000..16f5e19b7866 --- /dev/null +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, six +, pytest +, mock +, parameterized +, isPy35 +}: + +buildPythonPackage rec { + pname = "aws-lambda-builders"; + version = "0.2.1"; + + # No tests available in PyPI tarball + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-lambda-builders"; + rev = "v${version}"; + sha256 = "1pbi6572q1nqs2wd7jx9d5vgf3rqdsqlaz4v8fqvl23wfb2c4vpd"; + }; + + # Package is not compatible with Python 3.5 + disabled = isPy35; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + pytest + mock + parameterized + ]; + + checkPhase = '' + export PATH=$out/bin:$PATH + pytest tests/functional + ''; + + meta = with lib; { + homepage = https://github.com/awslabs/aws-lambda-builders; + description = "A tool to compile, build and package AWS Lambda functions"; + longDescription = '' + Lambda Builders is a Python library to compile, build and package + AWS Lambda functions for several runtimes & frameworks. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ dhkl ]; + }; +} diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 917a93798820..c6c84882fcd3 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.9.0"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1334795a85077cd5741822149260f90104fb2a01699171c9e9567c0db76ed74d"; + sha256 = "0axr4598b1h9kyb5mv104cpn5q667s0g1wkkbqzj66vrqsaa07qf"; }; # Tests are not included in the PyPI package diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 10511c9f4391..1a17d2650b5c 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "fc5537268cc8041f74e14077c4b4b4cef0f3de25ecef793ace63cedf87fe4a2a"; + sha256 = "bb74e1cc2388bd29c45e2e3eb31d0416d0f53d83baafca7b72ca9c945a2e249a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index 5ea04cd19c87..d6d1ba832d64 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { - version = "1.1.17"; + version = "1.1.18"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e7cd5a8ee2ec0639454c1bd0f1ea5f609d83977376abfd304527ec7343fef1be"; + sha256 = "5fd62ae10b1add97d3c69af970328ec3bd869184396bcf6bfa9c7bc94d688424"; }; propagatedBuildInputs = [ azure-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix index 5ba49d1f3f1f..c11b8707cb10 100644 --- a/pkgs/development/python-modules/azure-mgmt-common/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -5,6 +5,7 @@ , azure-common , azure-mgmt-nspkg , requests +, msrestazure }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66"; }; - propagatedBuildInputs = [ azure-common azure-mgmt-nspkg requests ]; + propagatedBuildInputs = [ azure-common azure-mgmt-nspkg requests msrestazure ]; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 462c9e615a13..ffd2ea11d7c3 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,21 +6,15 @@ }: buildPythonPackage rec { - version = "0.20.1"; + version = "4.4.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "97298fc7f133f1d50a974ed6299151eda494a574b0f7fdf8192a388015c2215a"; + sha256 = "356219a354140ea26e6b4f4be4f855f1ffaf63af60de24cd2ca335b4ece9db00"; }; - preConfigure = '' - # Patch to make this package work on requests >= 2.11.x - # CAN BE REMOVED ON NEXT PACKAGE UPDATE - sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py - ''; - postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index fd47f8895fd4..63457d6f5423 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -6,21 +6,15 @@ }: buildPythonPackage rec { - version = "0.20.1"; + version = "2.5.1"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx"; + sha256 = "cef9bf5d36700966e52f7cea86e29c622bc5bbb92d0ce7a75420e29fb0e75f45"; }; - preConfigure = '' - # Patch to make this package work on requests >= 2.11.x - # CAN BE REMOVED ON NEXT PACKAGE UPDATE - sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py - ''; - postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix index aa037b48b4f5..cf977539d5d2 100644 --- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "3.0.2"; pname = "azure-mgmt-nspkg"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq"; + sha256 = "8b2287f671529505b296005e6de9150b074344c2c7d1c805b3f053d081d58c52"; }; propagatedBuildInputs = [ azure-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index b60e3aee3402..e5f5b38509f4 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -7,21 +7,15 @@ buildPythonPackage rec { - version = "0.20.1"; + version = "2.1.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml"; + sha256 = "aef8573066026db04ed3e7c5e727904e42f6462b6421c2e8a3646e4c4f8128be"; }; - preConfigure = '' - # Patch to make this package work on requests >= 2.11.x - # CAN BE REMOVED ON NEXT PACKAGE UPDATE - sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py - ''; - postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 2e0523bb25cc..12d10d8ac477 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -6,21 +6,15 @@ }: buildPythonPackage rec { - version = "0.20.0"; + version = "3.1.1"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim"; + sha256 = "22a779cae5e09712b7d62ef9bc3d8907a5666893a8a113b6d9348e933170236f"; }; - preConfigure = '' - # Patch to make this package work on requests >= 2.11.x - # CAN BE REMOVED ON NEXT PACKAGE UPDATE - sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py - ''; - postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py diff --git a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix index 1dbca3943a9a..013fe9f446ff 100644 --- a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix +++ b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "backports.ssl_match_hostname"; - version = "3.5.0.1"; + version = "3.7.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1wndipik52cyqy0677zdgp90i435pmvwd89cz98lm7ri0y3xjajh"; + sha256 = "bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index 7a17fd0f1d0a..3882af3a67df 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -2,42 +2,75 @@ , buildPythonPackage , fetchFromGitHub , nose +, pylibmc +, memcached +, redis +, pymongo , mock , webtest , sqlalchemy , pycrypto +, cryptography , isPy27 +, isPy3k , funcsigs , pycryptopp }: buildPythonPackage rec { pname = "Beaker"; - version = "1.8.0"; + version = "1.10.1"; # The pypy release do not contains the tests src = fetchFromGitHub { owner = "bbangert"; repo = "beaker"; rev = "${version}"; - sha256 = "17yfr7a307n8rdl09was4j60xqk2s0hk0hywdkigrpj4qnw0is7g"; + sha256 = "0xrvg503xmi28w0hllr4s7fkap0p09fgw2wax3p1s2r6b3xjvbz7"; }; - buildInputs = - [ nose - mock - webtest - ]; propagatedBuildInputs = [ sqlalchemy pycrypto + cryptography ] ++ lib.optionals (isPy27) [ funcsigs pycryptopp ]; + checkInputs = [ + nose + mock + webtest + pylibmc + memcached + redis + pymongo + ]; + + + # Can not run memcached tests because it immediately tries to connect + postPatch = lib.optionalString isPy3k '' + substituteInPlace setup.py \ + --replace "python-memcached" "python3-memcached" + '' + '' + + rm tests/test_memcached.py + ''; + + # Disable external tests because they need to connect to a live database. + # Also disable a test in test_cache.py called "test_upgrade" because + # it currently fails on darwin. + # Please see issue https://github.com/bbangert/beaker/issues/166 + checkPhase = '' + nosetests \ + -e ".*test_ext_.*" \ + -e "test_upgrade" \ + -vv tests + ''; + meta = { description = "A Session and Caching library with WSGI Middleware"; maintainers = with lib.maintainers; [ garbas domenkozar ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/beanstalkc/default.nix b/pkgs/development/python-modules/beanstalkc/default.nix index 9ac9cf831eb3..e83a9f67789c 100644 --- a/pkgs/development/python-modules/beanstalkc/default.nix +++ b/pkgs/development/python-modules/beanstalkc/default.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ stdenv, fetchFromGitHub, buildPythonPackage }: buildPythonPackage rec { pname = "beanstalkc"; - version = "0.4.0"; + version = "0.5.2"; - src = fetchPypi { - inherit pname version; - sha256 = "98978e57797320146f4b233286d9a02f65d20bad0168424118839fc608085280"; + src = fetchFromGitHub { + owner = "bosondata"; + repo = "beanstalkc"; + rev = "v${version}"; + sha256 = "1dpb1yimp2pfnikmgsb2fr9x6h8riixlsx3xfqphnfvrid49vw5s"; }; + doCheck = false; + meta = { description = "A simple beanstalkd client library for Python"; maintainers = with stdenv.lib.maintainers; [ aanderse ]; diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index f230d5e4c05d..1b9ba31f0353 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -1,19 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose }: +{ stdenv, buildPythonPackage, fetchPypi, soupsieve, pytest, python }: buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.6.3"; + version = "4.7.1"; src = fetchPypi { inherit pname version; - sha256 = "90f8e61121d6ae58362ce3bed8cd997efb00c914eae0ff3d363c32f9a9822d10"; + sha256 = "945065979fb8529dd2f37dbb58f00b661bdbcbebf954f93b32fdf5263ef35348"; }; - checkInputs = [ nose ]; + checkInputs = [ pytest ]; checkPhase = '' - nosetests build + py.test $out/${python.sitePackages}/bs4/tests ''; + propagatedBuildInputs = [ soupsieve ]; + meta = with stdenv.lib; { homepage = http://crummy.com/software/BeautifulSoup/bs4/; description = "HTML and XML parser"; diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index ed99686ed27b..61dc1db1a486 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "bidict"; - version = "0.17.5"; + version = "0.18.0"; src = fetchPypi { inherit pname version; - sha256 = "1icj0fnfx47n6i33pj5gfrmd1rzpvah1jihhdhqiqx2cy9rs6x4c"; + sha256 = "4d10630fd5d86b7c165387473c5180e7fca7635f12e24b1f426aac259c72c81a"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 3e301e03993d..dd4b548563cc 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -1,16 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case }: +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case, psutil }: buildPythonPackage rec { pname = "billiard"; - version = "3.5.0.5"; + version = "3.6.0.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "03msmapj3s5zgqk87d646mafz7a01h5bm2wijalgpi0s80ks5na2"; + sha256 = "756bf323f250db8bf88462cd042c992ba60d8f5e07fc5636c24ba7d6f4261d84"; }; - buildInputs = [ pytest case ]; + checkInputs = [ pytest case psutil ]; meta = with stdenv.lib; { homepage = https://github.com/celery/billiard; diff --git a/pkgs/development/python-modules/binaryornot/default.nix b/pkgs/development/python-modules/binaryornot/default.nix index 2f0b01a5c23d..77f1ff7cbd09 100644 --- a/pkgs/development/python-modules/binaryornot/default.nix +++ b/pkgs/development/python-modules/binaryornot/default.nix @@ -10,9 +10,9 @@ buildPythonPackage rec { }; prePatch = '' - # See https://github.com/audreyr/binaryornot/issues/40 + # TypeError: binary() got an unexpected keyword argument 'average_size' substituteInPlace tests/test_check.py \ - --replace "average_size=512" "average_size=128" + --replace "average_size=512" "" ''; propagatedBuildInputs = [ chardet ]; diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index 8e54e3bbde72..23f4257a3574 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { description = "Module for binary data manipulation"; homepage = "https://github.com/scott-griffiths/bitstring"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 7cd55c9e6470..c2b0db61cbb3 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "bleach"; - version = "3.0.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "48d39675b80a75f6d1c3bdbffec791cf0bbbab665cf01e20da701c77de278718"; + sha256 = "3fdf7f77adcf649c9911387df51254b813185e32b2c6619f690b593a617e19fa"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index da06b15f5b4e..03a1181a014d 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -9,6 +9,13 @@ buildPythonPackage rec { sha256 = "4909d58b32ab7f93d3cd83fa4bbe4edef42ab7566f016bdb6a405a0d8b1907c9"; }; + patches = [ + (fetchpatch { + url = "https://github.com/BlockIo/block_io-python/commit/8ec0a0cd1afcfcb439d6dc306d8497dd9e4a0993.patch"; + sha256 = "1i6c153wvkr5ncm3cpn34faxvavz534x5kndwn4adlaxlzq30snn"; + }) + ]; + propagatedBuildInputs = [ base58 ecdsa diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index 56036fc97b34..823b9ab8c6a4 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "18.9.1"; + version = "19.1.1"; pname = "BoltzTraP2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b828ad2b3b3a40956ef866e462e4c82faf83be79348af3945d4e7cede8a53913"; + sha256 = "81e8a5ef8240c6a2205463fa7bc643b8033125237927f5492dab0b5d1aadb35a"; }; buildInputs = [ cython cmake ]; diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 85b752409eac..8ee8b2c9fd5a 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -3,26 +3,26 @@ let wheel_source = fetchPypi { pname = "wheel"; - version = "0.32.2"; + version = "0.33.1"; format = "wheel"; - sha256 = "1216licil12jjixfqvkb84xkync5zz0fdc2kgzhl362z3xqjsgn9"; + sha256 = "8eb4a788b3aec8abf5ff68d4165441bc57420c9f64ca5f471f58c3969fe08668"; }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "40.6.3"; + version = "40.8.0"; format = "wheel"; - sha256 = "e2c1ce9a832f34cf7a31ed010aabcab5008eb65ce8f2aadc04622232c14bdd0b"; + sha256 = "e8496c0079f3ac30052ffe69b679bd876c5265686127a3159cfa415669b7f9ab"; }; in stdenv.mkDerivation rec { pname = "pip"; - version = "18.1"; + version = "19.0.3"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "7909d0a0932e88ea53a7014dfd14522ffef91a464daaaf5c573343852ef98550"; + sha256 = "bd812612bbd8ba84159d9ddc0266b7fbce712fc9bc98c82dee5750546ec8ec64"; }; unpackPhase = '' diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index ba7f4393dbd1..e62936a92884 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.9.80"; # N.B: if you change this, change botocore too + version = "1.9.96"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "99ec19dc4f0aa8a8354db7baebe1ff57bd18aeb6a539b28693b2e8ca8dc3d85b"; + sha256 = "c103241394d396ee08548b03d5d1f0f89a7ad1dfa7ccca88a47131f329cca093"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 7eb9f3d44af7..801977a96206 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.80"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.12.96"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "76a2969278250e010253ddf514f4b54eaa7d2b1430f682874c3c2ab92f25a96d"; + sha256 = "55c1594041e6716847d5a8b38181e3cc44e245edbf4598ae2b99e3040073b2cf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index ad80e5647a48..c1d9a1a8f82f 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -11,6 +11,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; + postInstall = '' + substituteInPlace "$out/share/applications/bpython.desktop" \ + --replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython" + ''; + checkInputs = [ mock ]; # tests fail: https://github.com/bpython/bpython/issues/712 diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index c76a930c9655..70dd13cf3b40 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.12.2"; + version = "2.13.1"; src = fetchPypi { inherit pname version; - sha256 = "ff5d7e8a1361da8dfe1025d35ef6ce55e929dd8518d2a811a1cf2c948950a043"; + sha256 = "3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484"; }; patches = [ ./nix.patch ]; diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index ede09373f90f..755c39287f16 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.12.2"; + version = "2.13.1"; src = fetchPypi { inherit pname version; - sha256 = "ff5d7e8a1361da8dfe1025d35ef6ce55e929dd8518d2a811a1cf2c948950a043"; + sha256 = "3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index d4b9195c5558..2581ba9c95f0 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cachetools"; - version = "2.1.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "90f1d559512fc073483fe573ef5ceb39bf6ad3d39edc98dc55178a2b2b176fa3"; + sha256 = "9efcc9fab3b49ab833475702b55edd5ae07af1af7a4c627678980b45e459c460"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cairocffi/0_9.nix b/pkgs/development/python-modules/cairocffi/0_9.nix new file mode 100644 index 000000000000..19a469dad262 --- /dev/null +++ b/pkgs/development/python-modules/cairocffi/0_9.nix @@ -0,0 +1,26 @@ +# FIXME: make gdk_pixbuf dependency optional +{ stdenv +, buildPythonPackage +, pythonOlder +, fetchPypi +, lib +, substituteAll +, makeFontsConf +, freefont_ttf +, pytest +, pytestrunner +, glibcLocales +, cairo +, cffi +, withXcffib ? false, xcffib +, python +, glib +, gdk_pixbuf +}@args: + +import ./generic.nix ({ + version = "0.9.0"; + sha256 = "15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337"; + dlopen_patch = ./dlopen-paths-0.9.patch; + inherit withXcffib; +} // args) diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index bdd11fb3de6f..528c845c07ea 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -1,60 +1,27 @@ # FIXME: make gdk_pixbuf dependency optional { stdenv , buildPythonPackage +, pythonOlder , fetchPypi , lib , substituteAll , makeFontsConf , freefont_ttf , pytest +, pytestrunner , glibcLocales , cairo , cffi , withXcffib ? false, xcffib , python , glib -, gdk_pixbuf }: +, gdk_pixbuf +}@args: -buildPythonPackage rec { - pname = "cairocffi"; - version = "0.9.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337"; - }; - - LC_ALL = "en_US.UTF-8"; - - # checkPhase require at least one 'normal' font and one 'monospace', - # otherwise glyph tests fails - FONTCONFIG_FILE = makeFontsConf { - fontDirectories = [ freefont_ttf ]; - }; - - checkInputs = [ pytest glibcLocales ]; - propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; - - checkPhase = '' - py.test $out/${python.sitePackages} - ''; - - patches = [ - # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0 - (substituteAll { - src = ./dlopen-paths.patch; - ext = stdenv.hostPlatform.extensions.sharedLibrary; - cairo = cairo.out; - glib = glib.out; - gdk_pixbuf = gdk_pixbuf.out; - }) - ./fix_test_scaled_font.patch - ]; - - meta = with lib; { - homepage = https://github.com/SimonSapin/cairocffi; - license = licenses.bsd3; - maintainers = with maintainers; []; - description = "cffi-based cairo bindings for Python"; - }; -} +import ./generic.nix ({ + version = "1.0.2"; + sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff"; + dlopen_patch = ./dlopen-paths.patch; + disabled = pythonOlder "3.5"; + inherit withXcffib; +} // args) diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch new file mode 100644 index 000000000000..862f7bd4bf7c --- /dev/null +++ b/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch @@ -0,0 +1,47 @@ +commit 705dc9a55bd160625d9996e63fc7dc532d0ad0ab +Author: Alexander V. Nikolaev +Date: Sat Feb 6 08:09:06 2016 +0200 + + Patch dlopen() to allow direct paths to all required libs + + This patch is NixOS specific + +diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py +index 718aa7f..1a1dcff 100644 +--- a/cairocffi/__init__.py ++++ b/cairocffi/__init__.py +@@ -27,20 +27,22 @@ VERSION = '0.7.2' + version = '1.10.0' + version_info = (1, 10, 0) + ++# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime ++_LIBS = { ++ 'cairo': '@cairo@/lib/libcairo@ext@', ++ 'glib-2.0': '@glib@/lib/libglib-2.0@ext@', ++ 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@', ++ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@', ++} + +-def dlopen(ffi, *names): ++def dlopen(ffi, name, *names): + """Try various names for the same library, for different platforms.""" +- for name in names: +- for lib_name in [name, 'lib' + name]: +- try: +- path = ctypes.util.find_library(lib_name) +- if path: +- lib = ffi.dlopen(path) +- if lib: +- return lib +- except OSError: +- pass +- raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names)) ++ path = _LIBS.get(name, None) ++ if path: ++ lib = ffi.dlopen(path) ++ if lib: ++ return lib ++ raise OSError("dlopen() failed to load a library: %s as %s" % (name, path)) + + + cairo = dlopen(ffi, 'cairo', 'cairo-2') diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch index 862f7bd4bf7c..d42b8bcce48e 100644 --- a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch +++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch @@ -1,4 +1,4 @@ -commit 705dc9a55bd160625d9996e63fc7dc532d0ad0ab +commit 0435bc2577d4b18f54b78b2f5185abb2b2005982 Author: Alexander V. Nikolaev Date: Sat Feb 6 08:09:06 2016 +0200 @@ -7,12 +7,12 @@ Date: Sat Feb 6 08:09:06 2016 +0200 This patch is NixOS specific diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py -index 718aa7f..1a1dcff 100644 +index 6061973..3538a58 100644 --- a/cairocffi/__init__.py +++ b/cairocffi/__init__.py -@@ -27,20 +27,22 @@ VERSION = '0.7.2' - version = '1.10.0' - version_info = (1, 10, 0) +@@ -21,19 +21,22 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip() + version = '1.16.0' + version_info = (1, 16, 0) +# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime +_LIBS = { @@ -26,13 +26,12 @@ index 718aa7f..1a1dcff 100644 +def dlopen(ffi, name, *names): """Try various names for the same library, for different platforms.""" - for name in names: -- for lib_name in [name, 'lib' + name]: +- for lib_name in (name, 'lib' + name): - try: - path = ctypes.util.find_library(lib_name) -- if path: -- lib = ffi.dlopen(path) -- if lib: -- return lib +- lib = ffi.dlopen(path or lib_name) +- if lib: +- return lib - except OSError: - pass - raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names)) @@ -44,4 +43,4 @@ index 718aa7f..1a1dcff 100644 + raise OSError("dlopen() failed to load a library: %s as %s" % (name, path)) - cairo = dlopen(ffi, 'cairo', 'cairo-2') + cairo = dlopen(ffi, 'cairo', 'cairo-2', 'cairo-gobject-2', 'cairo.so.2') diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix new file mode 100644 index 000000000000..4fa5cc466c31 --- /dev/null +++ b/pkgs/development/python-modules/cairocffi/generic.nix @@ -0,0 +1,51 @@ +{ version +, sha256 +, dlopen_patch +, disabled ? false +, ... +}@args: + +with args; + +buildPythonPackage rec { + pname = "cairocffi"; + inherit version disabled; + + src = fetchPypi { + inherit pname version sha256; + }; + + LC_ALL = "en_US.UTF-8"; + + # checkPhase require at least one 'normal' font and one 'monospace', + # otherwise glyph tests fails + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + + checkInputs = [ pytest pytestrunner glibcLocales ]; + propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; + + checkPhase = '' + py.test $out/${python.sitePackages} + ''; + + patches = [ + # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0 + (substituteAll { + src = dlopen_patch; + ext = stdenv.hostPlatform.extensions.sharedLibrary; + cairo = cairo.out; + glib = glib.out; + gdk_pixbuf = gdk_pixbuf.out; + }) + ./fix_test_scaled_font.patch + ]; + + meta = with lib; { + homepage = https://github.com/SimonSapin/cairocffi; + license = licenses.bsd3; + maintainers = with maintainers; []; + description = "cffi-based cairo bindings for Python"; + }; +} diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index abaabb24b4d9..17d442e4527e 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -1,31 +1,21 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch , cairocffi, cssselect2, defusedxml, pillow, tinycss2 -, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: +, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: buildPythonPackage rec { pname = "CairoSVG"; - version = "2.2.1"; + version = "2.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "93c5b3204478c4e20c4baeb33807db5311b4420c21db2f21034a6deda998cb14"; + sha256 = "66f333ef5dc79fdfbd3bbe98adc791b1f854e0461067d202fa7b15de66d517ec"; }; - patches = [ - # Fix tests. Remove with the next release - (fetchpatch { - url = https://github.com/Kozea/CairoSVG/commit/1f403ad229f0e2782d6427a79f0fbeb6b76148b6.patch; - sha256 = "1dxpj5zh8wmx9f8pj11hrixd5jlaqq5xlcdnbl462bh29zj18l26"; - }) - ]; - - LC_ALL="en_US.UTF-8"; - propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; - checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; meta = with stdenv.lib; { homepage = https://cairosvg.org; diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index dadd55ab0406..8e6c90441211 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -1,29 +1,37 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pythonOlder , wrapt +, typing , pyserial , nose , mock +, hypothesis +, future , pytest , pytest-timeout }: buildPythonPackage rec { pname = "python-can"; - version = "3.0.0"; + version = "3.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0d2ddb3b663af51b11a4c7fb7a577c63302a831986239f82bb6af65efc065b07"; + # PyPI tarball is missing some tests and is missing __init__.py in test + # directory causing the tests to fail. See: + # https://github.com/hardbyte/python-can/issues/518 + src = fetchFromGitHub { + repo = pname; + owner = "hardbyte"; + rev = "v${version}"; + sha256 = "01lfsh7drm4qvv909x9i0vnhskdh27mcb5xa86sv9m3zfpq8cjis"; }; - propagatedBuildInputs = [ wrapt pyserial ]; - checkInputs = [ nose mock pytest pytest-timeout ]; + propagatedBuildInputs = [ wrapt pyserial ] ++ lib.optional (pythonOlder "3.5") typing; + checkInputs = [ nose mock pytest pytest-timeout hypothesis future ]; + # Add the scripts to PATH checkPhase = '' - pytest -k "not test_writer_and_reader \ - and not test_reader \ - and not test_socketcan_on_ci_server" + PATH=$out/bin:$PATH pytest -c /dev/null ''; meta = with lib; { diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 64f649ad28ab..3fc4c3e84ed4 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -25,12 +25,19 @@ buildPythonPackage rec { -k "not test_nightshade_image" ''; - buildInputs = [ cython glibcLocales ]; - LC_ALL = "en_US.UTF-8"; + nativeBuildInputs = [ + cython + geos # for geos-config + proj + ]; + + buildInputs = [ + geos proj + ]; propagatedBuildInputs = [ # required - six pyshp shapely geos proj numpy + six pyshp shapely numpy # optional gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 9a89fff08f8a..05fe33f7e2eb 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -1,4 +1,5 @@ { stdenv +, libev , buildPythonPackage , fetchPypi , pkgs @@ -28,7 +29,10 @@ buildPythonPackage rec { }; buildInputs = [ - pkgs.libev + libev + ]; + + nativeBuildInputs = [ # NOTE: next version will work with cython 0.29 # Requires 'Cython!=0.25,<0.29,>=0.20' (cython.overridePythonAttrs(old: rec { diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 498729bb1325..c22bb427a349 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -1,39 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy37, fetchpatch, iana-etc, libredirect, - pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet +{ stdenv, buildPythonPackage, fetchPypi, isPy37, fetchpatch, iana-etc, libredirect +, case, pytest, boto3, moto, kombu, billiard, pytz, anyjson, amqp, eventlet }: buildPythonPackage rec { pname = "celery"; - version = "4.2.1"; + version = "4.3.0rc1"; src = fetchPypi { inherit pname version; - sha256 = "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp"; + sha256 = "1jmg47l0b3bnwmg44x48bwziwyk6xqs1y5plvr99a3ikz1l807yf"; }; - # See https://github.com/celery/celery/issues/4500 - # TODO: Remove once upgraded to 4.3 - disabled = isPy37; - - patches = [ - # Skip test_RedisBackend.test_timeouts_in_url_coerced - # See https://github.com/celery/celery/pull/4847 - (fetchpatch { - url = https://github.com/celery/celery/commit/b2668607c909c61becd151905b4525190c19ff4a.patch; - sha256 = "11w0z2ycyh8kccj4y69zb7bxppiipcwwigg6jn1q9yrcsvz170jq"; - }) - # Allow usage of a newer pytest version - # See https://github.com/celery/celery/pull/4912 - (fetchpatch { - url = https://github.com/celery/celery/commit/16f56fe6f84cac9f92affac3ad06a1f168a19798.patch; - sha256 = "0vz68rl32m34k51nhs898jcfdbj5m7cszzxx0w0j3j1fhn1wq594"; - }) - ]; - - postPatch = '' - substituteInPlace requirements/test.txt --replace ",<3.9" "" - ''; - # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox preCheck = stdenv.lib.optionalString stdenv.isLinux '' export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ @@ -43,7 +20,7 @@ buildPythonPackage rec { unset NIX_REDIRECTS LD_PRELOAD ''; - checkInputs = [ pytest case ]; + checkInputs = [ case pytest boto3 moto ]; propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 2f634bf21e50..7eca740953f8 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.11.5"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4"; + sha256 = "9b6f7ba4e78c52c1a291d0c0c0bd745d19adde1a9e1c03cb899f0c6efd6f8033"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 2b9441b76622..42e24dedba29 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "chainer"; - version = "5.0.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "74c11c3f20c33f85d3f42cc237a55efc384dc6f42035d6d2448318b182f236ee"; + sha256 = "cc8390a7f445a14a1bc71d54de348be247158fe2813a5ef11c5046265001c8c4"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index a3e945bc9168..f982ffefb2a7 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.6.2"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "96c22f95ccc91ed3e79cc4a9a88bf27f95a13a2caf5a55137ab081d371258f0f"; + sha256 = "98a1237bf77f18761d8f964cb3c3b794e2d377a261b5e1640268608ec94336fa"; }; checkInputs = [ watchdog pytest hypothesis mock ]; diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 6719c6669029..ef8456d376c6 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "channels"; - version = "2.1.6"; + version = "2.1.7"; src = fetchPypi { inherit pname version; - sha256 = "15qmwkpmia9y32amg7dqx3ph81b6m3fa0pawhq8gshvdfjdvhfjd"; + sha256 = "e13ba874d854ac493ece329dcd9947e82357c15437ac1a90ed1040d0e5b87aad"; }; # Files are missing in the distribution diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix index 1c42b1283eee..f082510713ad 100644 --- a/pkgs/development/python-modules/characteristic/default.nix +++ b/pkgs/development/python-modules/characteristic/default.nix @@ -13,6 +13,10 @@ buildPythonPackage rec { checkInputs = [ pytest ]; + postPatch = '' + substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" + ''; + meta = { description = "Python attributes without boilerplate"; homepage = https://characteristic.readthedocs.org; diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 1f452fb461a4..3509a6469936 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytestrunner, hypothesis }: +, pytest_3, pytestrunner, hypothesis }: buildPythonPackage rec { pname = "chardet"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; }; - checkInputs = [ pytest pytestrunner hypothesis ]; + checkInputs = [ pytest_3 pytestrunner hypothesis ]; meta = with stdenv.lib; { homepage = https://github.com/chardet/chardet; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 1763ccbce855..4a860c5510ca 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , cheroot, contextlib2, portend, routes, six -, setuptools_scm, zc_lockfile +, setuptools_scm, zc_lockfile, more-itertools , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov -, backports_functools_lru_cache, requests_toolbelt +, backports_functools_lru_cache, requests_toolbelt, pytest-services }: let srcInfo = if isPy3k then { - version = "18.0.1"; - sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520"; + version = "18.1.0"; + sha256 = "4dd2f59b5af93bd9ca85f1ed0bb8295cd0f5a8ee2b84d476374d4e070aa5c615"; } else { version = "17.4.1"; sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv"; @@ -22,14 +22,29 @@ in buildPythonPackage rec { inherit (srcInfo) version sha256; }; - propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ]; + propagatedBuildInputs = if isPy3k then [ + # required + cheroot portend more-itertools zc_lockfile + # optional + routes + ] else [ + cheroot contextlib2 portend routes six zc_lockfile + ]; buildInputs = [ setuptools_scm ]; - checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt ]; + checkInputs = if isPy3k then [ + objgraph pytest pytestcov pathpy requests_toolbelt pytest-services + ] else [ + backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt + ]; checkPhase = '' - LANG=en_US.UTF-8 pytest + # 3 out of 5 SignalHandlingTests need network access + # test_2_File_Concurrency also fails upstream: https://github.com/cherrypy/cherrypy/issues/1306 + # ...and skipping it makes 2 other tests fail + LANG=en_US.UTF-8 pytest -k "not SignalHandlingTests and not test_4_Autoreload \ + and not test_2_File_Concurrency and not test_3_Redirect and not test_4_File_deletion" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/chevron/default.nix b/pkgs/development/python-modules/chevron/default.nix new file mode 100644 index 000000000000..c6338fce56bc --- /dev/null +++ b/pkgs/development/python-modules/chevron/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "chevron"; + version = "0.13.1"; + + # No tests available in the PyPI tarball + src = fetchFromGitHub { + owner = "noahmorrison"; + repo = "chevron"; + rev = "0.13.1"; + sha256 = "0l1ik8dvi6bgyb3ym0w4ii9dh25nzy0x4yawf4zbcyvvcb6af470"; + }; + + checkPhase = '' + ${python.interpreter} test_spec.py + ''; + + meta = with lib; { + homepage = https://github.com/noahmorrison/chevron; + description = "A python implementation of the mustache templating language"; + license = licenses.mit; + maintainers = with maintainers; [ dhkl ]; + }; +} diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix index 673a570c61f0..daf522fe6534 100644 --- a/pkgs/development/python-modules/click-default-group/default.nix +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, click, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, click, pytest_3 }: buildPythonPackage rec { pname = "click-default-group"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest_3 ]; meta = with lib; { homepage = https://github.com/click-contrib/click-default-group; diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 561c47069cb8..1ae0cba4844a 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, substituteAll, locale, pytest }: +{ lib, buildPythonPackage, fetchPypi, substituteAll, locale, pytest }: buildPythonPackage rec { pname = "click"; @@ -10,10 +10,10 @@ buildPythonPackage rec { sha256 = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"; }; - patches = stdenv.lib.optional (stdenv.lib.versionAtLeast version "6.7") (substituteAll { - src = ./fix-paths.patch; - locale = "${locale}/bin/locale"; - }); + postPatch = '' + substituteInPlace click/_unicodefun.py \ + --replace "'locale'" "'${locale}/bin/locale'" + ''; buildInputs = [ pytest ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { # https://github.com/pallets/click/issues/823 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://click.pocoo.org/; description = "Create beautiful command line interfaces in Python"; longDescription = '' diff --git a/pkgs/development/python-modules/click/fix-paths.patch b/pkgs/development/python-modules/click/fix-paths.patch deleted file mode 100644 index b44a08e591e8..000000000000 --- a/pkgs/development/python-modules/click/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/click/_unicodefun.py b/click/_unicodefun.py -index 620edff..85a3c98 100644 ---- a/click/_unicodefun.py -+++ b/click/_unicodefun.py -@@ -63,7 +63,7 @@ def _verify_python3_env(): - if os.name == 'posix': - import subprocess - try: -- rv = subprocess.Popen(['locale', '-a'], stdout=subprocess.PIPE, -+ rv = subprocess.Popen(['@locale@', '-a'], stdout=subprocess.PIPE, - stderr=subprocess.PIPE).communicate()[0] - except OSError: - rv = b'' diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index feb215a6e7a5..548317a9835a 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "0.6.1"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "f169a8523a40eb0a3452e1878aac31da6759409fbafa51dd50d89d4a6b42bcf1"; + sha256 = "18d3a5dfc82f752b9f4c844cceb663213e26e130f4a2894a18ad1f11d57a30bc"; }; buildInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 4e8b76f91063..ff9e70b41463 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.7"; + version = "0.9.10"; src = fetchPypi { inherit pname version; - sha256 = "b04a3421be2ae35e7e8347e29c2f3960eed38d0163e312845147d5d828a09379"; + sha256 = "00d68374abe02363a417160e5836022be5c8f8bdac1da5dd101fadb6f8e96619"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix index c6ee1eaf8bc0..8f75170c58c4 100644 --- a/pkgs/development/python-modules/cmd2/old.nix +++ b/pkgs/development/python-modules/cmd2/old.nix @@ -2,6 +2,7 @@ , pyperclip, six, pyparsing, vim , contextlib2 ? null, subprocess32 ? null , pytest, mock, which, fetchFromGitHub, glibcLocales +, runtimeShell }: buildPythonPackage rec { pname = "cmd2"; @@ -19,8 +20,8 @@ buildPythonPackage rec { postPatch = stdenv.lib.optional stdenv.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin - echo '#${stdenv.shell}' > bin/pbpaste - echo '#${stdenv.shell}' > bin/pbcopy + echo '#${runtimeShell}' > bin/pbpaste + echo '#${runtimeShell}' > bin/pbcopy chmod +x bin/{pbcopy,pbpaste} export PATH=$(realpath bin):$PATH ''; diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix index 1f8d913aa2a8..cf0cff1f1551 100644 --- a/pkgs/development/python-modules/cmdline/default.nix +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cmdline"; - version = "0.1.8"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "324cc8fc6580f221824821c47232c297ed1f7cc737186a57305a8c08fc902dd7"; + sha256 = "7cf6af53549892b2218c2f56a199dff54a733be5c5515c0fd626812070b0a86a"; }; # No tests, https://github.com/rca/cmdline/issues/1 diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix index 5cfa1862f48b..896ee51537bf 100644 --- a/pkgs/development/python-modules/colander/default.nix +++ b/pkgs/development/python-modules/colander/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "colander"; - version = "1.5.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "18ah4cwwxnpm6qxi6x9ipy51dal4spd343h44s5wd01cnhgrwsyq"; + sha256 = "d758163a22d22c39b9eaae049749a5cd503f341231a02ed95af480b1145e81f2"; }; propagatedBuildInputs = [ translationstring iso8601 enum34 ]; diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix index bce14db7704f..e85c95b85bda 100644 --- a/pkgs/development/python-modules/colorama/default.nix +++ b/pkgs/development/python-modules/colorama/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "colorama"; - version = "0.3.9"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1wd1szk0z3073ghx26ynw43gnc140ibln1safgsis6s6z3s25ss8"; + sha256 = "05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d"; }; # No tests in archive diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix index 14bae27592ab..2e57ea538c94 100644 --- a/pkgs/development/python-modules/colorlover/default.nix +++ b/pkgs/development/python-modules/colorlover/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "colorlover"; - version = "0.2.1"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1clwvssrj007r07prfvkqnpjy3f77dlp584lj879x8mwl8f0japi"; + sha256 = "b8fb7246ab46e1f5e6715649453c1762e245a515de5ff2d2b4aab7a6e67fa4e2"; }; # no tests included in distributed archive diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 7bef3e829351..93b5e58a7745 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -2,22 +2,23 @@ buildPythonPackage rec { pname = "configparser"; - version = "3.5.0"; + version = "3.7.3"; src = fetchPypi { inherit pname version; - sha256 = "0fi7vf09vi1588jd8f16a021m5y6ih2hy7rpbjb408xw45qb822k"; + sha256 = "27594cf4fc279f321974061ac69164aaebd2749af962ac8686b20503ac0bcf2d"; }; # No tests available doCheck = false; - # Fix issue when used together with other namespace packages - # https://github.com/NixOS/nixpkgs/issues/23855 - patches = [ - ./0001-namespace-fix.patch - ]; + preConfigure = '' + export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 + ''; meta = with stdenv.lib; { + description = "Updated configparser from Python 3.7 for Python 2.6+."; + license = licenses.mit; + homepage = https://github.com/jaraco/configparser; }; } diff --git a/pkgs/development/python-modules/contextvars/default.nix b/pkgs/development/python-modules/contextvars/default.nix index 12914617b8f5..27ee2fc82f9e 100644 --- a/pkgs/development/python-modules/contextvars/default.nix +++ b/pkgs/development/python-modules/contextvars/default.nix @@ -10,6 +10,8 @@ buildPythonPackage rec { sha256 = "09fnni8cyxm070bfv9ay030qbyk0dfds5nq77s0p38h33hp08h93"; }; + # pull request for this patch is https://github.com/MagicStack/contextvars/pull/9 + patches = [ ./immutables_version.patch ]; propagatedBuildInputs = [ immutables ]; meta = { diff --git a/pkgs/development/python-modules/contextvars/immutables_version.patch b/pkgs/development/python-modules/contextvars/immutables_version.patch new file mode 100644 index 000000000000..733c0502a665 --- /dev/null +++ b/pkgs/development/python-modules/contextvars/immutables_version.patch @@ -0,0 +1,11 @@ +--- ./setup.py 2018-07-30 15:40:14.000000000 +0000 ++++ ./setup.py 2019-02-12 18:33:24.984430303 +0000 +@@ -17,7 +17,7 @@ + packages=['contextvars'], + provides=['contextvars'], + install_requires=[ +- 'immutables==0.6', ++ 'immutables>=0.6', + ], + license='Apache License, Version 2.0', + classifiers=[ diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 5a341168e8d6..2b0c0665fa3f 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cornice"; - version = "3.4.4"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1355f998ac6af53bda985e13ed0695cd206b0a3f14657b83979b31bbc72f1acb"; + sha256 = "e95dceaee9ce16a09564c1226977a0fe62f1399701581b59c4188f5c91a86687"; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index a58591f4b05f..dfbb14eb7e65 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -4,7 +4,6 @@ , openssl , cryptography_vectors , darwin -, idna , asn1crypto , packaging , six @@ -23,11 +22,11 @@ buildPythonPackage rec { # also bump cryptography_vectors pname = "cryptography"; - version = "2.4.2"; + version = "2.5"; src = fetchPypi { inherit pname version; - sha256 = "1pc60dksi9w9mshl6cvn7gdjazbp3pmydy3qp9wgy5wzd8n0b9h5"; + sha256 = "00c4d7gvsymlaw0r13zrm32dcnarmpayjyrh65yymlmr6mrbcij9"; }; outputs = [ "out" "dev" ]; @@ -35,7 +34,6 @@ buildPythonPackage rec { buildInputs = [ openssl cryptography_vectors ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = [ - idna asn1crypto packaging six diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index 00c726cee899..f02a986ec023 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { # also bump cryptography pname = "cryptography_vectors"; - version = "2.4.2"; + version = "2.5"; src = fetchPypi { inherit pname version; - sha256 = "013qx2hz0jv79yzfzpn0r2kk33i5qy3sdnzgwiv5779d18snblwi"; + sha256 = "15qfl3pnw2f11r0z0zhwl56f6pb60ysav8fxmpnz5p80cfwljdik"; }; # No tests included diff --git a/pkgs/development/python-modules/csvkit/default.nix b/pkgs/development/python-modules/csvkit/default.nix deleted file mode 100644 index 48f932086cc6..000000000000 --- a/pkgs/development/python-modules/csvkit/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k -, agate, agate-excel, agate-dbf, agate-sql, six -, ordereddict, simplejson -, glibcLocales, nose, mock, unittest2 -}: - -buildPythonPackage rec { - pname = "csvkit"; - version = "1.0.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "a6c859c1321d4697dc41252877249091681297f093e08d9c1e1828a6d52c260c"; - }; - - propagatedBuildInputs = [ - agate agate-excel agate-dbf agate-sql six - ] ++ lib.optionals (!isPy3k) [ - ordereddict simplejson - ]; - - checkInputs = [ - glibcLocales nose - ] ++ lib.optionals (!isPy3k) [ - mock unittest2 - ]; - - checkPhase = '' - LC_ALL="en_US.UTF-8" nosetests -e test_csvsql - ''; - - meta = with lib; { - description = "A library of utilities for working with CSV, the king of tabular file formats"; - maintainers = with maintainers; [ vrthra ]; - license = with licenses; [ mit ]; - homepage = https://github.com/wireservice/csvkit; - }; -} diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix index 95825b07b233..1344ef4d6ae2 100644 --- a/pkgs/development/python-modules/cufflinks/default.nix +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -1,19 +1,27 @@ -{ buildPythonPackage, stdenv, fetchPypi, pandas, plotly, colorlover +{ buildPythonPackage, stdenv, fetchPypi +, numpy, pandas, plotly, six, colorlover +, ipython, ipywidgets, nose }: buildPythonPackage rec { pname = "cufflinks"; - version = "0.14.6"; + version = "0.15"; src = fetchPypi { inherit pname version; - sha256 = "4188324361cc584214150aadaeb28ed07e9d150adb714b53c5f09d5b3fcdd28a"; + sha256 = "014098a4568199957198c0a7fe3dbeb3b4010b6de8d692a41fe3b3ac107b660e"; }; - propagatedBuildInputs = [ pandas plotly colorlover ]; + propagatedBuildInputs = [ + numpy pandas plotly six colorlover + ipython ipywidgets + ]; - # tests not included in archive - doCheck = false; + checkInputs = [ nose ]; + + checkPhase = '' + nosetests -xv tests.py + ''; meta = { homepage = https://github.com/santosjorge/cufflinks; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 908506bcd9cd..d23d5bef0e49 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "5.0.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "557e665d6f2e74e21987b6736d580ec919f51205623fe3d79df06b9d22b3e09d"; + sha256 = "664acff0e1094f0135acca8899318d300258b704e049b1ef0c59154912da53b2"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 2411e8251a0d..4847d57b67b3 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "cvxopt"; - version = "1.2.2"; + version = "1.2.3"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - sha256 = "19ipi6ljj9qv87lhgcsky1gy9543gcmqdbgzpk6v5ccv90nrcf00"; + sha256 = "ea62a2a1b8e2db3a6ae44ac394f58e4620149af226c250c6f2b18739b48cfc21"; }; # similar to Gsl, glpk, fftw there is also a dsdp interface diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index cd61c8b4ac7c..58126c7d1e68 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "7.0.0"; + version = "7.1.1"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "75ee5edccf385d8e8b1443058909fbf3477bb1db12ab7f367aafba8d993fc828"; + sha256 = "17d760bdf89e364fc7c964c5640c1b38cbb22ab49b53830883f21fda92c59131"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index bf46bf9a182b..1e1248591f0c 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -29,8 +29,11 @@ buildPythonPackage rec { ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install --no-index --prefix=$out --no-cache --build=tmpdir . ''; - buildInputs = [ + nativeBuildInputs = [ pari + ]; + + buildInputs = [ gmp ]; diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix new file mode 100644 index 000000000000..1bba260e2a03 --- /dev/null +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, dask +, distributed +, mpi4py +, pytest +, requests +}: + +buildPythonPackage rec { + version = "1.0.2"; + pname = "dask-mpi"; + + src = fetchPypi { + inherit pname version; + sha256 = "1apzzh90gl9jx43z0gjmgpniplhvqziafi2l8688a0g01vw7ibjv"; + }; + + checkInputs = [ pytest requests ]; + propagatedBuildInputs = [ dask distributed mpi4py ]; + + checkPhase = '' + py.test dask_mpi + ''; + + # hardcoded mpirun path in tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/dask/dask-mpi; + description = "Deploy Dask using mpi4py"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 86fc85f8d69b..93351de1125a 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "dask"; - version = "0.20.2"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "d4139a03ab5eb6cedeb06cf1e39af90fb5226ca214d77408def7677d7e6b7af3"; + sha256 = "2e70135d6856805699b52774d8e0cec41beda92bdfc9f9c776962b4bfb34822c"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 51809aeccac5..2c3cd4a3e013 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.25.0"; + version = "0.26.0"; src = fetchPypi { inherit pname version; - sha256 = "e71f9024fb0b968bd704178c7e48fa41ce728281cc6913994db5e065596cddf1"; + sha256 = "cbaa6b4b2b88fd552605e6730f60d5437017bb76d6b701432eaafbc983735b79"; }; postPatch = '' diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 4fcb38e7b36b..63191aa224e3 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -42,5 +42,7 @@ in buildPythonPackage rec { description = "A data description language"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fridh ]; + # Package is no longer maintained upstream, and more and more tests are failing. + broken = true; }; } \ No newline at end of file diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index fc8f5671490b..63366d93056c 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,15 +1,23 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm }: +{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }: buildPythonPackage rec { pname = "python-dateutil"; - version = "2.7.5"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02"; + sha256 = "c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e"; }; + checkInputs = [ pytest ]; propagatedBuildInputs = [ six setuptools_scm ]; + checkPhase = '' + py.test dateutil/test + ''; + + # Requires fixing + doCheck = false; + meta = with stdenv.lib; { description = "Powerful extensions to the standard datetime module"; homepage = https://pypi.python.org/pypi/python-dateutil; diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index e3b1bebcccb2..f4395245a81f 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "decorator"; - version = "4.3.0"; + version = "4.3.2"; src = fetchPypi { inherit pname version; - sha256 = "c39efa13fbdeb4506c476c9b3babf6a718da943dab7811c206005a4a956c080c"; + sha256 = "33cd704aea07b4c28b3eb2c97d288a06918275dac0ecebdaf1bc8a48d98adb9e"; }; meta = { diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 6e79119b6a8f..477468a0eb39 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deluge-client"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "a95d5bc3cf12e842793cb90eecef5c91f4bd8a7fc4e1e8fdef36d62b643d87cb"; + sha256 = "7c2bb6baa3183f039125fc490f47f8c6699312c3e69fcada89e9e70f63c6e092"; }; # it will try to connect to a running instance diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix index 3a0ecffe526a..84f30b7edf6e 100644 --- a/pkgs/development/python-modules/derpconf/default.nix +++ b/pkgs/development/python-modules/derpconf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "derpconf"; - version = "0.8.2"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "ce4f0cd55d367a3357538a18422c916dced0617a00056b4ebabe775059eace4f"; + sha256 = "1bb152d8a1cf5c2a6d629bf29acd4af0c00811339642fc0a56172b0a83b31a15"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/detox/default.nix b/pkgs/development/python-modules/detox/default.nix index 00cea5180cd5..9fbeef2488ca 100644 --- a/pkgs/development/python-modules/detox/default.nix +++ b/pkgs/development/python-modules/detox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "detox"; - version = "0.18"; + version = "0.19"; src = fetchPypi { inherit pname version; - sha256 = "1yvfhnkw6zpm11yrl2shl794yi68jcfqj8m5n596gqxxbiq6gp90"; + sha256 = "e650f95f0c7f5858578014b3b193e5dac76c89285c1bbe4bae598fd641bf9cd3"; }; buildInputs = [ pytest ]; @@ -23,5 +23,8 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "What is detox?"; homepage = https://bitbucket.org/hpk42/detox; + license = licenses.mit; + # detox is unmaintained and incompatible with tox > 3.6 + broken = true; }; } diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 185ab310510a..4a070a578731 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, requests, py, pytest }: +{ lib, buildPythonPackage, fetchPypi, requests, py, pytest, pytest-flakes }: buildPythonPackage rec { pname = "devpi-common"; @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ requests py ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest pytest-flakes ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix index 062fb00e48b4..cf1bebad1443 100644 --- a/pkgs/development/python-modules/diff-match-patch/default.nix +++ b/pkgs/development/python-modules/diff-match-patch/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "diff-match-patch"; - version = "20121119"; + version = "20181111"; meta = { homepage = https://code.google.com/p/google-diff-match-patch/; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0k1f3v8nbidcmmrk65m7h8v41jqi37653za9fcs96y7jzc8mdflx"; + sha256 = "a809a996d0f09b9bbd59e9bbd0b71eed8c807922512910e05cbd3f9480712ddb"; }; } diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 3f01d56ac915..af24ad8ed04c 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "dill"; - version = "0.2.8.2"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "624dc244b94371bb2d6e7f40084228a2edfff02373fe20e018bef1ee92fdd5b3"; + sha256 = "f6d6046f9f9195206063dd0415dff185ad593d6ee8b0e67f12597c0f4df4986f"; }; # Messy test suite. Even when running the tests like tox does, it fails diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index e69b6366a80d..09868b2f7555 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -2,20 +2,23 @@ buildPythonPackage rec { pname = "distro"; - version = "1.3.0"; - - checkInputs = [ pytest pytestcov tox]; - - checkPhase = '' - touch tox.ini - tox - ''; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "224041cef9600e72d19ae41ba006e71c05c4dc802516da715d7fda55ba3d8742"; + sha256 = "0mrg75w4ap7mdzyga75yaid9n8bgb345ih5mwjp3plj6v1jxwb9n"; }; + # TODO: Enable more tests on NixOS (20 out of 173 are failing, 10 due to the + # missing lsb_release binary): + patches = [ ./nixos.patch ]; + + checkInputs = [ pytest pytestcov ]; + + checkPhase = '' + py.test + ''; + meta = with stdenv.lib; { homepage = https://github.com/nir0s/distro; description = "Linux Distribution - a Linux OS platform information API."; diff --git a/pkgs/development/python-modules/distro/nixos.patch b/pkgs/development/python-modules/distro/nixos.patch new file mode 100644 index 000000000000..21aa4827b635 --- /dev/null +++ b/pkgs/development/python-modules/distro/nixos.patch @@ -0,0 +1,31 @@ +diff --git a/tests/test_distro.py b/tests/test_distro.py +index 5521068..4e1bab8 100644 +--- a/tests/test_distro.py ++++ b/tests/test_distro.py +@@ -432,7 +432,7 @@ class TestOSRelease: + self._test_outcome(desired_outcome) + + +-@pytest.mark.skipif(not IS_LINUX, reason='Irrelevant on non-linux') ++@pytest.mark.skip(reason='lsb_release is not available and would return exit code 3') + class TestLSBRelease(DistroTestCase): + + def setup_method(self, test_method): +@@ -919,7 +919,7 @@ class TestDistroRelease: + self._test_outcome(desired_outcome, 'cloudlinux', '7', 'redhat') + + +-@pytest.mark.skipif(not IS_LINUX, reason='Irrelevant on non-linux') ++@pytest.mark.skip(reason='Unknown (TODO)') + class TestOverall(DistroTestCase): + """Test a LinuxDistribution object created with default arguments. + +@@ -1618,7 +1618,7 @@ def _bad_os_listdir(path='.'): + raise OSError() + + +-@pytest.mark.skipIf(not IS_LINUX, reason='Irrelevant on non-linx') ++@pytest.mark.skip(reason='Unknown (TODO)') + class TestOverallWithEtcNotReadable(TestOverall): + def setup_method(self, test_method): + self._old_listdir = os.listdir diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 694b11c6ca87..4bcd767bd63d 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -1,17 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { pname = "django-picklefield"; - version = "1.1.0"; + version = "2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "f1733a8db1b6046c0d7d738e785f9875aa3c198215de11993463a9339aa4ea24"; + }; + + propagatedBuildInputs = [ django ]; meta = { description = "A pickled object field for Django"; homepage = https://github.com/gintas/django-picklefield; license = lib.licenses.mit; }; - - src = fetchPypi { - inherit pname version; - sha256 = "174zlsajpjflrf3jgn0wp5svnxfyrjadk4s9jb45vzjqcmffwzyf"; - }; } diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 6e2bbd9fd5d3..5069227d8239 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Django"; - version = "1.11.18"; + version = "1.11.23"; src = fetchurl { url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "19b6f020als9hr4q1im5282yn2b1hzf586n9kjrlkrslq7da3k3k"; + sha256 = "1qb9npkpvyafd1f4yjqyzhj78wp1ifg3awj41bd04v83idznv9jj"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix index ee2408f73405..22dd49729bc6 100644 --- a/pkgs/development/python-modules/django/1_8.nix +++ b/pkgs/development/python-modules/django/1_8.nix @@ -29,6 +29,9 @@ buildPythonPackage rec { # The patches were not backported due to Django 1.8 having reached EOL https://www.djangoproject.com/weblog/2018/aug/01/security-releases/ https://www.djangoproject.com/weblog/2019/jan/04/security-releases/ + https://www.djangoproject.com/weblog/2019/feb/11/security-releases/ + https://www.djangoproject.com/weblog/2019/jun/03/security-releases/ + https://www.djangoproject.com/weblog/2019/jul/01/security-releases/ ]; }; diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix index ab2e83e33705..e5d08381055c 100644 --- a/pkgs/development/python-modules/django/2_1.nix +++ b/pkgs/development/python-modules/django/2_1.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.1.5"; + version = "2.1.11"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1hwqqsfg8jgnn039yxrq6xrksk11y7vwpfvba6lk01c3v8c3jffn"; + sha256 = "1m9bs78sh91slsjxkhxgkg715gbsgph9ky7d74czs0z2mhg86h8s"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix new file mode 100644 index 000000000000..efc13e455e57 --- /dev/null +++ b/pkgs/development/python-modules/django/2_2.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchPypi, substituteAll, + isPy3k, + geos, gdal, pytz, sqlparse, + withGdal ? false +}: + +buildPythonPackage rec { + pname = "Django"; + version = "2.2.4"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1s5ad5zlmwdn4h5lwn4s4m8mqy0gz4w9nfzyknn815sr252db98n"; + }; + + patches = stdenv.lib.optional withGdal + (substituteAll { + src = ./1.10-gis-libs.template.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }) + ; + + propagatedBuildInputs = [ pytz sqlparse ]; + + # too complicated to setup + doCheck = false; + + meta = with stdenv.lib; { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + license = licenses.bsd3; + maintainers = with maintainers; [ georgewhewell lsix ]; + }; +} diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index f850350ee168..96c63738eb7b 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-contrib-comments"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "689f3f80ff7ea8ab9f712ae5fe17ffa2ee8babbf8d75229ee8acc7bad461dfef"; + sha256 = "61b051d7bc3ff593e86b41a1ed5e969423cf55cc92768598af3315e2528e0890"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 4e256a38c86e..90b81c8379e2 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -1,27 +1,23 @@ -{ stdenv, buildPythonPackage, python, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, isPy3k , django_environ, mock, django, six -, pytest, pytestrunner, pytest-django, setuptools_scm +, pytest, pytestrunner, pytest-django }: buildPythonPackage rec { pname = "django-guardian"; - version = "1.4.9"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "c3c0ab257c9d94ce154b9ee32994e3cff8b350c384040705514e14a9fb7c8191"; + sha256 = "9e144bbdfa67f523dc6f70768653a19c0aac29394f947a80dcb8eb7900840637"; }; checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; - buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ django six ]; - - checkPhase = '' - ${python.interpreter} nix_run_setup test --addopts="--ignore build" - ''; + propagatedBuildInputs = [ django ]; meta = with stdenv.lib; { description = "Per object permissions for Django"; homepage = https://github.com/django-guardian/django-guardian; license = [ licenses.mit licenses.bsd2 ]; + broken = !isPy3k; # https://github.com/django-guardian/django-guardian/pull/605 }; } diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index 0b0ddf5f0f23..7f89335c1922 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "4.2"; + version = "4.3"; src = fetchPypi { inherit pname version; - sha256 = "42bd7fa91af9996d7dfd34e6b027445acbece188d371d63abd19dde4c7ac8fc8"; + sha256 = "407845f0c16b6f17547a65864657377446e0b3aa8a629b032bf5053f87f82fe9"; }; doCheck = false; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index f227ed99bc9a..6d7bc33aaf95 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { - version = "3.9.1"; + version = "3.9.3"; pname = "djangorestframework"; src = fetchPypi { inherit pname version; - sha256 = "79c6efbb2514bc50cf25906d7c0a5cfead714c7af667ff4bd110312cd380ae66"; + sha256 = "1w1rc8cpw89sll5wsg1aj1w3klk91a1bsdz9y4zhg5xrc0qpd118"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index 90e2c526789f..c200b6959b64 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -1,12 +1,17 @@ -{ buildPythonPackage, dlib, python, pytest }: +{ buildPythonPackage, dlib, python, pytest, avxSupport ? true }: buildPythonPackage { inherit (dlib) name src nativeBuildInputs buildInputs meta; + # although AVX can be enabled, we never test with it. Some Hydra machines + # fail because of this, however their build results are probably used on hardware + # with AVX support. checkPhase = '' ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS ''; + setupPyBuildFlags = [ "--${if avxSupport then "yes" else "no"} USE_AVX_INSTRUCTIONS" ]; + patches = [ ./build-cores.patch ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index cf37c9de4e09..74b49d1fa5a3 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "dnspython"; - version = "1.15.0"; + version = "1.16.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0z5d9vwf211v54bybrhm3qpxclys4dfdfsp7lk2hvf57yzhn7xa0"; + sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; }; # needs networking for some tests diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index 491ab814e3b8..e47196df07a1 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "docker-pycreds"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "8b0e956c8d206f832b06aa93a710ba2c3bcbacb5a314449c040b0b814355bbff"; + sha256 = "6ce3270bcaf404cc4c3e27e4b6c70d3521deae82fb508767870fdbf772d584d4"; }; # require docker-credential-helpers binaries diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 961b0125c1a9..3bf2e62d6995 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,12 +3,12 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "3.5.1"; + version = "3.7.0"; pname = "docker"; src = fetchPypi { inherit pname version; - sha256 = "fbe82af9b94ccced752527c8de07fa20267f9634b48674ba478a0bb4000a0b1e"; + sha256 = "2840ffb9dc3ef6d00876bde476690278ab13fa1f8ba9127ef855ac33d00c3152"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 9f739aae4ba5..b44597b8d13f 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -1,14 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, Mako +, pytest, pytestcov, mock, Mako, decorator }: buildPythonPackage rec { pname = "dogpile.cache"; - version = "0.6.8"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "e2fbe5d95e6df3fcfff2b666c69f3c06a4a3f77296142ae2bca523a176f88fa0"; + sha256 = "691b7f199561c4bd6e7e96f164a43cc3781b0c87bea29b7d59d859f873fd4a31"; }; # Disable concurrency tests that often fail, @@ -19,12 +19,13 @@ buildPythonPackage rec { rm tests/cache/test_memcached_backend.py ''; - buildInputs = [ pytest pytestcov mock Mako ]; + checkInputs = [ pytest pytestcov mock Mako ]; + + propagatedBuildInputs = [ decorator ]; meta = with stdenv.lib; { description = "A caching front-end based on the Dogpile lock"; homepage = https://bitbucket.org/zzzeek/dogpile.cache; - platforms = platforms.unix; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index e852076d8a2c..5ab65ace69f5 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -4,12 +4,12 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.19.10"; + version = "0.19.11"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "0330787f28c5252f12040b9a1c0f5990f19f806c12b3d510ee7ea1fa53a6f3b4"; + sha256 = "afbe070f6899357e33f63f3f3696e601731fef66c64a489dea1bc9f539f4a725"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 83b35dc8c89a..dae1df695624 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.5"; + version = "2.6"; meta = { description = "Easy thumbnails for Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e244d1f26027fc32c6ca60ffb0169a39099446f614b0433e907a2588ae7d9b95"; + sha256 = "23fbe3415c93b2369ece8ebdfb5faa05540943bef8b941b3118ce769ba95e275"; }; propagatedBuildInputs = [ django pillow ]; diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 97e486a0532b..3f276374d9ea 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0svk7id7ncygj2rnxhm7602xizljyidk4xgrl6i0xgq3829cz4bl"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; checkPhase = '' cmake . # utf_8_char fails with python3 diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index 66c124d65a78..b65e524346f0 100644 --- a/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -62,5 +62,8 @@ buildPythonPackage rec { * Perform various actions on the items which remain in the actionable list. ''; maintainers = with maintainers; [ basvandijk ]; + + # https://github.com/elastic/curator/pull/1280 + broken = versionAtLeast click.version "7.0"; }; } diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index 3f79e663455e..77d20876fe15 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -4,31 +4,23 @@ , configparser , pytest , isPy3k -, isPy27 }: buildPythonPackage rec { pname = "entrypoints"; - version = "0.2.3"; + version = "0.3"; src = fetchPypi { inherit pname version; - sha256 = "d2d587dde06f99545fb13a383d2cd336a8ff1f359c5839ce3a64c917d10c029f"; + sha256 = "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"; }; checkInputs = [ pytest ]; propagatedBuildInputs = lib.optional (!isPy3k) configparser; - checkPhase = let - # On python2 with pytest 3.9.2 (not with pytest 3.7.4) the test_bad - # test fails. It tests that a warning (exectly one) is thrown on a "bad" - # path. The pytest upgrade added some warning, resulting in two warnings - # being thrown. - # upstream: https://github.com/takluyver/entrypoints/issues/23 - pyTestArgs = if isPy27 then "-k 'not test_bad'" else ""; - in '' - py.test ${pyTestArgs} tests + checkPhase = '' + py.test tests ''; meta = { diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index 43446b407af6..600cb3b0320e 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -1,16 +1,17 @@ { lib, buildPythonPackage, fetchPypi -, click, jinja2, terminaltables }: +, mock, jinja2, click, terminaltables +}: buildPythonPackage rec { pname = "envs"; - version = "1.2.6"; + version = "1.3"; src = fetchPypi { inherit pname version; - sha256 = "5fe059d6df1ae01c422d32b10ec7f539baad0e7d339f4c8b2de4ad8cbb07c8ba"; + sha256 = "ccf5cd85ddb8ed335e39ed8a22e0d23658f5a6d7da430f225e6f750c6f50ae42"; }; - checkInputs = [ click jinja2 terminaltables ]; + checkInputs = [ mock jinja2 click terminaltables ]; meta = with lib; { description = "Easy access to environment variables from Python"; diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 64686d948134..d6f533a58bfe 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "1.12.0"; + version = "1.12.2"; # tests are not present in the PyPI version src = fetchFromGitHub { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "003c4flgsz6my64qm3mf9cb3wfxw0480aj9glf9wdz7xkwaq2l43"; + sha256 = "1p24fq6f46j0qd0ccb64mncxbnm2n9w0sqpl4zk113caaaxkpjil"; }; # one test is failing due to it trying to send a request to example.com diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 6f97a2cb6bf3..df78bff6f1d3 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, pytest +, pytest_3 , setuptools_scm , apipkg }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest_3 ]; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ apipkg ]; @@ -31,6 +31,9 @@ buildPythonPackage rec { py.test testing ''; + # not yet compatible with pytest 4 + doCheck = false; + __darwinAllowLocalNetworking = true; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix index b532c7d19f73..2856eeeab1b9 100644 --- a/pkgs/development/python-modules/face_recognition/default.nix +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "face_recognition"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { repo = pname; owner = "ageitgey"; - rev = "v${version}"; - sha256 = "17jnyr80j1p74gyvh1jabvwd3zsxvip2y7cjhh2g6gsjv2dpvrjv"; + rev = "634db2e4309a365cee2503cb65d6f2e88f519d1e"; + sha256 = "06zw5hq417d5yp17zynhxhb73074lx2qy64fqfzf711rw5vrn2mx"; }; postPatch = '' @@ -19,6 +19,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models ]; + # Our dlib is compiled with AVX instructions by default which breaks + # with "Illegal instruction" on some builders due to missing hardware features. + # + # As this makes the build fairly unreliable, it's better to skip the test and to ensure that + # the build is working and after each change to the package, manual testing should be done. + doCheck = false; + + # Although tests are disabled by default, checkPhase still exists, so + # maintainers can check the package's functionality locally before modifying it. checkInputs = [ flake8 pytest glibcLocales ]; checkPhase = '' LC_ALL="en_US.UTF-8" py.test diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix index 88a75d29fd18..40a1d759c127 100644 --- a/pkgs/development/python-modules/fb-re2/default.nix +++ b/pkgs/development/python-modules/fb-re2/default.nix @@ -7,19 +7,17 @@ buildPythonPackage rec { pname = "fb-re2"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "0wd97qdcafcca90s6692g2dmzl5n6cdvm20vn7pmag3l9gvx395c"; + sha256 = "83b2c2cd58d3874e6e3a784cf4cf2f1a57ce1969e50180f92b010eea24ef26cf"; }; buildInputs = [ re2 ]; - checkInputs = [ pytest ]; - checkPhase = '' - py.test - ''; + # no tests in PyPI tarball + doCheck = false; meta = { description = "Python wrapper for Google's RE2"; diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix index 8e95d1e413e4..d0d324fb9774 100644 --- a/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { downloadPage = https://pypi.python.org/pypi/filebrowser_safe/; license = licenses.free; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 4f6d8d0dc171..5ac7ccd1adc5 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -2,13 +2,13 @@ requests, mt-940, sepaxml, bleach, isPy3k }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.0.1"; pname = "fints"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1jja83h0ld55djiphcxdz64z5qp3w94204bfbgg65v5ybw0vpqq1"; + sha256 = "27427b5e6536b592f964c464a8f0c75c5725176604e9d0f208772a45918d9b78"; }; propagatedBuildInputs = [ requests mt-940 sepaxml bleach ]; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index c5505efc1689..ff6f0716d714 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,6 +1,7 @@ -{ stdenv, buildPythonPackage, fetchPypi, - six, cligj, munch, click-plugins, enum34, pytest, nose, - gdal +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, attrs, click, cligj, click-plugins, six, munch, enum34 +, pytest, boto3 +, gdal }: buildPythonPackage rec { @@ -14,24 +15,35 @@ buildPythonPackage rec { CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + nativeBuildInputs = [ + gdal # for gdal-config + ]; + buildInputs = [ gdal ]; propagatedBuildInputs = [ - six + attrs + click cligj - munch click-plugins - enum34 - ]; + six + munch + ] ++ stdenv.lib.optional (!isPy3k) enum34; checkInputs = [ pytest - nose + boto3 ]; - doCheck = false; + checkPhase = '' + rm -r fiona # prevent importing local fiona + # Some tests access network, others test packaging + pytest -k "not test_*_http \ + and not test_*_https \ + and not test_*_wheel" + ''; meta = with stdenv.lib; { description = "OGR's neat, nimble, no-nonsense API for Python"; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 9d9d211dbfae..966bf5877bda 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,52 +1,26 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch , mock, pytest, pytestrunner -, configparser, enum34, mccabe, pycodestyle, pyflakes +, configparser, enum34, mccabe, pycodestyle, pyflakes, entrypoints, functools32, typing }: buildPythonPackage rec { pname = "flake8"; - version = "3.5.0"; + version = "3.7.6"; src = fetchPypi { inherit pname version; - sha256 = "7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0"; + sha256 = "6d8c66a65635d46d54de59b027a1dda40abbe2275b3164b634835ac9c13fd048"; }; - # Allow newer version of pycodestyle and pyflakes - patches = [ - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/4fcbcccf381ce0987faa297173e4008b0490918f.patch; - sha256 = "0lfsg9n92fc8whj29paqsx7ifap2szv7pxj13hy739y87gsps676"; - excludes = [ "setup.cfg" ]; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/0273ca561f0ad03adff41ce5d95a1ec31b10fe5a.patch; - sha256 = "1ziy54v1cm7gn7a551qvrl0rs16q8zpzh303xf5gn4rxxz13qnzb"; - excludes = [ "setup.cfg" ]; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/85c503de32f81ed9859d902cbe20eb4d2e4e8d55.patch; - sha256 = "0170hjaxkq5ssva9rwkcgm4whb07fnxdb0z12gzmvw5w53hkqxj4"; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/68782675b7f00c5d24c24e424efd1fbcb0705224.patch; - sha256 = "183lcw7aqv5yzm8pfisrfngq3fchc7h3j7254c5hy2hqq653v98s"; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/ef1d5ceefcbfacf5dfe94534c4879ca814b130f0.patch; - sha256 = "1j5f0l4xryfhirixwjcl1lzayjhy6vhkizkpm7w87piylim8y26y"; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/527af5c214ef0eccfde3dd58d7ea15e09c483bd3.patch; - sha256 = "1y51r78770z27d43v64lrg8zvm39ycszzhh15cx8wq8wp3b7iz5x"; - excludes = [ "setup.cfg" ]; - }) - ]; - - buildInputs = [ pytest mock pytestrunner ]; - propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] + checkInputs = [ pytest mock pytestrunner ]; + propagatedBuildInputs = [ entrypoints pyflakes pycodestyle mccabe ] + ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser functools32 ] ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ] - ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser ]; + ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + + checkPhase = '' + py.test tests + ''; meta = with stdenv.lib; { description = "Code checking using pep8 and pyflakes"; diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix index 00f4fe8488c2..523e6ac53e6b 100644 --- a/pkgs/development/python-modules/flaky/default.nix +++ b/pkgs/development/python-modules/flaky/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "flaky"; - version = "3.4.0"; + version = "3.5.3"; src = fetchPypi { inherit pname version; - sha256 = "4ad7880aef8c35a34ddb394d4fa33047765bca1e3d67d182bf6eba9c8eabf3a2"; + sha256 = "12bd5e41f372b2190e8d754b6e5829c2f11dbc764e10b30f57e59f829c9ca1da"; }; buildInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 8b20146f212b..d61f5a776004 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "3.14.0"; + version = "3.17.0"; src = fetchPypi { inherit pname version; - sha256 = "133s9js7j1b2m6vv56a2xd9in0rmx5zrdp4r005qwbvr5qxld39s"; + sha256 = "97c66f197b4b175173bf955b9a845d03d62e521e512e88f6abff707e6859e7c3"; }; propagatedBuildInputs = [ flask pyjwt werkzeug ]; diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index 7af4aa2b8dd4..a2c372c8beeb 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0pgk6ngqzh7lgq2nr6hraqp3z76f3f0kjhai50vxb6j1civ8v3mn"; + sha256 = "ebc896bf6e8d7a414e3efba0bd0770a8f73dcd7023f99e849c64164287e36e9b"; }; propagatedBuildInputs = [ flask ]; diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index f9f23859748a..c2f7caf1b818 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "Flask-SocketIO"; - version = "3.1.2"; + version = "3.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1hcl0qnhfqc9x4y6fnvsrablim8yfqfg2i097b2v3srlz69vdyr6"; + sha256 = "ee8e2954ec3ae0abf19f50fce5ec8b7b9ff937c5353c0a72c7e1cfb86df1195d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 7c64d9bd1830..64decd9c41c8 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "flit"; - version = "1.2.1"; + version = "1.3"; src = fetchPypi { inherit pname version; - sha256 = "6aefa6ff89a993af7a7af40d3df3d0387d6663df99797981ec41b1431ec6d1e1"; + sha256 = "6f6f0fb83c51ffa3a150fa41b5ac118df9ea4a87c2c06dff4ebf9adbe7b52b36"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 58df04c17c80..21780ccb9fcd 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.37.0"; + version = "3.37.3"; src = fetchPypi { inherit pname version; - sha256 = "1bf7k6qdvi2ycw87g8iqy0rwl3ms25k3zz6ix1fpsk8qx36gk9x1"; + sha256 = "c898a455a39afbe6707bc17a0e4f720ebe2087fec67683e7c86a13183078204d"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 926ad05156a5..80a6f439de80 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ dateutil six ]; - buildInputs = [ mock nose ]; + checkInputs = [ mock nose ]; meta = with stdenv.lib; { description = "FreezeGun: Let your Python tests travel through time"; diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/pkgs/development/python-modules/fs-s3fs/default.nix index 156b0fdd76e9..26277161b0bc 100644 --- a/pkgs/development/python-modules/fs-s3fs/default.nix +++ b/pkgs/development/python-modules/fs-s3fs/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fs-s3fs"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1czv67zs4sl5l3rv9l3hzn22zzzqm372lq1wlhihigir4cfyslak"; + sha256 = "49bfa4572bb11e37324dd43be935ab99376259eff652365aef0e4a747bb11418"; }; propagatedBuildInputs = [ fs six boto3 ]; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 1ab01cf7d896..cdbdcf7d16e2 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "fs"; - version = "2.1.3"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "87e8d4e93040779a407c92b7f2f27117038927b4b1da41bdce23ce226557327d"; + sha256 = "6c3f79a16dfcbf8a8f437f81dd8afaa3741285d9369574c48e1d27e40b0c980e"; }; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/fudge/default.nix b/pkgs/development/python-modules/fudge/default.nix index f2e92d96f573..de45a1404f57 100644 --- a/pkgs/development/python-modules/fudge/default.nix +++ b/pkgs/development/python-modules/fudge/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchPypi , nose -, nosejs -, sphinx , isPy3k }: @@ -17,8 +15,7 @@ buildPythonPackage rec { sha256 = "1p7g6hv9qxscbzjv2n5pczpkkp55mp3s56adfc912w9qpf3rv4nr"; }; - buildInputs = [ nose nosejs ]; - propagatedBuildInputs = [ sphinx ]; + checkInputs = [ nose ]; checkPhase = '' nosetests -v diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 4788112ebef9..e6f45a2b4c69 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, jinja2 }: buildPythonPackage rec { @@ -12,10 +13,19 @@ buildPythonPackage rec { sha256 = "ca94c337f2d9a70db177ec4330534fad7b2b772beda625c1ec071fbcf1361e22"; }; + propagatedBuildInputs = [ + jinja2 + ]; + + # There are no unit tests in the pypi tarball. Most of the unit tests on the + # github repository currently only work with gcc5, so we just disable them. + # See also: https://github.com/gcovr/gcovr/issues/206 + doCheck = false; + meta = with stdenv.lib; { description = "A Python script for summarizing gcov data"; license = licenses.bsd0; - homepage = http://gcovr.com/; + homepage = https://www.gcovr.com/; }; } diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 5cd6ad8bf878..eeceb9759856 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -10,10 +10,10 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.6.0"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - sha256 = "24adaca52e8d821a2f5d5e6fe2e37cf321b1fafb505926ea79a7c2f019ce5b07"; + sha256 = "ed845ac585f724ae1f40fdb517ed8ade822531f9bbcd1be4a599c2e86aff48a8"; }; propagatedBuildInputs = [ smart_open numpy six scipy ]; diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index b3767fd2dbd7..da338648e4cf 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "geopy"; - version = "1.17.0"; + version = "1.18.1"; disabled = !isPy27; src = fetchPypi { inherit pname version; - sha256 = "1bbea0efc5af91e0a7d4c2b31650f61667bcc1d0d717784d78c03f0ed13bb374"; + sha256 = "07a21f699b3daaef726de7278f5d65f944609306ab8a389e9f56e09abf86eac8"; }; doCheck = false; # too much diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 09cc5d573db3..a8caf6500162 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "gevent"; - version = "1.3.7"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "3f06f4802824c577272960df003a304ce95b3e82eea01dad2637cc8609c80e2c"; + sha256 = "1eb7fa3b9bd9174dfe9c3b59b7a09b768ecd496debfc4976a9530a3e15c990d1"; }; buildInputs = [ libev ]; diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 4be26fe0e121..140f93f33f80 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder @@ -15,24 +15,28 @@ buildPythonPackage rec { pname = "gidgethub"; - version = "3.0.0"; - format = "flit"; + version = "3.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1ebe79cf80ad64cb78c880efc7f30ac664e18b80dfd18ee201bf8685cf029628"; + sha256 = "52119435ba73ddd5e697dae7bec8b93a048bc738720b81691ebd4b4d81d2d762"; }; - buildInputs = [ setuptools pytestrunner ]; + nativeBuildInputs = [ setuptools pytestrunner ]; checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ]; propagatedBuildInputs = [ uritemplate ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "extras_require=extras_require," "extras_require=None," + ''; + # requires network (reqests github.com) doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "An async GitHub API library"; homepage = https://github.com/brettcannon/gidgethub; license = licenses.asl20; diff --git a/pkgs/development/python-modules/gin-config/default.nix b/pkgs/development/python-modules/gin-config/default.nix index 893f7bf58755..8701751e3a0b 100644 --- a/pkgs/development/python-modules/gin-config/default.nix +++ b/pkgs/development/python-modules/gin-config/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "gin-config"; - version = "0.1.2"; + version = "0.1.3"; src = fetchPypi { inherit pname version; - sha256 = "a4e8a2537320240859157870ab58df60e979d936a3c9b17a8b2fa686fc31b287"; + sha256 = "07843fde2917f1a44f808fceb3c0227bb02ff7c4ebba8de6642206c03e7e8ba2"; }; diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index d8fc12b1c422..ec58825878ae 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch -, utillinux, pygit2, gitMinimal, git-annex +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll +, python, utillinux, pygit2, gitMinimal, git-annex }: buildPythonPackage rec { @@ -16,22 +16,22 @@ buildPythonPackage rec { sha256 = "146q1jhcfc7f96ajkhjffskkljk2xzivs5ih5clb8qx0sh7mj097"; }; - prePatch = '' - substituteInPlace git_annex_adapter/process.py \ - --replace "'git', 'annex'" "'${git-annex}/bin/git-annex'" \ - --replace "'git-annex'" "'${git-annex}/bin/git-annex'" - ''; + patches = [ + (substituteAll { + src = ./git-annex-path.patch; + gitAnnex = "${git-annex}/bin/git-annex"; + }) + ]; checkInputs = [ + gitMinimal utillinux # `rev` is needed in tests/test_process.py ]; - propagatedBuildInputs = [ pygit2 gitMinimal ]; - - buildInputs = [ git-annex ]; + propagatedBuildInputs = [ pygit2 ]; checkPhase = '' - python -m unittest + ${python.interpreter} -m unittest ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch b/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch new file mode 100644 index 000000000000..8b1b854058b9 --- /dev/null +++ b/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch @@ -0,0 +1,75 @@ +diff --git a/git_annex_adapter/process.py b/git_annex_adapter/process.py +index 6ddb985..bbd0ab8 100644 +--- a/git_annex_adapter/process.py ++++ b/git_annex_adapter/process.py +@@ -389,7 +389,7 @@ class GitAnnexBatchProcess: + _procclass = Process + + def __init__(self, args, workdir): +- self.args = ('git', 'annex', *args) ++ self.args = ('@gitAnnex@', *args) + self.workdir = workdir + self._process = None + self._dead_process = None +@@ -586,7 +586,7 @@ class ProcessRunner: + class GitAnnexRunner(ProcessRunner): + """Helper class to run git-annex commands.""" + def __init__(self, args_prefix, workdir): +- args_prefix = ('git-annex', *args_prefix) ++ args_prefix = ('@gitAnnex@', *args_prefix) + super().__init__(args_prefix, workdir) + + def __call__(self, *args_suffix): +diff --git a/tests/test_process.py b/tests/test_process.py +index ed619bb..9335078 100644 +--- a/tests/test_process.py ++++ b/tests/test_process.py +@@ -181,7 +181,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase): + def test_process_annex_metadata_batch(self): + """Process should be able to read one line""" + with Process( +- ['git', 'annex', 'metadata', '--batch', '--json'], ++ ['@gitAnnex@', 'metadata', '--batch', '--json'], + str(self.tempdir), + ) as proc: + proc.writeline( +@@ -202,7 +202,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase): + def test_jsonprocess_annex_metadata_batch(self): + """JsonProcess should encode and decode properly""" + with JsonProcess( +- ['git', 'annex', 'metadata', '--batch', '--json'], ++ ['@gitAnnex@', 'metadata', '--batch', '--json'], + str(self.tempdir), + ) as proc: + obj = proc({'key':'SHA256E-s0--0'}) +@@ -218,7 +218,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase): + def test_process_annex_info_batch(self): + """Process should be able to read multiple lines""" + with Process( +- ['git', 'annex', 'info', '--batch'], ++ ['@gitAnnex@', 'info', '--batch'], + str(self.tempdir), + ) as proc: + proc.writeline('here') +diff --git a/tests/utils.py b/tests/utils.py +index 281ee3f..969aedc 100644 +--- a/tests/utils.py ++++ b/tests/utils.py +@@ -107,7 +107,7 @@ class TempAnnexTestCase(TempRepoTestCase): + # Have to uninit before cleaning directory, since git-annex + # marks its objects read-only so that they don't get deleted. + subprocess.run( +- ['git', 'annex', 'uninit'], ++ ['@gitAnnex@', 'uninit'], + cwd=self.repo.workdir, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +@@ -122,7 +122,7 @@ class TempAnnexTestCase(TempRepoTestCase): + path.write_text(text) + + subprocess.run( +- ['git', 'annex', 'add', '--quiet', relpath], ++ ['@gitAnnex@', 'add', '--quiet', relpath], + cwd=self.repo.workdir, + check=True, + ) diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index cab7ca68ef60..a57c9c3353a1 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "github3.py"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "35fea5bf3567a8e88d3660686d83f96ef164e698ce6fb30f9e2b0edded7357af"; + sha256 = "15a115c18f7bfcf934dfef7ab103844eb9f620c586bad65967708926da47cbda"; }; checkInputs = [ betamax pytest betamax-matchers ] diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 02ad8f0f6fb6..e42cf5756f1e 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "1.6.1"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "aae6142ec8136d835f0f5c48824a65df5eb964863e155a5d90ce7ee8b84b0f8a"; + sha256 = "d96f7ed1887c8f55f2bc8d493cd8ec73ff9f3361f0a134203e34e2e57bedd964"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index f24dd2b7249e..ac193e61dcbd 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "glom"; - version = "18.4.0"; + version = "19.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0rfikq27a9wwfkd4k3bk7x4fssw6r7z138g9i3wpzvjc7anlzk24"; + sha256 = "5c47dc6dc97bb1c20e5607f3d58eac81e13b16880a284b52d503eea92d7b5fc2"; }; propagatedBuildInputs = [ boltons attrs face ]; diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix index d2bf002cd5f6..f8dfc4ff2d39 100644 --- a/pkgs/development/python-modules/gmusicapi/default.nix +++ b/pkgs/development/python-modules/gmusicapi/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "gmusicapi"; - version = "11.0.4"; + version = "12.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b0345df8119c4721cabafff765fe9ded1a246886f5a67b1b306c656b685650b8"; + sha256 = "6e066f38bbfce068e0e89f34ccdbc7056fd5fdc446d3c33c70f53b26078eb78b"; }; propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ]; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 89c7c6b8df80..291d038258fb 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "google-api-python-client"; version = "1.7.8"; - #disabled = !isPy3k; # TODO: Python 2.7 was deprecated but weboob still depends on it. src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix index b2196c8748ce..6a882e29c194 100644 --- a/pkgs/development/python-modules/google-music-proto/default.nix +++ b/pkgs/development/python-modules/google-music-proto/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-music-proto"; - version = "2.2.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "008nap32hcrlnkkqkf462vwnm6xzrn6fj71lbryfmrakad7rz7bc"; + sha256 = "798ac14408593525d1865f608b30f71cce291b1a239f4d63f14bb4dcf79d7528"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-music-utils/default.nix b/pkgs/development/python-modules/google-music-utils/default.nix index d7fb8a917076..84f677d4d4e4 100644 --- a/pkgs/development/python-modules/google-music-utils/default.nix +++ b/pkgs/development/python-modules/google-music-utils/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "google-music-utils"; - version = "2.0.0"; + version = "2.1.0"; # Pypi tarball doesn't contain tests src = fetchFromGitHub { owner = "thebigmunch"; repo = "google-music-utils"; rev = version; - sha256 = "0i5zcr1ypnxizi41s3lrplz9m9rmb56s5iihjx61kbybxcq2b6gk"; + sha256 = "0fn4zp0gf1wx2x06dbc840qcq21j4p3ajghxp7646w2n6n9gxhh7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index b0fe0f8a2544..71aa37d00866 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -16,6 +16,11 @@ buildPythonPackage rec { sha256 = "13i9nd62wqfg0f5r7ykr15q83397vdpw0js50fy5nbgs33sbf6b7"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "audio-metadata>=0.3,<0.4" "audio-metadata" + ''; + propagatedBuildInputs = [ appdirs audio-metadata diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index fde773e738b4..b0b6bfaa5ef9 100644 --- a/pkgs/development/python-modules/google_auth/default.nix +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.5.1"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "9ca363facbf2622d9ba828017536ccca2e0f58bd15e659b52f312172f8815530"; + sha256 = "0f7c6a64927d34c1a474da92cfc59e552a5d3b940d3266606c6a28b72888b9e4"; }; checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ]; diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix index 5e33b1b51eaa..1646888b36ad 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "1.8.1"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "621e05321d7a26b87fa2d4f8dd24f963d3424d7566a6454d65c4427b9d8552e2"; + sha256 = "169ffdb1b677f69f1f9d032bd38f724aed73e0565153ac17199472c083a3852f"; }; checkInputs = [ pytest mock ipython ]; diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix index b36f651e2f77..9475c792fb90 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "3acbb1bd9e25fd233ae321c137a58306d5d0ef262e3cbe825c511c8ef55b33a2"; + sha256 = "e6a6c380757e22e9a45cf5b261be6d6a4262f87ee172a6c21f6f7ad6013827cd"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix index cf5476f7d1d8..d4052a227bb4 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "0.2.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "3e9d9e07af8651826db5997ca0f11f02401cef42eb822d416a19df05b17c5a45"; + sha256 = "2167e1c599ea1d9fed96d317ad817d0b37497460c70f11aafa13a24ede7c9c35"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index d59f281c59ad..9d6461168d4e 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.13.2"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "f8884619fed4c77234c7293939be5a696869f61a5dc2ca47193cff630cee179f"; + sha256 = "aef243b533144c11c9ff750565c43dffe5445debb143697002edb6205f64a437"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix index c2bf189c2375..74c9370dad30 100644 --- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "39d2c83ee198ec1995c03faf5d557089e7027a8356802302dee08b18380c8250"; + sha256 = "ec1d049cb54fc036887d946ce0391bde481a3da7263e55908eaf9694079ec46f"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index cc689acc48fb..33dfc6e83cfb 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.5.6"; + version = "1.5.8"; src = fetchPypi { inherit pname version; - sha256 = "6de6de98e895f4266caefa768778533bdea98abbead6972d35c8a0f57409eea2"; + sha256 = "d56ca712f67fff216d3be9eeeb8360ca59066d0365ba70b137b9e1801813747e"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index e49012d45025..199f568322ac 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "1.8.5"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1jvwq7qjr2iazmwdzkmr82iza7snylpm6x0kr9p0z5mkicg1l38l"; + sha256 = "9c8e0c3ca22c0a2bfd0f27d24be6e4da5fe315d39d51f5af7bb5da416dbfa4b7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix index bbba074b3f52..7c115b58d32f 100644 --- a/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/pkgs/development/python-modules/grappelli_safe/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { downloadPage = http://pypi.python.org/pypi/grappelli_safe/; license = licenses.free; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 94332616b1e2..1493c78df834 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "green"; - version = "2.13.0"; + version = "2.13.1"; src = fetchPypi { inherit pname version; - sha256 = "fe937dab641e7bb8b7b0a3678bc1372f1759282934767b035de681a40da7033b"; + sha256 = "ea6e2699a2e58df834d2c845fb2b076c12d4835daecfcb658c6bd5583ebf4b7d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index ad777cf44352..4e548577f906 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.16.1"; + version = "1.18.0"; src = fetchPypi { inherit pname version; - sha256 = "0h0w7jlggm8nc250wwqai7lihw8mymx9jjpkl0cdmqmwbypj72vd"; + sha256 = "77ec4d3c92ccbbe3de37c457e3c72962e519c36cafb96abe5842bced8eb926fa"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index e170c14949d4..9d8814e65313 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,17 +1,22 @@ -{ stdenv, buildPythonPackage, fetchPypi, lib, darwin -, six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig }: +{ stdenv, buildPythonPackage, fetchFromGitHub, lib, darwin +, six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig +, cython}: with stdenv.lib; buildPythonPackage rec { pname = "grpcio"; - version = "1.16.1"; + version = "1.18.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0am76f8r4v5kcvbar593n2c1mp25cxi67cxigjhd0rnncmk4bgs1"; + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0cilbhk35gv46mk40jl5f3iqa94x14qyxbavpfq0kh0rld82nx4m"; }; - nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools; + nativeBuildInputs = [ cython pkgconfig ] + ++ optional stdenv.isDarwin darwin.cctools; propagatedBuildInputs = [ six protobuf ] ++ lib.optionals (isPy27 || isPy34) [ enum34 ] diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 04dc793a7175..c0ad2dc3ac9b 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.5.5"; + version = "1.6.0"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "b80487a8269ba55201390353fd46d1904ec16f5488c8daaf7ff87154e09cca42"; + sha256 = "845a7fe4fd9776cda1bd66112dc2d788cb5ccf8333a205bd4a32807e57d3c875"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index c197c2652305..a2597b2e6e77 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "3.0.1"; + version = "3.1.0"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "1cc06b22c6a1b6726925defcd41c19ce6cd5ab939252e72759bdf0353e36f552"; + sha256 = "f7ce6c06250f694976c3cd4944e3b607b0810b93383839e5b67c7199ce2f0d3d"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 698da6dc91a1..14d27e7442e2 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -1,5 +1,5 @@ -{ stdenv, pkgs, lib, buildPythonPackage, fetchPypi, six, enum34, decorator, -nose, shouldbe, gss, krb5Full, which, darwin }: +{ stdenv, lib, buildPythonPackage, fetchPypi, six, enum34, decorator, +nose, gss, krb5Full, darwin }: buildPythonPackage rec { pname = "gssapi"; @@ -16,13 +16,15 @@ buildPythonPackage rec { --replace "get_output('krb5-config gssapi --prefix')" "'${lib.getDev krb5Full}'" ''; - LD_LIBRARY_PATH = "${pkgs.krb5Full}/lib"; + LD_LIBRARY_PATH = "${krb5Full}/lib"; - buildInputs = [ krb5Full which nose shouldbe ] + nativeBuildInputs = [ krb5Full ] ++ ( if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.GSS ] else [ gss ] ); propagatedBuildInputs = [ decorator enum34 six ]; + checkInputs = [ nose ]; + doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local' meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 2b9703452dc7..a26b02ee0300 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { substituteInPlace meson.build --replace python3 python${if isPy3k then "3" else "2"} ''; - nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection gst-plugins-base ]; mesonFlags = [ "-Dpython=python${if isPy3k then "3" else "2"}" diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix new file mode 100644 index 000000000000..b066f323d682 --- /dev/null +++ b/pkgs/development/python-modules/gumath/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, numba +, ndtypes +, xnd +, libndtypes +, libxnd +, libgumath +, isPy27 +}: + +buildPythonPackage { + pname = "gumath"; + disabled = isPy27; + inherit (libgumath) src version meta; + + checkInputs = [ numba ]; + propagatedBuildInputs = [ ndtypes xnd ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'add_include_dirs = [".", "libgumath", "ndtypes/python/ndtypes", "xnd/python/xnd"] + INCLUDES' \ + 'add_include_dirs = [".", "${libndtypes}/include", "${libxnd}/include", "${libgumath}/include"]' \ + --replace 'add_library_dirs = ["libgumath", "ndtypes/libndtypes", "xnd/libxnd"] + LIBS' \ + 'add_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' \ + --replace 'add_runtime_library_dirs = ["$ORIGIN"]' \ + 'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' + ''; +} diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 2e4b58ae3ff1..fe4cf01a8dfe 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.10.9"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "1id2xyyypks8bjdayb19av809w0838ghymyngmyhdbbsk588q7q0"; + sha256 = "f9c79fc295b8b20cfda5ab0a671e72c95615dc77517ae414f8f8b10e9375f155"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index 015ad38d0c14..910080e679f7 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "h2"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0r3f43r0v7sqgdjjg5ngw0dndk2v6cyd0jncpwya54m37y42z5mj"; + sha256 = "fd07e865a3272ac6ef195d8904de92dc7b38dc28297ec39cfa22716b6d62e6eb"; }; propagatedBuildInputs = [ enum34 hpack hyperframe ]; diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 4259b7ad0537..0b702901ae7f 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "ha-ffmpeg"; - version = "1.9"; + version = "1.11"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0644j5fqw8p6li6nrnm1rw7nhvsixq1c7gik3f1yx50776yg05i8"; + sha256 = "386cc5bbec3a341d8bafec1c524bd8e64f41f9be8195808dec80f76661bf1cc3"; }; buildInputs = [ ffmpeg ]; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 27d83d9c6c23..cbe5afcc8edf 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.18"; + version = "0.8.19"; src = fetchPypi { inherit pname version; - sha256 = "4d6782f08872f4c54983873a41759daae680d6247b0db363f3510cb001108f02"; + sha256 = "7bd74c7bd16540d7f437cf6cb61ceb4d23506f4d040c436d7570d104c1297e31"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/hetzner/default.nix b/pkgs/development/python-modules/hetzner/default.nix index ccf4e1a5ba7f..2909d2c2a6c5 100644 --- a/pkgs/development/python-modules/hetzner/default.nix +++ b/pkgs/development/python-modules/hetzner/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "hetzner"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { repo = "hetzner"; owner = "aszlig"; rev = "v${version}"; - sha256 = "1xd1klvjskv0pg8ginih597jkk491a55b8dq80dsm61m5sbsx3vq"; + sha256 = "152fklxff08s71v0b78yp5ajwpqyszm3sd7j0qsrwa2x9ik4968h"; }; meta = with stdenv.lib; { @@ -20,5 +20,4 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ aszlig ]; }; - } diff --git a/pkgs/development/python-modules/hglib/default.nix b/pkgs/development/python-modules/hglib/default.nix index aa8c051aed3c..eab8ffe2bfd8 100644 --- a/pkgs/development/python-modules/hglib/default.nix +++ b/pkgs/development/python-modules/hglib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose, mercurial, isPy3k }: +{ stdenv, buildPythonPackage, fetchPypi, substituteAll, python, nose, mercurial }: buildPythonPackage rec { pname = "python-hglib"; @@ -9,11 +9,18 @@ buildPythonPackage rec { sha256 = "7c1fa0cb4d332dd6ec8409b04787ceba4623e97fb378656f7cab0b996c6ca3b2"; }; - checkInputs = [ nose ]; - buildInputs = [ mercurial ]; + patches = [ + (substituteAll { + src = ./hgpath.patch; + hg = "${mercurial}/bin/hg"; + }) + ]; - checkPhase = ''python test.py''; - doCheck = if isPy3k then false else true; + checkInputs = [ nose ]; + + checkPhase = '' + ${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" + ''; meta = with stdenv.lib; { description = "Mercurial Python library"; diff --git a/pkgs/development/python-modules/hglib/hgpath.patch b/pkgs/development/python-modules/hglib/hgpath.patch new file mode 100644 index 000000000000..2141aa32a139 --- /dev/null +++ b/pkgs/development/python-modules/hglib/hgpath.patch @@ -0,0 +1,24 @@ +diff -r 2d0ec6097d78 hglib/__init__.py +--- a/hglib/__init__.py Mon Apr 30 15:43:29 2018 +0900 ++++ b/hglib/__init__.py Tue Mar 19 23:30:01 2019 +0100 +@@ -1,7 +1,7 @@ + import subprocess + from hglib import client, util, error + +-HGPATH = 'hg' ++HGPATH = '@hg@' + + def open(path=None, encoding=None, configs=None): + '''starts a cmdserver for the given path (or for a repository found +diff -r 2d0ec6097d78 tests/common.py +--- a/tests/common.py Mon Apr 30 15:43:29 2018 +0900 ++++ b/tests/common.py Tue Mar 19 23:30:01 2019 +0100 +@@ -26,7 +26,7 @@ + os.mkdir(self._testtmp) + os.chdir(self._testtmp) + # until we can run norepo commands in the cmdserver +- os.system('hg init') ++ os.system('@hg@ init') + self.client = hglib.open() + + def tearDown(self): diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix index 3a159e6d3493..347cd94c8f51 100644 --- a/pkgs/development/python-modules/hkdf/default.nix +++ b/pkgs/development/python-modules/hkdf/default.nix @@ -13,12 +13,15 @@ buildPythonPackage rec { sha256 = "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2"; }; - buildInputs = [ nose ]; + checkInputs = [ nose ]; checkPhase = '' nosetests ''; + # no tests in PyPI tarball + doCheck = false; + meta = with stdenv.lib; { description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"; homepage = "https://github.com/casebeer/python-hkdf"; diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 3c67bccaa7f3..bbea01f49001 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -1,5 +1,12 @@ -{ stdenv, buildPythonPackage, fetchPypi -, six, requests-cache, pygments, pyquery }: +{ lib +, buildPythonPackage +, fetchPypi +, six +, requests-cache +, pygments +, pyquery +, python +}: buildPythonPackage rec { pname = "howdoi"; @@ -12,9 +19,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ six requests-cache pygments pyquery ]; - meta = with stdenv.lib; { + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { description = "Instant coding answers via the command line"; homepage = https://pypi.python.org/pypi/howdoi; license = licenses.mit; + maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix index 7e7db13aaec1..a10882417fc0 100644 --- a/pkgs/development/python-modules/hpack/default.nix +++ b/pkgs/development/python-modules/hpack/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, glibcLocales }: buildPythonPackage rec { @@ -13,10 +12,6 @@ buildPythonPackage rec { sha256 = "8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2"; }; - buildInputs = [ glibcLocales ]; - - LANG = "en_US.UTF-8"; - meta = with stdenv.lib; { description = "Pure-Python HPACK header compression"; homepage = "http://hyper.rtfd.org"; diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index 97d2854ca226..5a59b63cea41 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -24,6 +24,9 @@ buildPythonPackage rec { ]; checkPhase = '' + # remove test causing error + # https://github.com/html5lib/html5lib-python/issues/411 + rm html5lib/tests/test_stream.py py.test ''; diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 197e646027c4..ab9e65d78cb0 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -2,13 +2,16 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.11.3"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "1pyb0hmc0j0kcy27yiw38gq9pk7f1fkny5k1vd13cdz6l3csw7g7"; + sha256 = "4ba6b8fd77d0038769bf3c33c9a96a6f752bc4cdf739701fdcaf210121f399d4"; }; + # Needs setting up + doCheck = false; + meta = with lib; { homepage = http://code.google.com/p/httplib2; description = "A comprehensive HTTP client library"; diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix index 70c50c1f6637..a8f847c53bb1 100644 --- a/pkgs/development/python-modules/hyperframe/default.nix +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "hyperframe"; - version = "5.1.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "017vjbb1xjak1pxcvihhilzjnmpfvhapk7k88wp6lvdkkm9l8nd2"; + sha256 = "a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 71eced5c7eeb..d1fadad00d0f 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "3.79.3"; + version = "4.7.3"; pname = "hypothesis"; # Use github tarballs that includes tests @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "1ay0kwh5315scv7yz9xxrr7shynyx6flgplc1qzbz3j21cyx3yn7"; + sha256 = "03l4hp0p7i2k04arnqkav0ygc23ml46dy3cfrlwviasrj7yzk5hc"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; diff --git a/pkgs/development/python-modules/i3-py/default.nix b/pkgs/development/python-modules/i3-py/default.nix index e433cd51c20c..ea6e449947c5 100644 --- a/pkgs/development/python-modules/i3-py/default.nix +++ b/pkgs/development/python-modules/i3-py/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { description = "Tools for i3 users and developers"; homepage = "https://github.com/ziberna/i3-py"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 991edee90e55..d47f5ce39fec 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.1.8"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "08826e68e39e7de53cc2ddd8f6228a4e463b4bacb20565e5301c3ec690e68d27"; + sha256 = "d3ddec4436e043c3398392b4ba8936b4ab52fa262284e767eb6c351d9b3ab5b7"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index 9ce3ba3f6680..5e5d623ff10e 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "idna"; - version = "2.7"; + version = "2.8"; src = fetchPypi { inherit pname version; - sha256 = "684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16"; + sha256 = "c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407"; }; meta = { diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix index db0b8301f008..5bc281d2be1e 100644 --- a/pkgs/development/python-modules/ifaddr/default.nix +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -7,24 +7,18 @@ }: buildPythonPackage rec { - version = "0.1.4"; + version = "0.1.6"; pname = "ifaddr"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "cf2a8fbb578da2844d999a0a453825f660ed2d3fc47dcffc5f673dd8de4f0f8b"; + sha256 = "c19c64882a7ad51a394451dabcbbed72e98b5625ec1e79789924d5ea3e3ecb93"; }; - # ipaddress is provided in python stdlib > 3.3 - postPatch = if pythonOlder "3.4" then "" else '' - sed -i "s/'ipaddress'//" setup.py - ''; - propagatedBuildInputs = [ ipaddress ]; checkPhase = '' - ${python.interpreter} ifaddr/test_ifaddr.py + ${python.interpreter} -m unittest discover ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix new file mode 100644 index 000000000000..f72698fd0d13 --- /dev/null +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +}: + +buildPythonPackage rec { + pname = "imageio-ffmpeg"; + version = "0.2.0"; + + src = fetchPypi { + sha256 = "191k77hd69lfmd8p4w02c2ajjdsall6zijn01gyhqi11n48wpsib"; + inherit pname version; + }; + + disabled = !isPy3k; + + # No test infrastructure in repository. + doCheck = false; + + meta = with lib; { + description = "FFMPEG wrapper for Python"; + homepage = https://github.com/imageio/imageio-ffmpeg; + license = licenses.bsd2; + maintainers = [ maintainers.pmiddend ]; + }; + +} diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index de8380280670..f7b3ff63c53c 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,28 +1,34 @@ { stdenv , buildPythonPackage +, pathlib , fetchPypi , pillow , psutil +, imageio-ffmpeg , pytest , numpy , isPy3k +, ffmpeg , futures , enum34 }: buildPythonPackage rec { pname = "imageio"; - version = "2.4.1"; + version = "2.5.0"; src = fetchPypi { - sha256 = "0jjiwf6wjipmykh33prjh448qv8mpgngfi77ndc7mym5r1xhgf0n"; + sha256 = "1bdcrr5190jvk0msw2lswj4pbdhrcggjpj8m6q2a2mrxzjnmmrj2"; inherit pname version; }; - checkInputs = [ pytest psutil ]; + checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [ + imageio-ffmpeg ffmpeg + ]; propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [ futures enum34 + pathlib ]; checkPhase = '' @@ -34,8 +40,12 @@ buildPythonPackage rec { # For some reason, importing imageio also imports xml on Nix, see # https://github.com/imageio/imageio/issues/395 + + # Also, there are tests that test the downloading of ffmpeg if it's not installed. + # "Uncomment" those by renaming. postPatch = '' - substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\"" + substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\"," + substituteInPlace tests/test_ffmpeg.py --replace 'test_get_exe_installed' 'get_exe_installed' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 678614912a80..0c5ce54a229c 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "imgaug"; - version = "0.2.7"; + version = "0.2.8"; src = fetchPypi { inherit pname version; - sha256 = "7ca6bce4dcfd3e40330b593fe8e55018bf475983cc6777f8ebf5422c722fffb8"; + sha256 = "03dcbb3d7485de372eacde4b890b676e0c7a992524ee4bc72bd05a9a1cc5f9a4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 9a67568d9e52..d65010732ca5 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { homepage = https://imread.readthedocs.io/en/latest/; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 9d3511e41d1b..147cc8753eb0 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "inflect"; - version = "1.0.2"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "98cf5d82952ed8bf1cf9236c6058e9a21bc66172ecb907969d907741f91388b5"; + sha256 = "4ded1b2a6fcf0fc0397419c7727f131a93b67b80d899f2973be7758628e12b73"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 0438a035501b..d2839d32b0a9 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -1,4 +1,5 @@ { lib +, bash , buildPythonPackage , fetchPypi }: @@ -12,6 +13,10 @@ buildPythonPackage rec { sha256 = "1dr1a5qbb9z5hyns4zk086zm0iqbms33zv0s1296wx502y7jyjfw"; }; + patchPhase = '' + sed -e 's|/bin/bash|${bash}/bin/bash|g' -i invoke/config.py + ''; + # errors with vendored libs doCheck = false; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index b4daf5a6ecbb..043f58cfa5d4 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -32,8 +32,9 @@ buildPythonPackage rec { }) ]; + # For failing tests, see https://github.com/ipython/ipykernel/issues/387 checkPhase = '' - HOME=$(mktemp -d) pytest ipykernel + HOME=$(mktemp -d) pytest ipykernel -k "not (test_sys_path or test_sys_path_profile_dir or test_complete)" ''; meta = { diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index e4a56f85e814..5aa4b15f4623 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.1.1"; + version = "7.2.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b10a7ddd03657c761fc503495bc36471c8158e3fc948573fb9fe82a7029d8efd"; + sha256 = "6a9496209b76463f1dec126ab928919aaf1f55b38beb9219af3fe202f6bbdd12"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 672704249dc9..b422b368ffb6 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,7 @@ { buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools_scm }: +, setuptools_scm, jaraco_collections +}: buildPythonPackage rec { pname = "irc"; @@ -23,5 +24,6 @@ buildPythonPackage rec { jaraco_stream pytz jaraco_itertools + jaraco_collections ]; } diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 012bab56ab6e..10d57d7264b6 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.9.5"; + version = "3.9.6"; src = fetchPypi { inherit pname version; - sha256 = "f500a0561b83a2982d3424d640243d05bda9716f4fe9a655e331f3a07ca02710"; + sha256 = "d4ae098cb31d6c678a6eac074a24f8ba4adfe7df65db13b0b2ab7355f28d6e3b"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix index 21d098eb31b4..c65c5f21e567 100644 --- a/pkgs/development/python-modules/iso3166/default.nix +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0zs9za9dr2nl5srxir08yibmp6nffcapmzala0fgh8ny7y6rafrx"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 62f2c2591400..8fde41e9b499 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -1,17 +1,18 @@ { buildPythonPackage, fetchPypi, setuptools_scm -, six, jaraco_classes }: +, six, jaraco_classes, jaraco_text +}: buildPythonPackage rec { pname = "jaraco.collections"; - version = "1.6.0"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "332fd500cf13dbaf7ef239741302329b947ba82ce40f5a5e47e790c8714ae0b3"; + sha256 = "eb43fb9a7b29cff20767caf838c14bdf80a89395aba67a97d61c8f16e0e22c97"; }; doCheck = false; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six jaraco_classes ]; + propagatedBuildInputs = [ six jaraco_classes jaraco_text ]; # break dependency cycle patchPhase = '' diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index cbff3f8b45a8..7fc90d63f695 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "1.20"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "bad775f06e58bb8de5563bc2a8bf704168919e6779d6e849b1ca58b443e97f3b"; + sha256 = "35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345"; }; propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch b/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch new file mode 100644 index 000000000000..43530fcc3285 --- /dev/null +++ b/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch @@ -0,0 +1,38 @@ +From fcffcc61e432e5250e7fbfb1ecbe0f1cac3006cf Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sun, 10 Mar 2019 13:10:18 +0100 +Subject: [PATCH] Don't run flake8 checks during the build + +If the code simply violates their code style, the Nix package shouldn't fail. +--- + pytest.ini | 2 +- + setup.cfg | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pytest.ini b/pytest.ini +index d165e5e..d8e4694 100644 +--- a/pytest.ini ++++ b/pytest.ini +@@ -1,6 +1,6 @@ + [pytest] + norecursedirs=dist build .tox .eggs +-addopts=--doctest-modules --flake8 ++addopts=--doctest-modules + doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES + filterwarnings= + ignore:Possible nested set::pycodestyle:113 +diff --git a/setup.cfg b/setup.cfg +index 9f3517f..c9033ec 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -30,7 +30,6 @@ setup_requires = setuptools_scm >= 1.15.0 + testing = + pytest >= 3.5, !=3.7.3 + pytest-checkdocs +- pytest-flake8 + docs = + sphinx + jaraco.packaging >= 3.2 +-- +2.18.1 + diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 249054581fab..cbf966785e17 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -1,18 +1,21 @@ { lib, buildPythonPackage, fetchPypi, setuptools_scm -, inflect, more-itertools, six, pytest, pytest-flake8 }: +, inflect, more-itertools, six, pytest +}: buildPythonPackage rec { pname = "jaraco.itertools"; - version = "4.0.0"; + version = "4.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1d09zpi593bhr56rwm41kzffr18wif98plgy6xdy0zrbdwfarrxl"; + sha256 = "d1380ed961c9a4724f0bcca85d2bffebaa2507adfde535d5ee717441c9105fae"; }; + patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; + buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ inflect more-itertools six ]; - checkInputs = [ pytest pytest-flake8 ]; + checkInputs = [ pytest ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch b/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch new file mode 100644 index 000000000000..aab9604b9ce8 --- /dev/null +++ b/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch @@ -0,0 +1,38 @@ +From 4b9801d9bbe535fd6719933b96278915573e3595 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sun, 10 Mar 2019 16:42:21 +0100 +Subject: [PATCH] Don't run flake8 checks during the build + +If the code simply violates their code style, the Nix package shouldn't fail. +--- + pytest.ini | 2 +- + setup.cfg | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pytest.ini b/pytest.ini +index 9b3c1ec..a5189c1 100644 +--- a/pytest.ini ++++ b/pytest.ini +@@ -1,6 +1,6 @@ + [pytest] + norecursedirs=dist build .tox .eggs +-addopts=--doctest-modules --flake8 ++addopts=--doctest-modules + doctest_optionflags=ALLOW_UNICODE ELLIPSIS + filterwarnings= + ignore:Possible nested set::pycodestyle:113 +diff --git a/setup.cfg b/setup.cfg +index 3e7bbed..5cac7a2 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -29,7 +29,6 @@ setup_requires = setuptools_scm >= 1.15.0 + testing = + pytest >= 3.5, !=3.7.3 + pytest-checkdocs +- pytest-flake8 + docs = + sphinx + jaraco.packaging >= 3.2 +-- +2.18.1 + diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index 68fba6bfb5fb..ae05a76da1d5 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, setuptools_scm -, tempora, six, pytest, pytest-flake8 }: +, tempora, six, pytest +}: buildPythonPackage rec { pname = "jaraco.logging"; @@ -10,9 +11,11 @@ buildPythonPackage rec { sha256 = "1lb846j7qs1hgqwkyifv51nhl3f8jimbc4lk8yn9nkaynw0vyzcg"; }; + patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; + buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ tempora six ]; - checkInputs = [ pytest pytest-flake8 ]; + checkInputs = [ pytest ]; checkPhase = '' PYTHONPATH=".:$PYTHONPATH" pytest diff --git a/pkgs/development/python-modules/jaraco_stream/default.nix b/pkgs/development/python-modules/jaraco_stream/default.nix index 5788a52dfff7..492d903f24dc 100644 --- a/pkgs/development/python-modules/jaraco_stream/default.nix +++ b/pkgs/development/python-modules/jaraco_stream/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "jaraco.stream"; - version = "1.2"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "06qsjyab56vi0ikr819ghb7f8ymf09n92vla7gcn8j12113m2mib"; + sha256 = "c2e9d507d8cf04a3ff916b57eaf46bacb8a9f8895b55ead853de9c47b8f5daa4"; }; doCheck = false; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 01309e0c4d92..6087258a289b 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -1,14 +1,15 @@ { buildPythonPackage, fetchPypi, setuptools_scm -, jaraco_functools, jaraco_collections }: +, jaraco_functools +}: buildPythonPackage rec { pname = "jaraco.text"; - version = "1.10.1"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "07ccc0zc28sb1kyfyviw3n8f581qynrshqvqg1xsp4gkf1m2ibhh"; + sha256 = "1l5hq2jvz9xj05aayc42f85v8wx8rpi16lxph8blw51wgnvymsyx"; }; doCheck = false; buildInputs =[ setuptools_scm ]; - propagatedBuildInputs = [ jaraco_functools jaraco_collections ]; + propagatedBuildInputs = [ jaraco_functools ]; } diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 03aa9d0d0f81..675dba0ea72f 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "3.0.2"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "21824ab1e29e9ccbca85e77562a090067882976880603c41af8d9c4cffc1d4fc"; + sha256 = "42d0d08c0d36dcf1c4e1ddb1d10338d0dffb94105a02d74b6ea655ee8dd93cc2"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 67f115a9cc76..1b14074fad75 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,24 +9,28 @@ , six , stevedore , isPy27 +, fasteners +, jinja2 }: buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "2.6.0"; + version = "2.9.1"; disabled = !isPy27; src = fetchPypi { inherit pname version; - sha256 = "1768b278efa8825d2549c03de6ef1d2458e741b9b7984d94db0ef3c22e608938"; + sha256 = "fba5f3efe8bd06d559f06a5d3bd68da5a7395541fcd370053a8174d08519e3d0"; }; - patchPhase = '' + postPatch = '' export HOME=$TMPDIR ''; - buildInputs = [ pip ]; - propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore ]; + propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore fasteners jinja2 ]; + + # Need to fix test deps + doCheck = false; meta = with stdenv.lib; { description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git"; diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index b800303c20cb..52827f0a23ca 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Jinja2"; - version = "2.10"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"; + sha256 = "065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index d96752ba05f3..9b2a5c447327 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi +, fetchpatch , sphinx , numpydoc , pytest @@ -10,21 +11,37 @@ buildPythonPackage rec { pname = "joblib"; - version = "0.12.4"; + version = "0.13.2"; - # get full repository inorder to run tests - src = fetchFromGitHub { - owner = "joblib"; - repo = pname; - rev = version; - sha256 = "06zszgp7wpa4jr554wkk6kkigp4k9n5ad5h08i6w9qih963rlimb"; + src = fetchPypi { + inherit pname version; + sha256 = "315d6b19643ec4afd4c41c671f9f2d65ea9d787da093487a81ead7b0bac94524"; }; + # python-lz4 compatibility + # https://github.com/joblib/joblib/pull/847 + patches = [ + (fetchpatch { + url = https://github.com/joblib/joblib/commit/d3235fd601f40c91e074d48a411d7380329fe155.patch; + sha256 = "1hg1vfbba7mfilrpvmd97s68v03vs4bhlp1c1dj9lizi51mj2q2h"; + }) + (fetchpatch { + url = https://github.com/joblib/joblib/commit/884c92cd2aa5c2c1975ab48786da75556d779833.patch; + sha256 = "11kvpkvi428dq13ayy7vfyrib8isvcrdw8cd5hxkp5axr7sl12ba"; + }) + (fetchpatch { + url = https://github.com/joblib/joblib/commit/f1e177d781cc0d64420ec964a0b17d8268cb42a0.patch; + sha256 = "1sq6wcw4bhaq8cqwcd43fdws3467qy342xx3pgv62hp2nn75a21d"; + }) + ]; + checkInputs = [ sphinx numpydoc pytest ]; propagatedBuildInputs = [ python-lz4 ]; + # test_disk_used is broken + # https://github.com/joblib/joblib/issues/57 checkPhase = '' - py.test joblib + py.test joblib -k "not test_disk_used" ''; meta = { diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 9b2d3a5b832e..2ca26ad65e8c 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -1,18 +1,26 @@ -{ lib, fetchPypi, buildPythonApplication, EditorConfig, pytest, six }: +{ lib, fetchPypi, buildPythonApplication, EditorConfig, fetchpatch, pytest, six }: buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.8.9"; + version = "1.9.1"; - propagatedBuildInputs = [ six ]; - - buildInputs = [ EditorConfig pytest ]; + propagatedBuildInputs = [ six EditorConfig ]; + checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "7d02baa9b0459bf9c5407c1b99ad5566de04a3b664b18a58ac64f52832034204"; + sha256 = "0q8ld072dkccssagjxyvc9633fb6ynflvz70924phgp3zxmim960"; }; + patches = [ + (fetchpatch { + url = "https://github.com/beautify-web/js-beautify/commit/78e35a11cbb805fc044241d6465800ee2bd57ebc.patch"; + sha256 = "1ah7nshk96yljy37i20v4fga834dix9cdbhkdc3flfm4904n4523"; + }) + ]; + + patchFlags = [ "-p2" ]; + meta = with lib; { homepage = "http://jsbeautifier.org"; description = "JavaScript unobfuscator and beautifier."; diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index e5956d31b61d..a6ef8e3e1fb9 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "1.0"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "d43ede55b3d9b5524a8e11566ea0b11c9c8109116ef6a509a1b619d2041e7397"; + sha256 = "625098cc8e5854b8c23b587aec33bc8e33e0e597636bfaca76152249c78fe5c1"; }; doCheck = false; diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 0413a5badba8..a400dd4d18ce 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -16,13 +16,13 @@ }: buildPythonPackage rec { - version = "0.6.0"; + version = "0.7.0"; pname = "jupyter-repo2docker"; disabled = !(pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "32c6dc6fd2402d6f5a955f8ab59299097bb5f4972c7dcc6fe2a8fe4c96dcab27"; + sha256 = "cf93ddf283de8c6b8f4ad983f8bf9b7b2a2c37812e387c245f8ba229d4f180c4"; }; checkInputs = [ pytest pyyaml wheel pytestcov ]; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 0478d59c7085..978ed150ef45 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -13,6 +13,7 @@ , tornado , traitlets , requests +, notebook , pythonOlder , nodePackages }: @@ -106,7 +107,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado - traitlets prometheus_client async_generator + traitlets prometheus_client async_generator notebook ]; # Disable tests because they take an excessive amount of time to complete. diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix index f7712ff62006..7d384ba7cc37 100644 --- a/pkgs/development/python-modules/kazoo/default.nix +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "kazoo"; - version = "2.5.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1963l6994vzzy7bjh77y5wnf8lh8zwwibcpcgpfd1rzcppvp9dwd"; + sha256 = "4a73c2c62a7163ca1c4aef82aa042d795560497cc81034f212ef13cc037cc783"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix index 9d6202337441..96c38f3cd89d 100644 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Keras_Preprocessing"; - version = "1.0.8"; + version = "1.0.9"; src = fetchPypi { inherit pname version; - sha256 = "6e669aa713727f0bc08f756616f64e0dfa75d822226cfc0dcf33297ab05cef7d"; + sha256 = "5e3700117981c2db762e512ed6586638124fac5842170701628088a11aeb51ac"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 5714c242af57..041fafaf08cd 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "keyring"; - version = "16.0.2"; + version = "18.0.0"; src = fetchPypi { inherit pname version; - sha256 = "95e4f1d0342d0bf5d137d1d2352d59f7abbebb1507bec1ac26831c411ac23150"; + sha256 = "12833d2b05d2055e0e25931184af9cd6a738f320a2264853cabbd8a3a0f0b65d"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 86e677a03374..033ab8211350 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { meta = { maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 2a8c59be4204..b70228b6835a 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -1,19 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, case, pytz, amqp }: +{ lib, buildPythonPackage, fetchPypi, pytest, case, pytz, Pyro4, amqp }: buildPythonPackage rec { - pname = "kombu"; - version = "4.2.2.post1"; + pname = "kombu"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "3c9dca2338c5d893f30c151f5d29bfb81196748ab426d33c362ab51f1e8dbf78"; + sha256 = "529df9e0ecc0bad9fc2b376c3ce4796c41b482cf697b78b71aea6ebe7ca353c8"; }; postPatch = '' substituteInPlace requirements/test.txt --replace "pytest-sugar" "" ''; - checkInputs = [ pytest case pytz ]; + checkInputs = [ pytest case pytz Pyro4 ]; propagatedBuildInputs = [ amqp ]; diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 1fb69e816bbe..3ad0ae3b7232 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -1,19 +1,24 @@ { lib, buildPythonPackage, fetchPypi -, pbr, ldap, fixtures, testresources, testtools }: +, pbr, ldap, prettytable, fixtures, testresources, testtools }: buildPythonPackage rec { name = "ldappool-${version}"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { pname = "ldappool"; inherit version; - sha256 = "3ef502e65b396a917dbee9035db5d5a5aae6a94897dac2bc253c8257ca1c31a6"; + sha256 = "d9c9ec29be3f3e64164be84fe080a3087108836f307a12ec62f7d18988293df3"; }; + postPatch = '' + # Tests run without most of the dependencies + echo "" > test-requirements.txt + ''; + nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ ldap ]; + propagatedBuildInputs = [ ldap prettytable ]; checkInputs = [ fixtures testresources testtools ]; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index f3e030084d2f..9eba46cd303f 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.22"; + version = "0.1.23"; src = fetchPypi { inherit pname version; - sha256 = "15206e92220d96512b357a9a740bc91b8b33b42b9164fe3b56c4c3aedf882cdc"; + sha256 = "476a1d1f6d9e7f72befff0ea4e631461882c9c1c620b92878503bf46383c8d20"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index eb58cc0b2d57..939e4f18898e 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "libagent"; - version = "0.12.1"; + version = "0.13.0"; src = fetchPypi{ inherit pname version; - sha256 = "f21515a217125b7c8cbb1f53327d1d4363c1b980a7e246feabf91aed9b1c51e5"; + sha256 = "ecd6854ba8f04d04e39cb00ae3a179d6a1d5dc8e0b60ac5208c0a62e10e3106e"; }; propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 5261a7b65642..2fbe7207f4f7 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { homepage = https://github.com/schwehr/libais; description = "Library for decoding maritime Automatic Identification System messages"; license = licenses.asl20; - platforms = platforms.linux; # It currently fails to build on darwin + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 8d0bf2b7b17e..004fedf79b4d 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -15,8 +15,9 @@ buildPythonPackage rec { disabled = pythonOlder "3.4.0"; - propagatedBuildInputs = [ sip protobuf ]; + propagatedBuildInputs = [ sip ]; nativeBuildInputs = [ cmake ]; + buildInputs = [ protobuf ]; postPatch = '' # To workaround buggy SIP detection which overrides PYTHONPATH diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index ef01fde2daa7..6babc6ae0145 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -66,8 +66,9 @@ buildPythonPackage rec { enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ - cmake cython nose ]; diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index c575e5594be3..54b98cf21368 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "05iamhbsqm8binqhc2zchfqdkajlx2icf8xl5vkd5fbrhw6yylad"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ libsodium ]; postPatch = diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index aca690665925..258c2d6932d5 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.6.2"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "2aa868b8aade749b9904eeb7034fcf44115601c367969b6d01f5e1b4b9b6031d"; + sha256 = "b332225ac29bfae1ba386deca2b6566271576de3ab17617ad0a71892c799b118"; }; propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy ]; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 9f78b9994509..52760420b83c 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { description = "C++ implementation of 3mf loading with SIP python bindings"; homepage = https://github.com/Ultimaker/libSavitar; license = licenses.lgpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ abbradar orivej ]; }; } diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index e5a03f783551..03797575a83e 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }: +{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib, python }: buildPythonPackage rec { pname = "libsexy"; @@ -10,14 +10,14 @@ buildPythonPackage rec { sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig pygtk ]; propagatedBuildInputs = [ - pygtk libsexy gtk2 glib pango libxml2 + pygtk libsexy glib pango libxml2 ]; postInstall = '' - ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/ + ln -s $out/${python.sitePackages}/gtk-2.0/* $out/${python.sitePackages} ''; meta = { diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 58f2d2a9694c..cce640cce366 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2018.09.09"; + version = "2018.12.19"; src = fetchPypi { inherit pname version; - sha256 = "077v4gsl0fimsqxir1mpzn2kvw01fg6fa0nnf33nlfa0xzdn241y"; + sha256 = "6034e324b3a455f042975006a35dd33fa9175115c7302cb53ca9a646f6594bfc"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix new file mode 100644 index 000000000000..a0bc3a887459 --- /dev/null +++ b/pkgs/development/python-modules/loguru/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, colorama }: + +buildPythonPackage rec { + pname = "loguru"; + version = "0.3.0"; + + disabled = isPy27; + src = fetchPypi { + inherit pname version; + sha256 = "1b2phizcx2wbdm5np0s16yd68fc0isqnm8qs6l9pmlrlyf9gm87j"; + }; + + checkInputs = [ pytest colorama ]; + checkPhase = '' + pytest -k 'not test_time_rotation_reopening' + ''; + + meta = with lib; { + homepage = https://github.com/Delgan/loguru; + description = "Python logging made (stupidly) simple"; + license = licenses.mit; + maintainers = with maintainers; [ jakewaksbaum ]; + }; +} diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix index 59abefb05387..10d7eda9e045 100644 --- a/pkgs/development/python-modules/luftdaten/default.nix +++ b/pkgs/development/python-modules/luftdaten/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "luftdaten"; - version = "0.3.4"; + version = "0.5.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c298ea749ff4eec6a95e04023f9068d017acb02133f1fdcc38eb98e5ebc69442"; + sha256 = "4672f807c0e22bde2606dd887b0358de1da77068d1a1afe6dd8e331d2391b02c"; }; propagatedBuildInputs = [ aiohttp async-timeout ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index a37a22318ec5..117a9699e01d 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.2.6"; + version = "4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "7035d9361f3ceec9ccc1dd3482094d1174580e7e1bf6870b77ea758f7cad15d2"; + sha256 = "da5e7e941d6e71c9c9a717c93725cda0708c2474f532e3680ac5e39ec57d224d"; }; nativeBuildInputs = [ libxml2.dev libxslt.dev ]; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 4cab8f47250f..c0e91542d38a 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { ]; patchFlags = "-p0"; + nativeBuildInputs = [ swig2 ]; buildInputs = [ swig2 openssl ]; propagatedBuildInputs = [ typing ]; diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 9ba6698e4a0f..34e2260109be 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = http://mahotas.readthedocs.io/; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index 1dc90e66683b..c8b77e9668f2 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "manhole"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "11ivy8qiv87jl2lc1ldhv9dc4jwf3hz7wysdfiagdcd9kkd48v8m"; + sha256 = "d4ab98198481ed54a5b95c0439f41131f56d7d3755eedaedce5a45ca7ff4aa42"; }; # test_help expects architecture-dependent Linux signal numbers. diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix index 1117ba958fa4..006e3a9051be 100644 --- a/pkgs/development/python-modules/marisa/default.nix +++ b/pkgs/development/python-modules/marisa/default.nix @@ -1,18 +1,22 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, marisa, swig }: +{ stdenv, buildPythonPackage, fetchFromGitHub, marisa, swig +, isPy3k +}: buildPythonPackage rec { pname = "marisa"; version = "1.3.40"; + disabled = isPy3k; + src = fetchFromGitHub { owner = "s-yata"; repo = "marisa-trie"; - rev = "59e410597981475bae94d9d9eb252c1d9790dc2f"; - sha256 = "0z4bf55np08q3cbi6gvj3cpw3zp8kf2d0jq6k74pjk066m7rapbb"; + rev = "8dba9850b89d7828ebf33b8ab84df2b54d31260b"; + sha256 = "0pkp9fggk53lxlicfwrskgx33qplc4v6njbavlnz4x4z63zd4933"; }; nativeBuildInputs = [ swig marisa ]; - buildinputs = [ marisa ]; + buildInputs = [ marisa ]; sourceRoot = "${src.name}/bindings/python"; diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index 069b71de00d3..7a7d7f0287b6 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "MarkupSafe"; - version = "1.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6"; + sha256 = "4e97332c9ce444b0c2c38dd22ddc61c743eb208d916e4265a2a3b575bdccb1d3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 1bf78bc20849..8582f8a29f92 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.15.0"; + version = "0.16.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1phqbbrq1xjvc7cwasy5zws4bdb050qikfp1qg8f1hqhmipkpiaz"; + sha256 = "c99d51bb4dfca7e1b35ae12ed96746c0df0464b7eb95bba6835a1231e6ea286c"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 9b8f1c0e530e..513c277bcacb 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "2.16.3"; + version = "2.18.1"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e1b79eb3b815b49918c64114dda691b8767b48a1f66dd1d8c0cd5842b74257c2"; + sha256 = "6eeaf1301a5f5942bfe8ab2c2eaf03feb793072b56d5fae563638bddd7bb62e6"; }; propagatedBuildInputs = [ dateutil simplejson ]; diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index 6334d2e4f793..fb433be8d990 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -34,13 +34,15 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python which sphinx stdenv ] ++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver - libpng pkgconfig mock pytz ] + libpng mock pytz ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index d4c8e970c501..e795181e2ff0 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -21,14 +21,14 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt4 != null; buildPythonPackage rec { - version = "3.0.2"; + version = "3.0.3"; pname = "matplotlib"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c94b792af431f6adb6859eb218137acd9a35f4f7442cea57e4a59c54751c36af"; + sha256 = "1dzpgpj34i6lv9wgacqdshai2d237m3vymqrgl52sj1gwf4kblz1"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/mautrix-appservice/default.nix b/pkgs/development/python-modules/mautrix-appservice/default.nix index 1420f1880a31..ba96e7d734be 100644 --- a/pkgs/development/python-modules/mautrix-appservice/default.nix +++ b/pkgs/development/python-modules/mautrix-appservice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "mautrix-appservice"; - version = "0.3.7"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "1615220f5bb75e2093ad1e30f4c2e1243499b0b20caef014fd73faadd3bfea6c"; + sha256 = "60192920cff75afdd096eea3a43276e33ec15f4f00bd04d2d1dda616c84f22a5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index 110d1a57c826..c68fb90952e5 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -1,24 +1,30 @@ { lib , buildPythonPackage -, mecab , fetchPypi +, mecab +, swig }: buildPythonPackage rec { pname = "mecab-python3"; - version = "0.7"; + version = "0.996.1"; src = fetchPypi { inherit pname version; - sha256 = "007dg4f5fby2yl7cc44x6xwvcrf2w2ifmn0rmk56ss33mhs8l6qy"; + sha256 = "5aca4d0d196161e41452b89921042c0e61a6b7e7e9373211c0c1c50d1809055d"; }; - propagatedBuildInputs = [ mecab ]; + nativeBuildInputs = [ + mecab # for mecab-config + swig + ]; + + buildInputs = [ mecab ]; meta = with lib; { description = "A python wrapper for mecab: Morphological Analysis engine"; - homepage = https://github.com/LuminosoInsight/wordfreq/; - license = licenses.bsd0; + homepage = https://github.com/SamuraiT/mecab-python3; + license = with licenses; [ gpl2 lgpl21 bsd3 ]; # any of the three maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index 1a7478b266ab..a831618134bc 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { downloadPage = https://github.com/stephenmcd/mezzanine/releases; license = licenses.free; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index 3425440390dd..e3dffbfcb489 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "micawber"; - version = "0.3.8"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "2e128db870cf3a351f5c680b6d1ae7e097a7ff6c70c8ba78c7d3be8e3d3c20bd"; + sha256 = "2e19cd5e9ce5b8b57714389e4b709af7dedc4f8f44e9df5566a9d3ccefaac38e"; }; propagatedBuildInputs = [ beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix index db0a5bcca2b3..8090ac199da8 100644 --- a/pkgs/development/python-modules/moinmoin/default.nix +++ b/pkgs/development/python-modules/moinmoin/default.nix @@ -4,25 +4,25 @@ buildPythonPackage rec { pname = "moinmoin"; - version = "1.9.9"; + version = "1.9.10"; # SyntaxError in setup.py disabled = isPy3k; src = fetchurl { url = "http://static.moinmo.in/files/moin-${version}.tar.gz"; - sha256 = "197ga41qghykmir80ik17f9hjpmixslv3zjgj7bj9qvs1dvdg5s3"; + sha256 = "0g05lnl1s8v61phi3z1g3b6lfj4g98grj9kw8nyjl246x0c489ja"; }; patches = [ # Recommended to install on their download page. - (fetchpatch { - url = "https://bitbucket.org/thomaswaldmann/moin-1.9/commits/561b7a9c2bd91b61d26cd8a5f39aa36bf5c6159e/raw"; - sha256 = "1nscnl9nspnrwyf3n95ig0ihzndryinq9kkghliph6h55cncfc65"; - }) ./fix_tests.patch ]; + prePatch = '' + sed -i "s/\xfc/ü/" setup.cfg + ''; + checkInputs = [ pytest werkzeug pygments ]; meta = with lib; { diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index e53098f6f232..4675a3860549 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -1,33 +1,42 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, nose, numpy, six, ruamel_yaml, msgpack-python, coverage, coveralls, pymongo, lsof }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, numpy +, six +, ruamel_yaml +, msgpack-python +, coverage +, coveralls +, pymongo +, lsof +}: buildPythonPackage rec { pname = "monty"; - version = "1.0.2"; + version = "1.0.4"; # No tests in Pypi src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "0ss70fanavqdpj56yymj06lacgnknb4ap39m2q28v9lz32cs6xdg"; + sha256 = "0vqaaz0dw0ypl6sfwbycpb0qs3ap04c4ghbggklxih66spdlggh6"; }; - propagatedBuildInputs = [ nose numpy six ruamel_yaml msgpack-python coverage coveralls pymongo lsof ]; - + checkInputs = [ lsof nose numpy msgpack-python coverage coveralls pymongo]; + propagatedBuildInputs = [ six ruamel_yaml ]; + preCheck = '' substituteInPlace tests/test_os.py \ - --replace 'def test_which(self):' '#' \ - --replace 'py = which("python")' '#' \ - --replace 'self.assertEqual(os.path.basename(py), "python")' '#' \ - --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' \ - --replace 'self.assertIs(which("non_existent_exe"), None)' '#' \ + --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems"; longDescription = " - Monty implements supplementary useful functions for Python that are not part of the - standard library. Examples include useful utilities like transparent support for zipped files, useful design + Monty implements supplementary useful functions for Python that are not part of the + standard library. Examples include useful utilities like transparent support for zipped files, useful design patterns such as singleton and cached_class, and many more. "; homepage = https://github.com/materialsvirtuallab/monty; @@ -35,4 +44,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy ]; }; } - diff --git a/pkgs/development/python-modules/more-itertools/2.7.nix b/pkgs/development/python-modules/more-itertools/2.7.nix new file mode 100644 index 000000000000..e0786aefa2c2 --- /dev/null +++ b/pkgs/development/python-modules/more-itertools/2.7.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, six +, stdenv +}: + + +buildPythonPackage rec { + pname = "more-itertools"; + version = "5.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ six ]; + + # iterable = range(10 ** 10) # Is efficiently reversible + # OverflowError: Python int too large to convert to C long + doCheck = !stdenv.hostPlatform.is32bit; + + meta = { + homepage = https://more-itertools.readthedocs.org; + description = "Expansion of the itertools module"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index b71319029620..999708697a94 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "4.3.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "c476b5d3a34e12d40130bc2f935028b5f636df8f372dc2c1c01dc19681b2039e"; + sha256 = "590044e3942351a1bdb1de960b739ff4ce277960f2425ad4509446dbace8d9d1"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index b5f5c1379bcf..bef182558042 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -15,8 +15,9 @@ buildPythonPackage rec { py.test test ''; - buildInputs = [ six pathpy pytest ]; - propagatedBuildInputs = [ decorator zetup ]; + nativeBuildInputs = [ zetup ]; + checkInputs = [ six pathpy pytest ]; + propagatedBuildInputs = [ decorator ]; meta = with stdenv.lib; { description = '' @@ -24,6 +25,6 @@ buildPythonPackage rec { ''; homepage = https://bitbucket.org/userzimmermann/python-moretools; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 960fb604ec9b..693d5cf5d7f0 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "moviepy"; - version = "0.2.3.5"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1jrdpnzyk373zlh8lvjdabyvljz3sahshbdgbpk6w9vx5hfacvjk"; + sha256 = "16c7ffca23d90c76dd7b163f648c8166dfd589b7c180b8ff75aa327ae0a2fc6d"; }; # No tests diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 6d3897475ad4..d3535589911c 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -13,11 +13,18 @@ buildPythonPackage rec { inherit mpi; }; - patches = [ (fetchpatch { - # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE - url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; - sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; + patches = [ + (fetchpatch { + # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE (upstream patch) + url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; + sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; }) + (fetchpatch { + # Open MPI: Workaround removal of MPI_{LB|UB} (upstream patch) + url = "https://bitbucket.org/mpi4py/mpi4py/commits/39ca784226460f9e519507269ebb29635dc8bd90/raw"; + sha256 = "02kxikdlsrlq8yr5hca42536mxbrq4k4j8nqv7p1p2r0q21a919q"; + }) + ]; postPatch = '' @@ -48,7 +55,7 @@ buildPythonPackage rec { setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; - buildInputs = [ mpi openssh ]; + nativeBuildInputs = [ mpi openssh ]; meta = { description = diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index 8280ecec4a46..9da56cad8815 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "mpmath"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "04d14803b6875fe6d69e6dccea87d5ae5599802e4b1df7997bddd2024001050c"; + sha256 = "fc17abe05fbab3382b61a123c398508183406fa132e0223874578e20946499f6"; }; # error: invalid command 'test' diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 3068a31f1e29..d48d0995a764 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "msgpack"; - version = "0.5.6"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3"; + sha256 = "4008c72f5ef2b7936447dcb83db41d97e9791c83221be13d5e19db0796df1972"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix new file mode 100644 index 000000000000..e44d65e5cbe3 --- /dev/null +++ b/pkgs/development/python-modules/msrest/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, requests +, requests_oauthlib +, isodate +, certifi +, enum34 +, typing +, aiohttp +, aiodns +, pytest +, httpretty +, mock +, futures +, trio +}: + +buildPythonPackage rec { + version = "0.6.4"; + pname = "msrest"; + + # no tests in PyPI tarball + # see https://github.com/Azure/msrest-for-python/pull/152 + src = fetchFromGitHub { + owner = "Azure"; + repo = "msrest-for-python"; + rev = "v${version}"; + sha256 = "0ilrc06qq0dw4qqzq1dq2vs6nymc39h19w52dwcyawwfalalnjzi"; + }; + + propagatedBuildInputs = [ + requests requests_oauthlib isodate certifi + ] ++ lib.optionals (!isPy3k) [ enum34 typing ] + ++ lib.optionals isPy3k [ aiohttp aiodns ]; + + checkInputs = [ pytest httpretty ] + ++ lib.optionals (!isPy3k) [ mock futures ] + ++ lib.optional isPy3k trio; + + # Deselected tests require network access + checkPhase = '' + pytest tests/ -k "not test_conf_async_trio_requests" + ''; + + meta = with lib; { + description = "The runtime library 'msrest' for AutoRest generated Python clients."; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.mit; + maintainers = with maintainers; [ bendlas ]; + }; +} diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/pkgs/development/python-modules/msrestazure/default.nix new file mode 100644 index 000000000000..7e71f618d8a0 --- /dev/null +++ b/pkgs/development/python-modules/msrestazure/default.nix @@ -0,0 +1,26 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, adal +, msrest +}: + +buildPythonPackage rec { + version = "0.6.0"; + pname = "msrestazure"; + + src = fetchPypi { + inherit pname version; + sha256 = "06s04f6nng4na2663kc12a3skiaqb631nscjfwpsrx4lzkf8bccr"; + }; + + propagatedBuildInputs = [ adal msrest ]; + + meta = with pkgs.lib; { + description = "The runtime library 'msrestazure' for AutoRest generated Python clients."; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.mit; + maintainers = with maintainers; [ bendlas ]; + }; +} diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index d097224e52da..820b4c1696b3 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -1,17 +1,18 @@ { buildPythonPackage, stdenv, pyyaml, pytest, enum34 -, pytestpep8, pytestflakes, fetchFromGitHub, isPy3k, lib, glibcLocales +, pytestpep8, pytest-flakes, fetchFromGitHub, isPy3k, lib, glibcLocales }: buildPythonPackage rec { - version = "4.13.0"; + version = "4.13.2"; pname = "mt-940"; # No tests in PyPI tarball + # See https://github.com/WoLpH/mt940/pull/72 src = fetchFromGitHub { owner = "WoLpH"; repo = "mt940"; rev = "v${version}"; - sha256 = "0p6z4ipj0drph3ryn8mnb3xn0vjfv54y1c5w5i9ixrxwz48h6bga"; + sha256 = "1lvw3qyv7qhjabcvg55br8x4pnc7hv8xzzaf6wnr8cfjg0q7dzzg"; }; postPatch = '' @@ -21,9 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional (!isPy3k) enum34; - LC_ALL="en_US.UTF-8"; - - checkInputs = [ pyyaml pytestpep8 pytestflakes pytest glibcLocales ]; + checkInputs = [ pyyaml pytestpep8 pytest-flakes pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index c5c53577505c..a98697039a86 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.6.1"; + version = "0.70.7"; src = fetchPypi { inherit pname version; - sha256 = "1ip5caz67b3q0553mr8gm8xwsb8x500jn8ml0gihgyfy52m2ypcq"; + sha256 = "46479a327388df8e77ad268892f2e73eac06d6271189b868ce9d4f95474e58e3"; }; propagatedBuildInputs = [ dill ]; diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index b3cea69c098d..2e826ab61e81 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -6,13 +6,17 @@ buildPythonPackage rec { pname = "murmurhash"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "02wbyjixvzd6l1mljpm1ci7x835zhk3nqxgy7kvbi4jimvairs9q"; + sha256 = "c7a646f6b07b033642b4f52ae2e45efd8b80780b3b90e8092a0cec935fbf81e2"; }; + postPatch = '' + substituteInPlace setup.py --replace "'wheel>=0.32.0,<0.33.0'" "" + ''; + buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 78271de6f69f..0bd08a82b937 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , hypothesis , pycodestyle , pyflakes @@ -10,11 +11,17 @@ buildPythonPackage rec { pname = "mutagen"; - version = "1.41.1"; + version = "1.42.0"; src = fetchPypi { inherit pname version; - sha256 = "2ea9c900a05fa7f5f4c5bd9fc1475d7d576532e13b2f79b694452b997ff67200"; + sha256 = "bb61e2456f59a9a4a259fbc08def6d01ba45a42da8eeaa97d00633b0ec5de71c"; + }; + + # fix tests with updated pycodestyle + patches = fetchpatch { + url = https://github.com/quodlibet/mutagen/commit/0ee86ef9d7e06639a388d0638732810b79998608.patch; + sha256 = "1bj3mpbv7krh5m1mvfl0z18s8wdxb1949zcnkcqxp2xl5fzsi288"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index 591aa6b04772..b100f3fa3500 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -1,10 +1,11 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib -, responses, mock, pytestcov, pytest, pytestcache, pytestpep8, coverage, six }: +{ stdenv, buildPythonPackage, fetchFromGitHub +, requests, requests_oauthlib, six +, pytest, pytestpep8, pytestcache, pytestcov, responses, mock +}: buildPythonPackage rec { version = "0.9.3"; pname = "mwclient"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "mwclient"; @@ -13,9 +14,9 @@ buildPythonPackage rec { sha256 = "1kbrmq8zli2j93vmc2887bs7mqr4q1n908nbi1jjcci5v4cd4cqw"; }; - buildInputs = [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ]; + checkInputs = [ pytest pytestpep8 pytestcache pytestcov responses mock ]; - propagatedBuildInputs = [ six requests requests_oauthlib ]; + propagatedBuildInputs = [ requests requests_oauthlib six ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index 317f79ebe081..2c8ea30345f3 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -20,9 +20,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace python/setup.py \ - --replace "graphviz<0.9.0" "graphviz<0.10.0" \ - --replace "numpy<=1.15.0" "numpy<1.16.0" \ - --replace "requests<2.19.0" "requests<2.20.0" + --replace "graphviz<0.9.0," "graphviz" \ + --replace "numpy<=1.15.0," "numpy" \ + --replace "requests<2.19.0," "requests" ''; preConfigure = '' diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 1194280ef4b5..a06a378a0768 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "1.7"; + version = "1.9"; src = fetchPypi { inherit pname version; - sha256 = "00b030f9558454ec237576def2de9b7e50517ae039e03d84482b6ddf1bd1d54d"; + sha256 = "be1f14b0b841b49adb2f6018eaa1ce9529c8147eb561909baaa757e8cf9e821b"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index bcb252a7b499..c028eaaaa142 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.650"; + version = "0.670"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "1ypa7zl14rjd2pnk5zll6yhfz6jfrrdib3dgq3f1f6586pwbbm9q"; + sha256 = "e80fd6af34614a0e898a57f14296d0dacb584648f0339c2e000ddbf0f4cc2f8d"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mysql_python/default.nix b/pkgs/development/python-modules/mysql_python/default.nix index a38f7e02e1cd..0ab11521cc88 100644 --- a/pkgs/development/python-modules/mysql_python/default.nix +++ b/pkgs/development/python-modules/mysql_python/default.nix @@ -17,8 +17,9 @@ buildPythonPackage rec { sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441"; }; - buildInputs = [ nose ]; - propagatedBuildInputs = [ pkgs.mysql.connector-c ]; + checkInputs = [ nose ]; + nativeBuildInputs = [ pkgs.mysql.connector-c ]; + buildInputs = [ pkgs.mysql.connector-c ]; # plenty of failing tests doCheck = false; diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 712871890171..c43c45df600c 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,11 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "1.3.14"; + version = "1.4.2.post1"; + + nativeBuildInputs = [ + mysql.connector-c + ]; buildInputs = [ mysql.connector-c @@ -13,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0symgjmzkckzsxx3piaxywls8q19s1pdgbmpm0v1m425wnfax09r"; + sha256 = "f257d250f2675d0ef99bd318906f3cfc05cef4a2f385ea695ff32a3f04b9f9a7"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 92f885d7bbda..da8e953826ff 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "natsort"; - version = "5.5.0"; + version = "6.0.0"; checkInputs = [ pytest @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e29031f37aa264145d6ad9acdab335479ce3636806fc7aa70b7675a2b2198d09"; + sha256 = "ff3effb5618232866de8d26e5af4081a4daa9bb0dfed49ac65170e28e45f2776"; }; # testing based on project's tox.ini diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix new file mode 100644 index 000000000000..2110f3628a80 --- /dev/null +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, libndtypes +, isPy27 +}: + +buildPythonPackage { + pname = "ndtypes"; + disabled = isPy27; + inherit (libndtypes) version src meta; + + propagatedBuildInputs = [ numpy ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'include_dirs = ["libndtypes"]' \ + 'include_dirs = ["${libndtypes}/include"]' \ + --replace 'library_dirs = ["libndtypes"]' \ + 'library_dirs = ["${libndtypes}/lib"]' \ + --replace 'runtime_library_dirs = ["$ORIGIN"]' \ + 'runtime_library_dirs = ["${libndtypes}/lib"]' + ''; + + postInstall = '' + mkdir $out/include + cp python/ndtypes/*.h $out/include + ''; +} diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index e8fa0e5e409e..59c13bc0a633 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.9.10"; + version = "1.0.0"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "d952e21f4333166d79423db2eda6d772be7b30134381ee055d5177be0db68a57"; + sha256 = "bd1cb7df2ea979e57d8ad02493ad85f9afbf1fcea3dfe34239da8c0dda98087e"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix index 1adfe13dd13b..fa11ab3fb907 100644 --- a/pkgs/development/python-modules/nevow/default.nix +++ b/pkgs/development/python-modules/nevow/default.nix @@ -12,6 +12,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ twisted ]; + checkInputs = [ twisted ]; + checkPhase = '' trial formless nevow ''; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 32ec4b74509d..f697e34e9995 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.4.2"; + version = "0.5.0"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "5049363eb6da2e7c35589477dfc79bf69929ca66de2d7ed2e9dc07acf78636f4"; + sha256 = "085cd4f7c19a47ed9d951c853223190b9fb0dbddeaeedf8f86dfa9c53d6492ca"; }; # disable some failing tests diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 1978ce816375..fe08e1f0789e 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -44,15 +44,13 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.1.7"; + version = "1.1.8"; src = fetchPypi { inherit pname version; - sha256 = "0iyi5w2h42bpssqj52ixm2kxp56yxfxdacb6xv5r24yv3hmwd4yn"; + sha256 = "d5eec6de7d8e7020106c42b37d17f99de92824440cc79dfa6080f7c2e6d9fecc"; }; - patches = [ ./move-uneeded-requires.patch ]; - postPatch = '' substituteInPlace nipype/interfaces/base/tests/test_core.py \ --replace "/usr/bin/env bash" "${bash}/bin/bash" diff --git a/pkgs/development/python-modules/nipype/move-uneeded-requires.patch b/pkgs/development/python-modules/nipype/move-uneeded-requires.patch deleted file mode 100644 index 89324285d182..000000000000 --- a/pkgs/development/python-modules/nipype/move-uneeded-requires.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/nipype/info.py b/nipype/info.py -index c6503ac..4379643 100644 ---- a/nipype/info.py -+++ b/nipype/info.py -@@ -147,9 +147,6 @@ REQUIRES = [ - 'neurdflib', - 'click>=%s' % CLICK_MIN_VERSION, - 'funcsigs', -- 'pytest>=%s' % PYTEST_MIN_VERSION, -- 'pytest-xdist', -- 'mock', - 'pydotplus', - 'pydot>=%s' % PYDOT_MIN_VERSION, - 'packaging', -@@ -159,7 +156,15 @@ REQUIRES = [ - if sys.version_info <= (3, 4): - REQUIRES.append('configparser') - --TESTS_REQUIRES = ['pytest-cov', 'codecov', 'pytest-env', 'coverage<5'] -+TESTS_REQUIRES = [ -+ 'pytest>=%s' % PYTEST_MIN_VERSION, -+ 'pytest-xdist', -+ 'mock', -+ 'pytest-cov', -+ 'codecov', -+ 'pytest-env', -+ 'coverage<5' -+] - - EXTRA_REQUIRES = { - 'doc': ['Sphinx>=1.4', 'numpydoc', 'matplotlib', 'pydotplus', 'pydot>=1.2.3'], diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index 71c142436d9f..3a3f03c87ba3 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, fetchpatch , fetchPypi , pbr , pythonix @@ -16,6 +17,15 @@ buildPythonPackage rec { sha256 = "0gsrd99kkv99jsrh3hckz7ns1zwndi9vvh4465v4gnpz723dd6fj"; }; + patches = [ + # Patch should be dropped once https://github.com/t184256/nixpkgs-python-importer/pull/7 + # is merged and in a release + (fetchpatch { + url = "https://github.com/adisbladis/nixpkgs-python-importer/commit/749e05f1.patch"; + sha256 = "1a72phazpqf6vf3hl3m84z9i5n6h1xpa53bqxnpsff6agxxhd21b"; + }) + ]; + buildInputs = [ pbr ]; propagatedBuildInputs = [ pythonix ]; diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 56edc44bce71..70fdab645287 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,17 +1,16 @@ -{ fetchurl, buildPythonPackage, lib, six, pythonAtLeast, pythonOlder }: +{ fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k, fetchpatch }: buildPythonPackage rec { - version = "3.2.5"; + version = "3.4.5"; pname = "nltk"; - src = fetchurl { - url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz"; - sha256 = "2661f9971d983db314bbebd51ba770811a362c6597fd0f303bb1d3beadcb4834"; + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "153x2clrnigs74jdgnn3qmljdjj4gprmvpdvh49i18ls4m8mbm5y"; }; - propagatedBuildInputs = [ six ]; - - disabled = pythonOlder "2.7" || pythonOlder "3.4" && (pythonAtLeast "3.0"); + propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) singledispatch; # Tests require some data, the downloading of which is impure. It would # probably make sense to make the data another derivation, but then feeding diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/pkgs/development/python-modules/nose-randomly/default.nix index 531994d90535..23315f9531b2 100644 --- a/pkgs/development/python-modules/nose-randomly/default.nix +++ b/pkgs/development/python-modules/nose-randomly/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "nose-randomly"; - version = "1.2.5"; + version = "1.2.6"; src = fetchPypi { inherit pname version; - sha256 = "361f4c2fbb090ec2bc8e5e4151e21409a09ac13f364e3448247cc01f326d89b3"; + sha256 = "7e483a3d79e13ae760d6ade57ae07ae45bb4b223b61a805e958b4c077116c67c"; }; checkInputs = [ numpy nose ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index c9cd7f91833b..291a80a521b4 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -16,12 +16,12 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.16.0"; + version = "1.16.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "cb189bd98b2e7ac02df389b6212846ab20661f4bafe16b5a70a6f1728c1cc7cb"; + sha256 = "31d3fe5b673e99d33d70cfee2ea8fe8dccd60f265c3ed990873a88647e3dd288"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 2b37bab525e7..7fb1de53dbd9 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/oath/default.nix b/pkgs/development/python-modules/oath/default.nix new file mode 100644 index 000000000000..a64eeb8e1036 --- /dev/null +++ b/pkgs/development/python-modules/oath/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "oath"; + version = "1.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xqgcqgx6aa0j21hwsdb3aqpqhviwj756bcqjjjcm1h1aij11p6m"; + }; + + meta = with stdenv.lib; { + description = "Python implementation of the three main OATH specifications: HOTP, TOTP and OCRA"; + homepage = "https://github.com/bdauvergne/python-oath"; + license = licenses.bsd3; + maintainers = with maintainers; [ aw ]; + }; +} diff --git a/pkgs/development/python-modules/oauth2/default.nix b/pkgs/development/python-modules/oauth2/default.nix index e01ef7c902d9..09bde0cfa7c8 100644 --- a/pkgs/development/python-modules/oauth2/default.nix +++ b/pkgs/development/python-modules/oauth2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { description = "Library for OAuth version 1.0"; license = licenses.mit; maintainers = with maintainers; [ garbas ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 61259764becf..cdf88db632ca 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -1,31 +1,33 @@ { stdenv , buildPythonPackage -, fetchurl +, fetchPypi , mock -, nose -, unittest2 +, pytest , cryptography , blinker , pyjwt }: buildPythonPackage rec { - version = "2.0.0"; + version = "3.0.1"; pname = "oauthlib"; - src = fetchurl { - url = "https://github.com/idan/oauthlib/archive/v${version}.tar.gz"; - sha256 = "02b645a8rqh4xfs1cmj8sss8wqppiadd1ndq3av1cdjz2frfqcjf"; + src = fetchPypi { + inherit pname version; + sha256 = "0ce32c5d989a1827e3f1148f98b9085ed2370fc939bf524c9c851d8714797298"; }; - buildInputs = [ mock nose unittest2 ]; + checkInputs = [ mock pytest ]; propagatedBuildInputs = [ cryptography blinker pyjwt ]; + checkPhase = '' + py.test tests/ + ''; + meta = with stdenv.lib; { homepage = https://github.com/idan/oauthlib; - downloadPage = https://github.com/idan/oauthlib/releases; description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; maintainers = with maintainers; [ prikhi ]; + license = licenses.bsd3; }; - } diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix index 161272ce1a73..f4dba0858dbf 100644 --- a/pkgs/development/python-modules/odfpy/default.nix +++ b/pkgs/development/python-modules/odfpy/default.nix @@ -3,26 +3,30 @@ , fetchPypi , python , isPy27 +, defusedxml +, pytest }: buildPythonPackage rec { pname = "odfpy"; - version = "1.3.6"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "6bcaf3b23aa9e49ed8c8c177266539b211add4e02402748a994451482a10cb1b"; + sha256 = "596021f0519623ca8717331951c95e3b8d7b21e86edc7efe8cb650a0d0f59a2b"; }; - # Python 2.7 uses a different ordering for xml namespaces. - # The testAttributeForeign test expects "ns44", but fails since it gets "ns43" - checkPhase = " " + lib.optionalString (!isPy27) '' - ${python.interpreter} -m unittest discover -s tests + propagatedBuildInputs = [ defusedxml ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest ''; meta = { description = "Python API and tools to manipulate OpenDocument files"; - homepage = "https://joinup.ec.europa.eu/software/odfpy/home"; + homepage = https://github.com/eea/odfpy; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index 9b88a71c5cc0..116ba717add6 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { homepage = "https://github.com/Tigge/openant"; description = "ANT and ANT-FS Python Library"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index ca05cccd0374..211e7a366275 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.5.12"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "7bcf019a0be528673a8aec1e60b5c863342c3231962dbf7922fd4da42a49a91a"; + sha256 = "70da6b45a5925285b6a3d93570b45f4402eb2d335740163a58eef533b139565c"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix index dc86068becb4..d26459acf704 100644 --- a/pkgs/development/python-modules/ordered-set/default.nix +++ b/pkgs/development/python-modules/ordered-set/default.nix @@ -1,10 +1,10 @@ -{ buildPythonPackage, fetchPypi, lib, pytest, pytestrunner }: +{ buildPythonPackage, fetchPypi, lib, pytest }: buildPythonPackage rec { pname = "ordered-set"; version = "3.1"; - buildInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index 474609220cfa..017f75d991ce 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "ovh"; - version = "0.4.8"; + version = "0.5.0"; # Needs yanc doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "79fa4bdc61b9953af867676a9558d9e792b9fde568c980efe848a40565a217cd"; + sha256 = "f74d190c4bff0953d76124cb8ed319a8a999138720e42957f0db481ef4746ae8"; }; meta = { diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index a5b7218d8864..2a3302aea387 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "packaging"; - version = "18.0"; + version = "19.0"; src = fetchPypi { inherit pname version; - sha256 = "0886227f54515e592aaa2e5a553332c73962917f2831f1b0f9b9f4380a4b9807"; + sha256 = "0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af"; }; propagatedBuildInputs = [ pyparsing six ]; diff --git a/pkgs/development/python-modules/pamela/default.nix b/pkgs/development/python-modules/pamela/default.nix index 05254e4fd43e..9a55719d77f3 100644 --- a/pkgs/development/python-modules/pamela/default.nix +++ b/pkgs/development/python-modules/pamela/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pamela"; - version = "0.3.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0ssxbqsshrm8p642g3h6wsq20z1fsqhpdvqdm827gn6dlr38868y"; + sha256 = "65c9389bef7d1bb0b168813b6be21964df32016923aac7515bdf05366acbab6c"; }; postUnpack = '' diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index a6ef3b22e412..844a66392c65 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.1.0"; pname = "pamqp"; src = fetchPypi { inherit pname version; - sha256 = "701b0c41b68eb86bad6f111658917992780d56a3f094a6cad87ef217afa8296d"; + sha256 = "e1fa1107a195993fca6e04f1eb7286b60e223c958944d7808a501258ccc0ef8c"; }; buildInputs = [ mock nose pep8 pylint mccabe ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 2562975e5922..1944e23f4b49 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -20,6 +20,7 @@ , openpyxl , tables , xlwt +, runtimeShell , libcxx ? null }: @@ -97,8 +98,8 @@ in buildPythonPackage rec { # Until then we disable the tests. + optionalString isDarwin '' # Fake the impure dependencies pbpaste and pbcopy - echo "#!${stdenv.shell}" > pbcopy - echo "#!${stdenv.shell}" > pbpaste + echo "#!${runtimeShell}" > pbcopy + echo "#!${runtimeShell}" > pbpaste chmod a+x pbcopy pbpaste export PATH=$(pwd):$PATH '' + '' diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index 2d4f6a9e9f4e..74a223d7f808 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "paperspace"; - version = "0.0.13"; + version = "0.0.15"; src = fetchPypi { inherit pname version; - sha256 = "824ec2aeccc6ddaba82a28b4ab74b1c81fb94206fd89c2b083eae3a61e63c2bf"; + sha256 = "af96dae7a1d84df8781aded392764953c9cbeb43d5cc314e405d3470f7c8006c"; }; propagatedBuildInputs = [ boto3 requests ]; diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index 14b41fe950bb..8d13fcfb4d54 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }: +{ stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k }: buildPythonPackage rec { pname = "parameterized"; - version = "0.6.1"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1qj1939shm48d9ql6fm1nrdy4p7sdyj8clz1szh5swwpf1qqxxfa"; + sha256 = "d8c8837fb677ed2d5a93b9e2308ce0da3aeb58cf513120d501e0b7af14da78d5"; }; # Tests require some python3-isms but code works without. doCheck = isPy3k; - checkInputs = [ nose glibcLocales ]; - propagatedBuildInputs = [ six ]; + checkInputs = [ nose mock glibcLocales ]; checkPhase = '' LC_ALL="en_US.UTF-8" nosetests -v diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 8a4881b730f7..004b58fec6a7 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.9.0"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "9dd6048ea212cd032a342f9f6aa2b7bc222f7407c7e37bdc2777fecd36897437"; + sha256 = "870dd675c1ee8951db3e29b81ebe44fd131e3eb8c03a79483a58ea574f3145c2"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix index 9ebd5e9b9ea2..82d9107bfdde 100644 --- a/pkgs/development/python-modules/parsel/default.nix +++ b/pkgs/development/python-modules/parsel/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "9ccd82b8a122345601f6f9209e972c0e8c3518a188fcff2d37cb4d7bc570b4b8"; }; - buildInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytestrunner ]; propagatedBuildInputs = [ functools32 six w3lib lxml cssselect ]; checkPhase = '' diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index c29901b2e99a..f5ecb64d2321 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "parso"; - version = "0.3.1"; + version = "0.3.4"; src = fetchPypi { inherit pname version; - sha256 = "35704a43a3c113cce4de228ddb39aab374b8004f4f2407d070b6a2ca784ce8a2"; + sha256 = "68406ebd7eafe17f8e40e15a84b56848eccbf27d7c1feb89e93d8fca395706db"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 1db458a0d0ff..ef706c65c6ca 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { checkPhase = '' rm partd/tests/test_zmq.py # requires network & fails - py.test + py.test -k "not test_serialize" ''; meta = { diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 433a67da51c9..3301521b085e 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -1,19 +1,26 @@ { stdenv , buildPythonPackage , fetchPypi -, nose +, pytestrunner +, pytest }: buildPythonPackage rec { - version = "1.5.2"; + version = "2.0.1"; pname = "PasteDeploy"; src = fetchPypi { inherit pname version; - sha256 = "d5858f89a255e6294e63ed46b73613c56e3b9a2d82a42f1df4d06c8421a9e3cb"; + sha256 = "d423fb9d51fdcf853aa4ff43ac7ec469b643ea19590f67488122d6d0d772350a"; }; - buildInputs = [ nose ]; + buildInputs = [ pytestrunner ]; + + checkInputs = [ pytest ]; + + # no tests in PyPI tarball + # should be included with versions > 2.0.1 + doCheck = false; meta = with stdenv.lib; { description = "Load, configure, and compose WSGI applications and servers"; diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index ac85b4be1200..fe89e6e5aeab 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "2.0.2"; + version = "3.0.0"; pname = "PasteScript"; src = fetchPypi { inherit pname version; - sha256 = "c03f249805538cc2328741ae8d262a9200ae1c993119b3d9bac4cd422cb476c0"; + sha256 = "d9d4d98df8606ad3bfa77be4722207d1a53a0fbcc714ee75d0fcd8a5c3f775c3"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 0756174fec6c..814854596e9d 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pathos"; - version = "0.2.2.1"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "69486cfe8c9fbd028395df445e4205ea3001d7ca5608d8d0b67b67ce98bb8892"; + sha256 = "954c5b0a8b257c375e35d311c65fa62a210a3d65269195557de38418ac9f61f9"; }; propagatedBuildInputs = [ dill pox ppft multiprocess ]; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index b3d13a0f6482..6beba7717014 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.1.1"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "f59d71442f9ece3dffc17bc36575768e1ee9967756e6b6535f0ee1f0054c3d68"; + sha256 = "d717573351cfe09f49df61906cd272abaa759b3e91744396b804965ff7bff38b"; }; # circular dependencies with fixtures diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index 32a4581676bc..d8fa26abf742 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.3.1"; + version = "1.4.1"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "0igkzl12582iq6bh6dycw9bcz2459rs6gybq9mranj54yfgjl2ky"; + sha256 = "c417149cb5ca52021203943e0eeb95db53580afebe728086e69671add4daeb08"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 90f6d5a85e01..f0ac35feefdc 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pex"; - version = "1.5.3"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "a0244c9e25172598fca73cb61e2a2f133503565c95d99210c3d5c0e85950c4bd"; + sha256 = "724588ce982222a3020ad3de50e0912915815175771b35e59fe06fdf1db35415"; }; prePatch = '' @@ -24,6 +24,7 @@ buildPythonPackage rec { homepage = "https://github.com/pantsbuild/pex"; license = licenses.asl20; maintainers = with maintainers; [ copumpkin ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/pg8000/1_12.nix b/pkgs/development/python-modules/pg8000/1_12.nix new file mode 100644 index 000000000000..26b9cf4f6a96 --- /dev/null +++ b/pkgs/development/python-modules/pg8000/1_12.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytz +, six +}: + +buildPythonPackage rec { + pname = "pg8000"; + version = "1.12.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yc3knh28cx3rjb2ifg5kmqqa78yyyw2gzzslbm9fj0mzh5aq1sx"; + }; + + propagatedBuildInputs = [ pytz six ]; + + meta = with stdenv.lib; { + homepage = https://github.com/tlocke/pg8000; + description = "PostgreSQL interface library, for asyncio"; + maintainers = with maintainers; [ garbas domenkozar ]; + platforms = platforms.unix; + }; + +} + diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index a0e8d08a2c7b..d8e04f56146e 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -7,20 +7,20 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.12.4"; + version = "1.13.1"; src = fetchPypi { inherit pname version; - sha256 = "903a19158e9efda326908bb4b70a71d31f640b4326576774433ab11fd4e46f39"; + sha256 = "2208c7aaffe8d61f5c4ccbefeb74ba033003899e64aee37c0eb98aadae8b9c6b"; }; propagatedBuildInputs = [ pytz six ]; meta = with stdenv.lib; { - homepage = https://github.com/mfenniak/pg8000; + homepage = https://github.com/tlocke/pg8000; description = "PostgreSQL interface library, for asyncio"; maintainers = with maintainers; [ garbas domenkozar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index b2ce1fb8f98b..8c653ce060aa 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0yvlxv9vy0hbfgf0xcwl7wh5hg6cl86arsv1ip3kvn9znn6x8kgl"; }; - buildInputs = [ pytest psycopg2 ]; + checkInputs = [ pytest psycopg2 ]; propagatedBuildInputs = [ click sqlparse ]; checkPhase = '' diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 4e94c1a71407..4fcc20d2d0d7 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.3"; + version = "8.10.6"; src = fetchPypi { inherit pname version; - sha256 = "0d870906c6019b41bd4b3720f804aec85a21fd78a7676ac260dcbf218b4e7097"; + sha256 = "2fe47dbf947cc74643ef1a49411466483d1165ced2b62578a14b513dd09642a9"; }; meta = { diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 903b2b90c300..026d466d2185 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "1.13.2.107"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "72f06728c98b9a7ab3db2d6fa2ae5d029029fbcff4e8fcfbc29f1e2620a0f905"; + sha256 = "46baf7c4571fe75374071674727c2beb0388cf57073e0623d8457f04b1c54495"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ]; diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index bbf2c687ce56..680094357500 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pid"; - version = "2.2.1"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "636cb4743a6e6fb1d89efcfd772e6deb5a058590f3531703595d776507098d7b"; + sha256 = "077da788630394adce075c88f4a087bcdb27d98cab67eb9046ebcfeedfc1194d"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 5651884928c8..e0791248e266 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "Pillow"; - version = "5.3.0"; + version = "5.4.1"; src = fetchPypi { inherit pname version; - sha256 = "2ea3517cd5779843de8a759c2349a3cd8d3893e03ab47053b66d5ec6f8bc4f93"; + sha256 = "5233664eadfa342c639b9b9977190d64ad7aca4edc51a966394d7e08e7f38a9f"; }; doCheck = !stdenv.isDarwin && !isPyPy; diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index d6806308e550..8bbda8bd51f1 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -1,21 +1,27 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi +, isPy27 +, funcsigs }: buildPythonPackage rec { pname = "pint"; - version = "0.8.1"; + version = "0.9"; src = fetchPypi { - inherit pname version; - sha256 = "afcf31443a478c32bbac4b00337ee9026a13d0e2ac83d30c79151462513bb0d4"; + inherit version; + pname = "Pint"; + sha256 = "32d8a9a9d63f4f81194c0014b3b742679dce81a26d45127d9810a68a561fe4e2"; }; - meta = with stdenv.lib; { + propagatedBuildInputs = lib.optional isPy27 funcsigs; + + meta = with lib; { description = "Physical quantities module"; license = licenses.bsd3; homepage = "https://github.com/hgrecco/pint/"; + maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index de35a06d6d47..3c3183da2737 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "3.1.0"; + version = "3.3.2"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pip-tools/${name}.tar.gz"; - sha256 = "0w1qdkr5n612nb3b890mbdyjb3cxn2mna1c7ysr4d0x4nh1wmkmi"; + sha256 = "100496b15463155f4da3df04c2ca0068677e1ee74d346ebade2d85eef4de8cda"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 7fc5adee7fbc..da5fc24fb22e 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pip"; - version = "18.1"; + version = "19.0.3"; src = fetchPypi { inherit pname version; - sha256 = "c0a292bd977ef590379a3f05d7b7f65135487b67470f6281289a94e015650ea1"; + sha256 = "6e6f197a1abfb45118dbb878b5c859a0edbdd33fd250100bc015b67fded4b9f2"; }; # pip detects that we already have bootstrapped_pip "installed", so we need diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 4619400b6e35..37c999e86b4c 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -16,8 +16,13 @@ buildPythonPackage rec { sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf"; }; + nativeBuildInputs = with pkgs; [ + swig1 coin3d soqt + ]; + buildInputs = with pkgs; with xorg; [ - swig1 coin3d soqt libGLU_combined + coin3d soqt + libGLU_combined libXi libXext libSM libICE libX11 ]; diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index 38098b432e45..ab8c2f638b41 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -4,6 +4,8 @@ buildPythonPackage rec { pname = "pkgconfig"; version = "1.4.0"; + setupHook = pkgconfig.setupHook; + src = fetchPypi { inherit pname version; sha256 = "048c3b457da7b6f686b647ab10bf09e2250e4c50acfe6f215398a8b5e6fcdb52"; diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index db323e671d40..879274a16c32 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.4.2"; + version = "1.5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "5878d542a4b3f237e359926384f1dde4e099c9f5525d236b1840cf704fa8d474"; + sha256 = "7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb"; }; doCheck = false; # I don't know why, but with doCheck = true it fails. diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 87c594e473d7..8577441cf9d2 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "2.3.4"; + version = "2.4.1"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "fefa30cbd1114844a07b6a37d95fd6657774ce8a551a2ac79641887cd63c72db"; + sha256 = "2b7832f9fe0c6cd23dfdb805bcfc52e2ff06fca6604e5782b7518904c1dad6bb"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index ac6cdc31f485..e794b53950ee 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi, fetchpatch , plaster, PasteDeploy , pytest, pytestcov }: @@ -12,6 +12,15 @@ buildPythonPackage rec { sha256 = "c231130cb86ae414084008fe1d1797db7e61dc5eaafb5e755de21387c27c6fae"; }; + patches = [ + # Fix tests compatibility with PasteDeploy 2+ + # https://github.com/Pylons/plaster_pastedeploy/pull/17 + (fetchpatch { + url = https://github.com/Pylons/plaster_pastedeploy/commit/d77d81a57e917c67a20332beca8f418651172905.patch; + sha256 = "0n5vnqn8kad41kn9grcwiic6c6rhvy1ji3w81s2v9xyk0bd9yryf"; + }) + ]; + checkPhase = '' py.test ''; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 20a9c7ca9812..6a2d49996b3d 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.4.2"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0bv4gq60mrkw0r5kmakxrnfawlim01bjf3khp62p0qmhw0ixk269"; + sha256 = "3cfc53346fa5c32432f13b0c20c272f9cf48f9af9c15f8f77745fb602c12bd91"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index c4b884e1d3dc..98d189d62b1c 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchPypi, buildPythonPackage, pytest, tox }: buildPythonPackage rec { - version = "0.7"; + version = "1.0.0"; pname = "pluginbase"; buildInputs = [ pytest tox ]; src = fetchPypi { inherit pname version; - sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8"; + sha256 = "497894df38d0db71e1a4fbbfaceb10c3ef49a3f95a0582e11b75f8adaa030005"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 6a7f09a1451a..3f6f3ab13bf3 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "plyfile"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "067e384e3723f28dbbd8e8f976a9712dadf6761b2d62c4c1a90821e3c5310bce"; + sha256 = "84ba5ee8c70a4924f64aa7edff5764b929f3b7842d53a3197d0b753818ad7089"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index bb0b56b1e9c0..9ce01c098fd4 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast and feature-rich Python interface to LevelDB"; - platforms = platforms.linux; + platforms = platforms.unix; homepage = https://github.com/wbolster/plyvel; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 6f7ebc4cbc92..05d7a116a5a0 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -40,8 +40,9 @@ in buildPythonPackage rec { }; postPatch = '' - substituteInPlace pyproject.toml --replace "3.0a3" "3.0.0a3" - substituteInPlace setup.py --replace "3.0a3" "3.0.0a3" + substituteInPlace setup.py --replace \ + "requests-toolbelt>=0.8.0,<0.9.0" \ + "requests-toolbelt>=0.8.0,<0.10.0" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index c7c888f6a00e..a8dc0e9907af 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools_scm, tempora, pytest-flake8 }: +, pytest, setuptools_scm, tempora }: buildPythonPackage rec { pname = "portend"; @@ -10,11 +10,15 @@ buildPythonPackage rec { sha256 = "b7ce7d35ea262415297cbfea86226513e77b9ee5f631d3baa11992d663963719"; }; + postPatch = '' + substituteInPlace pytest.ini --replace "--flake8" "" + ''; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytest pytest-flake8 ]; + checkInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index a4538b260fde..e08fe05d8226 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0c1lm3i4yngi1qclb0hny19vwjd2si5k2qni30wcrnxqqasqak1y"; + sha256 = "19c0f950x544ndsdkfhga58x69iiin2vqiz59pqn9mymk2vrlpkg"; }; meta = { diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index ef1a18e7ab14..18aa9cb7369d 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pox"; - version = "0.2.4"; + version = "0.2.5"; src = fetchPypi { inherit pname version; - sha256 = "9c8955d9beed4f9fd509587d17820efe6bc9f9b4a1abe581642aeed9a41784ea"; + sha256 = "2b53fbdf02596240483dc2cb94f94cc21252ad1b1858c7b1c151afeec9022cc8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 69c4da786fe1..770b3a5a73e0 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -6,13 +6,17 @@ buildPythonPackage rec { pname = "ppft"; - version = "1.6.4.8"; + version = "1.6.4.9"; src = fetchPypi { inherit pname version; - sha256 = "7e1aa0d74f832f0528234890165f3e64d34b3103ec1db7c93c9e7f2ad8cc18d2"; + sha256 = "5537b00afb7b247da0f59cc57ee5680178be61c8b2e21b5a0672b70a3d247791"; }; + checkPhase = '' + python -m ppft.tests + ''; + propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index f8f3d5458a08..ede3e07390cf 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub , requests, decorator, flake8, mock, six, update_checker, pytestrunner, prawcore -, pytest, betamax, betamax-serializers, betamax-matchers, requests_toolbelt +, pytest_3, betamax, betamax-serializers, betamax-matchers, requests_toolbelt }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytest_3 betamax betamax-serializers betamax-matchers diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index 5e169306b2f1..14fa0d2f59d4 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "premailer"; - version = "3.2.0"; + version = "3.3.0"; meta = { description = "Turns CSS blocks into style attributes "; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ca97cec6115fea6590b49558c55d891996f9eb4da6490c7b60c3a8af4c8c0735"; + sha256 = "93be4f197e9d2a87a8fe6b5b6a79b64070dbb523108dfaf2a415b4558fc78ec1"; }; buildInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/priority/deadline.patch b/pkgs/development/python-modules/priority/deadline.patch new file mode 100644 index 000000000000..174dbc2b199c --- /dev/null +++ b/pkgs/development/python-modules/priority/deadline.patch @@ -0,0 +1,39 @@ +From 9d933c3c6535c1c63291e3d35f4ada9135d422df Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Mon, 11 Mar 2019 02:08:43 +0000 +Subject: [PATCH] Allow test_period_of_repetition to be slow + +Recent versions of hypothesis default to a 200ms timeout, which wasn't +enough for my Thinkpad X220 to run this test. I've increased the timeout +for this single test to hopefully a reasonable amount for older +hardware. + +(cherry picked from commit 752beb3a32b59f54168816da531c9d2a387f9715) +--- + test/test_priority.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test/test_priority.py b/test/test_priority.py +index c98a28d..013ce30 100644 +--- a/test/test_priority.py ++++ b/test/test_priority.py +@@ -12,7 +12,7 @@ import itertools + + import pytest + +-from hypothesis import given ++from hypothesis import given, settings + from hypothesis.strategies import ( + integers, lists, tuples, sampled_from + ) +@@ -489,6 +489,7 @@ class TestPriorityTreeOutput(object): + fairness and equidistribution. + """ + @given(STREAMS_AND_WEIGHTS) ++ @settings(deadline=None) + def test_period_of_repetition(self, streams_and_weights): + """ + The period of repetition of a priority sequence is given by the sum of +-- +2.19.2 + diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix index 90b58b665de8..f2f7a935cc41 100644 --- a/pkgs/development/python-modules/priority/default.nix +++ b/pkgs/development/python-modules/priority/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, hypothesis }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pytest, hypothesis }: buildPythonPackage rec { pname = "priority"; @@ -9,6 +9,11 @@ buildPythonPackage rec { sha256 = "1gpzn9k9zgks0iw5wdmad9b4dry8haiz2sbp6gycpjkzdld9dhbb"; }; + patches = [ + # https://github.com/python-hyper/priority/pull/135 + ./deadline.patch + ]; + checkInputs = [ pytest hypothesis ]; checkPhase = '' PYTHONPATH="src:$PYTHONPATH" pytest diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index c986cc6b9900..5ab27b67da40 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "process-tests"; - version = "2.0.1"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "f43f3540edd333bdc5d8741218e173b1dfdbce5b0a40066d75248911e5340a06"; + sha256 = "7ae24a680cc7c44e7687e3723e6e64597a28223ad664989999efe10dd38c2431"; }; # No tests diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 362e73c0d71e..7a3d2264c283 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -7,7 +7,7 @@ , sphinx , flake8 , pytestpep8 -, pytestflakes +, pytest-flakes , pytestcov , pytestcache , pytestrunner @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-utils ]; nativeBuildInputs = [ pytestrunner ]; checkInputs = [ - pytest sphinx flake8 pytestpep8 pytestflakes pytestcov + pytest sphinx flake8 pytestpep8 pytest-flakes pytestcov pytestcache freezegun ]; # ignore tests on the nix wrapped setup.py and don't flake .eggs directory diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix index d358bbec1da6..67b828387980 100644 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ b/pkgs/development/python-modules/prometheus_client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "prometheus_client"; - version = "0.4.2"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "046cb4fffe75e55ff0e6dfd18e2ea16e54d86cc330f369bebcc683475c8b68a9"; + sha256 = "e8c11ff5ca53de6c3d91e1510500611cafd1d247a937ec6c588a0a7cc3bef93c"; }; doCheck = false; diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index cd0df6c52be7..78db87ce3cbe 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "2.0.7"; + version = "2.0.9"; src = fetchPypi { inherit pname version; - sha256 = "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx"; + sha256 = "2519ad1d8038fd5fc8e770362237ad0364d16a7650fb5724af6997ed5515e3c1"; }; checkPhase = '' py.test -k 'not test_pathcompleter_can_expanduser' diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 7a67ce292406..4f00537db0c8 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -13,8 +13,10 @@ buildPythonPackage rec { optional stdenv.isDarwin "-I${libcxx}/include/c++/v1" ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98"; - propagatedBuildInputs = [ protobuf google_apputils ]; - buildInputs = [ google_apputils pyext ]; + propagatedBuildInputs = [ google_apputils ]; + propagatedNativeBuildInputs = [ protobuf ]; # For protoc. + nativeBuildInputs = [ google_apputils pyext ]; + buildInputs = [ protobuf ]; patches = optional isPy37 # Python 3.7 compatibility (remove when protobuf 3.7 is released) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index eccca8ca3e6f..d46f2ddc2d17 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -1,26 +1,18 @@ { stdenv , buildPythonPackage -, fetchPypi, fetchpatch +, fetchPypi , darwin }: buildPythonPackage rec { pname = "psutil"; - version = "5.4.8"; + version = "5.5.1"; src = fetchPypi { inherit pname version; - sha256 = "6e265c8f3da00b015d24b842bfeb111f856b13d24f2c57036582568dc650d6c3"; + sha256 = "045qaqvn6k90bj5bcy259yrwcd2afgznaav3sfhphy9b8ambzkkj"; }; - patches = [ - (fetchpatch { - name = "disk_io_counters_fails.patch"; - url = "https://github.com/giampaolo/psutil/commit/8f99f3782663959062ee868bbfdbc336307a3a4d.diff"; - sha256 = "0j7wdgq8y20k27wcpmbgc1chd0vmbkxy8j0zwni1s4i7hyk64hmk"; - }) - ]; - # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 82b3edfdc0f1..dae97d87ef2a 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -2,17 +2,17 @@ buildPythonPackage rec { pname = "psycopg2"; - version = "2.7.6.1"; + version = "2.7.7"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "27959abe64ca1fc6d8cd11a71a1f421d8287831a3262bd4cacd43bbf43cc3c82"; + sha256 = "f4526d078aedd5187d0508aa5f9a01eae6a48a470ed678406da94b4cd6524b7e"; }; buildInputs = lib.optional stdenv.isDarwin openssl; - propagatedBuildInputs = [ postgresql ]; + nativeBuildInputs = [ postgresql ]; doCheck = false; diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 34134546f56d..8142f0acc615 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.6.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1j2p6w41hv7k604jbcpxvs5f04y8dsfdvd3d202l60ks0fc0agyj"; + sha256 = "56e70747add2e50846dd8bbef9a4735e82c1224ce630d1db7590b96bd59dd3f7"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index 4c6ca0bad338..676f6b22990b 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "py3exiv2"; - version = "0.4.0"; + version = "0.5.0"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "4042492db49efbdfc53e0afa89509695826b3fb74fb52444ed04f64c229a65f5"; + sha256 = "09mv7hcczayzjbd4dsrph16ab21slaiamgph9lwr1kjdw7ri5cpg"; }; buildInputs = [ exiv2 boost ]; diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix index 11fe98c664ee..0c2d5eb5c02b 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "scrypt"; - version = "0.8.6"; + version = "0.8.13"; src = fetchPypi { inherit pname version; - sha256 = "f8239b2d47fa1d40bc27efd231dc7083695d10c1c2ac51a99380360741e0362d"; + sha256 = "1377b1adc98c4152694bf5d7e93b41a9d2e9060af69b747cfad8c93ac426f9ea"; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix index 3931078c12ed..16b98320e8e4 100644 --- a/pkgs/development/python-modules/py_stringmatching/default.nix +++ b/pkgs/development/python-modules/py_stringmatching/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "py_stringmatching"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0rjsx7iipn6svki21lmsza7b0dz9vkgmix696zryiv7gkhblqyb4"; + sha256 = "c46db1e855cef596dfbbe1bd48fcabb30736479eff602c2bf88af10f998f1532"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pyalgotrade/default.nix b/pkgs/development/python-modules/pyalgotrade/default.nix index 1d4564e9f17a..7602caf24cf1 100644 --- a/pkgs/development/python-modules/pyalgotrade/default.nix +++ b/pkgs/development/python-modules/pyalgotrade/default.nix @@ -1,23 +1,36 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k +, matplotlib , numpy -, scipy +, python-dateutil , pytz +, requests +, retrying +, scipy +, six +, tornado +, tweepy +, ws4py }: buildPythonPackage rec { pname = "pyalgotrade"; version = "0.20"; - disabled = isPy3k; src = fetchPypi { - inherit pname version; + pname = "PyAlgoTrade"; + inherit version; sha256 = "7927c87af202869155280a93ff6ee934bb5b46cdb1f20b70f7407337f8541cbd"; }; - propagatedBuildInputs = [ numpy scipy pytz ]; + propagatedBuildInputs = [ + matplotlib numpy python-dateutil pytz requests + retrying scipy six tornado tweepy ws4py + ]; + + # no tests in PyPI tarball + doCheck = false; meta = with stdenv.lib; { description = "Python Algorithmic Trading"; diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index fd1866d22f43..927963cec8d2 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "17.12.1"; + version = "18.11.0"; src = fetchPypi { inherit pname version; - sha256 = "66623c52f34d83a2c0fc963e08e8b9d0c13d88404e3b43b1852ef71eda19afa3"; + sha256 = "b96292cc409e0f222b6fecff96afd2e19cfab5d1f2606344907751d42301263a"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 899b18eecbed..32c5f38b66d0 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis pandas pytest ]; PYARROW_BUILD_TYPE = "release"; + PYARROW_WITH_PARQUET = true; PYARROW_CMAKE_OPTIONS = [ "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" @@ -24,6 +25,10 @@ buildPythonPackage rec { "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" ]; + preBuild = '' + export PYARROW_PARALLEL=$NIX_BUILD_CORES + ''; + preCheck = '' rm pyarrow/tests/test_jvm.py rm pyarrow/tests/test_hdfs.py @@ -43,13 +48,15 @@ buildPythonPackage rec { # when it is not intended to be imported at all rm pyarrow/tests/deserialize_buffer.py substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled" + + # Fails to bind a socket + # "PermissionError: [Errno 1] Operation not permitted" + substituteInPlace pyarrow/tests/test_ipc.py --replace "test_socket_" "_disabled" ''; ARROW_HOME = _arrow-cpp; PARQUET_HOME = _arrow-cpp; - setupPyBuildFlags = ["--with-parquet" ]; - checkPhase = '' mv pyarrow/tests tests rm -rf pyarrow diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 96304606cdfa..0bef3f9e69f5 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyasn1-modules"; - version = "0.2.3"; + version = "0.2.4"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "d14fcb29dabecba3d7b360bf72327c26c385248a5d603cf6be5f566ce999b261"; + sha256 = "a52090e8c5841ebbf08ae455146792d9ef3e8445b21055d3a3b7ed9c712b7c7c"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index 60ab64655551..afc353d182c4 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pybase64"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "d415057b17bd8acf65e7a2f5d25e468b5b39df3290c7d9dbb75c0785afbdf3cf"; + sha256 = "b26263fb6aff11b1e62965c3bac205c4ebe147f37c213191384acafea7f8ab50"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 0bdac6594062..f49c50185db7 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch }: buildPythonPackage rec { pname = "pybind11"; @@ -9,6 +9,13 @@ buildPythonPackage rec { sha256 = "1kz1z2cg3q901q9spkdhksmcfiskaghzmbb9ivr5mva856yvnak4"; }; + patches = [ + (fetchpatch { + url = https://github.com/pybind/pybind11/commit/44a40dd61e5178985cfb1150cf05e6bfcec73042.patch; + sha256 = "047nzyfsihswdva96hwchnp4gj2mlbiqvmkdnhxrfi9sji8x31ka"; + }) + ]; + # Current PyPi version does not include test suite doCheck = false; diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index 2ba0e653e774..629fdd0114d8 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pycapnp"; - version = "0.6.3"; + version = "0.6.4"; disabled = isPyPy || isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b3c5a1fcc93fd02fdc070aeccb89654b87f20bdc740f643cc6378925ed6d4c17"; + sha256 = "44e14a5ace399cf1753acb8bbce558b8c895c48fd2102d266c34eaff286824cf"; }; buildInputs = [ capnproto cython ]; diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index 341e9519d80c..f68a10d6186e 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -1,21 +1,29 @@ { stdenv , buildPythonPackage , fetchPypi -, pkgs +, python +, c-ares +, cffi }: buildPythonPackage rec { pname = "pycares"; - version = "2.4.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "15pwsxsj1nr33n6x2918bfbzdnqv1qkwd2d5jgvxsm81zxnvgk0f"; + sha256 = "b253f5dcaa0ac7076b79388a3ac80dd8f3bd979108f813baade40d3a9b8bf0bd"; }; - propagatedBuildInputs = [ pkgs.c-ares ]; + buildInputs = [ c-ares ]; - # No tests included + propagatedBuildInputs = [ cffi ]; + + checkPhase = '' + ${python.interpreter} tests/tests.py + ''; + + # requires network access doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix index 6d670006014b..4a5577d7e0bb 100644 --- a/pkgs/development/python-modules/pycdio/default.nix +++ b/pkgs/development/python-modules/pycdio/default.nix @@ -23,8 +23,8 @@ buildPythonPackage rec { patchShebangs . ''; - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = [ setuptools nose pkgs.swig pkgs.libcdio ] + nativeBuildInputs = [ nose pkgs.pkgconfig pkgs.swig ]; + buildInputs = [ setuptools pkgs.libcdio ] ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv; # Run tests using nosetests but first need to install the binaries diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index bda05a58e150..0f42af006195 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "2.4.0"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0q012ghssk2xhm17v28sc2lv62vk7wd5p7zzdbgxk6kywfx8yvm2"; + sha256 = "7ce4eeb398a73c26bd65870739c94845da60f4527ebe2f104826ee32d70d035c"; }; disabled = !isPy3k; @@ -18,6 +18,6 @@ buildPythonPackage rec { homepage = https://github.com/balloob/pychromecast; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 43a8e6f9f450..4671a8e78466 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -1,22 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pycodestyle"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "cbfca99bd594a10f674d0cd97a3d802a1fdef635d4361e1a2658de47ed261e3a"; + sha256 = "e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c"; }; - patches = [ - # https://github.com/PyCQA/pycodestyle/pull/801 - (fetchpatch { - url = https://github.com/PyCQA/pycodestyle/commit/397463014fda3cdefe8d6c9d117ae16d878dc494.patch; - sha256 = "01zask2y2gim5il9lcmlhr2qaadv9v7kaw1y619l8xbjhpbq2zh8"; - }) - ]; - meta = with lib; { description = "Python style guide checker (formerly called pep8)"; homepage = https://pycodestyle.readthedocs.io; diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 6ae90ac55243..7594c7c1e570 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "PyContracts"; - version = "1.8.8"; + version = "1.8.12"; src = fetchPypi { inherit pname version; - sha256 = "0njcssvjj2aisb52xp9jmfps43iqg3fw4grj524i911p34yln2va"; + sha256 = "e76adbd832deec28b2045a6094c5bb779a0b2cb1105a23b3efafe723e2c9937a"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 473d81c73bd9..e4b66b907cae 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - version = "3.7.2"; + version = "3.7.3"; pname = "pycryptodome"; src = fetchPypi { inherit pname version; - sha256 = "f5fc7e3b2d29552f0383063408ce2bd295e9d3c7ef13377599aa300a3d2baef7"; + sha256 = "1a222250e43f3c659b4ebd5df3e11c2f112aab6aef58e38af55ef5678b9f0636"; }; meta = { diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 61a0df7accda..62613c747654 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; - version = "3.7.2"; + version = "3.7.3"; meta = { description = "A self-contained cryptographic library for Python"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "5d4e10ad9ff7940da534119ef92a500dcf7c28351d15e12d74ef0ce025e37d5b"; + sha256 = "b70fe991564e178af02ccf89435a8f9e8d052707a7c4b95bf6027cb785da3175"; }; } diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index c437df9cd99c..9fb27c88c029 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { }; buildInputs = [ curl openssl.out ]; + nativeBuildInputs = [ curl ]; checkInputs = [ bottle pytest nose flaky ]; diff --git a/pkgs/development/python-modules/pyepsg/default.nix b/pkgs/development/python-modules/pyepsg/default.nix index dd8c987401d1..4822e528deea 100644 --- a/pkgs/development/python-modules/pyepsg/default.nix +++ b/pkgs/development/python-modules/pyepsg/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyepsg"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0ng0k140kzq3xcffi4vy10py4cmwzfy8anccysw3vgn1x30ghzjr"; + sha256 = "2d08fad1e7a8b47a90a4e43da485ba95705923425aefc4e2a3efa540dbd470d7"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix index fdc76493da8c..bed1dffa5c72 100644 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ b/pkgs/development/python-modules/pyfftw/default.nix @@ -1,18 +1,18 @@ { stdenv, buildPythonPackage, fetchPypi -, fftw, fftwFloat, fftwLongDouble, numpy, scipy }: +, fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }: buildPythonPackage rec { - version = "0.10.4"; + version = "0.11.1"; pname = "pyFFTW"; src = fetchPypi { inherit pname version; - sha256 = "739b436b7c0aeddf99a48749380260364d2dc027cf1d5f63dafb5f50068ede1a"; + sha256 = "05ea28dede4c3aaaf5c66f56eb0f71849d0d50f5bc0f53ca0ffa69534af14926"; }; buildInputs = [ fftw fftwFloat fftwLongDouble]; - propagatedBuildInputs = [ numpy scipy ]; + propagatedBuildInputs = [ numpy scipy cython dask ]; # Tests cannot import pyfftw. pyfftw works fine though. doCheck = false; diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix index 622c366cd8d1..d8256e9632a3 100644 --- a/pkgs/development/python-modules/pyfiglet/default.nix +++ b/pkgs/development/python-modules/pyfiglet/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "0.8.post0"; + version = "0.8.post1"; pname = "pyfiglet"; src = fetchPypi { inherit pname version; - sha256 = "1kjskfbkm28rajcj0aa0v5w1v4p6r9y0hlhzz2bwsxvwlqg4b519"; + sha256 = "c6c2321755d09267b438ec7b936825a4910fec696292139e664ca8670e103639"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 3f799c1962a8..354535d47ac5 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,17 +2,14 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "9a7662ec724d0120012f6e29d6248ae3727d821bba522a0e6b356eff19126a49"; + sha256 = "5e8c00e30c464c99e0b501dc160b13a14af7f27d4dffb529c556e30a159e231d"; }; - buildInputs = [ unittest2 ]; - - # https://github.com/PyCQA/pyflakes/issues/386 - doCheck = false; + checkInputs = [ unittest2 ]; meta = with stdenv.lib; { homepage = https://launchpad.net/pyflakes; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 8fbd73dfc1f5..199107022dfe 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPythonPackage, python, libX11 +{ lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11 , SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype }: @@ -6,11 +6,15 @@ buildPythonPackage rec { pname = "pygame"; version = "1.9.4"; - src = fetchurl { - url = "mirror://pypi/p/pygame/pygame-${version}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "700d1781c999af25d11bfd1f3e158ebb660f72ebccb2040ecafe5069d0b2c0b6"; }; + nativeBuildInputs = [ + pkg-config SDL + ]; + buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg portmidi libX11 freetype @@ -35,7 +39,7 @@ buildPythonPackage rec { LOCALBASE=/ ${python.interpreter} config.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for games"; homepage = http://www.pygame.org/; license = licenses.lgpl21Plus; diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index 916bf7f692d2..18eced7e8067 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "pygame_sdl2"; version = "2.1.0"; - renpy_version = "6.99.14"; + renpy_version = "7.2.0"; name = "${pname}-${version}-${renpy_version}"; src = fetchurl { url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz"; - sha256 = "1zsnb2bivbwysgxmfg9iv12arhpf3gqkmqinhciz955hlqv016b9"; + sha256 = "1amgsb6mm8ssf7vdcs5dr8rlxrgyhh29m4i573z1cw61ynd7vgcw"; }; # force rebuild of headers needed for install @@ -17,17 +17,13 @@ buildPythonPackage rec { rm -rf gen gen3 ''; - patches = [ - # fix for recent sdl2 - (fetchpatch { - url = "https://github.com/apoleon/pygame_sdl2/commit/ced6051f4a4559a725804cc58c079e1efea0a573.patch"; - sha256 = "08rqjzvdlmmdf8kyd8ws5lzjy1mrwnds4fdy38inkyw7saydcxyr"; - }) + nativeBuildInputs = [ + SDL2.dev cython ]; buildInputs = [ SDL2 SDL2_image SDL2_ttf SDL2_mixer - cython libjpeg libpng + libjpeg libpng ]; diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 1fcc0ef8ce48..835cdbaa6be1 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Python interface to Graphviz graph drawing package"; homepage = https://github.com/pygraphviz/pygraphviz; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index e466f800107c..acb5c9648783 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, fetchFromBitbucket , isPy3k , fetchurl , pkgs @@ -17,6 +18,18 @@ buildPythonPackage rec { sha256 = "1210fd7e20d4abc1d9166147a9f7645a2a58b655fe030ad54ab3ea0d0c6e0834"; }; + srcMissing = fetchFromBitbucket { + owner = "andybuckley"; + repo = "pyhepmc"; + rev = "pyhepmc-1.0.0"; + sha256 = "0vxad143pz45q94w5p0dycpk24insdsv1m5k867y56xy24bi0d4w"; + }; + + prePatch = '' + cp -r $srcMissing/hepmc . + chmod +w hepmc + ''; + patches = [ # merge PR https://bitbucket.org/andybuckley/pyhepmc/pull-requests/1/add-incoming-outgoing-generators-for/diff ./pyhepmc_export_edges.patch @@ -26,11 +39,11 @@ buildPythonPackage rec { # regenerate python wrapper preConfigure = '' - rm hepmc/hepmcwrap.py swig -c++ -I${pkgs.hepmc}/include -python hepmc/hepmcwrap.i ''; - buildInputs = [ pkgs.swig pkgs.hepmc ]; + nativeBuildInputs = [ pkgs.swig ]; + buildInputs = [ pkgs.hepmc ]; HEPMCPATH = pkgs.hepmc; diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index a12e5eb462c1..5749724162e0 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.54"; + version = "0.1.56"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3c27f303e6a424229d2d5133af593c21f7d660bdf19d3d00641fbac08a6992c5"; + sha256 = "ca9f222b99d80be4b7ef8a4427ab55368d14914a0516623e66d1da7563919169"; }; # PyPI tarball does not include tests/ directory diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 4b984566e919..f41edfc960dd 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -4,7 +4,7 @@ , pytest , six , fetchpatch -, pkgs +, icu }: buildPythonPackage rec { @@ -18,19 +18,22 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://sources.debian.org/data/main/p/pyicu/2.0.3-1/debian/patches/icu_test.patch; + url = "https://salsa.debian.org/python-team/modules/pyicu/raw/debian/2.2-2/" + + "debian/patches/icu_test.patch"; sha256 = "1iavdkyqixm9i753svl17barla93b7jzgkw09dn3hnggamx7zwx9"; }) ]; - buildInputs = [ pkgs.icu pytest ]; + nativeBuildInputs = [ icu ]; # for icu-config + buildInputs = [ icu ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { homepage = https://pypi.python.org/pypi/PyICU/; description = "Python extension wrapping the ICU C++ API"; license = licenses.mit; - platforms = platforms.linux; # Maybe other non-darwin Unix + platforms = platforms.unix; maintainers = [ maintainers.rycee ]; }; diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix index 6eeeeb20c005..153b5701b267 100644 --- a/pkgs/development/python-modules/pyinputevent/default.nix +++ b/pkgs/development/python-modules/pyinputevent/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { homepage = "https://github.com/ntzrmtthihu777/pyinputevent"; description = "Python interface to the Input Subsystem's input_event and uinput"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pyjet/default.nix b/pkgs/development/python-modules/pyjet/default.nix index ca9492cb9485..efbced9f3b32 100644 --- a/pkgs/development/python-modules/pyjet/default.nix +++ b/pkgs/development/python-modules/pyjet/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyjet"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1glcwv9ni8i40smfw6m456xjadlkackim5nk33xmas1fa96lpagg"; + sha256 = "89ce11cd4541fb573d68fd60a219e5e1bdeb94cfcfffc917b472fde2aa9a5a31"; }; # fix for python37 diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index 065cae45929a..c02c0361cf28 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -4,27 +4,17 @@ buildPythonPackage rec { pname = "PyJWT"; - version = "1.6.4"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176"; + sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; }; propagatedBuildInputs = [ cryptography ecdsa ]; checkInputs = [ pytestrunner pytestcov pytest ]; - # pytest 3.9.0 changed behavior of deprecated_call, see release notes - postPatch = '' - for x in tests/test_api_*py; do - substituteInPlace "$x" --replace AssertionError pytest.fail.Exception - done - ''; - - # https://github.com/jpadilla/pyjwt/issues/382 - doCheck = false; - meta = with lib; { description = "JSON Web Token implementation in Python"; homepage = https://github.com/jpadilla/pyjwt; diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 68c35ed0df12..bb1f60025db7 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -1,22 +1,25 @@ { lib, fetchPypi, buildPythonPackage , lxml, pycryptodome, construct -, argon2_cffi, dateutil, enum34 +, argon2_cffi, dateutil, future }: buildPythonPackage rec { pname = "pykeepass"; - version = "3.0.2"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1kfnh42nimsbdpwpny2c9df82b2n4fb5fagh54ck06f3x483vd90"; + sha256 = "2c9e2ddb03ee696ed8aa72c2cddfb81280614864e003226141d68b975aa56f6f"; }; propagatedBuildInputs = [ lxml pycryptodome construct - argon2_cffi dateutil enum34 + argon2_cffi dateutil future ]; + # no tests in PyPI tarball + doCheck = false; + meta = { homepage = https://github.com/pschmitt/pykeepass; description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)"; diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix index 7ee739752725..994ba059f9e2 100644 --- a/pkgs/development/python-modules/pykerberos/default.nix +++ b/pkgs/development/python-modules/pykerberos/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0v47p840myqgc7hr4lir72xshcfpa0w8j9n077h3njpqyn6wlbag"; }; - buildInputs = [ krb5 ]; + nativeBuildInputs = [ krb5 ]; # there are no tests doCheck = false; diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 64479a7b5af2..911275d0e5f3 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -1,12 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi, certifi, six }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, certifi, six }: buildPythonPackage rec { pname = "pylast"; - version = "2.4.0"; + version = "3.0.0"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8e883f13b70c3879fc821bbee1accf27ea4e68898f4462cbbe358f615adcbbfb"; + sha256 = "24051c52011ff18bdeaee9df084ecc90da6c627da86f3cdcfec4af2928e9bc56"; }; propagatedBuildInputs = [ certifi six ]; diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix index 8db864cc869d..ce0df266332e 100644 --- a/pkgs/development/python-modules/pylibgen/default.nix +++ b/pkgs/development/python-modules/pylibgen/default.nix @@ -1,23 +1,26 @@ -{ buildPythonPackage, python, lib, fetchPypi +{ buildPythonPackage, lib, fetchPypi , isPy3k , requests +, pytest }: buildPythonPackage rec { pname = "pylibgen"; - version = "1.3.1"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1rviqi3rf62b43cabdy8c2cdznjv034mp0qrfrzvkih4jlkhyfrh"; + sha256 = "3c2a82b47cb7225dcf4ecea27081b0185ae4d195499140cdbb9597d914e1ae9e"; }; disabled = !isPy3k; propagatedBuildInputs = [ requests ]; - # It's not using unittest - checkPhase = "${python.interpreter} tests/test_pylibgen.py -c 'test_api_endpoints()'"; + checkInputs = [ pytest ]; + + # no tests in PyPI tarball + doCheck = false; meta = { description = "Python interface to Library Genesis"; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 67066c85f052..86730bc43306 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -12,7 +12,9 @@ buildPythonPackage rec { sha256 = "689de29ae747642ab230c6d37be2b969bf75663176658851f456619aacf27492"; }; - checkInputs = [ pytest pytestrunner pyenchant ]; + nativeBuildInputs = [ pytestrunner ]; + + checkInputs = [ pytest pyenchant ]; propagatedBuildInputs = [ astroid isort mccabe ]; diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix index 40b639925a04..752755700b27 100644 --- a/pkgs/development/python-modules/pylti/default.nix +++ b/pkgs/development/python-modules/pylti/default.nix @@ -13,7 +13,7 @@ , pytestcache , pytestcov , covCore -, pytestflakes +, pytest-flakes , pytestpep8 , sphinx , mock @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ]; checkInputs = [ flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore - pytestflakes pytestpep8 sphinx mock chalice + pytest-flakes pytestpep8 sphinx mock chalice ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 8e64d5cb11d5..c3f360768d02 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2018.10.18"; + version = "2019.2.4"; src = fetchPypi { inherit pname version; - sha256 = "cf9e030abafc4cd7c33847acf4bf0677bfc707f68fed48469c672d1980a8ceb9"; + sha256 = "0932024a8703236dce861bcadd9568455baa8c70c0f7a1fc52d8ca4b52342091"; }; nativeBuildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index ebf852c09a48..a683c07d3afd 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.5"; + version = "3.6"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6088e683c6d730bb21350a0f54ee083fa5a28e4d5ef52d57878141c9c20f21ee"; + sha256 = "c00c0778d2451a348a9508f8b956fe280a0f9affd3f85140ac3948bc2902f5e9"; }; # No need for coverage stats in Nix builds diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index 2169f23295a7..61acce347ef0 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -5,28 +5,21 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "2.3.0"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "1d0mxxycacimy46b08q44xyxkyji7rrs7viwc3wkpckhqs54q24x"; + sha256 = "e76cc5525c3fc5cba61073e12365dc06f303b261d8f923aaa6eac09bf8fab245"; }; postPatch = '' substituteInPlace pymediainfo/__init__.py \ - --replace 'CDLL(library_file)' \ - 'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}")' \ - --replace 'CDLL("libmediainfo.0.dylib")' \ - 'CDLL("${libmediainfo}/lib/libmediainfo.0${stdenv.hostPlatform.extensions.sharedLibrary}")' \ - --replace 'CDLL("libmediainfo.dylib")' \ - 'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}")' \ - --replace 'CDLL("libmediainfo.so.0")' \ - 'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0")' - - # Fix test, remove after version 2.3.0 - substituteInPlace tests/test_pymediainfo.py \ - --replace 'codec, "AVC"' 'format, "AVC"' \ - --replace 'codec, "AAC LC"' 'format, "AAC"' + --replace "libmediainfo.0.dylib" \ + "${libmediainfo}/lib/libmediainfo.0${stdenv.hostPlatform.extensions.sharedLibrary}" \ + --replace "libmediainfo.dylib" \ + "${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}" \ + --replace "libmediainfo.so.0" \ + "${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0" ''; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 3fe1952213e0..fb2e9abe0651 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -1,21 +1,36 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium, cffi, six, hypothesis}: +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, libsodium +, cffi +, six +, hypothesis +}: buildPythonPackage rec { pname = "pynacl"; version = "1.3.0"; - src = fetchFromGitHub { - owner = "pyca"; - repo = pname; - rev = version; - sha256 = "0ac00d5bfdmz1x428h2scq5b34llp61yhxradl94qjwz7ikqv052"; + src = fetchPypi { + inherit version; + pname = "PyNaCl"; + sha256 = "0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c"; }; checkInputs = [ pytest hypothesis ]; - propagatedBuildInputs = [ libsodium cffi six ]; + buildInputs = [ libsodium ]; + propagatedBuildInputs = [ cffi six ]; SODIUM_INSTALL = "system"; + # fixed in next release 1.3.0+ + # https://github.com/pyca/pynacl/pull/480 + postPatch = '' + substituteInPlace tests/test_bindings.py \ + --replace "average_size=128," "" + ''; + checkPhase = '' py.test ''; diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index c217e8406e12..f950c7798b88 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynmea2"; - version = "1.12.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "185wxn8gag9whxmysspbh8s7wn3sh1glgf508w2zzwi4lklryl7i"; + sha256 = "8b83fa7e3e668af5e182ef1c2fd4a535433ecadf60d7b627280172d695a1646b"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index c0e3fb51920e..428ec1d46b89 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { description = "Python ODBC module to connect to almost any database"; homepage = "https://github.com/mkleehammer/pyodbc"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 274c72974fe6..624dca05e1e3 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -11,20 +11,21 @@ , six , opencl-headers , ocl-icd +, pybind11 }: buildPythonPackage rec { pname = "pyopencl"; - version = "2018.2.2"; + version = "2018.2.3"; checkInputs = [ pytest ]; - buildInputs = [ opencl-headers ocl-icd ]; + buildInputs = [ opencl-headers ocl-icd pybind11 ]; propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ]; src = fetchPypi { inherit pname version; - sha256 = "419375fb794d97f9bd46f0dc24ce83b5cc83d316771ba82fac80de8bf883dcdc"; + sha256 = "ebefe9505cad970dfb4c8024630ef5a546c68d22943dbb3e5677943a6d006ac6"; }; # py.test is not needed during runtime, so remove it from `install_requires` @@ -32,6 +33,10 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "pytest>=2" "" ''; + preBuild = '' + export HOME=$(mktemp -d) + ''; + # gcc: error: pygpu_language_opencl.cpp: No such file or directory doCheck = false; diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index a6e8e94e094f..7bc54cb0ffb4 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -48,11 +48,11 @@ in buildPythonPackage rec { pname = "pyOpenSSL"; - version = "18.0.0"; + version = "19.0.0"; src = fetchPypi { inherit pname version; - sha256 = "6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580"; + sha256 = "aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index c853965469a9..1392956ef036 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyowm"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "ed175873823a2fedb48e453505c974ca39f3f75006ef1af54fdbcf72e6796849"; + sha256 = "8fd41a18536f4d6c432bc6d9ea69994efb1ea9b43688cf19523659b6f4d86cf7"; }; propagatedBuildInputs = [ requests geojson ]; diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index a747d42e418a..9f7c75a02d30 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,14 +1,8 @@ -{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus, makeWrapper }: +{ stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkgconfig, lndir, dbus, makeWrapper }: -let +buildPythonPackage rec { pname = "PyQt-x11-gpl"; version = "4.12"; - - inherit (pythonPackages) buildPythonPackage python dbus-python sip; -in buildPythonPackage { - pname = pname; - name = pname + "-" + version; - version = version; format = "other"; src = fetchurl { @@ -16,7 +10,7 @@ in buildPythonPackage { sha256 = "1nw8r88a5g2d550yvklawlvns8gd5slw53yy688kxnsa65aln79w"; }; - configurePhase = '' + postPatch = '' mkdir -p $out lndir ${dbus-python} $out rm -rf "$out/nix-support" @@ -32,17 +26,24 @@ in buildPythonPackage { --replace "qt_macx_spec = 'macx-g++'" "qt_macx_spec = 'unsupported/macx-clang-libc++'" # for bootstrapping phase \ ''} - configureFlagsArray=( \ - --confirm-license --bindir $out/bin \ - --destdir $out/${python.sitePackages} \ - --plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip/PyQt4 \ - --dbus=${dbus-python}/include/dbus-1.0 --verbose) - - ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}" + chmod +x configure.py + sed -i '1i#!${python.interpreter}' configure.py ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper qt4 lndir dbus ]; + configureScript = "./configure.py"; + dontAddPrefix = true; + configureFlags = [ + "--confirm-license" + "--bindir=${placeholder "out"}/bin" + "--destdir=${placeholder "out"}/${python.sitePackages}" + "--plugin-destdir=${placeholder "out"}/lib/qt4/plugins" + "--sipdir=${placeholder "out"}/share/sip/PyQt4" + "--dbus=${stdenv.lib.getDev dbus-python}/include/dbus-1.0" + "--verbose" + ]; + + nativeBuildInputs = [ pkgconfig lndir makeWrapper qt4 ]; + buildInputs = [ qt4 dbus ]; propagatedBuildInputs = [ sip ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 2d2c04d5fb2c..47a789000b19 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -23,7 +23,7 @@ in buildPythonPackage rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig qmake lndir ]; + nativeBuildInputs = [ pkgconfig qmake lndir sip ]; buildInputs = [ dbus sip ]; diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 3f8af5b82ebf..51c6f28564fb 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pyramid"; - version = "1.10.1"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "37c3e1c9eae72817e0365e2a38143543aee8b75240701fa5cb3a1be86c01a1c0"; + sha256 = "e70a9bac805284ebe7123fdd412e22a4c1d214603b3a074ac8f1185a0dd7c63e"; }; checkInputs = [ docutils virtualenv webtest zope_component ]; diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/pkgs/development/python-modules/pyramid_beaker/default.nix index 299fba098d9d..19b26a30ad71 100644 --- a/pkgs/development/python-modules/pyramid_beaker/default.nix +++ b/pkgs/development/python-modules/pyramid_beaker/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { py.test -k 'not test_includeme' pyramid_beaker/tests.py ''; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ beaker pyramid ]; diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix index 626142ee2f2d..216fb57c2210 100644 --- a/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyramid_jinja2"; - version = "2.7"; + version = "2.8"; src = fetchPypi { inherit pname version; - sha256 = "5c21081f65a5bec0b76957990c2b89ed41f4fd11257121387110cb722fd0e5eb"; + sha256 = "81e0615cb3108f2a251ff3141ad0d698a5d03685819f3a836ea84787e8489502"; }; buildInputs = [ webtest ]; diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix index 2ea6043c4279..99c4b7116d5a 100644 --- a/pkgs/development/python-modules/pyres/default.nix +++ b/pkgs/development/python-modules/pyres/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { checkPhase = '' redis-server & - nosetests . + nosetests . --exclude test_worker_pids ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index f3bc353fe0e7..2ef68338687b 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 , graphviz, networkx, six, opt-einsum, tqdm }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.3.1.post1"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "0shsnc5bia9k1fzmqnwwbm1x5qvac3zrq4lvyhg27rjgpcamvb9l"; + sha256 = "f5174bcd1b74fb455db948413dcbf5ac1a13dbddc6c54c6d215dd2e4b6b9548d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index df8df2cb93ca..65ff765a5849 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Pyro4"; - version = "4.74"; + version = "4.75"; src = fetchPypi { inherit pname version; - sha256 = "89ed7b12c162e5124f322f992f9506c44f5e1a379926cf01ee73ef810d3bf75f"; + sha256 = "1dfpp36imddx19yv0kd28gk1l71ckhpqy6jd590wpm2680jw15rq"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 16805ac58c04..9f8103b06065 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { homepage = https://github.com/svinota/pyroute2; license = licenses.asl20; maintainers = [maintainers.mic92]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index ab9c93b9b010..10e9781b3ab1 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -1,13 +1,18 @@ -{ stdenv, buildPythonPackage, fetchPypi -, setuptools, multipledispatch, numpy }: +{ stdenv +, buildPythonPackage +, fetchPypi +, setuptools +, multipledispatch +, numpy +}: buildPythonPackage rec { - version = "0.7.2"; + version = "0.10.2"; pname = "pyrr"; src = fetchPypi { inherit pname version; - sha256 = "04a65a9fb5c746b41209f55b21abf47a0ef80a4271159d670ca9579d9be3b4fa"; + sha256 = "1q9i4qa6ygr8hlpnw55s58naynxzwm0sc1m54wyy1ghbf8m8d2f0"; }; buildInputs = [ setuptools ]; @@ -17,5 +22,6 @@ buildPythonPackage rec { description = "3D mathematical functions using NumPy"; homepage = https://github.com/adamlwgriffiths/Pyrr/; license = licenses.bsd2; + maintainers = with maintainers; [ c0deaddict ]; }; } diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index e916c907e4f1..a2b614ba3b8c 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,20 +9,17 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.14.9"; + version = "0.14.11"; src = fetchPypi { inherit pname version; - sha256 = "0xwaqjjn665wd1rllqzndmlc8yzfw2wxakpfwlh6ir6kgbajff2s"; + sha256 = "3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2"; }; propagatedBuildInputs = [ six ]; checkInputs = [ pytestrunner pytest hypothesis ]; - # pytestrunner is only needed to run tests - patches = [ ./no-setup-requires-pytestrunner.patch ]; - meta = with stdenv.lib; { homepage = https://github.com/tobgu/pyrsistent/; description = "Persistent/Functional/Immutable data structures"; diff --git a/pkgs/development/python-modules/pyrsistent/no-setup-requires-pytestrunner.patch b/pkgs/development/python-modules/pyrsistent/no-setup-requires-pytestrunner.patch deleted file mode 100644 index 74d85dc42931..000000000000 --- a/pkgs/development/python-modules/pyrsistent/no-setup-requires-pytestrunner.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/setup.py b/setup.py -index 90a39a5..7bf444f 100644 ---- a/setup.py -+++ b/setup.py -@@ -77,9 +77,8 @@ setup( - 'Programming Language :: Python :: Implementation :: PyPy', - ], - test_suite='tests', -- tests_require=['pytest','hypothesis'], -+ tests_require=['pytest-runner', 'pytest','hypothesis'], - scripts=[], -- setup_requires=['pytest-runner'], - ext_modules=extensions, - cmdclass={'build_ext': custom_build_ext}, - install_requires=['six'], diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix index a86badb3bca8..0bb240310847 100644 --- a/pkgs/development/python-modules/pyrtlsdr/default.nix +++ b/pkgs/development/python-modules/pyrtlsdr/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)"; homepage = https://github.com/roger-/pyrtlsdr; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 4784e46ffb21..a15342e17fa3 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -17,7 +17,8 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = "-isystem ${stdenv.lib.getDev pcsclite}/include/PCSC/"; propagatedBuildInputs = [ pcsclite ]; - buildInputs = [ swig ] ++ stdenv.lib.optional stdenv.isDarwin PCSC; + buildInputs = stdenv.lib.optional stdenv.isDarwin PCSC; + nativeBuildInputs = [ swig ]; meta = { homepage = https://pyscard.sourceforge.io/; diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index 62ff439afbbf..d9168f291c02 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { 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/; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index ab46c726f6c7..37ffd8e76e30 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }: +{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4, mesa }: # This derivation provides a Python module and should therefore be called via `python-packages.nix`. buildPythonPackage rec { @@ -13,7 +13,9 @@ buildPythonPackage rec { enableParallelBuilding = true; - buildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ]; + nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ]; + + buildInputs = [ mesa ]; makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner"; @@ -21,7 +23,5 @@ buildPythonPackage rec { description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; license = lib.licenses.lgpl21; homepage = http://www.pyside.org; - maintainers = [ lib.maintainers.chaoflow ]; - platforms = lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 9ad65dc76e0f..0950726172d5 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { 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/; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index 859e91c872ec..42ad55ad0b95 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { enableParallelBuilding = true; - buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ]; + nativeBuildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ]; preConfigure = '' echo "preConfigure: Fixing shiboken_generator install target." @@ -33,7 +33,7 @@ buildPythonPackage rec { 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/; - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index a56899f8d0b3..e23e63525183 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -13,13 +13,17 @@ buildPythonPackage rec { enableParallelBuilding = true; - buildInputs = [ cmake pyside qt4 pysideShiboken ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt4 ]; + + propagatedBuildInputs = [ pyside pysideShiboken ]; 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; - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix index a5a0104490aa..d80cbf41629d 100644 --- a/pkgs/development/python-modules/pyspread/default.nix +++ b/pkgs/development/python-modules/pyspread/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pyspread"; - version = "1.1.2"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "ffdfd219450f5f22ee51eb633c04941d1d608e1ceb4d3357d07683b7e5b84f83"; + sha256 = "6e5d0eb49750eed7734852e15727e190270880c75dcc5f6c8fb1bfdaa59c48fc"; }; propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ]; diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index 882aed18c591..514ff6eb8fe1 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -1,11 +1,11 @@ { stdenv -, buildPythonApplication +, buildPythonPackage , fetchFromGitHub , chardet , nose }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "pysrt"; version = "1.1.1"; @@ -16,7 +16,7 @@ buildPythonApplication rec { sha256 = "0rwjaf26885vxhxnas5d8zwasvj7x88y4y2pdivjd4vdcpqrqdjn"; }; - buildInputs = [ nose ]; + checkInputs = [ nose ]; checkPhase = '' nosetests -v ''; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 24602c522603..346530d4a819 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.9.0"; + version = "0.10.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "fbd92c067c16111174a1286bfb253660f1e564e5146b39eeed1133315cf2c2cf"; + sha256 = "9fac5100fd716cbecf6ef89233e8590a4ad61d729d1732e0a96b84182df1daaf"; }; buildInputs = [ pytest ] diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 1bb5d001ddbd..9ddec4199d7f 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytest_xdist, virtualenv, process-tests, coverage }: +, pytest, coverage }: buildPythonPackage rec { pname = "pytest-cov"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0ab664b25c6aa9716cbf203b17ddb301932383046082c081b9848a0edf5add33"; }; - buildInputs = [ pytest pytest_xdist virtualenv process-tests ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [ coverage ]; # xdist related tests fail with the following error diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index ed38b5b52651..ec28c8af4422 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.4.6"; + version = "3.4.7"; src = fetchPypi { inherit pname version; - sha256 = "0r190xb707817la5kw5i3m646ijmg025zqy55gz16py94wsnav5y"; + sha256 = "3d489db7c9bd18d7c154347b1bdfb82cc6b1ec8539543508b199c77e5eb2caec"; }; nativeBuildInputs = [ pytest setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-faulthandler/default.nix b/pkgs/development/python-modules/pytest-faulthandler/default.nix index 852de1fd49cd..f9e6846367c3 100644 --- a/pkgs/development/python-modules/pytest-faulthandler/default.nix +++ b/pkgs/development/python-modules/pytest-faulthandler/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "bf8634c3fd6309ef786ec03b913a5366163fdb094ebcfdebc35626400d790e0d"; }; - buildInputs = [ setuptools_scm pytest ]; + nativeBuildInputs = [ setuptools_scm pytest ]; checkInputs = [ pytest-mock ]; propagatedBuildInputs = lib.optional (pythonOlder "3.0") faulthandler; diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index 67ceebef3057..e9ae311d496c 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -1,18 +1,18 @@ { stdenv, buildPythonPackage, fetchPypi -, setuptools-git, pytest }: +, setuptools-git, pytest_3 }: buildPythonPackage rec { pname = "pytest-fixture-config"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08"; + sha256 = "839d70343c87d6dda5bca88e3ab06e7b2027998dc1ec452c14d50be5725180a3"; }; nativeBuildInputs = [ setuptools-git ]; - buildInputs = [ pytest ]; + buildInputs = [ pytest_3 ]; doCheck = false; diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index eb8a2e3e1177..d3b2df60399d 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pytest-flake8"; - version = "1.0.3"; + version = "1.0.4"; # although pytest is a runtime dependency, do not add it as # propagatedBuildInputs in order to allow packages depend on another version @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b2c71fb6d469bae076a01c43d4a83485d740db6a8a00bad77e0657ed035e98d4"; + sha256 = "4d225c13e787471502ff94409dcf6f7927049b2ec251c63b764a4b17447b60c0"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index 52cfed14150a..df7981e6bfc0 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -10,7 +10,8 @@ buildPythonPackage rec { sha256 = "341964bf5760ebbdde9619f68a17d5632c674c3f6903ef66daa0a4f540b3d143"; }; - buildInputs = [ pytestpep8 pytest ]; + checkInputs = [ pytestpep8 pytest ]; + nativeBuildInputs = [ pytest ]; propagatedBuildInputs = [ pyflakes ]; # disable one test case that looks broken diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 14eb3a74d577..b3ea60174a65 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-forked"; - version = "0.2"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "e4500cd0509ec4a26535f7d4112a8cc0f17d3a41c29ffd4eab479d2a55b30805"; + sha256 = "d352aaced2ebd54d42a65825722cb433004b4446ab5d2044851d9cc7a00c9e38"; }; buildInputs = [ pytest setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index e0be487e86d3..6d84ef0de7db 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -1,28 +1,23 @@ { buildPythonPackage , lib -, fetchFromGitHub +, fetchPypi , pytest -, flask -, decorator , httpbin , six -, requests }: buildPythonPackage rec { pname = "pytest-httpbin"; - version = "0.3.0"; + version = "1.0.0"; - src = fetchFromGitHub { - owner = "kevin1024"; - repo = "pytest-httpbin"; - rev = "v${version}"; - sha256 = "0p86ljx775gxxicscs1dydmmx92r1g9bs00vdvxrsl3qdll1ksfm"; + src = fetchPypi { + inherit pname version; + sha256 = "0wlvw5qgkax7f0i5ks1562s37h2hdmn5yxnp1rajcc2289zm9knq"; }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ flask decorator httpbin six requests ]; + propagatedBuildInputs = [ httpbin six ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 7daffbfa69c4..5f2516b646c5 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -9,18 +9,18 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.4.2"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0615b1698bdd2a1e6e396caf2f496020f4f69bccc0518df5050aeb02800f7c07"; + sha256 = "3a5427909d1dfda10772c1bae4b9803679c0a8f04adb66c338ac607773bfefc2"; }; propagatedBuildInputs = [ werkzeug ]; - buildInputs = [ pytest six requests ]; + checkInputs = [ pytest six requests ]; checkPhase = '' - py.test + pytest ''; meta = { diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 163063ae57fc..6a70b6e8ce97 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,15 +2,15 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.10.0"; - + version = "1.10.1"; + src = fetchPypi { inherit pname version; - sha256 = "d89a8209d722b8307b5e351496830d5cc5e192336003a485443ae9adeb7dd4c0"; + sha256 = "4d0d06d173eecf172703219a71dbd4ade0e13904e6bbce1ce660e2e0dc78b5c4"; }; - propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock; - nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = lib.optional (!isPy3k) mock; + nativeBuildInputs = [ setuptools_scm pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index 1decbeb643d6..1e8a49f90be7 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestflakes, pytestpep8, tox }: +{ stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, pytestpep8, tox }: buildPythonPackage rec { pname = "pytest-quickcheck"; version = "0.8.3"; @@ -9,7 +9,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ pytestflakes pytestpep8 tox ]; + propagatedBuildInputs = [ pytest-flakes pytestpep8 tox ]; meta = with stdenv.lib; { license = licenses.asl20; diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index aeea977ad338..2123357483be 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "6.0"; + version = "7.0"; src = fetchPypi { inherit pname version; - sha256 = "978349ae00687504fd0f9d0970c37199ccd89cbdb0cb8c4ed7ee417ede582b40"; + sha256 = "1zfm9v80bqfdapygy9wmi6j6y5c179ixpnh9ih27py4v6cqwzjgk"; }; - checkInputs = [ mock ]; + checkInputs = [ mock pytest ]; propagatedBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index caede4c18095..98cae527672f 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -1,18 +1,18 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools-git, pytest-shutil, pytest-fixture-config, psutil -, requests, future }: +, pytest_3, pytest-shutil, pytest-fixture-config, psutil +, requests, future, retry }: buildPythonPackage rec { pname = "pytest-server-fixtures"; - version = "1.3.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "902607675ce2ee09bdc72381b4470f79504fc131afdc15174e49a84d031760df"; + sha256 = "c89f9532f62cf851489082ece1ec692b6ed5b0f88f20823bea25e2a963ebee8f"; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ setuptools-git pytest-shutil pytest-fixture-config psutil requests future ]; + buildInputs = [ pytest_3 ]; + propagatedBuildInputs = [ pytest-shutil pytest-fixture-config psutil requests future retry ]; # RuntimeError: Unable to find a free server number to start Xvfb doCheck = false; diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix new file mode 100644 index 000000000000..2a4c5591a5f5 --- /dev/null +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, requests +, psutil +, pytest +, subprocess32 +}: + +buildPythonPackage rec { + pname = "pytest-services"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "035bc9ce8addb33f7c2ec95a9c0c88926d213a6c2e12b2c57da31a4ec0765f2c"; + }; + + propagatedBuildInputs = [ + requests + psutil + pytest + ] ++ lib.optional (!isPy3k) subprocess32; + + # no tests in PyPI tarball + doCheck = false; + + meta = with lib; { + description = "Services plugin for pytest testing framework"; + homepage = https://github.com/pytest-dev/pytest-services; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 4fa11dbd7d13..fedf5010b2bd 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,18 +1,19 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet +, pytest_3, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet , contextlib2, termcolor }: buildPythonPackage rec { pname = "pytest-shutil"; - version = "1.3.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "2cfe4d3f5f25ad2b19e64847d62563f5494b2e0450ca1cfc5940974029b2cbd1"; + sha256 = "efe615b7709637ec8828abebee7fc2ad033ae0f1fc54145f769a8b5e8cc3b4ca"; }; - buildInputs = [ cmdline pytest ]; + checkInputs = [ cmdline pytest_3 ]; propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; + nativeBuildInputs = [ pytest_3 ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index f000a1f937ab..3997e716817f 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -15,6 +15,11 @@ buildPythonPackage rec { sha256 = "1cczcjhw4xx5sjkhxlhc5c1bkr7x6fcyx12wrnvwfckshdvblc2a"; }; + patches = fetchpatch { + url = https://bitbucket.org/pytest-dev/pytest-timeout/commits/36998c891573d8ec1db1acd4f9438cb3cf2aee2e/raw; + sha256 = "05zc2w7mjgv8rm8i1cbxp7k09vlscmay5iy78jlzgjqkrx3wkf46"; + }; + checkInputs = [ pytest pexpect ]; checkPhase = ''pytest -ra''; diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 413d090bbcc9..ec6441870563 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -1,19 +1,21 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }: +, pytest_3, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }: buildPythonPackage rec { pname = "pytest-virtualenv"; - version = "1.3.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "8d8a0b9b57f5efb7db6457c1f57347e35fe332979ecefe592d5324430ae3ed7f"; + sha256 = "d281725d10848773cb2b495d1255dd0a42fc9179e34a274c22e1c35837721f19"; }; - buildInputs = [ pytest pytestcov mock cmdline ]; + checkInputs = [ pytest_3 pytestcov mock cmdline ]; propagatedBuildInputs = [ pytest-fixture-config pytest-shutil ]; checkPhase = '' py.test tests/unit ''; + nativeBuildInputs = [ pytest_3 ]; + meta = with stdenv.lib; { description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; homepage = https://github.com/manahl/pytest-plugins; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index a8fc1c6742b9..614a5348bceb 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "1.24.1"; + version = "1.26.1"; src = fetchPypi { inherit pname version; - sha256 = "909bb938bdb21e68a28a8d58c16a112b30da088407b678633efb01067e3923de"; + sha256 = "d03d1ff1b008458ed04fa73e642d840ac69b4107c168e06b71037c62d7813dd4"; }; nativeBuildInputs = [ setuptools_scm pytest ]; diff --git a/pkgs/development/python-modules/pytest/3.10.nix b/pkgs/development/python-modules/pytest/3.10.nix new file mode 100644 index 000000000000..f24cab8af1c6 --- /dev/null +++ b/pkgs/development/python-modules/pytest/3.10.nix @@ -0,0 +1,47 @@ +{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py +, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools +, atomicwrites, mock, writeText, pathlib2 +}: +buildPythonPackage rec { + version = "3.10.1"; + pname = "pytest"; + + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "e246cf173c01169b9617fc07264b7b1316e78d7a650055235d6d897bc80d9660"; + }; + + checkInputs = [ hypothesis mock ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] + ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] + ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + + checkPhase = '' + runHook preCheck + $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable" + runHook postCheck + ''; + + # Remove .pytest_cache when using py.test in a Nix build + setupHook = writeText "pytest-hook" '' + pytestcachePhase() { + find $out -name .pytest_cache -type d -exec rm -rf {} + + } + + preDistPhases+=" pytestcachePhase" + ''; + + meta = with stdenv.lib; { + homepage = https://docs.pytest.org; + description = "Framework for writing tests"; + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 9412a750a9ab..45572938496c 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2 }: buildPythonPackage rec { - version = "3.9.3"; + version = "4.2.1"; pname = "pytest"; preCheck = '' @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a9e5e8d7ab9d5b0747f37740276eb362e6a76275d76cebbb52c6049d93b475db"; + sha256 = "c2396a15726218a2dfef480861c4ba37bd3952ebaaa5b0fede3fc23fddcd7f8c"; }; checkInputs = [ hypothesis mock ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - $out/bin/py.test -x testing/ + $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" runHook postCheck ''; diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index 74d04cfd9277..9ed165f93b11 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -3,12 +3,12 @@ , autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.7.1"; pname = "python-binance"; src = fetchPypi { inherit pname version; - sha256 = "0h8kd88j53w6yfc60fr8a45zi30p09l98vm8yzqym4lcgx76nvps"; + sha256 = "9ce406da68bfbc209ae6852d1b8a2812708d04502f82a61b0c9ca41356cc6ab7"; }; doCheck = false; # Tries to test multiple interpreters with tox diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index 76544adaf0b6..f4704c30b5dd 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-daemon"; - version = "2.2.0"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "aca149ebf7e73f10cd554b2df5c95295d49add8666348eff6195053ec307728c"; + sha256 = "affeca9e5adfce2666a63890af9d6aff79f670f7511899edaddca7f96593cc25"; }; # A test fail within chroot builds. diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix new file mode 100644 index 000000000000..bee0cab0a3f5 --- /dev/null +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -0,0 +1,59 @@ +{ lib, buildPythonPackage, fetchPypi, + nose, dbus, dbus-python, pygobject3, + which, pyflakes, pycodestyle, bluez, networkmanager +}: + +buildPythonPackage rec { + pname = "python-dbusmock"; + version = "0.18.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hj02p65cic4jdc6a5xf1hx8j5icwy7dcrm5kg91lkjks4gwpg5h"; + }; + + prePatch = '' + sed -i -e 's|pyflakes3|pyflakes|g' tests/test_code.py; + ''; + + # TODO: Get the rest of these tests running? + # This is a mocking library used as a check dependency for a single derivation. + # That derivation's tests pass. Maybe not worth the effort to fix these... + NOSE_EXCLUDE = lib.concatStringsSep "," [ + "test_bluez4" # NixOS ships BlueZ5 + # These appear to fail because they're expecting to run in an Ubuntu chroot? + "test_everything" # BlueZ5 OBEX + "test_polkitd" + "test_consolekit" + "test_api" + "test_logind" + "test_notification_daemon" + "test_ofono" + "test_gnome_screensaver" + "test_cli" + "test_timedated" + "test_upower" + # Very slow, consider disabling? + # "test_networkmanager" + ]; + + checkInputs = [ + nose dbus dbus-python which pycodestyle pyflakes + pygobject3 bluez bluez.test networkmanager + ]; + + checkPhase = '' + runHook preCheck + export PATH="$PATH:${bluez.test}/test"; + nosetests -v + runHook postCheck + ''; + + meta = with lib; { + description = "Mock D-Bus objects for tests"; + homepage = https://github.com/martinpitt/python-dbusmock; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ callahad ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix index 94cdd8029baa..4691785dae16 100644 --- a/pkgs/development/python-modules/python-editor/default.nix +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.0.3"; + version = "1.0.4"; pname = "python-editor"; src = fetchPypi { inherit pname version; - sha256 = "a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565"; + sha256 = "51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b"; }; # No proper tests diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 1ea6dd89f2a4..1f64ff13fa03 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -8,18 +8,21 @@ , iana-etc , libredirect , aiohttp +, websockets +, websocket_client +, requests , tornado }: buildPythonPackage rec { pname = "python-engineio"; - version = "3.0.0"; + version = "3.4.3"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "1v510fhn0li808ar2cmwh5nijacy5x60q9x4gm0b34j6mkmc59ph"; + sha256 = "0wk81rqigw47z087f5kc7b9iwqggypxc62q8q818qyzqwb93ysxf"; }; propagatedBuildInputs = [ @@ -30,7 +33,10 @@ buildPythonPackage rec { eventlet mock aiohttp + websockets + websocket_client tornado + requests ]; # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 692bbe4bcd89..02097d75ac87 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -8,7 +8,16 @@ , pycairo }: -buildPythonPackage rec { +let + boost = pkgs.boost.override { + enablePython = true; + inherit python; + }; + mapnik = pkgs.mapnik.override { + inherit python boost; + }; + +in buildPythonPackage rec { pname = "python-mapnik"; version = "3.0.16"; @@ -28,25 +37,25 @@ buildPythonPackage rec { export BOOST_THREAD_LIB="boost_thread" export BOOST_SYSTEM_LIB="boost_system" ''; - buildInputs = with pkgs; [ - (boost.override { - enablePython = true; - inherit python; - }) - (mapnik.override { - inherit python; - boost = (boost.override { enablePython = true; inherit python; }); - }) - cairo - harfbuzz - icu - libjpeg - libpng - libtiff - libwebp - proj - zlib - ]; + + nativeBuildInputs = [ + mapnik # for mapnik_config + ]; + + buildInputs = [ + mapnik + boost + ] ++ (with pkgs; [ + cairo + harfbuzz + icu + libjpeg + libpng + libtiff + libwebp + proj + zlib + ]); propagatedBuildInputs = [ pillow pycairo ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index d245d472a007..2b55d975ed3d 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.6.3"; + version = "0.7.0"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "0a7729c711d9be2b6c0638ce4851d398e181f2329814668aa7fda6421a5da085"; + sha256 = "d9c1411b25600ea65bb534ad75bf4ab6efd9627abd86872f0e5453ff42220d06"; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index b3e3de0285a9..39950b97f6c7 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-slugify"; - version = "1.2.6"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "7723daf30996db26573176bddcdf5fcb98f66dc70df05c9cb29f2c79b8193245"; + sha256 = "d3e034397236020498e677a35e5c05dcc6ba1624b608b9ef7e5fe3090ccbd5a8"; }; doCheck = !isPy3k; # (only) on python3 unittest loader (loadTestsFromModule) fails diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index f58b42aa04cc..368b26f2fb5e 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "2.1.2"; + version = "3.1.2"; src = fetchPypi { inherit pname version; - sha256 = "9e9d87d5f3cd6d39c42dd665e1fe3e12361637e28f5ad9a7aa8f73358b7a3dd5"; + sha256 = "aa702157694d55a743fb6f1cc0bd1af58fbfda8a7d71d747d4b12d6dac29cab3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 7aa776540061..67fbd4e24ebe 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytest-flakes, pytestpep8, sphinx, six }: buildPythonPackage rec { pname = "python-utils"; @@ -14,7 +14,7 @@ buildPythonPackage rec { rm tests/*.pyc ''; - checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; + checkInputs = [ pytest pytestrunner pytestcov pytest-flakes pytestpep8 sphinx ]; checkPhase = '' py.test tests diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix new file mode 100644 index 000000000000..30c6dff048a0 --- /dev/null +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, lxml +, oath +, pycryptodome +, requests +, pytest +}: + +buildPythonPackage rec { + pname = "python-vipaccess"; + version = "0.10.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m6b7qipiaj6pz86kjhyq5m5jxxijpk58gpsdkj5bn0wjl6x1pg2"; + }; + + propagatedBuildInputs = [ + lxml + oath + pycryptodome + requests + ]; + + checkInputs = [ pytest ]; + # test_check_token_detects_valid_hotp_token, + # test_check_token_detects_valid_totp_token and + # test_check_token_detects_invlaid_token require network + checkPhase = '' + mv vipaccess vipaccess.hidden + pytest tests/ -k 'not test_check_token' + ''; + + meta = with stdenv.lib; { + description = "A free software implementation of Symantec's VIP Access application and protocol"; + homepage = "https://github.com/dlenski/python-vipaccess"; + license = licenses.asl20; + maintainers = with maintainers; [ aw ]; + }; +} diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix index f7cecae84979..6ed150d12398 100644 --- a/pkgs/development/python-modules/pythonix/default.nix +++ b/pkgs/development/python-modules/pythonix/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "pythonix"; - version = "0.1.4"; + version = "0.1.6"; format = "other"; src = fetchFromGitHub { owner = "Mic92"; repo = "pythonix"; rev = "v${version}"; - sha256 = "1q1fagfwzvmcm1n3a0liay7m5krazmhw9l001m90rrz2x7vrsqwk"; + sha256 = "1qzcrpn333hsgn6fj1m1s3cvaf0ny8qpygamcrazqv57xmwyr8h5"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 41eac5d2044b..37bfee1d246d 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytools"; - version = "2018.5.2"; + version = "2019.1"; src = fetchPypi { inherit pname version; - sha256 = "3b3f41e1235b579dc4f4a3d6f5f8ae187841968e72a4f73ac481c6bfe4c1668b"; + sha256 = "f6972030e6c97089e49b832fd1f4e7959aee89bb6db929aaa3bde2553d78872b"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 8b9ba07ce953..7c45659220cb 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -77,11 +77,14 @@ in buildPythonPackage rec { # https://github.com/intel/mkl-dnn/commit/8134d346cdb7fe1695a2aa55771071d455fae0bc NIX_CFLAGS_COMPILE = lib.optionals (numpy.blasImplementation == "mkl") [ "-Wno-error=array-bounds" ]; - buildInputs = [ + nativeBuildInputs = [ cmake - numpy.blas utillinux which + ]; + + buildInputs = [ + numpy.blas ] ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn ] ++ lib.optionals stdenv.isLinux [ numactl ]; diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 408c64190bb5..cc30c802fd93 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2018.7"; + version = "2018.9"; src = fetchPypi { inherit pname version; - sha256 = "31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca"; + sha256 = "d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index d1328fca0041..9fb057800db3 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytzdata"; - version = "2018.7"; + version = "2018.9"; src = fetchPypi { inherit pname version; - sha256 = "10c74b0cfc51a9269031f86ecd11096c9c6a141f5bb15a3b8a88f9979f6361e2"; + sha256 = "dddaaf4f1717820a6fdcac94057e03c1a15b3829a44d9eaf19988917977db408"; }; # No tests diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index 4169c2a22f9b..49b015507725 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyunifi"; - version = "2.15"; + version = "2.16"; src = fetchPypi { inherit pname version; - sha256 = "cf2f9f538722447bded6b319a35c26ea088c51ccdbd3dec887210946c7992ebf"; + sha256 = "1d28ec8204fe3b0eb1043f5ba9b646a2c38e5fd89a0419d760cff8f0df507c83"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix index 37fe5a053696..b1397b1db789 100644 --- a/pkgs/development/python-modules/pyupdate/default.nix +++ b/pkgs/development/python-modules/pyupdate/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyupdate"; - version = "0.2.16"; + version = "0.2.29"; src = fetchPypi { inherit pname version; - sha256 = "1p4zpjvwy6h9kr0dp80z5k04s14r9f75jg9481gpx8ygxj0l29bi"; + sha256 = "0096bde03f43b67c068914ebcb756265641a6d2a5888d4bc81636347c22bf0aa"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 71243ef6f76e..2298202d53e4 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "17.1.2"; + version = "17.1.3"; src = fetchPypi { inherit pname version; - sha256 = "a72b82ac1910f2cf61a49139f4974f994984475f771b0faa730839607eeedddf"; + sha256 = "83722236bd6ae6a07dec0cb728906785040e91826c7575709a258b4e21d0f812"; }; checkInputs = [ pytest tornado ]; @@ -22,12 +22,14 @@ buildPythonPackage rec { # test_socket.py seems to be hanging # others fail + # for test_monitor: https://github.com/zeromq/pyzmq/issues/1272 checkPhase = '' py.test $out/${python.sitePackages}/zmq/ -k "not test_socket \ and not test_current \ and not test_instance \ and not test_callable_check \ and not test_on_recv_basic \ - and not test_on_recv_wake" + and not test_on_recv_wake \ + and not test_monitor" ''; } diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/pkgs/development/python-modules/qdarkstyle/default.nix new file mode 100644 index 000000000000..99d9ba8cf8a3 --- /dev/null +++ b/pkgs/development/python-modules/qdarkstyle/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "qdarkstyle"; + version = "2.6.5"; + + src = fetchPypi { + inherit version; + pname = "QDarkStyle"; + sha256 = "96b14cd0440a0f73db4e14c5accdaa08072625d0395ae011d444508cbd73eb9e"; + }; + + # No tests available + doCheck = false; + + meta = with lib; { + description = "A dark stylesheet for Python and Qt applications"; + homepage = https://github.com/ColinDuquesnoy/QDarkStyleSheet; + license = licenses.mit; + maintainers = with maintainers; [ nyanloutre ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 1938cb37c75a..bb92fc9df9ac 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "qiskit"; - version = "0.6.1"; + version = "0.7.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "601e8db4db470593b94a32495c6e90e2db11a9382817a34584520573a7b8cc38"; + sha256 = "63e7a7c3033fe955d715cc825b3fb61d27c25ad66e1761493ca2243b5dbfb4f9"; }; buildInputs = [ cmake ] diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 788b2e9e9ae4..987c1ca90490 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -1,19 +1,18 @@ { lib -, buildPythonPackage -, qscintillaCpp +, pythonPackages +, qscintilla , lndir -, sip -, python -, pyqt5 }: - +, qtbase +}: +with pythonPackages; buildPythonPackage rec { pname = "qscintilla"; - version = qscintillaCpp.version; - src = qscintillaCpp.src; + version = qscintilla.version; + src = qscintilla.src; format = "other"; - nativeBuildInputs = [ lndir sip ]; - buildInputs = [ qscintillaCpp ]; + nativeBuildInputs = [ lndir sip qtbase ]; + buildInputs = [ qscintilla ]; propagatedBuildInputs = [ pyqt5 ]; preConfigure = '' @@ -23,13 +22,14 @@ buildPythonPackage rec { cd Python ${python.executable} ./configure.py \ --pyqt=PyQt5 \ - --destdir=$out/lib/${python.sitePackages}/PyQt5 \ - --stubsdir=$out/lib/${python.sitePackages}/PyQt5 \ + --destdir=$out/${python.sitePackages}/PyQt5 \ + --stubsdir=$out/${python.sitePackages}/PyQt5 \ --apidir=$out/api/${python.libPrefix} \ - --qsci-incdir=${qscintillaCpp}/include \ - --qsci-libdir=${qscintillaCpp}/lib \ + --qsci-incdir=${qscintilla}/include \ + --qsci-libdir=${qscintilla}/lib \ --pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \ - --qsci-sipdir=$out/share/sip/PyQt5 + --qsci-sipdir=$out/share/sip/PyQt5 \ + --sip-incdir=${sip}/include ''; meta = with lib; { diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix index c4ea8ff2e734..91c2009744f7 100644 --- a/pkgs/development/python-modules/qscintilla/default.nix +++ b/pkgs/development/python-modules/qscintilla/default.nix @@ -17,7 +17,9 @@ disabledIf (isPy3k || isPyPy) src = pkgs.qscintilla.src; - buildInputs = [ pkgs.xorg.lndir pyqt4.qt pyqt4 ]; + nativeBuildInputs = [ pkgs.xorg.lndir ]; + + buildInputs = [ pyqt4.qt pyqt4 ]; preConfigure = '' mkdir -p $out diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index ff2d8cf0740c..2fe8c0a669ae 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyside }: +{ stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }: buildPythonPackage rec { pname = "QtAwesome"; @@ -9,7 +9,16 @@ buildPythonPackage rec { sha256 = "0f6dvqmalzi4q4rrpl1xlrxanibam1nifzsgqb5z4jr4ap7kiyp3"; }; - propagatedBuildInputs = [ qtpy six pyside ]; + propagatedBuildInputs = [ qtpy six ]; + + checkInputs = [ pyqt5 pytest ]; + + checkPhase = '' + py.test + ''; + + # Requires https://github.com/boylea/qtbot + doCheck = false; meta = with stdenv.lib; { description = "Iconic fonts in PyQt and PySide applications"; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 07b5a3169614..810cffa5cc62 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1b03n1ixzscm0jw97l4dq5iy4fslnqxq5bb8287xb7n2a1gs26xw"; }; - buildInputs = [ nose ] ++ lib.optionals isPy27 [mock]; + checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5]; # : cannot connect to X server diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index a2e261284d83..ecc531d82cec 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.5.2"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1kdbr8kwryjskhs6mp11jj02h4jdxvlzbzdn1chw30kcb280ysac"; + sha256 = "fd5c09655e58bf3a013d2940e71f069732ed67f056d4dcb2b0609a3ecd9b320f"; }; # no concrete propagatedBuildInputs as multiple backends are supposed diff --git a/pkgs/development/python-modules/quamash/default.nix b/pkgs/development/python-modules/quamash/default.nix new file mode 100644 index 000000000000..b39e081c4712 --- /dev/null +++ b/pkgs/development/python-modules/quamash/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytest, isPy3k, pyqt5, pyqt ? pyqt5 }: + +buildPythonPackage rec { + pname = "quamash"; + version = "0.6.1"; + + disabled = !isPy3k; + + # No tests in PyPi tarball + src = fetchFromGitHub { + owner = "harvimt"; + repo = "quamash"; + rev = "version-${version}"; + sha256 = "117rp9r4lz0kfz4dmmpa35hp6nhbh6b4xq0jmgvqm68g9hwdxmqa"; + }; + + propagatedBuildInputs = [ pyqt ]; + + checkInputs = [ pytest ]; + checkPhase = '' + pytest -k 'test_qthreadexec.py' # the others cause the test execution to be aborted, I think because of asyncio + ''; + + meta = with lib; { + description = "Implementation of the PEP 3156 event-loop (asyncio) api using the Qt Event-Loop"; + homepage = https://github.com/harvimt/quamash; + license = licenses.bsd2; + maintainers = with maintainers; [ borisbabic ]; + }; +} diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index a4274317e1bd..bc778984493c 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "quantities"; - version = "0.12.2"; + version = "0.12.3"; src = fetchPypi { inherit pname version; - sha256 = "92e8397938516483f4fd1855097ec11953ab10dd0bf3293954559226679f76f0"; + sha256 = "582f3c7aeba897846761e966615e01202a5e5d06add304492931b05085d19883"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix index 9e6b9dc0d673..7406faca6014 100644 --- a/pkgs/development/python-modules/rabbitpy/default.nix +++ b/pkgs/development/python-modules/rabbitpy/default.nix @@ -1,6 +1,6 @@ { stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , mock , nose , pamqp @@ -10,13 +10,29 @@ buildPythonPackage rec { version = "1.0.0"; pname = "rabbitpy"; - src = fetchPypi { - inherit pname version; - sha256 = "54d33746d0c6a686417cd354346803945df0740b39fb92842d259387100db126"; + # No tests in the pypi tarball, so we directly fetch from git + src = fetchFromGitHub { + owner = "gmr"; + repo = pname; + rev = version; + sha256 = "0fd80zlr4p2sh77rxyyfi9l0h2zqi2csgadr0rhnpgpqsy10qck6"; }; - buildInputs = [ mock nose ]; propagatedBuildInputs = [ pamqp ]; + checkInputs = [ mock nose ]; + + checkPhase = '' + runHook preCheck + rm tests/integration_tests.py # Impure tests requiring network + nosetests tests + runHook postCheck + ''; + + postPatch = '' + # See: https://github.com/gmr/rabbitpy/issues/118 + substituteInPlace setup.py \ + --replace 'pamqp>=1.6.1,<2.0' 'pamqp' + ''; meta = with stdenv.lib; { description = "A pure python, thread-safe, minimalistic and pythonic RabbitMQ client library"; diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 9717a9cda23d..6306267ba2ac 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ]; - buildInputs = [ cython ]; + nativeBuildInputs = [ cython gdal ]; propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs ]; meta = with lib; { diff --git a/pkgs/development/python-modules/rawkit/default.nix b/pkgs/development/python-modules/rawkit/default.nix index e8be12b26696..6bee2bf1b0a3 100644 --- a/pkgs/development/python-modules/rawkit/default.nix +++ b/pkgs/development/python-modules/rawkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ stdenv, fetchPypi, buildPythonPackage, fetchpatch , libraw , pytest, mock }: @@ -11,6 +11,14 @@ buildPythonPackage rec { sha256 = "0vrhrpr70i61y5q5ysk341x1539ff1q1k82g59zq69lv16s0f76s"; }; + patches = [ + # Python 3.7 compatibility + (fetchpatch { + url = https://github.com/photoshell/rawkit/commit/663e90afa835d398aedd782c87b8cd0bff64bc9f.patch; + sha256 = "1cdw0x9bgk0b5jnpjnmd8jpbaryarr3cjqizq44366qh3l0jycxy"; + }) + ]; + buildInputs = [ libraw ]; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index 3be8bb99bbe4..e394b9646430 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -16,10 +16,10 @@ buildPythonPackage rec { sha256 = "1ng8l8cx81cz23ls7fq9wz4ijs0zbbaqh4kj0mj6plzcqcf8na4i"; }; - buildInputs = [ nose ]; + checkInputs = [ nose ]; propagatedBuildInputs = [ six ]; - checkPhase = "nosetests"; + checkPhase = "LC_ALL=C nosetests"; meta = with stdenv.lib; { homepage = https://www.reviewboard.org/docs/rbtools/dev/; diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix new file mode 100644 index 000000000000..6f85280979bd --- /dev/null +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, pytest +, mock +, sphinx +}: + +buildPythonPackage rec { + pname = "readthedocs-sphinx-ext"; + version = "0.5.17"; + + src = fetchPypi { + inherit pname version; + sha256 = "21097cbb37c9a0590e2cb444b55bd87302fc8f69640fa2d4f2d113e98e9558ff"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytest mock sphinx ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Sphinx extension for Read the Docs overrides"; + homepage = http://github.com/rtfd/readthedocs-sphinx-ext; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 879ca3d7b4dd..1851fe7a0de9 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -1,11 +1,11 @@ { fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "redis"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1kw3a1618pl908abiaxd41jg5z0rwyl2w2i0d8xi9zxy5437a011"; + sha256 = "7ba8612bbfd966dea8c62322543fed0095da2834dbd5a7c124afbc617a156aa7"; }; # tests require a running redis diff --git a/pkgs/development/python-modules/rednose/default.nix b/pkgs/development/python-modules/rednose/default.nix index 8257ca87dd99..fa142cf87236 100644 --- a/pkgs/development/python-modules/rednose/default.nix +++ b/pkgs/development/python-modules/rednose/default.nix @@ -13,9 +13,9 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0" ''; - # Do not test on Python 2 darwin because the tests suite gets stuck - # https://github.com/JBKahn/rednose/issues/23 - doCheck = !(stdenv.isDarwin && isPy27); + # Do not test on Python 2 because the tests suite gets stuck + # https://github.com/NixOS/nixpkgs/issues/60786 + doCheck = !(isPy27); checkInputs = [ six ]; propagatedBuildInputs = [ nose colorama termstyle ]; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index f089d1cdba2f..bc16fffcef53 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2018.11.22"; + version = "2019.02.21"; src = fetchPypi { inherit pname version; - sha256 = "79a6a60ed1ee3b12eb0e828c01d75e3b743af6616d69add6c2fde1d425a4ba3f"; + sha256 = "587bd4cad11c7294f89799c45778abca271d7c6668a0e85c41a6dbfa8096f9bb"; }; postCheck = '' @@ -19,6 +19,9 @@ buildPythonPackage rec { ${python.interpreter} -c 'import test_regex; test_regex.test_main();' ''; + # No tests in archive + doCheck = false; + meta = { description = "Alternative regular expression module, to replace re"; homepage = https://bitbucket.org/mrabarnett/mrab-regex; diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index d2fcef3e169d..be37a48f00cb 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -2,12 +2,12 @@ , oauthlib, requests }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.2.0"; pname = "requests-oauthlib"; src = fetchPypi { inherit pname version; - sha256 = "8886bfec5ad7afb391ed5443b1f697c6f4ae98d0e5620839d8b4499c032ada3f"; + sha256 = "bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57"; }; doCheck = false; # Internet tests fail when building in chroot diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index f865f6b8aed9..13e017520a79 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -9,23 +9,27 @@ buildPythonPackage rec { pname = "requests-toolbelt"; - version = "0.8.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5"; + sha256 = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"; }; checkInputs = [ betamax mock pytest ]; propagatedBuildInputs = [ requests ]; checkPhase = '' - py.test tests + # disabled tests access the network + py.test tests -k "not test_no_content_length_header \ + and not test_read_file \ + and not test_reads_file_from_url_wrapper" ''; meta = { description = "A toolbelt of useful classes and functions to be used with python-requests"; homepage = http://toolbelt.rtfd.org; - maintainers = with lib.maintainers; [ jgeerds ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ matthiasbeyer jgeerds ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index cf9660b09065..063c6d950711 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "requests"; - version = "2.20.1"; + version = "2.21.0"; src = fetchPypi { inherit pname version; - sha256 = "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263"; + sha256 = "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e"; }; nativeBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 4f9c44107654..e9e51756d9fb 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -1,11 +1,12 @@ { stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytest , pytestcov , numpy , scipy , cython +, numba , six }: @@ -13,16 +14,20 @@ buildPythonPackage rec { pname = "resampy"; version = "0.2.1"; - src = fetchPypi { - inherit pname version; - sha256 = "7f6912ca2b746eb9bcdc05c52fcef088f0b7ba1ca6ee0b2d0a359d18fc57f8f8"; + # No tests in PyPi Archive + src = fetchFromGitHub { + owner = "bmcfee"; + repo = pname; + rev = version; + sha256 = "0a2bxj042y62dimm2i4vglbhpwbybam07mcl67cb6pmfsw9fbqhj"; }; checkInputs = [ pytest pytestcov ]; - propagatedBuildInputs = [ numpy scipy cython six ]; + propagatedBuildInputs = [ numpy scipy cython numba six ]; - # No tests included - doCheck = false; + checkPhase = '' + pytest tests + ''; meta = with stdenv.lib; { homepage = https://github.com/bmcfee/resampy; diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index b8626524b54f..eeed42892308 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -1,28 +1,29 @@ { lib , buildPythonPackage , fetchPypi +, isPy37 , docutils , nose -, stdenv -, flake8 -, pyyaml , testtools }: buildPythonPackage rec { pname = "restructuredtext_lint"; - version = "1.1.3"; + version = "1.2.2"; + + # https://github.com/twolfson/restructuredtext-lint/pull/47 + disabled = isPy37; src = fetchPypi { inherit pname version; - sha256 = "c48ca9a84c312b262809f041fe47dcfaedc9ee4879b3e1f9532f745c182b4037"; + sha256 = "82880a8de8a41bfc84f533744091b1ead8e2ab9ad6c0a3f60f4750ef6c802350"; }; - checkInputs = [ nose flake8 pyyaml testtools ]; + checkInputs = [ nose testtools ]; propagatedBuildInputs = [ docutils ]; checkPhase = '' - ${stdenv.shell} test.sh + nosetests --nocapture ''; meta = { @@ -30,4 +31,4 @@ buildPythonPackage rec { homepage = https://github.com/twolfson/restructuredtext-lint; license = lib.licenses.unlicense; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/retry/default.nix b/pkgs/development/python-modules/retry/default.nix new file mode 100644 index 000000000000..a4743dcbfe46 --- /dev/null +++ b/pkgs/development/python-modules/retry/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, decorator +, py +, mock +, pytest +}: + +buildPythonPackage rec { + pname = "retry"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "f8bfa8b99b69c4506d6f5bd3b0aabf77f98cdb17f3c9fc3f5ca820033336fba4"; + }; + + nativeBuildInputs = [ + pbr + ]; + + propagatedBuildInputs = [ + decorator + py + ]; + + checkInputs = [ + mock + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Easy to use retry decorator"; + homepage = https://github.com/invl/retry; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index b2675d04d5b0..4ffb182626c3 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -10,9 +10,9 @@ buildPythonPackage rec { sha256 = "1qf4dyxvjs7mxrxc0gr7gzyn4iflb2wgq01r5pzrxac8rnvy8fmw"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; checkPhase = '' - py.test + pytest ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index ed0bf42ae687..1a40f61cc50e 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -14,5 +14,6 @@ buildPythonPackage rec { builder = ./builder.sh; - buildInputs = [ rpmextract python wirelesstools gettext ]; + nativeBuildInputs = [ rpmextract gettext ]; + buildInputs = [ wirelesstools ]; } diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 98bed064b1fc..be8b0b9454d7 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -1,11 +1,12 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy3k , robotframework , moretools , pathpy , six -, setuptools +, zetup }: buildPythonPackage rec { @@ -17,13 +18,14 @@ buildPythonPackage rec { sha256 = "04gkn1zpf3rsvbqdxrrjqqi8sa0md9gqwh6n5w2m03fdwjg4lc7q"; }; - propagatedBuildInputs = [ robotframework moretools pathpy six setuptools ]; + nativeBuildInputs = [ zetup ]; + + propagatedBuildInputs = [ robotframework moretools pathpy six ]; meta = with stdenv.lib; { description = "Python Tools for Robot Framework and Test Libraries"; homepage = https://bitbucket.org/userzimmermann/robotframework-tools; license = licenses.gpl3; - platforms = platforms.linux; + broken = isPy3k; # 2019-03-15, missing dependency robotframework-python3 }; - } diff --git a/pkgs/development/python-modules/root_numpy/default.nix b/pkgs/development/python-modules/root_numpy/default.nix index 3f36eb730ce3..dc2c5f790b59 100644 --- a/pkgs/development/python-modules/root_numpy/default.nix +++ b/pkgs/development/python-modules/root_numpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "root_numpy"; - version = "4.7.3"; + version = "4.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0vy6mqmkddfv46yc4hp43fvaisn3yw92ryaw031k841hhj73q0xg"; + sha256 = "5842bbcde92133f60a61f56e9f0a875a0dbc2a567cc65a9ac141ecd72e416878"; }; disabled = isPy3k; # blocked by #27649 diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 21281d341cce..b91709446b3f 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rope"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "a108c445e1cd897fe19272ab7877d172e7faf3d4148c80e7d20faba42ea8f7b2"; + sha256 = "031eb54b3eeec89f4304ede816995ed2b93a21e6fba16bd02aff10a0d6c257b7"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index dfbcdec858aa..1b4ab4d40db9 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -58,6 +58,10 @@ buildPythonPackage rec { tidyr ]) ++ extraRPackages ++ rWrapper.recommendedPackages; + nativeBuildInputs = [ + R # needed at setup time to detect R_HOME (alternatively set R_HOME explicitly) + ]; + patches = [ # R_LIBS_SITE is used by the nix r package to point to the installed R libraries. # This patch sets R_LIBS_SITE when rpy2 is imported. @@ -98,7 +102,7 @@ buildPythonPackage rec { homepage = http://rpy.sourceforge.net/rpy2; description = "Python interface to R"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ joelmo ]; }; } diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 3e7cd4479ebd..7b14d337f342 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.15.86"; + version = "0.15.88"; src = fetchPypi { inherit pname version; - sha256 = "d98b3d421eebf7e10311ab12f41c5b0353e7cae1cc78f51312e24f569d593de0"; + sha256 = "ac56193c47a31c9efa151064a9e921865cdad0f7a991d229e7197e12fe8e0cd7"; }; # Tests cannot load the module to test diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 9b74b9c8ba35..7589d0fce73c 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.1.13"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "90dc18e028989c609146e241ea153250be451e05ecc0c2832565231dacdf59c1"; + sha256 = "f23d5cb7d862b104401d9021fc82e5fa0e0cf57b7660a1331425aab0c691d021"; }; foo = 1; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index 9486899c6061..d4eed74611e6 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "salmon-mail"; - version = "3.0.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e2f5c9cfe95e178813755c2df2f9f7c792246356d7489caa72f06b2553da8cdc"; + sha256 = "cb2f9c3bf2b9f8509453ca8bc06f504350e19488eb9d3d6a4b9e4b8c160b527d"; }; checkInputs = [ nose jinja2 mock ]; diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 18dd6e58f5c3..7ca3fc0f94be 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { description = "Powerful interactive network packet manipulation program"; homepage = https://scapy.net/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ primeos bjornfor ]; }; } diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index ee86d8869fe8..4d4ec409e028 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "schedule"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0nrkbbmr9k1bqfmv9wg5aslxzkkifcd62fm04n6844nf5mya00qh"; + sha256 = "f9fb5181283de4db6e701d476dd01b6a3dd81c38462a54991ddbb9d26db857c9"; }; buildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 5d8399d6267c..e2ba35e0438c 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "scikit-image"; - version = "0.14.1"; + version = "0.14.2"; src = fetchPypi { inherit pname version; - sha256 = "86a9b3b4f74f231e0a6bcfd3235dcf3f0118df25dac21201da5e064d681e2c50"; + sha256 = "1afd0b84eefd77afd1071c5c1c402553d67be2d7db8950b32d6f773f25850c1f"; }; buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 5fe21024e008..01c54ef5f16b 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "51a2424c8ed80e60bdb9a896806e7adaf24a58253b326fbad10f80a6d06f2214"; + sha256 = "e085d1babcb419bbe58e2e805ac61924dac4ca45a07c9fa081144739e500aa3c"; }; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index bff45c7f2c3c..e2c3e975b9a3 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "secretstorage"; - version = "3.1.0"; + version = "3.1.1"; disabled = pythonOlder "3.5"; src = fetchPypi { pname = "SecretStorage"; inherit version; - sha256 = "12vxzradibfmznssh7x2zd7qym2hl7wn34fn2yn58pnx6sykrai9"; + sha256 = "14lznnn916ddn6yrd3w2nr2zq49zc8hw53yjz1k9yhd492p9gir0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index d3c6006bc6c8..158d9a054df9 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/pkgs/development/python-modules/serverlessrepo/default.nix new file mode 100644 index 000000000000..d70abe1f95fd --- /dev/null +++ b/pkgs/development/python-modules/serverlessrepo/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, boto3 +, six +, pyyaml +, mock +}: + +buildPythonPackage rec { + pname = "serverlessrepo"; + version = "0.1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "533389d41a51450e50cc01405ab766550170149c08e1c85b3a1559b0fab4cb25"; + }; + + propagatedBuildInputs = [ + six + boto3 + pyyaml + ]; + + checkInputs = [ pytest mock ]; + + checkPhase = '' + pytest tests/unit + ''; + + meta = with lib; { + homepage = https://github.com/awslabs/aws-serverlessrepo-python; + description = "Helpers for working with the AWS Serverless Application Repository"; + longDescription = '' + A Python library with convenience helpers for working with the + AWS Serverless Application Repository. + ''; + license = lib.licenses.asl20; + maintainers = with maintainers; [ dhkl ]; + }; +} diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix index 93e172a4f606..7d9039123cd0 100644 --- a/pkgs/development/python-modules/service_identity/default.nix +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -10,6 +10,8 @@ , pytest }: +# Note to maintainers: package duplicated in nixpkgs/pkgs/servers/matrix-synapse/default.nix + buildPythonPackage rec { pname = "service_identity"; version = "17.0.0"; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 0a34c2b54296..7548f96a88e4 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "40.6.3"; + version = "40.8.0"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3b474dad69c49f0d2d86696b68105f3a6f195f7ab655af12ef9a9c326d2b08f8"; + sha256 = "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d"; }; nativeBuildInputs = [ unzip wrapPython python.pythonForBuild ]; diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index f6e0daea5add..4a6b5ecc0cda 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, pip }: buildPythonPackage rec { pname = "setuptools_scm"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1191f2a136b5e86f7ca8ab00a97ef7aef997131f1f6d4971be69a1ef387d8b40"; + sha256 = "52ab47715fa0fc7d8e6cd15168d1a69ba995feb1505131c3e814eb7087b57358"; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 42d825660737..220726733dcb 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi -, geos, glibcLocales, pytest, cython +{ stdenv, buildPythonPackage, fetchPypi, substituteAll +, geos, pytest, cython , numpy }: @@ -12,26 +12,31 @@ buildPythonPackage rec { sha256 = "c4b87bb61fc3de59fc1f85e71a79b0c709dc68364d9584473697aad4aa13240f"; }; - buildInputs = [ geos glibcLocales cython ]; + nativeBuildInputs = [ + geos # for geos-config + cython + ]; checkInputs = [ pytest ]; propagatedBuildInputs = [ numpy ]; - preConfigure = '' - export LANG="en_US.UTF-8"; - ''; + # environment variable used in shapely/_buildcfg.py + GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; - patchPhase = let - libc = if stdenv.isDarwin then "libc.dylib" else "libc.so.6"; - in '' - sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}'])|" shapely/geos.py - sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${libc}']).free|" shapely/geos.py - ''; + patches = [ + (substituteAll { + src = ./library-paths.patch; + libgeos_c = GEOS_LIBRARY_PATH; + libc = "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}" + + stdenv.lib.optionalString (!stdenv.isDarwin) ".6"; + }) + ]; # Disable the tests that improperly try to use the built extensions checkPhase = '' - py.test -k 'not test_vectorized and not test_fallbacks' tests + rm -r shapely # prevent import of local shapely + py.test tests ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch new file mode 100644 index 000000000000..6137e7581821 --- /dev/null +++ b/pkgs/development/python-modules/shapely/library-paths.patch @@ -0,0 +1,109 @@ +diff --git a/shapely/geos.py b/shapely/geos.py +index 09bf1ab..837aa98 100644 +--- a/shapely/geos.py ++++ b/shapely/geos.py +@@ -55,100 +55,10 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): + "Could not find lib {0} or load any of its variants {1}.".format( + libname, fallbacks or [])) + +-_lgeos = None +- +-if sys.platform.startswith('linux'): +- # Test to see if we have a wheel repaired by 'auditwheel' containing its +- # own libgeos_c +- geos_whl_so = glob.glob(os.path.abspath(os.path.join(os.path.dirname( +- __file__), '.libs/libgeos_c-*.so.*'))) +- if len(geos_whl_so) == 1: +- _lgeos = CDLL(geos_whl_so[0]) +- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- else: +- alt_paths = [ +- 'libgeos_c.so.1', +- 'libgeos_c.so', +- # anaconda +- os.path.join(sys.prefix, "lib", "libgeos_c.so"), +- ] +- _lgeos = load_dll('geos_c', fallbacks=alt_paths) +- free = load_dll('c').free +- free.argtypes = [c_void_p] +- free.restype = None +- +-elif sys.platform == 'darwin': +- # Test to see if we have a delocated wheel with a GEOS dylib. +- geos_whl_dylib = os.path.abspath(os.path.join(os.path.dirname( +- __file__), '.dylibs/libgeos_c.1.dylib')) +- if os.path.exists(geos_whl_dylib): +- _lgeos = CDLL(geos_whl_dylib) +- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- +- else: +- if hasattr(sys, 'frozen'): +- try: +- # .app file from py2app +- alt_paths = [os.path.join( +- os.environ['RESOURCEPATH'], '..', 'Frameworks', +- 'libgeos_c.dylib')] +- except KeyError: +- # binary from pyinstaller +- alt_paths = [ +- os.path.join(sys.executable, 'libgeos_c.dylib')] +- if hasattr(sys, '_MEIPASS'): +- alt_paths.append( +- os.path.join(sys._MEIPASS, 'libgeos_c.1.dylib')) +- else: +- alt_paths = [ +- # anaconda +- os.path.join(sys.prefix, "lib", "libgeos_c.dylib"), +- # The Framework build from Kyng Chaos +- "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS", +- # macports +- '/opt/local/lib/libgeos_c.dylib', +- ] +- _lgeos = load_dll('geos_c', fallbacks=alt_paths) +- +- free = load_dll('c').free +- free.argtypes = [c_void_p] +- free.restype = None +- +-elif sys.platform == 'win32': +- try: +- egg_dlls = os.path.abspath( +- os.path.join(os.path.dirname(__file__), 'DLLs')) +- if hasattr(sys, "frozen"): +- wininst_dlls = os.path.normpath( +- os.path.abspath(sys.executable + '../../DLLS')) +- else: +- wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs") +- original_path = os.environ['PATH'] +- os.environ['PATH'] = "%s;%s;%s" % \ +- (egg_dlls, wininst_dlls, original_path) +- _lgeos = load_dll("geos_c.dll", fallbacks=[ +- os.path.join(sys.prefix, "Library", "lib", "geos_c.dll"), +- ]) +- except (ImportError, WindowsError, OSError): +- raise +- +- def free(m): +- try: +- cdll.msvcrt.free(m) +- except WindowsError: +- # XXX: See http://trac.gispython.org/projects/PCL/ticket/149 +- pass +- +-elif sys.platform == 'sunos5': +- _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so']) +- free = CDLL('libc.so.1').free +- free.argtypes = [c_void_p] +- free.restype = None +-else: # other *nix systems +- _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so']) +- free = load_dll('c', fallbacks=['libc.so.6']).free +- free.argtypes = [c_void_p] +- free.restype = None ++_lgeos = CDLL('@libgeos_c@') ++free = CDLL('@libc@').free ++free.argtypes = [c_void_p] ++free.restype = None + + + def _geos_version(): diff --git a/pkgs/development/python-modules/simpleparse/default.nix b/pkgs/development/python-modules/simpleparse/default.nix index f1d6874dfbd1..339f6d1debd7 100644 --- a/pkgs/development/python-modules/simpleparse/default.nix +++ b/pkgs/development/python-modules/simpleparse/default.nix @@ -11,7 +11,8 @@ buildPythonPackage rec { disabled = isPy3k || isPyPy; src = fetchPypi { - inherit pname version; + pname = "SimpleParse"; + inherit version; sha256 = "18ccdc249bb550717af796af04a7d50aef523368901f64036a48eee5daca149d"; }; diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 6921b3590e4e..78e7a5f05389 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "six"; - version = "1.11.0"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"; + sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 5896437e61d6..9d4df1135994 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0lwlvvz7qndq89i8bhjv4zfkhg0lbd5yjhccb7svszf30k8niiap"; + sha256 = "a52206bb69c38c5f08709ec2ee5704b0f86fc0a770935b5dad9b5841bfd5f502"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index d039756eb811..4c938490eb4f 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, xmltodict, requests # Test dependencies -, pytest, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx +, pytest_3, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx , sphinx_rtd_theme }: @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ xmltodict requests ]; checkInputs = [ - pytest pytestcov coveralls pylint flake8 graphviz mock sphinx + pytest_3 pytestcov coveralls pylint flake8 graphviz mock sphinx sphinx_rtd_theme ]; diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 92ace6f2bb35..5b67fcb09641 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sopel"; - version = "6.5.3"; + version = "6.6.3"; src = fetchPypi { inherit pname version; - sha256 = "4d8c1dc7e9cad73afc40d849484bc0f626aad6557951b1a0cff437af442ccb99"; + sha256 = "aa9a52da9cf33c1d5f6b9b8513d31a339d8cbef9a288487b251538949a4faae1"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix index 5362e0b00375..b2b7f2035030 100644 --- a/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/pkgs/development/python-modules/sortedcontainers/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sortedcontainers"; - version = "2.0.5"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "b74f2756fb5e23512572cc76f0fe0832fd86310f77dfee54335a35fb33f6b950"; + sha256 = "974e9a32f56b17c1bac2aebd9dcf197f3eb9cd30553c5852a3187ad162e1a03a"; }; # pypi tarball does not come with tests diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index bdb003467f56..2094aa7793d6 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.3.12"; + version = "0.3.13"; src = fetchPypi { inherit pname version; - sha256 = "f59ae4e2ec12cb1e5940f06f08804ecca855d959de25ca45a3938de45d0f81a2"; + sha256 = "01x2hm3xxzhxrjcj21si4ggmvkwmy5hag7f6yabqlhwskws721cd"; }; propagatedBuildInputs = [ cffi numpy portaudio ]; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch b/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch index 5be786ee0f5c..a5761764fdbb 100644 --- a/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch +++ b/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch @@ -1,8 +1,8 @@ -diff --git a/sounddevice.py b/sounddevice.py -index f03476c..5745b6e 100644 ---- a/sounddevice.py -+++ b/sounddevice.py -@@ -58,28 +58,7 @@ from ctypes.util import find_library as _find_library +diff --git i/sounddevice.py w/sounddevice.py +index c7c1d62..aabcb12 100644 +--- i/sounddevice.py ++++ w/sounddevice.py +@@ -58,29 +58,7 @@ from ctypes.util import find_library as _find_library from _sounddevice import ffi as _ffi @@ -10,6 +10,7 @@ index f03476c..5745b6e 100644 - for _libname in ( - 'portaudio', # Default name on POSIX systems - 'bin\\libportaudio-2.dll', # DLL from conda-forge +- 'lib/libportaudio.dylib', # dylib from anaconda - ): - _libname = _find_library(_libname) - if _libname is not None: diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix new file mode 100644 index 000000000000..9f877ffb3554 --- /dev/null +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, beautifulsoup4 +, isPy3k +, backports_functools_lru_cache +}: + +buildPythonPackage rec { + pname = "soupsieve"; + version = "1.7.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "87db12ae79194f0ff9808d2b1641c4f031ae39ffa3cab6b907ea7c1e5e5ed445"; + }; + + checkPhase = '' + py.test + ''; + + checkInputs = [ pytest beautifulsoup4 ]; + + propagatedBuildInputs = lib.optional (!isPy3k) backports_functools_lru_cache; + + # Circular test dependency on beautifulsoup4 + doCheck = false; + + meta = { + description = "A CSS4 selector implementation for Beautiful Soup"; + license = lib.licenses.mit; + homepage = https://github.com/facelessuser/soupsieve; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix new file mode 100644 index 000000000000..d3d78620a3de --- /dev/null +++ b/pkgs/development/python-modules/sparse/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, scipy +, numba +, pytest +}: + +buildPythonPackage rec { + pname = "sparse"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2ac6fcbf68b38b999eae98467cf4880b942c13a72036868f78d65a10aeba808d"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + numpy + scipy + numba + ]; + + checkPhase = '' + pytest sparse + ''; + + meta = with lib; { + description = "Sparse n-dimensional arrays computations"; + homepage = https://github.com/pydata/sparse/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 3f54fefadf24..661bc6363f4f 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "spectral-cube"; - version = "0.4.3"; + version = "0.4.4"; doCheck = false; # the tests requires several pytest plugins that are not in nixpkgs src = fetchPypi { inherit pname version; - sha256 = "057g3mzlg5cy4wg2hh3p6gssn93rs6i7pswzhldvcq4k8m8hsl3b"; + sha256 = "9051ede204b1e25b6358b5e0e573b624ec0e208c24eb03a7ed4925b745c93b5e"; }; propagatedBuildInputs = [ astropy radio_beam pytest ]; diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 7385387eb866..7428e6e9e915 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -1,20 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, python }: +{ stdenv, buildPythonPackage, fetchPypi, numpy, nose, pyyaml }: buildPythonPackage rec { pname = "spglib"; - version = "1.10.4.11"; + version = "1.12.2.post0"; src = fetchPypi { inherit pname version; - sha256 = "13b0a227d2dc4079fe36d5bcce4e672400c7c5dfc5d3cd25ccb9521ef592d93e"; + sha256 = "15b02b74c0f06179bc3650c43a710a5200abbba387c6eda3105bfd9236041443"; }; propagatedBuildInputs = [ numpy ]; - checkPhase = '' - cd test - ${python.interpreter} -m unittest discover -bv - ''; + checkInputs = [ nose pyyaml ]; meta = with stdenv.lib; { description = "Python bindings for C library for finding and handling crystal symmetries"; diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix index 86d440a63b1f..4b110f3ec187 100644 --- a/pkgs/development/python-modules/sphinx-testing/default.nix +++ b/pkgs/development/python-modules/sphinx-testing/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinx-testing"; - version = "0.8.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1cbgkp770d7k85nmqkz50wk09xjwcmqw7sb2z17086n7vc1hy2rf"; + sha256 = "2a421b42b2dae8ecad2b4c9d3953f9970e5a9c07bb2c66626338157435e5708c"; }; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 6ce714c9a310..515f6b6156aa 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -2,19 +2,27 @@ , buildPythonPackage , fetchPypi , sphinx +, readthedocs-sphinx-ext +, pytest }: buildPythonPackage rec { pname = "sphinx_rtd_theme"; - version = "0.4.2"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "02f02a676d6baabb758a20c7a479d58648e0f64f13e07d1b388e9bb2afe86a09"; + sha256 = "728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a"; }; propagatedBuildInputs = [ sphinx ]; + checkInputs = [ readthedocs-sphinx-ext pytest ]; + + checkPhase = '' + py.test + ''; + meta = with stdenv.lib; { description = "ReadTheDocs.org theme for Sphinx"; homepage = https://github.com/snide/sphinx_rtd_theme/; diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 4843a5bbe9d7..b8a4f25f5df0 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "411da1819fda0593976a157f1a14ec1cfaef9ee1b4b708e795d0bf3953f0142b"; + sha256 = "9d64c8a119bfc592e6316af3e5475ce2d4d8ed6e013dc016a3f2e7971e50d7f3"; }; propagatedBuildInputs = [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain]; diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index 530bc53a280c..f20a3435a009 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.12"; + version = "0.14"; src = fetchPypi { inherit pname version; - sha256 = "95a453e1d912bfdd6a950f8df02f46608154676842d66f8a0d1db0b85a5ddfe5"; + sha256 = "504229e943e8ac821cd9d708124bde30041ae9d8341f9ea953866404527f4e82"; }; # No tests included. diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index aa3bcc6ae7a4..53c6ae8cdba0 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.2.12"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "7a099f42358731589851c38e5a90d997490dd6275b39e09f21bdd4df91a24413"; + sha256 = "1010623c4c31413fdfdd8b3fe194ab95dfabde1081f3c707d1b2eb56b044a7da"; }; # No tests in archive diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 2eccc5e013fa..86fcb6eaaabd 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "SQLObject"; - version = "3.7.0"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - sha256 = "c0d440b638c091027deea7330bb934188b86402cba552a0bbde0535ed8fdab93"; + sha256 = "0f0a5d9430c40b9fa5065e210a7fd3aaabb0713313e72b1b7b7dc4c7d62e43d2"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index 2df3397f6255..e7e9a1e5391b 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "srptools"; - version = "0.2.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0g0jdkblnd3wv5xgb33g6sfgqnhdcs8a3gqzp5gshq2vawdh8p37"; + sha256 = "5754f639ed1888f47c1185d74e8907ff9af4c0ccc1c8be2ef19339d0a1327f4d"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 4652bd0cf45b..978592366cb2 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.10.1"; + version = "2.21.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "12dslgxr06ymv1w9lzvlxp1zg0p6zg58l67pdb3v5v24c51rxrg7"; + sha256 = "170f76f2502888debf02da580138c840497b9359876ca3838f4692f2f02c9110"; }; checkInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index a4130502e4b9..aa582aacaa94 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "structlog"; - version = "18.2.0"; + version = "19.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e361edb3b9aeaa85cd38a1bc9ddbb60cda8a991fc29de9db26832f6300e81eb4"; + sha256 = "5feae03167620824d3ae3e8915ea8589fc28d1ad6f3edf3cc90ed7c7cb33fab5"; }; checkInputs = [ pytest pretend freezegun simplejson twisted ] diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 0da11909de9d..61d406edafc7 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -1,6 +1,7 @@ -{ stdenv +{ lib , fetchPypi -, buildPythonApplication +, buildPythonPackage +, isPy3k , guessit , babelfish , enzyme @@ -16,9 +17,16 @@ , rarfile , pytz , futures +, sympy +, vcrpy +, pytest +, pytestpep8 +, pytest-flakes +, pytestcov +, pytestrunner }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "subliminal"; version = "2.0.5"; @@ -27,13 +35,21 @@ buildPythonApplication rec { sha256 = "1dzv5csjcwgz69aimarx2c6606ckm2gbn4x2mzydcqnyai7sayhl"; }; - # Too many test dependencies - doCheck = false; - propagatedBuildInputs = [ guessit babelfish enzyme beautifulsoup4 requests - click dogpile_cache stevedore chardet pysrt six - appdirs rarfile pytz futures ]; + propagatedBuildInputs = [ + guessit babelfish enzyme beautifulsoup4 requests + click dogpile_cache stevedore chardet pysrt six + appdirs rarfile pytz + ] ++ lib.optional (!isPy3k) futures; - meta = with stdenv.lib; { + checkInputs = [ + sympy vcrpy pytest pytestpep8 pytest-flakes + pytestcov pytestrunner + ]; + + # https://github.com/Diaoul/subliminal/pull/963 + doCheck = false; + + meta = with lib; { homepage = https://github.com/Diaoul/subliminal; description = "Python library to search and download subtitles"; license = licenses.mit; diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix index 5c04c5bd5d35..efb8383c8fdc 100644 --- a/pkgs/development/python-modules/suds-jurko/default.nix +++ b/pkgs/development/python-modules/suds-jurko/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, pytest +, pytest_3 , isPyPy }: @@ -16,9 +16,9 @@ buildPythonPackage rec { sha256 = "1s4radwf38kdh3jrn5acbidqlr66sx786fkwi0rgq61hn4n2bdqw"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest_3 ]; - preBuild = '' + postPatch = '' # fails substituteInPlace tests/test_transport_http.py \ --replace "test_sending_unicode_data" "noop" diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index e647696c02b7..47cdc8a28b11 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, substituteAll , supervise , isPy3k , whichcraft @@ -16,11 +17,18 @@ buildPythonPackage rec { sha256 = "1230f42294910e83421b7d3b08a968d27d510a4a709e966507ed70db5da1b9de"; }; - propagatedBuildInputs = [ - supervise - ] ++ lib.optionals ( !isPy3k ) [ - whichcraft + patches = [ + (substituteAll { + src = ./supervise-path.patch; + inherit supervise; + }) ]; + + # In the git repo, supervise_api lives inside a python subdir + patchFlags = [ "-p2" ]; + + propagatedBuildInputs = lib.optional (!isPy3k) whichcraft; + checkInputs = [ utillinux ]; meta = { diff --git a/pkgs/development/python-modules/supervise_api/supervise-path.patch b/pkgs/development/python-modules/supervise_api/supervise-path.patch new file mode 100644 index 000000000000..c5538ddc26e2 --- /dev/null +++ b/pkgs/development/python-modules/supervise_api/supervise-path.patch @@ -0,0 +1,15 @@ +diff --git a/python/supervise_api/supervise.py b/python/supervise_api/supervise.py +index 497d3ea..be57e35 100644 +--- a/python/supervise_api/supervise.py ++++ b/python/supervise_api/supervise.py +@@ -41,9 +41,7 @@ try: + except: + from whichcraft import which + +-supervise_utility_location = which("supervise") +-if not supervise_utility_location: +- raise FileNotFoundError(errno.ENOENT, "Executable not found in PATH", "supervise") ++supervise_utility_location = '@supervise@/bin/supervise' + + + def ignore_sigchld(): diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index b238d58f68d3..7321848afd02 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.8.2"; + version = "0.8.3"; pname = "tabulate"; src = fetchPypi { inherit pname version; - sha256 = "e4ca13f26d0a6be2a2915428dc21e732f1e44dad7f76d7030b2ef1ec251cf7f2"; + sha256 = "8af07a39377cee1103a5c8b3330a421c2d99b9141e9cc5ddd2e3263fea416943"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index da2fd2cd22d1..c792136cb4fb 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "telethon-session-sqlalchemy"; - version = "0.2.5"; + version = "0.2.14"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b392096b14e5cdc4040d3900cc2be7847b160ed77e5c861a6bd07d75d8e17a85"; + sha256 = "94aaf98afc051b4e167783f3d972bd9b51ab736a1e45df100bf52984e53eebac"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index 23a06c0cd253..334163114a18 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.5.5"; + version = "1.9.0"; src = fetchPypi { inherit version; pname = "Telethon"; - sha256 = "1qpc4vc3lidhlp1c7521nxizjr6y5c3l9x41knqv02x8n3l9knxa"; + sha256 = "a8797ad5bfee2b350cfc9b73cbb30fc19c8f73c0db42471e0df1371b1a269edc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix new file mode 100644 index 000000000000..5b9e032c49a9 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k +, numpy +, absl-py +, mock +}: + +buildPythonPackage rec { + pname = "tensorflow-estimator"; + version = "1.13.0"; + format = "wheel"; + + src = fetchPypi { + pname = "tensorflow_estimator"; + inherit version format; + sha256 = "068l4w0w7dj9gqkf8avjclq9zsp7ifwzw4rpf4qjylz3hczamzbw"; + }; + + propagatedBuildInputs = [ mock numpy absl-py ]; + + meta = with stdenv.lib; { + description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting."; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ jyp ]; + }; +} + diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index 7f2c2539a738..7840e6de0092 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -5,6 +5,7 @@ , grpcio , markdown , futures +, absl-py }: # tensorflow/tensorboard is built from a downloaded wheel, because @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; - version = "1.11.0"; + version = "1.13.0"; format = "wheel"; src = fetchPypi ({ @@ -22,13 +23,19 @@ buildPythonPackage rec { format = "wheel"; } // (if isPy3k then { python = "py3"; - sha256 = "1nkd37zq9mk0gc9x6d4x8whahbx2cn0wl94lir3g1pibdzx9hc4v"; + sha256 = "19ixs811ndx8qh72dif0ywjss3rv7pf1khsgg6rvfjb9nw8wgjc2"; } else { python = "py2"; - sha256 = "1mkyb5gn952i4s7fmc9ay4yh74ysrqbiqna6dl1qmahjpbaavbf5"; + sha256 = "0qpv6jsf6jjvdl95qvarn006kfj5a99mq925d73xg4af50ssvkrf"; })); - propagatedBuildInputs = [ numpy werkzeug protobuf markdown grpcio ] ++ lib.optional (!isPy3k) futures; + propagatedBuildInputs = [ + numpy + werkzeug + protobuf + markdown + grpcio absl-py + ] ++ lib.optional (!isPy3k) futures; meta = with stdenv.lib; { description = "TensorFlow's Visualization Toolkit"; diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 90f8c9e6e302..03f1e66bf501 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -14,6 +14,7 @@ , mock , backports_weakref , enum34 +, tensorflow-estimator , tensorflow-tensorboard , cudaSupport ? false , cudatoolkit ? null @@ -41,7 +42,7 @@ let in buildPythonPackage rec { pname = "tensorflow"; - version = "1.11.0"; + version = "1.13.1"; format = "wheel"; src = let @@ -50,11 +51,12 @@ in buildPythonPackage rec { platform = if stdenv.isDarwin then "mac" else "linux"; unit = if cudaSupport then "gpu" else "cpu"; key = "${platform}_py_${pyver}_${unit}"; - dls = import ./tf1.11.0-hashes.nix; + dls = import (./. + "/tf${version}-hashes.nix"); in fetchurl dls.${key}; - propagatedBuildInputs = [ protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-tensorboard keras-applications keras-preprocessing ] - ++ lib.optional (!isPy3k) mock; + propagatedBuildInputs = [ protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-estimator tensorflow-tensorboard keras-applications keras-preprocessing ] + ++ lib.optional (!isPy3k) mock + ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ]; # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow # and the propageted input tensorflow-tensorboard which causes environment collisions. @@ -64,7 +66,6 @@ in buildPythonPackage rec { rm $out/bin/tensorboard ''; - installFlags = "--no-dependencies"; # tensorflow wants setuptools 39, can't allow that. # Note that we need to run *after* the fixup phase because the # libraries are loaded at runtime. If we run in preFixup then # patchelf --shrink-rpath will remove the cuda libraries. diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index 0954a3810057..d4ec2e757b2a 100644 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -1,10 +1,10 @@ -version=1.11.0 +version=1.13.1 hashfile=tf${version}-hashes.nix rm -f $hashfile echo "{" >> $hashfile for sys in "linux" "mac"; do for tfpref in "cpu/tensorflow" "gpu/tensorflow_gpu"; do - for pykind in "py2-none-any" "py3-none-any" "cp27-none-linux_x86_64" "cp35-cp35m-linux_x86_64" "cp36-cp36m-linux_x86_64"; do + for pykind in "py2-none-any" "py3-none-any" "cp27-none-linux_x86_64" "cp35-cp35m-linux_x86_64" "cp36-cp36m-linux_x86_64" "cp37-cp37m-linux_x86_64"; do if [ $sys == "mac" ]; then [[ $pykind =~ py.* ]] && [[ $tfpref =~ cpu.* ]] result=$? diff --git a/pkgs/development/python-modules/tensorflow/tf1.11.0-hashes.nix b/pkgs/development/python-modules/tensorflow/tf1.11.0-hashes.nix deleted file mode 100644 index 47cd25ef7571..000000000000 --- a/pkgs/development/python-modules/tensorflow/tf1.11.0-hashes.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ -linux_py_27_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.11.0-cp27-none-linux_x86_64.whl"; - sha256 = "0s3ar2jzz2m9ilqfl4aigfi4bq8k5n04grnfqy4nyii2y98xjy14"; -}; -linux_py_35_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.11.0-cp35-cp35m-linux_x86_64.whl"; - sha256 = "0vfw2v033h8wdgjlbwjx2i9fdqqnxxc3r085irq9nzkdmwzw2jl8"; -}; -linux_py_36_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.11.0-cp36-cp36m-linux_x86_64.whl"; - sha256 = "0zmr5bw3ki5l6jb19h70kmq3k3xnq60jkw6wqqr6par1c7b4i9c3"; -}; -linux_py_27_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.11.0-cp27-none-linux_x86_64.whl"; - sha256 = "1pcacy4ky7zhq7h7d93s4xp213q1yj2zxn2khlyll389lq0bcbax"; -}; -linux_py_35_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.11.0-cp35-cp35m-linux_x86_64.whl"; - sha256 = "04ggz7jzbhl41alnj526rp0vz88h68mcv3rbs5pmrwyg0j2cqjz3"; -}; -linux_py_36_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.11.0-cp36-cp36m-linux_x86_64.whl"; - sha256 = "1ywpq3n51pn7jrr231immi2s6ghdy9s0bnkk7dg4dbbxrisxg33a"; -}; -mac_py_2_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.11.0-py2-none-any.whl"; - sha256 = "1rjb6gm0spj0l5zl02zsr6x3qagf2khrjw02z7znmsshb5xhsx8j"; -}; -mac_py_3_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.11.0-py3-none-any.whl"; - sha256 = "16la41a2d29wa4i7h1g32d94g23ixzc3wc69kd9w82w45bwfv4xl"; -}; -} diff --git a/pkgs/development/python-modules/tensorflow/tf1.13.1-hashes.nix b/pkgs/development/python-modules/tensorflow/tf1.13.1-hashes.nix new file mode 100644 index 000000000000..bbfb0632c3c5 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/tf1.13.1-hashes.nix @@ -0,0 +1,42 @@ +{ +linux_py_27_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp27-none-linux_x86_64.whl"; + sha256 = "0y1vd3y5fxcjj5d35qbk8482b0s642nyp0c2sm068vx5wd4sjpcg"; +}; +linux_py_35_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp35-cp35m-linux_x86_64.whl"; + sha256 = "0b27swk4c2vaimwzbzl4c7xnccr9cfak5a3848lfqlcavcmbp94j"; +}; +linux_py_36_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp36-cp36m-linux_x86_64.whl"; + sha256 = "087jwjby3bym09z55cjhc587aasf01y6l009p1q2vcpfq7s7ljmk"; +}; +linux_py_37_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp37-cp37m-linux_x86_64.whl"; + sha256 = "0as68dp87lh7ffcccb149km6vws15ap04604irxwz35fq9h7grxg"; +}; +linux_py_27_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp27-none-linux_x86_64.whl"; + sha256 = "0bf239f2bnsbqs3qh4xdql9pgbsm0zk7j8q1hg0wn0wrq440n0ds"; +}; +linux_py_35_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp35-cp35m-linux_x86_64.whl"; + sha256 = "1cqav22a8yz6fzk46z6kv1ha2i28h5wccbd7k66drrfxibmb93j0"; +}; +linux_py_36_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp36-cp36m-linux_x86_64.whl"; + sha256 = "1xnbiz36z7nicqrv0cmymfnwb8mdz2hifcv71gh6gnyi1962f2d7"; +}; +linux_py_37_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp37-cp37m-linux_x86_64.whl"; + sha256 = "10gcrmd9y5a89wpi4rpp9scc9l2krijv8yjp7iphlykmn54ps74k"; +}; +mac_py_2_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.13.1-py2-none-any.whl"; + sha256 = "1a6y5xj2wqkd8qmabn2xjg3q7x2jfixwrz351dgcxlhy8qy5yc0g"; +}; +mac_py_3_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.13.1-py3-none-any.whl"; + sha256 = "1klsv18k0isfd61z1wirfz1lnqmx8k73ga8g9s18yand65iycads"; +}; +} diff --git a/pkgs/development/python-modules/tensorflow/tf1.7.1-hashes.nix b/pkgs/development/python-modules/tensorflow/tf1.7.1-hashes.nix deleted file mode 100644 index c9ed7c182644..000000000000 --- a/pkgs/development/python-modules/tensorflow/tf1.7.1-hashes.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ -linux_py_27_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.7.1-cp27-none-linux_x86_64.whl"; - sha256 = "0p8n5x74qmdv9g63y176xqpfdc1gawzjysn79bvk46knrks3pa2b"; -}; -linux_py_35_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.7.1-cp35-cp35m-linux_x86_64.whl"; - sha256 = "050qv8fjpnw2y8da7s910jv4nsxg56d3xdpl09jim47kbwqabr5m"; -}; -linux_py_36_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.7.1-cp36-cp36m-linux_x86_64.whl"; - sha256 = "00d5cij1mh64hh0zc2qfl8z2hpr3nna6lhpsc6qh4am1g7wz4ndn"; -}; -linux_py_27_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.7.1-cp27-none-linux_x86_64.whl"; - sha256 = "0ami6nlp9cwg631a8f5rfpzpwb9ls9zxhsx61cimw46xljx3l2b5"; -}; -linux_py_35_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.7.1-cp35-cp35m-linux_x86_64.whl"; - sha256 = "1xfc8dww52fy8g4b0j8r20q7yj2bfg20hlk9p7sk3k9z8swfw0kc"; -}; -linux_py_36_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.7.1-cp36-cp36m-linux_x86_64.whl"; - sha256 = "1kkqx8m7h03b8l9l6dki4g4r7sgi3wbb4dp9gvk6l08n4vnlvc50"; -}; -mac_py_2_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.7.1-py2-none-any.whl"; - sha256 = "1icbsvvwkkc09s6bdd43drvnhc6v6xmnqwjzipgc8rmpj1z71yz5"; -}; -mac_py_3_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.7.1-py3-none-any.whl"; - sha256 = "0s5dy956jvwazqflc90v15i912zvhwsbzlf0cl8k7isq52j6g3kp"; -}; -} diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index d2821310068f..395deff22261 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1z3xbijvhh86adg0jk5iv1jvga7cg25q1w12icb3snr5jim9sjv2"; + sha256 = "2b60a5304ccfbeac80ffae7350d7c2f5d7a24e9aab5036d0f82489746419d9b2"; }; meta = { diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index d0d032b6217e..af3d24899c77 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.5"; + version = "3.9.7"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "4de3d599d898bf22a311248e749bb21920a8b0f6139f80489352bcb950835db2"; + sha256 = "fc968325894f812098f4fde4341c1734050bb1b742d8decf62ae9704c761f577"; }; # Do not run the test suite: it takes a long time and uses diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index acbc2a608173..79ae18d33eaa 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -63,7 +63,10 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "pathlib==1.0.1" "pathlib>=1.0.0,<2.0.0" \ --replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" \ - --replace "msgpack-numpy<0.4.4" "msgpack-numpy" + --replace "msgpack-numpy<0.4.4" "msgpack-numpy" \ + --replace "wheel>=0.32.0,<0.33.0" "wheel" \ + --replace "wrapt>=1.10.0,<1.11.0" "wrapt" \ + --replace "msgpack>=0.5.6,<0.6.0" "msgpack" ''; # Cannot find cython modules. diff --git a/pkgs/development/python-modules/thumbor/0001-Don-t-use-which-implementation-to-find-required-exec.patch b/pkgs/development/python-modules/thumbor/0001-Don-t-use-which-implementation-to-find-required-exec.patch new file mode 100644 index 000000000000..4a2d9df06181 --- /dev/null +++ b/pkgs/development/python-modules/thumbor/0001-Don-t-use-which-implementation-to-find-required-exec.patch @@ -0,0 +1,277 @@ +From bd5a5b58b438ff34d27781e28cd7fab93bfc9f3f Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sat, 9 Mar 2019 23:26:30 +0100 +Subject: [PATCH] Don't use `which` implementation to find required executables + +Nix specific patch. + +Rather than relying on a global state, we set an absolute store path for +all external dependencies to ensure their functionality. +--- + integration_tests/__init__.py | 4 ++-- + tests/engines/test_gif.py | 2 +- + tests/handlers/test_base_handler.py | 30 ++++++++++++++--------------- + tests/optimizers/test_gifv.py | 2 +- + tests/test_server.py | 4 ++++ + tests/test_utils.py | 3 +++ + thumbor/server.py | 7 +------ + 7 files changed, 26 insertions(+), 26 deletions(-) + +diff --git a/integration_tests/__init__.py b/integration_tests/__init__.py +index 9bdd0a3..7d9de8f 100644 +--- a/integration_tests/__init__.py ++++ b/integration_tests/__init__.py +@@ -15,7 +15,7 @@ class EngineCase(AsyncHTTPTestCase): + def get_app(self): + cfg = Config(SECURITY_KEY='ACME-SEC') + server_params = ServerParameters(None, None, None, None, None, None) +- server_params.gifsicle_path = which('gifsicle') ++ server_params.gifsicle_path = '@gifsicle@' + + cfg.DETECTORS = [ + 'thumbor.detectors.face_detector', +@@ -28,7 +28,7 @@ class EngineCase(AsyncHTTPTestCase): + cfg.FILE_LOADER_ROOT_PATH = os.path.join(os.path.dirname(__file__), 'imgs') + cfg.ENGINE = getattr(self, 'engine', None) + cfg.USE_GIFSICLE_ENGINE = True +- cfg.FFMPEG_PATH = which('ffmpeg') ++ cfg.FFMPEG_PATH = '@ffmpeg@' + cfg.ENGINE_THREADPOOL_SIZE = 10 + cfg.OPTIMIZERS = [ + 'thumbor.optimizers.gifv', +diff --git a/tests/engines/test_gif.py b/tests/engines/test_gif.py +index c0c8430..ce0cc51 100644 +--- a/tests/engines/test_gif.py ++++ b/tests/engines/test_gif.py +@@ -44,7 +44,7 @@ class GitEngineTestCase(TestCase): + def get_server(self): + server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None) + server.security_key = 'ACME-SEC' +- server.gifsicle_path = which('gifsicle') ++ server.gifsicle_path = '@gifsicle@' + return server + + def get_context(self, *args, **kwargs): +diff --git a/tests/handlers/test_base_handler.py b/tests/handlers/test_base_handler.py +index 69dc110..4493abe 100644 +--- a/tests/handlers/test_base_handler.py ++++ b/tests/handlers/test_base_handler.py +@@ -557,7 +557,7 @@ class ImageOperationsWithAutoWebPTestCase(BaseImagingTestCase): + server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None) + server.security_key = 'ACME-SEC' + ctx = Context(server, cfg, importer) +- ctx.server.gifsicle_path = which('gifsicle') ++ ctx.server.gifsicle_path = '@gifsicle@' + return ctx + + def get_as_webp(self, url): +@@ -657,7 +657,7 @@ class ImageOperationsWithAutoWebPWithResultStorageTestCase(BaseImagingTestCase): + server.security_key = 'ACME-SEC' + ctx = Context(server, cfg, importer) + ctx.request = self.get_request() +- ctx.server.gifsicle_path = which('gifsicle') ++ ctx.server.gifsicle_path = '@gifsicle@' + return ctx + + @property +@@ -783,7 +783,7 @@ class ImageOperationsWithGifVTestCase(BaseImagingTestCase): + cfg = Config(SECURITY_KEY='ACME-SEC') + cfg.LOADER = "thumbor.loaders.file_loader" + cfg.FILE_LOADER_ROOT_PATH = self.loader_path +- cfg.FFMPEG_PATH = which('ffmpeg') ++ cfg.FFMPEG_PATH = '@ffmpeg@' + cfg.OPTIMIZERS = [ + 'thumbor.optimizers.gifv', + ] +@@ -793,7 +793,7 @@ class ImageOperationsWithGifVTestCase(BaseImagingTestCase): + server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None) + server.security_key = 'ACME-SEC' + ctx = Context(server, cfg, importer) +- ctx.server.gifsicle_path = which('gifsicle') ++ ctx.server.gifsicle_path = '@gifsicle@' + return ctx + + def test_should_convert_animated_gif_to_mp4_when_filter_without_params(self): +@@ -828,7 +828,7 @@ class ImageOperationsImageCoverTestCase(BaseImagingTestCase): + server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None) + server.security_key = 'ACME-SEC' + ctx = Context(server, cfg, importer) +- ctx.server.gifsicle_path = which('gifsicle') ++ ctx.server.gifsicle_path = '@gifsicle@' + return ctx + + def test_can_get_image_cover(self): +@@ -849,7 +849,7 @@ class ImageOperationsWithResultStorageTestCase(BaseImagingTestCase): + cfg.RESULT_STORAGE_FILE_STORAGE_ROOT_PATH = self.root_path + + cfg.USE_GIFSICLE_ENGINE = True +- cfg.FFMPEG_PATH = which('ffmpeg') ++ cfg.FFMPEG_PATH = '@ffmpeg@' + cfg.AUTO_WEBP = True + cfg.OPTIMIZERS = [ + 'thumbor.optimizers.gifv', +@@ -860,7 +860,7 @@ class ImageOperationsWithResultStorageTestCase(BaseImagingTestCase): + server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None) + server.security_key = 'ACME-SEC' + ctx = Context(server, cfg, importer) +- ctx.server.gifsicle_path = which('gifsicle') ++ ctx.server.gifsicle_path = '@gifsicle@' + + return ctx + +@@ -891,7 +891,7 @@ class ImageOperationsResultStorageOnlyTestCase(BaseImagingTestCase): + cfg.RESULT_STORAGE = 'thumbor.result_storages.file_storage' + cfg.RESULT_STORAGE_EXPIRATION_SECONDS = 60 + cfg.RESULT_STORAGE_FILE_STORAGE_ROOT_PATH = self.root_path +- cfg.FFMPEG_PATH = which('ffmpeg') ++ cfg.FFMPEG_PATH = '@ffmpeg@' + + cfg.USE_GIFSICLE_ENGINE = True + cfg.AUTO_WEBP = True +@@ -904,7 +904,7 @@ class ImageOperationsResultStorageOnlyTestCase(BaseImagingTestCase): + server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None) + server.security_key = 'ACME-SEC' + ctx = Context(server, cfg, importer) +- ctx.server.gifsicle_path = which('gifsicle') ++ ctx.server.gifsicle_path = '@gifsicle@' + + return ctx + +@@ -1040,7 +1040,7 @@ class ImageOperationsWithMaxPixels(BaseImagingTestCase): + server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None) + server.security_key = 'ACME-SEC' + ctx = Context(server, cfg, importer) +- ctx.server.gifsicle_path = which('gifsicle') ++ ctx.server.gifsicle_path = '@gifsicle@' + return ctx + + def test_should_error(self): +@@ -1061,7 +1061,7 @@ class ImageOperationsWithRespectOrientation(BaseImagingTestCase): + server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None) + server.security_key = 'ACME-SEC' + self.context = Context(server, cfg, importer) +- self.context.server.gifsicle_path = which('gifsicle') ++ self.context.server.gifsicle_path = '@gifsicle@' + return self.context + + def test_should_be_ok_when_orientation_exif(self): +@@ -1153,7 +1153,7 @@ class ImageOperationsWithJpegtranTestCase(BaseImagingTestCase): + cfg = Config(SECURITY_KEY='ACME-SEC') + cfg.LOADER = "thumbor.loaders.file_loader" + cfg.FILE_LOADER_ROOT_PATH = self.loader_path +- cfg.JPEGTRAN_PATH = which('jpegtran') ++ cfg.JPEGTRAN_PATH = '@jpegtran@' + cfg.PROGRESSIVE_JPEG = True, + cfg.RESULT_STORAGE_STORES_UNSAFE = True, + cfg.OPTIMIZERS = [ +@@ -1175,9 +1175,7 @@ class ImageOperationsWithJpegtranTestCase(BaseImagingTestCase): + f.write(response.body) + f.close() + +- exiftool = which('exiftool') +- if not exiftool: +- raise AssertionError('exiftool was not found. Please install it to run thumbor\'s tests.') ++ exiftool = '@exiftool@' + + command = [ + exiftool, +@@ -1221,7 +1219,7 @@ class ImageOperationsWithoutStorage(BaseImagingTestCase): + server = ServerParameters(8889, 'localhost', 'thumbor.conf', None, 'info', None) + server.security_key = 'ACME-SEC' + ctx = Context(server, cfg, importer) +- ctx.server.gifsicle_path = which('gifsicle') ++ ctx.server.gifsicle_path = '@gifsicle@' + return ctx + + def test_meta(self): +diff --git a/tests/optimizers/test_gifv.py b/tests/optimizers/test_gifv.py +index 229e9cd..066f2d5 100644 +--- a/tests/optimizers/test_gifv.py ++++ b/tests/optimizers/test_gifv.py +@@ -31,7 +31,7 @@ class GifvOptimizerTest(TestCase): + def get_context(self): + conf = Config() + conf.STATSD_HOST = '' +- conf.FFMPEG_PATH = which('ffmpeg') ++ conf.FFMPEG_PATH = '@ffmpeg@' + ctx = Context(config=conf) + ctx.request = RequestParameters() + ctx.request.filters.append('gifv') +diff --git a/tests/test_server.py b/tests/test_server.py +index 5b31750..c2a65dc 100644 +--- a/tests/test_server.py ++++ b/tests/test_server.py +@@ -11,6 +11,8 @@ + from unittest import TestCase + import mock + ++from nose.tools import nottest ++ + from preggy import expect + + from thumbor.app import ThumborServiceApp +@@ -118,6 +120,7 @@ class ServerTestCase(TestCase): + expect(server_parameters.security_key).to_equal('something') + + @mock.patch.object(thumbor.server, 'which') ++ @nottest + def test_validate_gifsicle_path(self, which_mock): + server_parameters = mock.Mock(security_key=None) + conf = Config(SECURITY_KEY='test', USE_GIFSICLE_ENGINE=True) +@@ -128,6 +131,7 @@ class ServerTestCase(TestCase): + expect(server_parameters.gifsicle_path).to_equal('/usr/bin/gifsicle') + + @mock.patch.object(thumbor.server, 'which') ++ @nottest + def test_validate_null_gifsicle_path(self, which_mock): + server_parameters = mock.Mock(security_key=None) + conf = Config(SECURITY_KEY='test', USE_GIFSICLE_ENGINE=True) +diff --git a/tests/test_utils.py b/tests/test_utils.py +index 38cd51b..7dd0b3e 100644 +--- a/tests/test_utils.py ++++ b/tests/test_utils.py +@@ -10,6 +10,7 @@ + + from mock import Mock, patch + from unittest import TestCase ++from nose.tools import nottest + import logging + + from preggy import expect +@@ -112,6 +113,7 @@ class UtilsTestCase(TestCase): + test_func() + mock_warn.assert_called_once_with('Deprecated function test_func: func2') + ++ @nottest + def test_can_which_by_path(self): + result = which('/bin/ls') + expect(result).to_equal('/bin/ls') +@@ -119,6 +121,7 @@ class UtilsTestCase(TestCase): + result = which('/tmp') + expect(result).to_be_null() + ++ @nottest + def test_can_which_by_env(self): + result = which('ls') + expect(result).to_equal('/bin/ls') +diff --git a/thumbor/server.py b/thumbor/server.py +index c75a769..821163b 100644 +--- a/thumbor/server.py ++++ b/thumbor/server.py +@@ -89,12 +89,7 @@ def validate_config(config, server_parameters): + warnings.simplefilter('error', Image.DecompressionBombWarning) + + if config.USE_GIFSICLE_ENGINE: +- server_parameters.gifsicle_path = which('gifsicle') +- if server_parameters.gifsicle_path is None: +- raise RuntimeError( +- 'If using USE_GIFSICLE_ENGINE configuration to True, the `gifsicle` binary must be in the PATH ' +- 'and must be an executable.' +- ) ++ server_parameters.gifsicle_path = '@gifsicle@' + + + def get_context(server_parameters, config, importer): +-- +2.18.1 + diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix index 0f10692685b7..720391772b5d 100644 --- a/pkgs/development/python-modules/thumbor/default.nix +++ b/pkgs/development/python-modules/thumbor/default.nix @@ -1,13 +1,13 @@ { buildPythonPackage, python, tornado, pycrypto, pycurl, pytz , pillow, derpconf, python_magic, libthumbor, webcolors , piexif, futures, statsd, thumborPexif, fetchFromGitHub, isPy3k, lib -, mock, raven, nose, yanc, remotecv, pyssim, cairosvg1, preggy, opencv3 -, pkgs, coreutils +, mock, raven, nose, yanc, remotecv, pyssim, cairosvg, preggy, opencv3 +, pkgs, coreutils, substituteAll }: buildPythonPackage rec { pname = "thumbor"; - version = "6.6.0"; + version = "6.7.0"; disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004 @@ -16,9 +16,19 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "0m4q40fcha1aydyr1khjhnb08cdfma67yxgyhsvwar5a6sl0906i"; + sha256 = "1qv02jz7ivn38dsywp7nxrlflly86x9pm2pk3yqi8m8myhc7lipg"; }; + patches = [ + (substituteAll { + src = ./0001-Don-t-use-which-implementation-to-find-required-exec.patch; + gifsicle = "${pkgs.gifsicle}/bin/gifsicle"; + exiftool = "${pkgs.exiftool}/bin/exiftool"; + jpegtran = "${pkgs.libjpeg}/bin/jpegtran"; + ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; + }) + ]; + postPatch = '' substituteInPlace "setup.py" \ --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''} @@ -39,10 +49,10 @@ buildPythonPackage rec { mock yanc remotecv - cairosvg1 raven pkgs.redis pkgs.glibcLocales + pkgs.gifsicle ]; propagatedBuildInputs = [ @@ -58,10 +68,7 @@ buildPythonPackage rec { webcolors piexif statsd - pkgs.exiftool - pkgs.libjpeg - pkgs.ffmpeg - pkgs.gifsicle + cairosvg ] ++ lib.optionals (!isPy3k) [ futures thumborPexif ]; # Remove the source tree before running nosetests because otherwise nosetests @@ -71,7 +78,7 @@ buildPythonPackage rec { redis-server --port 6668 --requirepass hey_you & rm -r thumbor export LC_ALL="en_US.UTF-8" - nosetests -v --with-yanc -s tests/ + nosetests -v --with-yanc -s tests/ -e test_redeye_applied ''; meta = with lib; { diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 0e888d4ac272..9a0876548e55 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -1,31 +1,34 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pythonOlder -, numpy, nose, enum34, futures, pathlib }: +{ lib, fetchPypi, buildPythonPackage, isPy27 +, numpy, enum34, futures, pathlib +, pytest +}: buildPythonPackage rec { pname = "tifffile"; - # 2018.10.18 and 2018.11.6 are not releases...? - # https://github.com/blink1073/tifffile/issues/54 - # anaconda uses 0.15.1 - version = "0.15.1"; + version = "2019.2.22"; src = fetchPypi { inherit pname version; - sha256 = "1fbb2cfd57fd8e42e417bc29001a17f319701f1be00e0b8a0004a52da93f1b08"; + sha256 = "ed49d75b3eff711dbe74b35324dfd79e0db598b6e772a9096001545e81e95437"; }; - checkInputs = [ nose ]; + patches = lib.optional isPy27 ./python2-regex-compat.patch; + + # Missing dependencies: imagecodecs, czifile, cmapfile, oiffile, lfdfiles + # and test data missing from PyPI tarball + doCheck = false; + checkInputs = [ pytest ]; checkPhase = '' - nosetests --exe -v --exclude="test_extension" + pytest ''; propagatedBuildInputs = [ numpy ] - ++ lib.optional isPy27 [ futures pathlib ] - ++ lib.optional (pythonOlder "3.0") enum34; + ++ lib.optional isPy27 [ futures enum34 pathlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Read and write image data from and to TIFF files."; - homepage = https://github.com/blink1073/tifffile; + homepage = https://www.lfd.uci.edu/~gohlke/; maintainers = [ maintainers.lebastr ]; - license = licenses.bsd2; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/tifffile/python2-regex-compat.patch b/pkgs/development/python-modules/tifffile/python2-regex-compat.patch new file mode 100644 index 000000000000..7f4ec5764bb2 --- /dev/null +++ b/pkgs/development/python-modules/tifffile/python2-regex-compat.patch @@ -0,0 +1,23 @@ +--- a/setup.py 2019-02-20 18:52:12.000000000 +0100 ++++ b/setup.py 2019-03-02 13:55:39.014019260 +0100 +@@ -20,12 +20,6 @@ + + description = re.search(r'"""(.*)\.(?:\r\n|\r|\n)', code).groups()[0] + +-readme = re.search(r'(?:\r\n|\r|\n){2}"""(.*)"""(?:\r\n|\r|\n){2}from', code, +- re.MULTILINE | re.DOTALL).groups()[0] +- +-readme = '\n'.join([description, '=' * len(description)] +- + readme.splitlines()[1:]) +- + license = re.search(r'(# Copyright.*?(?:\r\n|\r|\n))(?:\r\n|\r|\n)+""', code, + re.MULTILINE | re.DOTALL).groups()[0] + +@@ -41,7 +35,6 @@ + name='tifffile', + version=version, + description=description, +- long_description=readme, + author='Christoph Gohlke', + author_email='cgohlke@uci.edu', + url='https://www.lfd.uci.edu/~gohlke/', diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix index 097a7368c835..2b0fc68ca4c4 100644 --- a/pkgs/development/python-modules/tilestache/default.nix +++ b/pkgs/development/python-modules/tilestache/default.nix @@ -16,7 +16,8 @@ buildPythonPackage rec { disabled = !isPy27; src = fetchPypi { - inherit pname version; + pname = "TileStache"; + inherit version; sha256 = "11e15dd85501345bcfeb18dce5b1c8fb74ac8d867df2520afe0eefe1edd85f27"; }; diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index 3fcb118ac2ad..dd1156f4355c 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { description = "A topological sort algorithm"; homepage = https://pypi.python.org/pypi/toposort/1.1; maintainers = with maintainers; [ tstrobel ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 3e67e73ac56b..772128c68608 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.5.3"; + version = "3.7.0"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "513e32fdf2f9e2d583c2f248f47ba9886428c949f068ac54a0469cac55df5862"; + sha256 = "25ef928babe88c71e3ed3af0c464d1160b01fca2dd1870a5bb26c2dea61a17fc"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index a38dd3ed88e9..f224ec21b0e8 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.28.1"; + version = "4.31.1"; src = fetchPypi { inherit pname version; - sha256 = "5b4d5549984503050883bc126280b386f5f4ca87e6c023c5d015655ad75bdebb"; + sha256 = "e22977e3ebe961f72362f6ddfb9197cc531c9737aaf5f607ef09740c849ecd05"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; @@ -27,7 +27,9 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; - doCheck = !stdenv.isDarwin; +# doCheck = !stdenv.isDarwin; + # Test suite is too big and slow. + doCheck = false; meta = { description = "A Fast, Extensible Progress Meter"; diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 380827e64881..c6f3a127ed57 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "traits"; - version = "4.6.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0w43qv36wnrimlh0nzzgg81315a18yza3vk494wqxf1l19g390jx"; + sha256 = "8369117036fbbe00dbd40e1a01c8775b52bdbfa11db5788168e7c8c56663bac0"; }; # Use pytest because its easier to discover tests diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 7808eb359326..4a2920418f1c 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.11.1"; + version = "0.11.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6043f321d856e1b45b9df0c37810264f08d065bb56cd999f61a05fe2906e9e18"; + sha256 = "a6f4b47b37a21247535fc43411cb70a8c61ef0a5a2dfee668bd05611e2741fb8"; }; propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp ]; diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix index 6d0835b431c6..e0c5329d23fc 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec{ pname = "trezor_agent"; - version = "0.9.3"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "0c1ef62903534d8b01260dbd6304780e278bc83e0bc21f6a83beee76e48e1580"; + sha256 = "e82bf000c1178b1a7612f2a90487eb34c6234d2edb15dc8e310ad875d8298690"; }; propagatedBuildInputs = [ trezor libagent ecdsa ed25519 mnemonic keepkey semver ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 3e6109133bac..f76939603d38 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.10.0"; + version = "0.11.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1c1snnhjg8l87ygf5p9z2qjcq090mws5w7pr9aaiava0yqawq8yk"; + sha256 = "3796774aedbf5be581c68f98c79b565654876de6e9a01c6a95e3ec6cd4e4b4c3"; }; checkInputs = [ pytest pyopenssl trustme jedi pylint ]; diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix index 01ad57e55d7d..476a23614169 100644 --- a/pkgs/development/python-modules/trollius/default.nix +++ b/pkgs/development/python-modules/trollius/default.nix @@ -17,6 +17,8 @@ buildPythonPackage rec { ./tests.patch ]; + disabled = isPy3k; + postPatch = '' # Overrides PYTHONPATH causing dependencies not to be found sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|g" tests/test_tasks.py diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index db966ed4421e..d870b622b8a9 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1215vr6l6c0fzsv5gyay82fxd4fidvq2rd94wvjrljs6h2wajazk"; + sha256 = "89b8d689013afeaa34b63e77f6d60eebad63edc4b247e744c7d6d891ed13a564"; }; checkInputs = [ pytest pyopenssl service-identity ]; diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix index 245556d91f6c..6c298dce7c7b 100644 --- a/pkgs/development/python-modules/tvdb_api/default.nix +++ b/pkgs/development/python-modules/tvdb_api/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , requests-cache +, pytest }: buildPythonPackage rec { @@ -15,8 +16,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests-cache ]; + checkInputs = [ pytest ]; + + # requires network access + doCheck = false; + meta = with stdenv.lib; { - description = "Simple to use TVDB (thetvdb.com) API in Python."; + description = "Simple to use TVDB (thetvdb.com) API in Python"; homepage = "https://github.com/dbr/tvdb_api"; license = licenses.unlicense; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 4c031c20aa1e..a49e994019e7 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "twine"; - version = "1.12.1"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "7d89bc6acafb31d124e6e5b295ef26ac77030bf098960c2a4c4e058335827c5c"; + sha256 = "d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc"; }; propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ]; diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/pkgs/development/python-modules/twitter-common-collections/default.nix index b2d6054aa258..ed177fc63f85 100644 --- a/pkgs/development/python-modules/twitter-common-collections/default.nix +++ b/pkgs/development/python-modules/twitter-common-collections/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.collections"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "0wf8ks6y2kalx2inzayq0w4kh3kg25daik1ac7r6y79i03fslsc5"; + sha256 = "c27f11612572f614cadf181cc65bcd0275d8b08f182bcb4ea1b74cd662625f21"; }; propagatedBuildInputs = [ twitter-common-lang ]; diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/pkgs/development/python-modules/twitter-common-confluence/default.nix index 53605baa3d5f..393bc0ac4e8b 100644 --- a/pkgs/development/python-modules/twitter-common-confluence/default.nix +++ b/pkgs/development/python-modules/twitter-common-confluence/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.confluence"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1i2fjn23cmms81f1fhvvkg6hgzqpw07dlqg3ydz6cqv2glw7zq26"; + sha256 = "8285cab3d31e4065a13575c1920101db4df0f36a59babcc225775e4fae91c0a1"; }; propagatedBuildInputs = [ twitter-common-log ]; diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/pkgs/development/python-modules/twitter-common-dirutil/default.nix index 0172232a7504..5d8a3e76fcac 100644 --- a/pkgs/development/python-modules/twitter-common-dirutil/default.nix +++ b/pkgs/development/python-modules/twitter-common-dirutil/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.dirutil"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1wpjfmmxsdwnbx5dl13is4zkkpfcm94ksbzas9y2qhgswfa9jqha"; + sha256 = "748b471bb2dd78f14e39d796cb01407aa8b61dda95808543404d5da50385efaf"; }; propagatedBuildInputs = [ twitter-common-lang ]; diff --git a/pkgs/development/python-modules/twitter-common-lang/default.nix b/pkgs/development/python-modules/twitter-common-lang/default.nix index 3541dacce4e5..53135a94d628 100644 --- a/pkgs/development/python-modules/twitter-common-lang/default.nix +++ b/pkgs/development/python-modules/twitter-common-lang/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "twitter.common.lang"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1l8fmnsrx7hgg3ivslg588rnl9n1gfjn2w6224fr8rs7zmkd5lan"; + sha256 = "9cd2d05a7f45c50c76c99024b3cad180bec42b0c65dfdc1f8ddc731bdd3b3af8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/pkgs/development/python-modules/twitter-common-log/default.nix index e3e1f2859dae..0fa7b63f5256 100644 --- a/pkgs/development/python-modules/twitter-common-log/default.nix +++ b/pkgs/development/python-modules/twitter-common-log/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "twitter.common.log"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1bdzbxx2bxwpf57xaxfz1nblzgfvhlidz8xqd7s84c62r3prh02v"; + sha256 = "81af4b0f51f3fb589f39b410d7031da6792e0ae650a45e9207a25a52a343a555"; }; propagatedBuildInputs = [ twitter-common-options twitter-common-dirutil ]; diff --git a/pkgs/development/python-modules/twitter-common-options/default.nix b/pkgs/development/python-modules/twitter-common-options/default.nix index 36b18403fab5..62705f3b6b11 100644 --- a/pkgs/development/python-modules/twitter-common-options/default.nix +++ b/pkgs/development/python-modules/twitter-common-options/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "twitter.common.options"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "0d1czag5mcxg0vcnlklspl2dvdab9kmznsycj04d3vggi158ljrd"; + sha256 = "9eeaf078462afdfa5ba237727c908a8b3b8b28d172838dbe58d3addf722da6c8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 5536c68e2bec..dd3b899efa9e 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted,isPy37 }: +{ stdenv, buildPythonPackage, fetchPypi, pytest_3, mock, six, twisted,isPy37 }: buildPythonPackage rec { pname = "txaio"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "67e360ac73b12c52058219bb5f8b3ed4105d2636707a36a7cdafb56fe06db7fe"; }; - checkInputs = [ pytest mock ]; + checkInputs = [ pytest_3 mock ]; propagatedBuildInputs = [ six twisted ]; diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index a17ecc0e592c..91e83250d8b0 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "18.3.0"; + version = "19.0.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1c7qfpr1zz34whz66lk4xpwdn7d5jqk6ccgas5n54li479mra0an"; + sha256 = "0fxzhsc62bhmr730vj9pzallmw56gz6iykvl28a5agrycm0bfc9p"; }; # Skip a failing test until fixed upstream: diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index f3f260cc1e87..ea4c9a63a194 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,10 +1,10 @@ { buildPythonPackage, fetchPypi, lib, pythonOlder }: buildPythonPackage rec { pname = "typed-ast"; - version = "1.1.2"; + version = "1.3.1"; src = fetchPypi{ inherit pname version; - sha256 = "4304399ff89452871348f6fb7a7112454cd508fbe3eb49b5ed711cce9b99fe9e"; + sha256 = "606d8afa07eef77280c2bf84335e24390055b478392e1975f96286d99d0cb424"; }; # Only works with Python 3.3 and newer; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index 69442bafd09d..961908116501 100644 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.2.11"; + version = "0.4.3"; pname = "uproot-methods"; src = fetchPypi { inherit pname version; - sha256 = "289b9b4a58511f35ab4783bb37cdc922eba75d1886e0eb1be136cc861eff7b66"; + sha256 = "f90d91a613a875ebdf214f0f6f3fd0f8beea9125fc35e54f334d6104fe47c87d"; }; propagatedBuildInputs = [ numpy awkward ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 097313b42f7a..fdb465202beb 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -10,20 +10,22 @@ , pytest , pkgconfig , lz4 +, mock +, requests , backports_lzma }: buildPythonPackage rec { pname = "uproot"; - version = "3.2.15"; + version = "3.4.6"; src = fetchPypi { inherit pname version; - sha256 = "a871f57529e3df170aa5556c1353a64077277644baecabb18d042954f2af9030"; + sha256 = "1fafe476c26252e4dbd399456323778e76d23dc2f43cf6581a707d1647978610"; }; - buildInputs = [ pytestrunner ]; - checkInputs = [ pytest pkgconfig lz4 ] + nativeBuildInputs = [ pytestrunner ]; + checkInputs = [ pytest pkgconfig lz4 mock requests ] ++ lib.optionals (pythonOlder "3.3") [ backports_lzma ]; propagatedBuildInputs = [ numpy cachetools uproot-methods awkward ]; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 09106e3a6d49..9a589ccf1f87 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = https://github.com/vega/ipyvega; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix index a7b6c6865cca..af1489df0358 100644 --- a/pkgs/development/python-modules/vega_datasets/default.nix +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "vega_datasets"; - version = "0.5.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1fa672ba89ded093b30c6d59fce10aca3ac7c927df254e588da7b6d14f695181"; + sha256 = "20d490b417f84607eb5079400f608f2e9c135b7092bee10f6857f6d23136e459"; }; propagatedBuildInputs = [ pandas ]; diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 14d678be892d..cb2b2af713de 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "venusian"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "9902e492c71a89a241a18b2f9950bea7e41d025cc8f3af1ea8d8201346f8577d"; + sha256 = "64ec8285b80b110d0ae5db4280e90e31848a59db98db1aba4d7d46f48ce91e3e"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index e01353b6238b..7003b9e1b043 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - version = "1.0.1"; + version = "1.5.6"; pname = "vidstab"; src = fetchPypi { inherit pname version; - sha256 = "31b45fa6c6c726ee05c4e106d95682f17258750d09e2e1c880bbccbf866f323e"; + sha256 = "6b488aed337855ac8b3730f7c6964c2ad41111a8f61ab0b457197696feefa593"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index a1b4cb823791..9e917e35ab07 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "virtualenv-clone"; - version = "0.2.6"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "6b3be5cab59e455f08c9eda573d23006b7d6fb41fae974ddaa2b275c93cc4405"; + sha256 = "217bd3f0880c9f85672c0bcc9ad9e0354ab7dfa89c2f117e63aa878b4279f5bf"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 5a39407ed2f8..d26b7b4f50aa 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "16.1.0"; + version = "16.4.1"; src = fetchPypi { inherit pname version; - sha256 = "f899fafcd92e1150f40c8215328be38ff24b519cd95357fa6e78e006c7638208"; + sha256 = "5a3ecdfbde67a4a3b3111301c4d64a5b71cf862c8c42958d30cf3253df1f29dd"; }; # Doubt this is needed - FRidh 2017-07-07 diff --git a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch index 2c121c83d498..4378e00bb1fc 100644 --- a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch +++ b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch @@ -13,17 +13,17 @@ it will only add the path to the python used when building available. -diff --git a/src/virtualenv.py b/src/virtualenv.py -index 4b57cde..afda73f 100755 ---- a/src/virtualenv.py -+++ b/src/virtualenv.py -@@ -1071,20 +1071,7 @@ def path_locations(home_dir, dry_run=False): +diff --git a/virtualenv.py b/virtualenv.py +index bcf3225..3530997 100755 +--- a/virtualenv.py ++++ b/virtualenv.py +@@ -1163,20 +1163,7 @@ def path_locations(home_dir, dry_run=False): def change_prefix(filename, dst_prefix): - prefixes = [sys.prefix] - -- if is_darwin: +- if IS_DARWIN: - prefixes.extend( - ( - os.path.join("/Library/Python", sys.version[:3], "site-packages"), @@ -39,20 +39,20 @@ index 4b57cde..afda73f 100755 if hasattr(sys, "real_prefix"): prefixes.append(sys.real_prefix) -@@ -1107,6 +1094,8 @@ def change_prefix(filename, dst_prefix): +@@ -1199,6 +1186,8 @@ def change_prefix(filename, dst_prefix): if src_prefix != os.sep: # sys.prefix == "/" - assert relpath[0] == os.sep - relpath = relpath[1:] + assert relative_path[0] == os.sep + relative_path = relative_path[1:] + if src_prefix == "/nix/store": -+ relpath = "/".join(relpath.split("/")[1:]) - return join(dst_prefix, relpath) ++ relative_path = "/".join(relative_path.split("/")[1:]) + return join(dst_prefix, relative_path) assert False, "Filename {} does not start with any of these prefixes: {}".format(filename, prefixes) -@@ -1233,6 +1222,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy +@@ -1375,6 +1364,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy site_filename_dst = change_prefix(site_filename, home_dir) site_dir = os.path.dirname(site_filename_dst) writefile(site_filename_dst, SITE_PY) -+ wrapper_path = join(prefix, "lib", py_version, "site-packages") ++ wrapper_path = join(prefix, "lib", PY_VERSION, "site-packages") + writefile( + join(site_dir, 'sitecustomize.py',), + "import sys; sys.path.append('%s')" % wrapper_path diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 64c1912af7ad..19ec56a1ece8 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "virtualenvwrapper"; - version = "4.8.2"; + version = "4.8.4"; src = fetchPypi { inherit pname version; - sha256 = "18d8e4c500c4c4ee794f704e050cf2bbb492537532a4521d1047e7dd1ee4e374"; + sha256 = "51a1a934e7ed0ff221bdd91bf9d3b604d875afbb3aa2367133503fee168f5bfa"; }; # pip depend on $HOME setting diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index 05d372ec47df..29515f75c9e0 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "voluptuous-serialize"; - version = "2.0.0"; + version = "2.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "44be04d87aec34bd7d31ab539341fadc505205f2299031ed9be985112c21aa41"; + sha256 = "d30fef4f1aba251414ec0b315df81a06da7bf35201dcfb1f6db5253d738a154f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 9bc2bbc27047..e2e305635200 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -22,7 +22,8 @@ buildPythonPackage rec { export HOME=$PWD ''; - buildInputs = [ python.pkgs.boost zlib.dev clang ncurses pytest docutils pygments ]; + nativeBuildInputs = [ clang ]; + buildInputs = [ python.pkgs.boost zlib.dev ncurses pytest docutils pygments ]; propagatedBuildInputs = [ numpy scipy scikitlearn ]; # Python ctypes.find_library uses DYLD_LIBRARY_PATH. diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index a377abc160e7..a988fa259a57 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "waitress"; - version = "1.1.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "d33cd3d62426c0f1b3cd84ee3d65779c7003aae3fc060dee60524d10a57f05a9"; + sha256 = "c369e238bd81ef7d61f04825f06f107c42094de60d13d8de8e71952c7c683dfe"; }; doCheck = false; diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 93a17ea4425d..26eca0d24cc1 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -6,18 +6,7 @@ , unidecode }: -let - # Support for Python 2.7 was dropped in 1.7.7 - google_api_python_client_python27 = google_api_python_client.overrideDerivation - (oldAttrs: rec { - pname = "google-api-python-client"; - version = "1.7.6"; - src = fetchPypi { - inherit pname version; - sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; - }; - }); -in buildPythonPackage rec { +buildPythonPackage rec { pname = "weboob"; version = "1.3"; disabled = ! isPy27; @@ -44,10 +33,12 @@ in buildPythonPackage rec { checkInputs = [ nose ]; + nativeBuildInputs = [ pyqt5 ]; + propagatedBuildInputs = [ pillow prettytable pyyaml dateutil gdata requests mechanize feedparser lxml gnupg pyqt5 libyaml simplejson cssselect futures pdfminer termcolor - google_api_python_client_python27 html2text unidecode ]; + google_api_python_client html2text unidecode ]; checkPhase = '' nosetests diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 6135409328b7..cfe66ce63d79 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.32.3"; + version = "0.33.1"; src = fetchPypi { inherit pname version; - sha256 = "029703bf514e16c8271c3821806a1c171220cc5bdd325cbf4e7da1e056a01db6"; + sha256 = "66a8fd76f28977bb664b098372daef2b27f60dc4d1688cfab7b37a09448f0e9d"; }; checkInputs = [ pytest pytestcov coverage ]; diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index 41d8530293d0..246b3c65fc5b 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, pytest_3 }: buildPythonPackage rec { pname = "Whoosh"; @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest_3 ]; # Wrong encoding postPatch = '' diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index de7639695d71..fb9182ab1792 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -12,7 +12,8 @@ buildPythonPackage rec { disabled = pythonOlder "2.7"; src = fetchPypi { - inherit pname version; + pname = "Willow"; + inherit version; sha256 = "818ee11803c90a0a6d49c94b0453d6266be1ef83ae00de72731c45fae4d3e78c"; }; diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix index 7258ec30f9f5..e2ad1254aa3b 100644 --- a/pkgs/development/python-modules/wptserve/default.nix +++ b/pkgs/development/python-modules/wptserve/default.nix @@ -16,6 +16,10 @@ buildPythonPackage rec { sha256 = "9d0c6adc279748abea81ac12b7a2cac97ebbdd87826dc11f6dbd85b781e9442a"; }; + postPatch = '' + substituteInPlace setup.py --replace "h2==" "h2>=" + ''; + propagatedBuildInputs = [ six h2 ]; meta = { diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index badecc776d75..9247a7c77576 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "wrapt"; - version = "1.10.11"; + version = "1.11.1"; # No tests in archive doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6"; + sha256 = "4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533"; }; meta = { diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index 8e9358dd473a..3adbaa942dd5 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -16,13 +16,14 @@ buildPythonPackage rec { numpy xarray ]; - buildInputs = [ + + nativeBuildInputs = [ gfortran - ] ++ lib.optional (pythonOlder "3.3") mock; - + ]; + checkInputs = [ netcdf4 - ]; + ] ++ lib.optional (pythonOlder "3.3") mock; doCheck = true; checkPhase = '' diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 3d81fe532aba..60f0f3cc9696 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, git, asyncio +{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, git , cherrypy, gevent, tornado }: buildPythonPackage rec { @@ -11,15 +11,16 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock git ]; - propagatedBuildInputs = [ asyncio cherrypy gevent tornado ]; + propagatedBuildInputs = [ cherrypy gevent tornado ]; checkPhase = '' - pytest -k 'not test_timeout_when_no_registered_fds and not test_mainloop_can_be_stopped_when_no_websocket_were_registered' + pytest ''; meta = with stdenv.lib; { homepage = https://ws4py.readthedocs.org; description = "A WebSocket package for Python"; maintainers = with maintainers; [ rickynils ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index 8773ef30b3d3..f9062c185841 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -1,14 +1,20 @@ -{ buildPythonPackage, fetchPypi, h11, enum34 }: +{ buildPythonPackage, fetchPypi, h11, enum34, pytest }: buildPythonPackage rec { pname = "wsproto"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "1fcb726d448f1b9bcbea884e26621af5ddd01d2d502941a024f4c727828b6009"; + sha256 = "fd6020d825022247053400306448e161d8740bdd52e328e5553cd9eee089f705"; }; propagatedBuildInputs = [ h11 enum34 ]; + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + } diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix new file mode 100644 index 000000000000..322c85b5810b --- /dev/null +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, pytest +}: + +buildPythonPackage rec { + pname = "wurlitzer"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "23e85af0850b98add77bef0a1eb47b243baab29160131d349234c9dfc9e57add"; + }; + + checkInputs = [ mock pytest ]; + + checkPhase = '' + py.test test.py + ''; + + meta = { + description = "Capture C-level output in context managers"; + homepage = https://github.com/minrk/wurlitzer; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index 427b46f44eee..584200ff2b09 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -33,12 +33,14 @@ buildPythonPackage rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ ] - ++ (lib.optional openglSupport pyopengl) - ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK (wxGTK.gtk) libX11 ]) - ++ (lib.optionals stdenv.isDarwin [ wxmac darwin.apple_sdk.frameworks.Cocoa ]) - ; + nativeBuildInputs = [ pkgconfig ] + ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ]) + ++ (lib.optionals stdenv.isDarwin [ wxmac darwin.apple_sdk.frameworks.Cocoa ]); + + buildInputs = [ ] + ++ (lib.optionals (!stdenv.isDarwin) [ (wxGTK.gtk) ]) + ++ (lib.optional openglSupport pyopengl); + preConfigure = '' cd wxPython # remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 21390d9c3f8d..674a56d3cb4e 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xkcdpass"; - version = "1.16.5"; + version = "1.17.2"; src = fetchPypi { inherit pname version; - sha256 = "62961d24466964f4770bdbdbcca9ebdb148d0bdb48a8329c7bf41e9317dbb9d4"; + sha256 = "ae7ad57c0287cc41c8c9f164b59296463f2e009d4b7aed382160cb40dfb4d91b"; }; # No tests included diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index 6307f630fcd9..e37b2694576a 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -1,22 +1,22 @@ { stdenv , buildPythonPackage , fetchPypi -, nose +, pytest }: buildPythonPackage rec { pname = "xlrd"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "8a21885513e6d915fe33a8ee5fdfa675433b61405ba13e2a69e62ee36828d7e2"; + sha256 = "546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2"; }; - checkInputs = [ nose ]; + checkInputs = [ pytest ]; checkPhase = '' - nosetests -v + py.test -k "not test_tilde_path_expansion" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 91933c5f95ec..e86b1b206094 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.12.3"; + version = "2.18.0"; src = fetchPypi { inherit pname version; - sha256 = "64609a2194d18c03e2348f1ea2fb97208b3455dfb76a16900143813aa61b6d3c"; + sha256 = "e192236798615f34479a9bb9f30df72ce0e5f319df75ecc0473d896713a17451"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index be1651caf8a4..07250337f838 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "xmltodict"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df"; + sha256 = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21"; }; checkInputs = [ coverage nose ]; diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix new file mode 100644 index 000000000000..8ffb8f96936b --- /dev/null +++ b/pkgs/development/python-modules/xnd/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, ndtypes +, libndtypes +, libxnd +, isPy27 +}: + +buildPythonPackage { + pname = "xnd"; + disabled = isPy27; + inherit (libxnd) version src meta; + + propagatedBuildInputs = [ ndtypes ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \ + 'include_dirs = ["${libndtypes}/include", "${ndtypes}/include", "${libxnd}/include"]' \ + --replace 'library_dirs = ["libxnd", "ndtypes/libndtypes"] + LIBS' \ + 'library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]' \ + --replace 'runtime_library_dirs = ["$ORIGIN"]' \ + 'runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]' \ + ''; + + postInstall = '' + mkdir $out/include + cp python/xnd/*.h $out/include + ''; +} diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix index a1e2c1a4e7b6..a474bf84d0fd 100644 --- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic-Bootstrap"; - version = "4.1.3.1"; + version = "3.3.7.1"; src = fetchPypi { inherit version pname; - sha256 = "1800e6bb5fc687604d8a893eee8c7882d800a6f3d6721799016f99a47d1dac0f"; + sha256 = "0c949e78e8cd77983fd803a68a98df0124e0c3a872fddb9ac8e6e5b4a487f131"; }; # no tests implemented diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index bfd302d27df7..53ad728cc29b 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "0x9ansmhqvc3rj0nbhpl0jdqr5pk6qdxf7i6r4gr0hzqr50vdaf0"; + sha256 = "8f25759997acb42e52b96bf3af0b4b942e6516b51198bebd3402640102006af7"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 292709a455b2..69ce7a360b01 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.25.0"; + version = "0.26.0"; src = fetchPypi { inherit pname version; - sha256 = "0mbdyhqwlm4pcd0wr5haxypxm0kr8y46nc17696xmd4pvfmzk9wa"; + sha256 = "edb47be90a56ca6f3075fe24f119a22225fbd62c66777b5d3916a7e9e793891b"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index cd31f7c2d55f..5c02ea83ec99 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.10.1"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "0r3pwfygvpkgc0hzxc6z8dl56g6brlh52r0x8kcjhywr1biahqb2"; + sha256 = "94210945c868f696a31812a510c01724d61c9a4d279eb4adf340c0d2a4c0bfd7"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 3b6237638dc3..24cb00c2b18c 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ZConfig"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "22d7fd3b8b12405f4856898995fd69e40bbe239c4c689502ee6d766a7368f585"; + sha256 = "560f779c7dcca0593083cbdb3fac9bfc7974cd5061363e2254844192e5644998"; }; patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 99d05a359631..abbc4a974f0b 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi , setuptools_scm, pathpy, nbconvert -, pytest }: +, pytest_3 }: buildPythonPackage rec { pname = "zetup"; @@ -11,11 +11,18 @@ buildPythonPackage rec { sha256 = "f1cde33d0ef3bedaf697e432201fa86da698dadd3445c0efd2a114753853c675"; }; + # Python 3.7 compatibility + # See https://github.com/zimmermanncode/zetup/pull/1 + postPatch = '' + substituteInPlace zetup/zetup_config.py \ + --replace "'3.6']" "'3.6', '3.7']" + ''; + checkPhase = '' py.test test ''; - checkInputs = [ pytest pathpy nbconvert ]; + checkInputs = [ pytest_3 pathpy nbconvert ]; propagatedBuildInputs = [ setuptools_scm ]; meta = with stdenv.lib; { @@ -24,6 +31,6 @@ buildPythonPackage rec { ''; homepage = https://github.com/zimmermanncode/zetup; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix index d7f212f22844..72c32ef8277f 100644 --- a/pkgs/development/python-modules/zm-py/default.nix +++ b/pkgs/development/python-modules/zm-py/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zm-py"; - version = "0.3.0"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "1hq83svprd21r74palhs3xq15g34135349y4lrgr7c76i3f37j2q"; + sha256 = "7cac73bd4f5e729fd8b3cff6f456652c3fd76b1a11f5d539bc7e14ffc7a87e9a"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix index 42d3842c451f..28f461689972 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.configuration"; - version = "4.3.0"; + version = "4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "ddd162b7b9379c0f5cc060cbf2af44133396b7d26eaee9c7cf6e196d87e9aeb3"; + sha256 = "6e16747f9fd6b9d8f09d78edf2a6f539cad0fa4ad49d8deb9cf63447cc4168e1"; }; checkInputs = [ zope_testrunner manuel ]; diff --git a/pkgs/development/python-modules/zope_deprecation/default.nix b/pkgs/development/python-modules/zope_deprecation/default.nix index da0d442b9c62..f6c5f51b6265 100644 --- a/pkgs/development/python-modules/zope_deprecation/default.nix +++ b/pkgs/development/python-modules/zope_deprecation/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.deprecation"; - version = "4.3.0"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "7d52e134bbaaa0d72e1e2bc90f0587f1adc116c4bdf15912afaf2f1e8856b224"; + sha256 = "0d453338f04bacf91bbfba545d8bcdf529aa829e67b705eac8c1a7fdce66e2df"; }; buildInputs = [ zope_testing ]; diff --git a/pkgs/development/python-modules/zope_i18n/default.nix b/pkgs/development/python-modules/zope_i18n/default.nix index f9a7264f02c2..aad822bca594 100644 --- a/pkgs/development/python-modules/zope_i18n/default.nix +++ b/pkgs/development/python-modules/zope_i18n/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zope.i18n"; - version = "4.6.1"; + version = "4.6.2"; src = fetchPypi { inherit pname version; - sha256 = "14f7339f6d4fed5e94882a7f1b2e40fd90ad00b3c28a7f4353762101395e3304"; + sha256 = "229de41f751dae36b1ef9fa284bc548ef40169234bf0d2199e41581e16304621"; }; propagatedBuildInputs = [ pytz zope_component ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index e28f5d85a6b0..5daab9f31a54 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx -, file, libvirt, glib, vips +, file, libvirt, glib, vips, taglib , libselinux ? null, libsepol ? null }@args: @@ -423,6 +423,17 @@ in ''; }; + taglib-ruby = attrs: { + buildInputs = [ taglib ]; + }; + + thrift = attrs: { + # See: https://stackoverflow.com/questions/36378190/cant-install-thrift-gem-on-os-x-el-capitan/36523125#36523125 + # Note that thrift-0.8.0 is a dependency of fluent-plugin-scribe which is a dependency of fluentd. + buildFlags = lib.optional (stdenv.isDarwin && lib.versionOlder attrs.version "0.9.2.0") + "--with-cppflags=\"-D_FORTIFY_SOURCE=0 -Wno-macro-redefined -Wno-shift-negative-value\""; + }; + timfel-krb5-auth = attrs: { buildInputs = [ kerberos ]; }; diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 9ae81e073df3..68422f09a4f4 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.6.3"; + version = "1.6.4"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0wdicgf41ysxcdly4hzpav52yhjx410c7c7nfbq87p0cqzywrbxd"; + sha256 = "16mx2394wmm4jvy26rlp46mb2nf8cayvxclpa6fn0sb4klqs7mc2"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index defc39a9f749..7db46005f453 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -27,6 +27,6 @@ perlPackages.buildPerlPackage rec { ''; homepage = http://www.gson.org/egypt/; license = with licenses; [ artistic1 gpl1Plus ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index d2c27b9f4853..939ae10c089d 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ant, jdk }: +{ stdenv, fetchFromGitHub, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { name = "jdepend-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install dist/${name}.jar $out/share cat > "$out/bin/jdepend" < # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "20591"; - gittap = "3.2.1"; - gittip = "25913f4745cb3b635d52f1aafc4d8ff2aad3988a"; - rev = "3.2.1"; - version = "3.2.1"; - sha256 = "1c4zj96386sc9lvfcsdh9lhyh0rvv4zzfr6218gvjkg9fy6cc91y"; - cs_tip = "0ff8220adef16a942697afd245afc5ab0f70cbf8"; - cs_sha256 = "1ak8ysgivq28d23r77881p0z5v65jhpap5plm10p9j3y2x00n3zn"; + version_commit = "20942"; + gittap = "3.3.0"; + gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; + rev = "3.3.0"; + version = "3.3.0"; + sha256 = "11ap3icr8w0y49lq5dxch2h589qdmwf3qv9lsdyfsz4l0mjm49ri"; + cs_ver = "4.0.1"; + cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "20591"; + version_commit = "20942"; gittap = "2.9.0-310-gcb62c376b"; gittip = "cb62c376bef6c7427019a7c28910c33c364436dd"; rev = "cb62c376bef6c7427019a7c28910c33c364436dd"; version = "2018-10-07"; sha256 = "0z4nr1d2ca8ibq34441j15pj22wh46brcbr00j5hcqvn8y2lh96l"; - cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; + cs_ver = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722"; }; # diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py index 684d70bc0bc4..794581bca7ad 100755 --- a/pkgs/development/tools/analysis/radare2/update.py +++ b/pkgs/development/tools/analysis/radare2/update.py @@ -61,15 +61,15 @@ def git(dirname: str, *args: str) -> str: def get_repo_info(dirname: str, rev: str) -> Dict[str, str]: sha256 = prefetch_github("radare", "radare2", rev) - cs_tip = None + cs_ver = None with open(Path(dirname).joinpath("shlr", "Makefile")) as makefile: for l in makefile: - match = re.match("CS_TIP=(\S+)", l) + match = re.match("CS_VER=(\S+)", l) if match: - cs_tip = match.group(1) - assert cs_tip is not None + cs_ver = match.group(1) + assert cs_ver is not None - cs_sha256 = prefetch_github("aquynh", "capstone", cs_tip) + cs_sha256 = prefetch_github("aquynh", "capstone", cs_ver) return dict( rev=rev, @@ -77,7 +77,7 @@ def get_repo_info(dirname: str, rev: str) -> Dict[str, str]: version_commit=git(dirname, "rev-list", "--all", "--count"), gittap=git(dirname, "describe", "--tags", "--match", "[0-9]*"), gittip=git(dirname, "rev-parse", "HEAD"), - cs_tip=cs_tip, + cs_ver=cs_ver, cs_sha256=cs_sha256, ) @@ -90,7 +90,7 @@ def write_package_expr(version: str, info: Dict[str, str]) -> str: rev = "{info["rev"]}"; version = "{version}"; sha256 = "{info["sha256"]}"; - cs_tip = "{info["cs_tip"]}"; + cs_ver = "{info["cs_ver"]}"; cs_sha256 = "{info["cs_sha256"]}"; }}""" diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 8778084163e8..a63395efda87 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -2,43 +2,79 @@ , python }: -with python.pkgs; +let + py = python.override { + packageOverrides = self: super: { + click = super.click.overridePythonAttrs (oldAttrs: rec { + version = "6.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; + }; + }); + + requests = super.requests.overridePythonAttrs (oldAttrs: rec { + version = "2.20.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263"; + }; + }); + + idna = super.idna.overridePythonAttrs (oldAttrs: rec { + version = "2.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16"; + }; + }); + + six = super.six.overridePythonAttrs (oldAttrs: rec { + version = "1.11"; + src = oldAttrs.src.override { + inherit version; + sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"; + }; + }); + }; + }; + +in + +with py.pkgs; buildPythonApplication rec { pname = "aws-sam-cli"; - version = "0.5.0"; + version = "0.14.2"; src = fetchPypi { inherit pname version; - sha256 = "2acf9517f467950adb4939746658091e60cf60ee80093ffd0d3d821cb8a1f9fc"; + sha256 = "b7f80838d57c1096a9a03ed703a91a8a5775a6ead33df8f31765ecf39b3a956f"; }; # Tests are not included in the PyPI package doCheck = false; propagatedBuildInputs = [ + aws-lambda-builders aws-sam-translator - boto3 + chevron click cookiecutter dateparser docker - enum34 flask - python-dateutil - pyyaml + idna + pathlib2 + requests + serverlessrepo six ]; - postPatch = '' - substituteInPlace ./requirements/base.txt \ - --replace 'aws-sam-translator==1.6.0' 'aws-sam-translator>=1.6.0'; - ''; - meta = with lib; { homepage = https://github.com/awslabs/aws-sam-cli; description = "CLI tool for local development and testing of Serverless applications"; license = licenses.asl20; - maintainers = with maintainers; [ andreabedini ]; + maintainers = with maintainers; [ andreabedini dhkl ]; }; } diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 5bb1825d0350..c75a053acb27 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -10,13 +10,13 @@ buildBazelPackage rec { name = "bazel-watcher-${version}"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "0yphks1qlp3xcbq5mg95lxrhl3q8pza5g3f9i2j6y7dsfz0s0l4v"; + sha256 = "1gjbv67ydyb0mafpp59qr9n8f8vva2mwhgan6lxxl0i9yfx7qc6p"; }; nativeBuildInputs = [ go git python ]; @@ -49,7 +49,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "14k1cpw4h78c2gk294xzq9a9nv09yabdrahbzgin8xizbgdxn1q8"; + sha256 = "0p6yarz4wlb6h33n4slkczkdkaa93zc9jx55h8wl9vv81ahp0md5"; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 32d35f1421c8..eb9f0d106d10 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -6,6 +6,7 @@ # Allow to independently override the jdks used to build and run respectively , buildJdk, runJdk , buildJdkName +, runtimeShell # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false @@ -281,7 +282,7 @@ stdenv.mkDerivation rec { mkdir -p tools cat > tools/bazel <<"EOF" - #!${stdenv.shell} -e + #!${runtimeShell} -e exit 1 EOF chmod +x tools/bazel @@ -290,7 +291,7 @@ stdenv.mkDerivation rec { ! hello_test cat > tools/bazel <<"EOF" - #!${stdenv.shell} -e + #!${runtimeShell} -e exec "$BAZEL_REAL" "$@" EOF diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/pkgs/development/tools/build-managers/cmake/application-services.patch index c83f56ae5720..78077f9eaa52 100644 --- a/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -1,6 +1,24 @@ -diff -ur cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx ---- cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx 2018-08-09 21:14:08.000000000 +0900 -+++ cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx 2018-08-12 02:47:28.719691934 +0900 +diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt +index 8aff8f6..af1852d 100644 +--- a/Source/CMakeLists.txt ++++ b/Source/CMakeLists.txt +@@ -791,12 +791,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc" + endif() + endif() + +-# On Apple we need CoreFoundation and CoreServices +-if(APPLE) +- target_link_libraries(CMakeLib "-framework CoreFoundation") +- target_link_libraries(CMakeLib "-framework CoreServices") +-endif() +- + if(WIN32 AND NOT UNIX) + # We need the rpcrt4 library on Windows. + # We need the crypt32 library on Windows for crypto/cert APIs. +diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx +index e353a37..b06f842 100644 +--- a/Source/cmGlobalXCodeGenerator.cxx ++++ b/Source/cmGlobalXCodeGenerator.cxx @@ -35,11 +35,6 @@ struct cmLinkImplementation; @@ -13,3 +31,19 @@ diff -ur cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx cmake-3.12.1-patched/Sou #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmXMLParser.h" +diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt +index d7af6e2..d4808fc 100644 +--- a/Utilities/cmlibarchive/CMakeLists.txt ++++ b/Utilities/cmlibarchive/CMakeLists.txt +@@ -1662,11 +1662,6 @@ IF(MSVC) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) + ENDIF(MSVC) + +-# We need CoreServices on Mac OS. +-IF(APPLE) +- LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices") +-ENDIF(APPLE) +- + add_subdirectory(libarchive) + + install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 68d4118f0491..54fe8e4af5a0 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, fetchpatch, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash +, buildPackages # darwin attributes -, ps +, cf-private, ps , isBootstrap ? false , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , useNcurses ? false, ncurses @@ -16,10 +17,10 @@ with stdenv.lib; let os = stdenv.lib.optionalString; - majorVersion = "3.12"; - minorVersion = "1"; - # from https://cmake.org/files/v3.12/cmake-3.12.1-SHA-256.txt - sha256 = "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5"; + majorVersion = "3.13"; + minorVersion = "4"; + # from https://cmake.org/files/v3.13/cmake-3.13.4-SHA-256.txt for cmake-3.13.4.tar.gz + sha256 = "fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b"; version = "${majorVersion}.${minorVersion}"; in @@ -33,11 +34,6 @@ stdenv.mkDerivation rec { inherit sha256; }; - prePatch = optionalString (!useSharedLibraries) '' - substituteInPlace Utilities/cmlibarchive/CMakeLists.txt \ - --replace '"-framework CoreServices"' '""' - ''; - patches = [ # Don't search in non-Nix locations such as /usr, but do search in our libc. ./search-path.patch @@ -56,11 +52,14 @@ stdenv.mkDerivation rec { buildInputs = [ setupHook pkgconfig ] + ++ optional stdenv.isDarwin cf-private # needed for CFBundleCopyExecutableURL ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] ++ optional useNcurses ncurses ++ optional useQt4 qt4 ++ optional withQt5 qtbase; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + propagatedBuildInputs = optional stdenv.isDarwin ps; preConfigure = '' @@ -71,7 +70,8 @@ stdenv.mkDerivation rec { --subst-var-by libc_lib ${getLib stdenv.cc.libc} substituteInPlace Modules/FindCxxTest.cmake \ --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell} - configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags" + # BUILD_CC and BUILD_CXX are used to bootstrap cmake + configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$BUILD_CC CXX=$BUILD_CXX $configureFlags" ''; configureFlags = [ @@ -95,6 +95,11 @@ stdenv.mkDerivation rec { # Avoid depending on frameworks. ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; + # make install attempts to use the just-built cmake + preInstall = optional (stdenv.hostPlatform != stdenv.buildPlatform) '' + sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile + ''; + dontUseCmakeConfigure = true; enableParallelBuilding = true; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 72d9f631afbc..8ae56834702b 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -30,6 +30,13 @@ let newPython = python3.override { sha256 = "1fyybgbmlr8ms32j7h76hz5g9xc6nf0644mwhc40a0s5k14makav"; }; }); + pluginbase = super.pluginbase.overridePythonAttrs (oldAttrs: rec { + version = "0.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8"; + }; + }); }; }; diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 18c6eff76e1f..024c57201e12 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,109 +1,76 @@ { stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: -let +stdenv.mkDerivation rec { + name = "dub-${version}"; + version = "1.13.0"; - dubBuild = stdenv.mkDerivation rec { - name = "dubBuild-${version}"; - version = "1.13.0"; + enableParallelBuilding = true; - enableParallelBuilding = true; - - src = fetchFromGitHub { - owner = "dlang"; - repo = "dub"; - rev = "v${version}"; - sha256 = "1wd5pdnbaafj33bbg188w0iz28ps4cyjangb12g2s9dyic29zjqv"; - }; - - postUnpack = '' - patchShebangs . - ''; - - # Can be removed with https://github.com/dlang/dub/pull/1368 - dubvar = "\\$DUB"; - postPatch = '' - substituteInPlace test/fetchzip.sh \ - --replace "dub remove" "\"${dubvar}\" remove" - ''; - - nativeBuildInputs = [ dmd libevent rsync ]; - buildInputs = [ curl ]; - - buildPhase = '' - export DMD=${dmd.out}/bin/dmd - ./build.sh - ''; - - installPhase = '' - mkdir $out - mkdir $out/bin - cp bin/dub $out/bin - ''; - - meta = with stdenv.lib; { - description = "Package and build manager for D applications and libraries"; - homepage = http://code.dlang.org/; - license = licenses.mit; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; + src = fetchFromGitHub { + owner = "dlang"; + repo = "dub"; + rev = "v${version}"; + sha256 = "1wd5pdnbaafj33bbg188w0iz28ps4cyjangb12g2s9dyic29zjqv"; }; - # Need to test in a fixed-output derivation, otherwise the - # network tests would fail if sandbox mode is enabled. - # Disable tests on Darwin for now because they don't work - # reliably there. - dubUnittests = if !stdenv.hostPlatform.isDarwin then - stdenv.mkDerivation rec { - name = "dubUnittests-${version}"; - version = dubBuild.version; + postUnpack = '' + patchShebangs . + ''; - enableParallelBuilding = dubBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = dubBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; + # Can be removed with https://github.com/dlang/dub/pull/1368 + dubvar = "\\$DUB"; + postPatch = '' + substituteInPlace test/fetchzip.sh \ + --replace "dub remove" "\"${dubvar}\" remove" + ''; - src = dubBuild.src; - - postUnpack = dubBuild.postUnpack; - postPatch = dubBuild.postPatch; + nativeBuildInputs = [ dmd libevent rsync ]; + buildInputs = [ curl ]; - nativeBuildInputs = dubBuild.nativeBuildInputs; - buildInputs = dubBuild.buildInputs; + buildPhase = '' + export DMD=${dmd.out}/bin/dmd + ./build.sh + ''; - buildPhase = '' - # Can't use dub from dubBuild directly because one unittest - # (issue895-local-configuration) needs to generate a config - # file under ../etc relative to the dub location. - cp ${dubBuild}/bin/dub bin/ - export DUB=$NIX_BUILD_TOP/source/bin/dub - export PATH=$PATH:$NIX_BUILD_TOP/source/bin/ - export DC=${dmd.out}/bin/dmd - export HOME=$TMP - ./test/run-unittest.sh - ''; + doCheck = true; - installPhase = '' - echo -n $inputString > $out - ''; - } - else - ""; + checkPhase = '' + export DUB=$NIX_BUILD_TOP/source/bin/dub + export PATH=$PATH:$NIX_BUILD_TOP/source/bin/ + export DC=${dmd.out}/bin/dmd + export HOME=$TMP -in + rm -rf test/issue502-root-import + rm test/issue990-download-optional-selected.sh + rm test/timeout.sh + rm test/issue674-concurrent-dub.sh + rm test/issue672-upgrade-optional.sh + rm test/issue1574-addcommand.sh + rm test/issue1524-maven-upgrade-dependency-tree.sh + rm test/issue1416-maven-repo-pkg-supplier.sh + rm test/issue1037-better-dependency-messages.sh + rm test/interactive-remove.sh + rm test/fetchzip.sh + rm test/feat663-search.sh + rm test/ddox.sh + rm test/0-init-multi.sh + rm test/0-init-multi-json.sh -stdenv.mkDerivation rec { - inherit dubUnittests; - name = "dub-${dubBuild.version}"; - phases = "installPhase"; - buildInputs = dubBuild.buildInputs; + ./test/run-unittest.sh + ''; installPhase = '' mkdir $out - cp -r --symbolic-link ${dubBuild}/* $out/ + mkdir $out/bin + cp bin/dub $out/bin ''; - meta = dubBuild.meta; + meta = with stdenv.lib; { + description = "Package and build manager for D applications and libraries"; + homepage = http://code.dlang.org/; + license = licenses.mit; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; } diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index 7fd801488311..baa658b522a3 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, nix-update-source, lib, python, which, pychecker ? null }: +{ stdenv, fetchFromGitHub, nix-update-source, lib, python +, which, runtimeShell, pychecker ? null }: stdenv.mkDerivation rec { version = "0.7.0"; src = fetchFromGitHub { @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { cp -r python/bin $out/bin ''; passthru.updateScript = '' - #!${stdenv.shell} + #!${runtimeShell} set -e echo cd ${toString ./.} diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 66e6dcbc0598..5e03474bf10d 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.9.0"; + version = "2.9.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "18wwcc956w1ii6zf8zjndgvmc614s18nxz3dary2iigbfq4y0asc"; + sha256 = "1h0gpzpr7xk6hvmrrq41bcp2k9aai348baf8ad9bxvci01n4zb12"; }; jarsrc = fetchurl { # NOTE: This is actually a .jar, Github has issues url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip"; - sha256 = "07pw852w57w3lj3fddlxfzjsln90q52dwxvxpz9qbprw8p2xfrim"; + sha256 = "1y2mva5s2w2szzn1b9rhz0dvkffls4ravii677ybcf2w9wd86z7a"; }; JARNAME = "${name}-standalone.jar"; diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index 8cce2b88317d..796747bf6e9c 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -20,6 +20,13 @@ stdenv.mkDerivation rec { url = "https://github.com/ninja-build/ninja/commit/9aa947471fcfc607bec6d92a1a6eed5c692edbaf.patch"; sha256 = "0zsg46jflsh644jccrcgyfalr7fkzrv041kyi8644nyk923gcrl9"; }) + # https://github.com/ninja-build/ninja/issues/1510 - fix w/musl, possibly BSDs? + # + (fetchpatch { + name = "fix-issue-1510.patch"; + url = https://github.com/makepost/ninja/commit/567815df38a2ff54ad7478a90bd75c91e434236a.patch; + sha256 = "0zd0xyi7h2066nw1dsk76c7yf71b0f7v4p5nljda7jxi01vpdh69"; + }) ]; nativeBuildInputs = [ python re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 02bf9c23cbac..9757d8cda8d1 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -3,21 +3,21 @@ with stdenv.lib; with pythonPackages; -let - version = "1.7.0"; -in buildPythonApplication rec { - inherit version; +buildPythonApplication rec { pname = "pantsbuild.pants"; - name = "${pname}-${version}"; + version = "1.7.0"; src = fetchPypi { inherit pname version; sha256 = "1d7ff1383287c8e72f2c9855cfef982d362274a64e2707a93c070f988ba80a37"; }; + # No tests + doCheck = false; + prePatch = '' sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py - substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.20,>=2.5.0" + substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.22,>=2.5.0" ''; # Unnecessary, and causes some really weird behavior around .class files, which @@ -36,6 +36,6 @@ in buildPythonApplication rec { homepage = "https://www.pantsbuild.org/"; license = licenses.asl20; maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.unix; + broken = true; }; } diff --git a/pkgs/development/tools/build-managers/waf/setup-hook.sh b/pkgs/development/tools/build-managers/waf/setup-hook.sh index b8a448df8ef8..3da86d3201f5 100644 --- a/pkgs/development/tools/build-managers/waf/setup-hook.sh +++ b/pkgs/development/tools/build-managers/waf/setup-hook.sh @@ -1,20 +1,23 @@ wafConfigurePhase() { runHook preConfigure - if ! [ -f ./waf ]; then - cp @waf@ waf + if ! [ -f "${wafPath:=./waf}" ]; then + echo "copying waf to $wafPath..." + cp @waf@ "$wafPath" fi - if [[ -z "${dontAddPrefix:-}" && -n "$prefix" ]]; then - configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" + if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then + wafConfigureFlags="${prefixKey:---prefix=}$prefix $wafConfigureFlags" fi local flagsArray=( - $configureFlags ${configureFlagsArray[@]} + @crossFlags@ + "${flagsArray[@]}" + $wafConfigureFlags "${wafConfigureFlagsArray[@]}" ${configureTargets:-configure} ) echoCmd 'configure flags' "${flagsArray[@]}" - python waf "${flagsArray[@]}" + python "$wafPath" "${flagsArray[@]}" runHook postConfigure } @@ -33,7 +36,7 @@ wafBuildPhase () { ) echoCmd 'build flags' "${flagsArray[@]}" - python waf "${flagsArray[@]}" + python "$wafPath" "${flagsArray[@]}" runHook postBuild } @@ -52,7 +55,7 @@ wafInstallPhase() { ) echoCmd 'install flags' "${flagsArray[@]}" - python waf "${flagsArray[@]}" + python "$wafPath" "${flagsArray[@]}" runHook postInstall } diff --git a/pkgs/development/tools/cachix/cachix-api.nix b/pkgs/development/tools/cachix/cachix-api.nix new file mode 100644 index 000000000000..de8184308b27 --- /dev/null +++ b/pkgs/development/tools/cachix/cachix-api.nix @@ -0,0 +1,33 @@ +{ mkDerivation, aeson, base, base16-bytestring, bytestring, conduit +, cookie, cryptonite, deepseq, exceptions, hspec, hspec-discover +, http-api-data, http-media, lens, memory, protolude, resourcet +, servant, servant-auth, servant-auth-server, servant-auth-swagger +, servant-client, servant-swagger, servant-swagger-ui-core, stdenv +, string-conv, swagger2, text, transformers +}: +mkDerivation { + pname = "cachix-api"; + version = "0.2.0"; + sha256 = "73f27484d3748fe02ce834549dd3a04c92110390f7d9adb4c391bad2ececbef2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring conduit cookie cryptonite + deepseq exceptions http-api-data http-media lens memory resourcet + servant servant-auth servant-auth-server servant-auth-swagger + servant-client servant-swagger string-conv swagger2 text + transformers + ]; + executableHaskellDepends = [ aeson base ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring conduit cookie cryptonite + hspec http-api-data http-media lens memory protolude servant + servant-auth servant-auth-server servant-auth-swagger + servant-swagger servant-swagger-ui-core string-conv swagger2 text + transformers + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/cachix/cachix#readme"; + description = "Servant HTTP API specification for https://cachix.org"; + license = stdenv.lib.licenses.asl20; +} diff --git a/pkgs/development/tools/cachix/cachix.nix b/pkgs/development/tools/cachix/cachix.nix new file mode 100644 index 000000000000..0f5a354ec94e --- /dev/null +++ b/pkgs/development/tools/cachix/cachix.nix @@ -0,0 +1,39 @@ +{ mkDerivation, async, base, base16-bytestring, base64-bytestring +, bytestring, cachix-api, conduit, conduit-extra, cookie +, cryptonite, data-default, dhall, directory, ed25519, filepath +, fsnotify, here, hspec, hspec-discover, http-client +, http-client-tls, http-conduit, http-types, lzma-conduit +, megaparsec, memory, mmorph, netrc, optparse-applicative, process +, protolude, retry, safe-exceptions, servant, servant-auth +, servant-auth-client, servant-client, servant-client-core +, servant-conduit, stdenv, temporary, text, unix, uri-bytestring +, versions +}: +mkDerivation { + pname = "cachix"; + version = "0.2.0"; + sha256 = "16ba70af7f2ba4bc147ba84c34c9884bee589237a1d935f932c5e0b68157665a"; + revision = "1"; + editedCabalFile = "103ypqp0kclc1814q2ci5fi2jpfbxwmjqfsnkvwf3c1vr8cqplmh"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + async base base16-bytestring base64-bytestring bytestring + cachix-api conduit conduit-extra cookie cryptonite data-default + dhall directory ed25519 filepath fsnotify here http-client + http-client-tls http-conduit http-types lzma-conduit megaparsec + memory mmorph netrc optparse-applicative process protolude retry + safe-exceptions servant servant-auth servant-auth-client + servant-client servant-client-core servant-conduit text unix + uri-bytestring versions + ]; + executableHaskellDepends = [ base cachix-api ]; + executableToolDepends = [ hspec-discover ]; + testHaskellDepends = [ + base cachix-api directory here hspec protolude temporary + ]; + homepage = "https://github.com/cachix/cachix#readme"; + description = "Command line client for Nix binary cache hosting https://cachix.org"; + license = stdenv.lib.licenses.asl20; +} diff --git a/pkgs/development/tools/cachix/default.nix b/pkgs/development/tools/cachix/default.nix new file mode 100644 index 000000000000..a127fb137f67 --- /dev/null +++ b/pkgs/development/tools/cachix/default.nix @@ -0,0 +1,3 @@ +{ haskellPackages, haskell }: + +(haskell.lib.doDistribute haskellPackages.cachix).bin diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 1cd8f7757f96..0e21164482a8 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -19,7 +19,7 @@ buildRustPackage rec { description = "Generate changelogs from local git metadata"; homepage = https://github.com/clog-tool/clog-cli; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [stdenv.lib.maintainers.nthorne]; }; } diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index 4f285fa69618..dd80cdeff567 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "cloudfoundry-cli-${version}"; - version = "6.41.0"; + version = "6.43.0"; goPackagePath = "code.cloudfoundry.org/cli"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "1dkd0lfq55qpnxsrigffaqm2nlcxr0bm0jsl4rsjlmb8p2vgpx8b"; + sha256 = "0nigc8h5g9kb1max7nz74jzd8nmsxd3pfx7piimq9drlkh17v5kr"; }; makeTarget = let hps = stdenv.hostPlatform.system; in diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index ae9fa6b3690c..1aa13a34d121 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.7.0"; + version = "12.1.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1q8m2hi85kh01lz6agp76ppny3ik5m61v5l3ipha4jf6k90140k8"; + sha256 = "1yx530h5rz7wmd012962f9dfj0hvj1m7zab5vchndna4svzzycch"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1325jh984hv7yhc977d271866i5gq78lmw4h16sj5i8zny4wzgz5"; + sha256 = "0zsin76qiq46w675wdkaz3ng1i9szad3hzmk5dngdnr59gq5mqhk"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "119azvkbx6gmmh7y166jxaja0a6n8lghmslsyar95dxw8akxrfzz"; + sha256 = "0npjgarbwih8j2ih1mshwyp4nj9h15phvg61kifh63p9mf4r63nn"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index ecfdc1b027c1..babc46115e80 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.150.1"; + version = "2.164.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0sb6mzynw1vg6s43mpd7b0dz1clbf8akga09i14q66isb9nmhf3s"; + sha256 = "03m5ykl6kqih9li2fhyq9rf8x8djaj2rgjd2p897zzw5j0grkbx8"; }; buildCommand = '' diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index f2346480776c..602eb33fdc1c 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "pgcli"; @@ -13,6 +13,16 @@ python3Packages.buildPythonApplication rec { sha256 = "1p4j2dbcfxd3kz86qi519jkqjx1mg5wdgn1gxdjx3lk1vpsd7x04"; }; + patches = [ + (fetchpatch { + # TODO: Remove with next pgcli release. Fixes TypeError in tests + # https://github.com/dbcli/pgcli/pull/1006 + url = https://github.com/dbcli/pgcli/commit/351135b61ef9ad3184c49a406544708daf589fe3.patch; + sha256 = "08131y0lv1v760i0ypcx2hljx066ks93kp96xkv3bycxnavvcl53"; + excludes = [ "changelog.rst" ]; + }) + ]; + propagatedBuildInputs = with python3Packages; [ cli-helpers click configobj humanize prompt_toolkit psycopg2 pygments sqlparse pgspecial setproctitle keyring diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index d667e49e7cbe..e559f714bd1b 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { description = "Bulk, parallel insert of CSV records into PostgreSQL"; homepage = http://github.com/timescale/timescaledb-parallel-copy; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 91037e6dfaa9..d0bb744f1247 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -29,7 +29,7 @@ buildGoPackage rec { homepage = https://deis.io; description = "A command line utility used to interact with the Deis open source PaaS."; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ jgeerds ]; diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix index 3f818ea7be62..b8f49c863e46 100644 --- a/pkgs/development/tools/deisctl/default.nix +++ b/pkgs/development/tools/deisctl/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { homepage = https://deis.io; description = "A command-line utility used to provision and operate a Deis cluster."; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ jgeerds ]; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index e70971b670c2..b23745a7b493 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { }; checkInputs = with pythonPackages; [ - pytest pytestflakes webtest mock + pytest pytest-flakes webtest mock devpi-server tox sphinx wheel git mercurial detox setuptools diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index c93321638099..f50191d7dad3 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "dive"; - version = "0.5.0"; + version = "0.6.0"; goPackagePath = "github.com/wagoodman/dive"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "wagoodman"; repo = "dive"; rev = "v${version}"; - sha256 = "159m36p7b0ygdp42qdmmz02rhrkymh8m6yl21m1ixd4c2pjkjhns"; + sha256 = "05n19a5q1yi8r6r72z634z93lz2i347zccs9qm7gx5h86nh147zd"; }; goDeps = ./deps.nix; @@ -21,6 +21,6 @@ buildGoPackage rec { description = "A tool for exploring each layer in a docker image"; homepage = https://github.com/wagoodman/dive; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam spacekookie ]; }; } diff --git a/pkgs/development/tools/dive/deps.nix b/pkgs/development/tools/dive/deps.nix index c140b2ae7748..99fe79c1814c 100644 --- a/pkgs/development/tools/dive/deps.nix +++ b/pkgs/development/tools/dive/deps.nix @@ -709,4 +709,24 @@ sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; }; } + + { + goPackagePath = "github.com/logrusorgru/aurora"; + fetch = { + type = "git"; + url = "https://github.com/logrusorgru/aurora"; + rev = "a7b3b318ed4e"; + sha256 = "1dldc270z42zm2d377ks7sa5059janjcjhv3inza3rjvapknsrcb"; + }; + } + + { + goPackagePath = "github.com/wagoodman/keybinding"; + fetch = { + type = "git"; + url = "https://github.com/wagoodman/keybinding"; + rev = "6a824da6df05"; + sha256 = "0f59idv5xia7w53363ym0qywvp0aas2kmk93rnndf2s7cs2f1d3l"; + }; + } ] diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index ccfcfaace014..593287dbf21a 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.084.0"; + version = "2.084.1"; srcs = [ (fetchFromGitHub { owner = "dlang"; repo = "dmd"; rev = "v${version}"; - sha256 = "1v61spdamncl8c1bzjc19b03p4jl0ih5zq9b7cqsy9ix7qaxmikf"; + sha256 = "10ll5072rkv3ln7i5l88h2f9mzda567kw2jwh6466vm6ylzl4jms"; name = "dmd"; }) (fetchFromGitHub { @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { postUnpack = '' mv dmd dtools cd dtools + + substituteInPlace posix.mak --replace "\$(DMD) \$(DFLAGS) -unittest -main -run rdmd.d" "" ''; nativeBuildInputs = [ dmd ]; diff --git a/pkgs/development/tools/electron/3.x.nix b/pkgs/development/tools/electron/3.x.nix index 90a7c53be023..23620a12530b 100644 --- a/pkgs/development/tools/electron/3.x.nix +++ b/pkgs/development/tools/electron/3.x.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2, at-spi2-atk }: let - version = "3.1.0"; + version = "3.1.4"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -19,19 +19,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "09llladfj8l1vnk8fl8ad66qq4czr755fhrp5ciivpbh38zi6d3d"; + sha256 = "1llwpd10cz5nfwqimib7xkc3xxj3z4y19l97wxma3bciizmmgq3k"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "0g0af1z598f8k2i5sbkzpbga49hbgzl98qgk1n4iagk08iivyfwy"; + sha256 = "0mb7q82r9ndvz181lnkplmvwkijzc2msrpfwpghrhsc4j3zbh0bf"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "04yj58v1sqnw64csazpfcchv2498ppxs2izadpnirawk09azl3bl"; + sha256 = "0cf4jqq3n66dm11cy96q3nj1jxajv49yamhvn5g8a85nq4s5cx6f"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "0cjf4i24qpgkmzb4nm89kgl07bwrncpz66xs5jjvi94pmr6wx6jm"; + sha256 = "0lxp7fpccwk6qdw79dgjlm9hywfwl3aj932qg2aff18vs077skrg"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -59,7 +59,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "1cd1ashrcbdjlrr6yijyh2ppk8x8jdw5cm9qnx4lzk7sj9lwjbgb"; + sha256 = "1indim895a58ds09z91c8jfqmdp7ba85rx6bhq6dabgnvkykwmz0"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 5a00a883f512..8c6dce0114e8 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk }: let - version = "4.0.0"; + version = "4.0.6"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -20,19 +20,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "0yv2f7yf6ingjysswpnpnvqsjkdkp2rd4laawhziifzbfjda4yws"; + sha256 = "1ffv4wlj827wyq7y2hfaz2d0fapqr2r9likb90ayzh91vmkc8c2y"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "1kh2jds7jra9f1vcn2z1193cxcyvfxkldim4b9ij7chj9xzxwgln"; + sha256 = "01b063jabx7fglh63dk7nh21xxadwxrrvavcwznpw6jhid48g2yz"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "1v492qfdgnj3fks2hrfc9lmsx5a5xk957rvismlpc2mjkjrwx2dq"; + sha256 = "18dsb3pyj9gfn8xyzhblx7nidgp39pfqs1ml07nxfkf1bjdh4c4w"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "18vpqif5grvhrkx6h64yzw1pf9013811gzq2qxaj8pzr6lck3irf"; + sha256 = "0dx6bzj0laygqkyl8ngbh0yfzyc5mxr3fxlqb867cza9sz5hh95l"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -60,7 +60,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "08n3xzgncb2hf645zn8b0rb1izq9pqh3726hf2g4nvrgfllivlg1"; + sha256 = "0r1yn5lz808xdwp29g4kmlm5v0i1fsdxd4ph537gyz3sfn30dgq9"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 1a9d83c12947..d4fa99c48258 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -37,7 +37,7 @@ }: let - version = "1.0.2"; + version = "1.0.5"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "0z5aaw9zvgp26szbysa3059gqsivq5ah8b6l29mqxx6ryp1nhrc1"; + sha256 = "1l5hpxkc7f3mp9v8wyagpbc8vvfn0m0jq8rsk1h7vwyyjmijv6mb"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix new file mode 100644 index 000000000000..3408b960889d --- /dev/null +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + name = "git-quick-stats-${version}"; + version = "2.0.8"; + src = fetchFromGitHub { + repo = "git-quick-stats"; + owner = "arzzen"; + rev = "${version}"; + sha256 = "1px1sk7b6mjnbclsr1jn33m9k4wd8wqyw4d6w1rgj0ii29lhzmqi"; + }; + PREFIX = builtins.placeholder "out"; + meta = with stdenv.lib; { + homepage = "https://github.com/arzzen/git-quick-stats"; + description = "A simple and efficient way to access various statistics in git repository"; + platforms = platforms.all; + maintainers = [ maintainers.kmein ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 361fc74c729b..750df126e943 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { description = " Go bindings for protocol buffer"; maintainers = with maintainers; [ lewo ]; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index a2a049615b78..3b52c262c0c6 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, jshon, electron, hyper-haskell-server, extra-packages ? [] }: +{ stdenv, fetchFromGitHub, jshon, electron +, runtimeShell, hyper-haskell-server, extra-packages ? [] }: let binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); @@ -34,7 +35,7 @@ in stdenv.mkDerivation rec { # install electron wrapper script cat > $out/bin/hyper-haskell < $out/bin/gcc << EOF - #!${stdenv.shell} + #!${runtimeShell} ${extraConfig} exec ${distcc}/bin/distcc gcc "\$@" EOF @@ -61,7 +62,7 @@ let fi if [ -x "${gcc.cc}/bin/g++" ]; then cat > $out/bin/g++ << EOF - #!${stdenv.shell} + #!${runtimeShell} ${extraConfig} exec ${distcc}/bin/distcc g++ "\$@" EOF diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 0e4af1348902..73de8eb8cb61 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -6,6 +6,7 @@ , libtool , makeWrapper , texinfo +, CoreServices }: stdenv.mkDerivation rec { @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1d1fvm36qgh6a5j9v24wai61d297pvzxr14jngjlhh4i474ff21i"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; buildInputs = [ gettext libtool makeWrapper texinfo ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 0529a2764924..782bff68e349 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" = "1rg4j5jm8mkscrwlbx5qk3qjnblyr8z9x5npvyi73zm0ism0gv4j"; - "i686-linux" = "14swgx9sf23pns2pj30yyhd0p0rnykdimdrnj8rb0r1pqszw57qx"; - "x86_64-darwin" = "10l13r47nx74xicnjgb56nvgvx2al1zx1p8f09pjldaa2gjlll2k"; + "x86_64-linux" = "0hzr47hyw54b9j4c33n6f6n3pala6kjhyvinfszgikbghyhb7fsa"; + "i686-linux" = "0bka4h31cw10ii4pfygc81pwc3wr32pzw3v4k4bi8rnqbk280fmn"; + "x86_64-darwin" = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/6.x.nix similarity index 54% rename from pkgs/development/tools/misc/kibana/default.nix rename to pkgs/development/tools/misc/kibana/6.x.nix index 9d5e94e7d76e..e11dd5040b09 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -4,13 +4,14 @@ , makeWrapper , fetchzip , fetchurl -, nodejs +, nodejs-10_x , coreutils , which }: with stdenv.lib; let + nodejs = nodejs-10_x; inherit (builtins) elemAt; info = splitString "-" stdenv.hostPlatform.system; arch = elemAt info 0; @@ -18,26 +19,14 @@ let shas = if enableUnfree then { - "x86_64-linux" = "0lip4bj3jazv83gydw99dnp03cb0fd1p4z3lvpjbisgmqffbbg5v"; - "x86_64-darwin" = "0hjdnqagcwbjhpcfyr6w0zmy4sjnx4fyp79czb0vp7dig5arnwm3"; + "x86_64-linux" = "1i3zmzxihplwd8n994lfxhhgygdg3qxjqgrj1difa8w3vss0zbfn"; + "x86_64-darwin" = "09a96ms9id77infxd9xxfs6r7j01mn0rz5yw3g9sl92j9ri7r52c"; } else { - "x86_64-linux" = "1jybn4q7pz61iijzl85d948szlacfcbldn2nhhsb6063xwvf30sa"; - "x86_64-darwin" = "1bl1h6hgp9l5cjq6pzj2x855wjaka8hbs0fn2c03lbzsc991dppr"; + "x86_64-linux" = "166rhxr0qlv1yarj2mg1c3b8mxvhl70jhz53azq7ic6laj55q7fk"; + "x86_64-darwin" = "0ngngkbl036p2mzwhp8qafi3aqzk398a218w12srfqny5n630vdk"; }; - # For the correct phantomjs version see: - # https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js - phantomjs = rec { - name = "phantomjs-${version}-linux-x86_64"; - version = "2.1.1"; - src = fetchzip { - inherit name; - url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv"; - }; - }; - in stdenv.mkDerivation rec { name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; version = elk6Version; @@ -48,7 +37,7 @@ in stdenv.mkDerivation rec { }; patches = [ - # Kibana specifies it specifically needs nodejs 8.11.4 but nodejs in nixpkgs is at 8.12.0. + # Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3. # The test succeeds with this newer version so lets just # disable the version check. ./disable-nodejs-version-check.patch @@ -63,13 +52,6 @@ in stdenv.mkDerivation rec { makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana - '' + - # phantomjs is needed in the unfree version. When phantomjs doesn't exist in - # $out/libexec/kibana/data kibana will try to download and unpack it during - # runtime which will fail because the nix store is read-only. So we make sure - # it already exist in the nix store. - optionalString enableUnfree '' - ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name} ''; meta = { diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix new file mode 100644 index 000000000000..0c3dd9f12c28 --- /dev/null +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -0,0 +1,64 @@ +{ elk7Version +, enableUnfree ? true +, stdenv +, makeWrapper +, fetchzip +, fetchurl +, nodejs-10_x +, coreutils +, which +}: + +with stdenv.lib; +let + nodejs = nodejs-10_x; + inherit (builtins) elemAt; + info = splitString "-" stdenv.hostPlatform.system; + arch = elemAt info 0; + plat = elemAt info 1; + shas = + if enableUnfree + then { + "x86_64-linux" = "1mzycd0ljnkslz9p9jhq279bkpk35r7svhngxjnmsh11ampsvxb8"; + "x86_64-darwin" = "1bz409njdpmsagh5dg062114wpa96w7pmxwfjsizwksqyyjdwdv7"; + } + else { + "x86_64-linux" = "1x3gjc9xa03m4jfnl5vjxigzcnb8ysnhxgd8618v85x4l0010v38"; + "x86_64-darwin" = "1nsbmrswv2jv2z7686i2sf6rrmxysbqi5ih6jjrbrqnk64xi18j2"; + }; + +in stdenv.mkDerivation rec { + name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; + version = elk7Version; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; + sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + }; + + patches = [ + # Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3. + # The test succeeds with this newer version so lets just + # disable the version check. + ./disable-nodejs-version-check.patch + ]; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/libexec/kibana $out/bin + mv * $out/libexec/kibana/ + rm -r $out/libexec/kibana/node + makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ + --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" + sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana + ''; + + meta = { + description = "Visualize logs and time-stamped data"; + homepage = http://www.elasticsearch.org/overview/kibana; + license = if enableUnfree then licenses.elastic else licenses.asl20; + maintainers = with maintainers; [ offline rickynils basvandijk ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index 017c6ad80491..240d52ca7d0e 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -30,6 +30,6 @@ buildGoPackage rec { downloadPage="https://gitlab.com/esr/loccount/tree/master"; license = licenses.bsd2; maintainers = with maintainers; [ calvertvl ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index ad50e7e8e6df..5e418fcfdcfd 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -8,26 +8,17 @@ }: let - s = # Generated upstream information - rec { - baseName="luarocks"; - version="2.4.4"; - name="${baseName}-${version}"; - hash="0d7rl60dwh52qh5pfsphgx5ypp7k190h9ri6qpr2yx9kvqrxyf1r"; - url="http://luarocks.org/releases/luarocks-2.4.4.tar.gz"; - sha256="0d7rl60dwh52qh5pfsphgx5ypp7k190h9ri6qpr2yx9kvqrxyf1r"; - }; - buildInputs = [ - lua curl makeWrapper which unzip - ]; in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; +stdenv.mkDerivation rec { + pname="luarocks"; + version="2.4.4"; + src = fetchurl { - inherit (s) url sha256; + url="http://luarocks.org/releases/luarocks-${version}.tar.gz"; + sha256="0d7rl60dwh52qh5pfsphgx5ypp7k190h9ri6qpr2yx9kvqrxyf1r"; }; + patches = [ ./darwin.patch ]; preConfigure = '' lua -e "" || { @@ -41,6 +32,11 @@ stdenv.mkDerivation { configureFlags="$configureFlags --with-lua-include=$lua_inc" fi ''; + + buildInputs = [ + lua curl makeWrapper which + ]; + postInstall = '' sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* for i in "$out"/bin/*; do @@ -68,10 +64,12 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit (s) version; + inherit version; description = ''A package manager for Lua''; license = licenses.mit ; maintainers = with maintainers; [raskin teto]; platforms = platforms.linux ++ platforms.darwin; + downloadPage = "http://luarocks.org/releases/"; + updateWalker = true; }; } diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index f7b77cdc418d..874aa04157dc 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git }: +{ stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }: stdenv.mkDerivation rec { name = "opengrok-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out cp -a * $out/ substituteInPlace $out/bin/OpenGrok --replace "/bin/uname" "${coreutils}/bin/uname" - substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!${stdenv.shell}" + substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!${runtimeShell}" wrapProgram $out/bin/OpenGrok \ --prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \ --set JAVA_HOME "${jre}" \ diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index c89492287db4..19e4423f7d86 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -9,7 +9,7 @@ { stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor , freetype, libXinerama, libxcb, zlib, pciutils -, makeDesktopItem, xkeyboardconfig +, makeDesktopItem, xkeyboardconfig, dbus, runtimeShell, libGL }: let @@ -17,30 +17,23 @@ let libPath = stdenv.lib.makeLibraryPath [ glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11 libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib + dbus libGL ]; in +assert stdenv.hostPlatform.system == "x86_64-linux"; + stdenv.mkDerivation rec { pname = "saleae-logic"; - version = "1.2.10"; + version = "1.2.18"; name = "${pname}-${version}"; - src = - if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - name = "saleae-logic-${version}-32bit.zip"; - url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(32-bit).zip"; - sha256 = "1dyrj07cgj2fvwi1sk97vady9ri8f8n7mxy9zyzmw9isngs7bmll"; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - name = "saleae-logic-${version}-64bit.zip"; - url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip"; - sha256 = "1skx2pfnic7pyss7c69qb7kg2xvflpxf112xkf9awk516dw1w4h7"; - } - else - throw "Saleae Logic software requires i686-linux or x86_64-linux"; + src = fetchurl { + name = "saleae-logic-${version}-64bit.zip"; + url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip"; + sha256 = "0lhair2vsg8sjvzicvfcjfmvy30q7i01xj4z02iqh7pgzpb025h8"; + }; desktopItem = makeDesktopItem { name = "saleae-logic"; @@ -61,7 +54,15 @@ stdenv.mkDerivation rec { # Patch it patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic" - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic" + for bin in "$out/Logic" \ + "$out/libQt5Widgets.so.5" \ + "$out/libQt5Gui.so.5" \ + "$out/libQt5Core.so.5" \ + "$out/libQt5Network.so.5" ; do + patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$bin" + done + + patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/../" "$out/platforms/libqxcb.so" # Build the LD_PRELOAD library that makes Logic work from a read-only directory mkdir -p "$out/lib" @@ -70,7 +71,7 @@ stdenv.mkDerivation rec { # Make wrapper script that uses the LD_PRELOAD library mkdir -p "$out/bin" cat > "$out/bin/saleae-logic" << EOF - #!${stdenv.shell} + #!${runtimeShell} export LD_PRELOAD="$out/lib/preload.so" export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb" export PATH="${pciutils}/bin:\$PATH" @@ -91,7 +92,7 @@ stdenv.mkDerivation rec { description = "Software for Saleae logic analyzers"; homepage = http://www.saleae.com/; license = licenses.unfree; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 28500ee08eee..965f0ed096cd 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl }: +{ fetchurl, stdenv, perl, makeWrapper }: stdenv.mkDerivation rec { name = "sloccount-2.26"; @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl ]; # Make sure the Flex-generated files are newer than the `.l' files, so that @@ -40,6 +41,13 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/doc" ''; + postInstall = '' + for w in "$out/bin"/*; do + isScript "$w" || continue + wrapProgram "$w" --prefix PATH : "$out/bin" + done + ''; + meta = { description = "Set of tools for counting physical Source Lines of Code (SLOC)"; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index b3e9e71ebc05..a7f06e734530 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -104,7 +104,7 @@ in stdenv.mkDerivation rec { makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ - --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store + --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 537997eb8a45..59a1cd223b5d 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -114,7 +114,7 @@ print <<'EOF'; makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ - --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store + --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index be6bb73aab81..d9e563952ea7 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -2,7 +2,7 @@ , lambdaTerm, cppo, makeWrapper }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !stdenv.lib.versionAtLeast ocaml.version "4.03" then throw "utop is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 5e54a8b37058..162ac045a9de 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.3.3"; + version = "1.4.0"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "1b1yp5k2apccyqw9zb2xclnm16gfnnkaiwh2s0p79prsy6gjkp7y"; + sha256 = "0fpzmwh7vq8vc7gvlnpx4ji4yaxwi2h2ksz0z4782469pkcnbg56"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 09d7daa97bff..57fed5c9e8d1 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0sz6rzmfz5scian0a28lrvkrsd0108dmxrxpqh4nyi2ahlglbma1"; + sha256 = "1lfvns1f6xamz9905fakzkxh4zmk1wa9w33vxcq78fc5841ivnhg"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index 3a4f35c0412b..a3dc7bd16ce0 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { homepage = https://github.com/nathan/pax; license = licenses.mit; maintainers = [ maintainers.klntsky ]; - platforms = platforms.all; + platforms = platforms.linux; }; src = @@ -26,7 +26,7 @@ buildRustPackage rec { }; cargo-lock = fetchurl { - url = "https://gist.github.com/8084/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock"; + url = "https://gist.github.com/klntsky/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock"; sha256 = "0ff1b64b99cbca1cc2ceabcd2e4f7bc3411e3a2a9fbb9db2204d9240fe38ddeb"; }; in diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 254b3d2283ed..296d45723b24 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { pkgconfig shared-mime-info wrapGAppsHook - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ]; diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 3bba4237cf85..9a4211299555 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -38,11 +38,11 @@ let ]; in stdenv.mkDerivation rec { name = "react-native-debugger-${version}"; - version = "0.8.1"; + version = "0.9.7"; src = fetchurl { url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "180rvcnr3xxg7nb5g4b45l9a67h2dx8ps0l05r6ph3f71kzh4dd9"; + sha256 = "0f1wvk1550z4imcs60sv229zllcxpykx4b60bw658idr1xc3c0ix"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 5a1c2364a777..a1f5e5769ae8 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin }: +{ stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin, + runtimeShell }: rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; @@ -32,7 +33,7 @@ rustPlatform.buildRustPackage rec { doCheck = true; checkInputs = let fakeRustup = writeScriptBin "rustup" '' - #!${stdenv.shell} + #!${runtimeShell} shift shift exec "$@" diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 6b14f49716f2..15f48b0b940d 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,23 +2,26 @@ rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; - version = "0.6.7"; + version = "0.8.7"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "0sgkgvkqrc6l46fvk6d9hsy0xrjpl2ix47f3cv5bi74dv8i4y2b4"; + sha256 = "040rivayr0dgmrhlly5827c850xbr0j5ngiy6rvwyba5j9iv2x0y"; }; - cargoSha256 = "137dqj1sp02dh0dz9psf8i8q57gmz3rfgmwk073k7x5zzkgvj21c"; + cargoSha256 = "00j5nm491zil6kpjns31qyd6z7iqd77b5qp4h7149s70qjwfq2cb"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + # https://github.com/eqrion/cbindgen/issues/338 + RUSTC_BOOTSTRAP = 1; + meta = with stdenv.lib; { description = "A project for generating C bindings from Rust code"; homepage = https://github.com/eqrion/cbindgen; license = licenses.mpl20; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar andir ]; }; } diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 50aad7a013a9..e4744b01b0bb 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,12 +6,12 @@ let allSpecs = { "x86_64-linux" = { system = "linux64"; - sha256 = "0iq015nyhdn1z50aj6k2d38cf1vbp59x7qi48aikb4z1h3h1j6a6"; + sha256 = "04wb6h57daxmnv3a3xrcsznawbx7r8wyi1vk1g26z2l2ppcnsbzv"; }; "x86_64-darwin" = { system = "mac64"; - sha256 = "0bf59g7vx7qbz9lx6wgk82zjbf8isag1n3lbi0gw4b2bgv8md8ia"; + sha256 = "0f8j7m8ardaaw8pv02vxhwkqbcm34366bln0np0j0ig21d4fag09"; }; }; @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.46"; + version = "76.0.3809.68"; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 11de0bec425b..2e9093bfae6c 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { name = "skaffold-${version}"; - version = "0.19.0"; - # rev is the 0.19.0 commit, mainly for skaffold version command output - rev = "9eb0dfc1bf634b97462c66b4dfb80e4cea378ade"; + version = "0.21.1"; + # rev is the 0.21.1 commit, mainly for skaffold version command output + rev = "a73671cb547a80d3437f78d046bc500269673ea3"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0s7dyfdmgslwnmbkzyqvf2622gj5d7vx9igwz3bf6dpaz382mk6h"; + sha256 = "0n4gqri4rmah1brckj9d4vidm6faabvwfy5smhpl3f6flyv3slsy"; }; meta = { diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 966c50404d45..eeef99991db8 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -8,21 +8,21 @@ let in stdenv.mkDerivation rec { name = "trellis-${version}"; - version = "2018.12.20"; + version = "2019.02.21"; srcs = [ (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis"; - rev = "b947028a6ac6494b6000c6e1ab5aa0db813e8544"; - sha256 = "14dcsl2drx3xaqvpawp0j7088cijxcr5018yji48rmbl85763aw9"; + rev = "90910577671cdd950e56df6cb29d848dadea9467"; + sha256 = "0j5gnkqfkp8k01wmzsplg713dmw1zvg04hsy33bzbyxaqviybdip"; name = "trellis"; }) (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis-db"; - rev = "670d04f0b8412193d5e974eea67f2bb7355aa1ec"; - sha256 = "1hm385rg1jq9qbq63g5134gq9xpfadvpahxvzwpv0q543brkg730"; + rev = "d0b219af41ae3da6150645fbc5cc5613b530603f"; + sha256 = "1mnzvrqrcbfypvbagwyf6arv3kmj6q7n27gcmyk6ap2xnavkx4bq"; name = "database"; }) ]; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index b8ba30361aa8..0ad3677b6cd5 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,11 +1,12 @@ -{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, libguestfs, qemu, writeText, withLibvirt ? true}: +{ stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive +, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux }: let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.0"; + version = "2.2.5"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "1wa8l3j6hpy0m0snz7wvfcf0wsjikp22c2z29crpk10f7xl7c56b"; + sha256 = "0a228f5185b24b72efcc5a3924f86fa9fabab6f7562c3c63c1d9d239aa72a7b1"; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index 39eeb02ce55c..ad3422d8b599 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -1,12 +1,13 @@ { - addressable = { - dependencies = ["public_suffix"]; + bcrypt_pbkdf = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35"; type = "gem"; }; - version = "2.5.2"; + version = "1.0.1"; }; builder = { source = { @@ -25,14 +26,15 @@ }; version = "0.6.3"; }; - crack = { - dependencies = ["safe_yaml"]; + concurrent-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "0.4.3"; + version = "1.1.5"; }; diff-lcs = { source = { @@ -44,12 +46,22 @@ }; domain_name = { dependencies = ["unf"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v"; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; type = "gem"; }; - version = "0.5.20180417"; + version = "0.5.20190701"; + }; + ed25519 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw"; + type = "gem"; + }; + version = "1.2.4"; }; erubis = { source = { @@ -59,30 +71,26 @@ }; version = "2.7.0"; }; - fake_ftp = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rn7lxdk3sqc2i4v2c5k25b9ca1qnkdf32nv04y760aml9mszwf7"; - type = "gem"; - }; - version = "0.1.1"; - }; ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; type = "gem"; }; - version = "1.9.25"; + version = "1.11.1"; }; gssapi = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix"; + sha256 = "13l6pqbfrx3vv7cw26nq9p8rnyp9br31gaz85q32wx6hnzfcriwh"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; gyoku = { dependencies = ["builder"]; @@ -93,14 +101,6 @@ }; version = "1.3.1"; }; - hashdiff = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9"; - type = "gem"; - }; - version = "0.3.7"; - }; hashicorp-checkpoint = { source = { remotes = ["https://rubygems.org"]; @@ -127,12 +127,13 @@ version = "2.8.3"; }; i18n = { + dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00nsll7q89ab6k43dl3apxjhy4zidlgjmgb9mpk42bj3wk5zdyzf"; + sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7"; type = "gem"; }; - version = "0.8.0"; + version = "1.1.1"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; @@ -178,12 +179,14 @@ version = "3.2.2"; }; mime-types-data = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; + sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; type = "gem"; }; - version = "3.2018.0812"; + version = "3.2019.0331"; }; multi_json = { source = { @@ -214,10 +217,10 @@ net-ssh = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qfanf71yv8w7yl9l9wqcy68i2x1ghvnf8m581yy4pl0anfdhqw8"; + sha256 = "0jglf8rxvlw6is5019r6kwsdhw38zm3z39jbghdbj449r6h7h77n"; type = "gem"; }; - version = "5.0.2"; + version = "5.1.0"; }; netrc = { source = { @@ -235,22 +238,6 @@ }; version = "2.6.0"; }; - public_suffix = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; - type = "gem"; - }; - version = "3.0.3"; - }; - rake = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; - type = "gem"; - }; - version = "12.0.0"; - }; rb-fsevent = { source = { remotes = ["https://rubygems.org"]; @@ -263,10 +250,10 @@ dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4"; type = "gem"; }; - version = "0.9.10"; + version = "0.10.0"; }; rb-kqueue = { dependencies = ["ffi"]; @@ -313,15 +300,6 @@ }; version = "3.5.0"; }; - rspec-its = { - dependencies = ["rspec-core" "rspec-expectations"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3"; - type = "gem"; - }; - version = "1.2.0"; - }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; source = { @@ -356,20 +334,14 @@ version = "0.6.2"; }; rubyzip = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; + sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc"; type = "gem"; }; - version = "1.2.2"; - }; - safe_yaml = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - type = "gem"; - }; - version = "1.0.4"; + version = "1.2.3"; }; thor = { source = { @@ -389,15 +361,14 @@ version = "0.1.4"; }; unf_ext = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; + sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf"; type = "gem"; }; - version = "0.0.7.5"; - }; - vagrant = { - dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "rubyzip" "vagrant_cloud" "wdm" "winrm" "winrm-elevated" "winrm-fs"]; + version = "0.0.7.6"; }; vagrant-spec = { dependencies = ["childprocess" "log4r" "rspec" "thor"]; @@ -414,10 +385,10 @@ dependencies = ["rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k325a1cblj3jd2av8a6j3xsjjm36g578gpbmxw7h5dbffp49il1"; + sha256 = "0451x3ab869hbycffcq656dm7mmjwmnxcyhv6g7dpdv3acg64783"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; wdm = { source = { @@ -427,40 +398,33 @@ }; version = "0.1.1"; }; - webmock = { - dependencies = ["addressable" "crack" "hashdiff"]; + winrm = { + dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5"; + sha256 = "19vxrclxc5l8n2agwvv291740s6gna2phg3lkybjb0ldkmpi3sj2"; type = "gem"; }; version = "2.3.2"; }; - winrm = { - dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05c1xji4afwxx4vgim5n4nj62zbyppmm67ci3kwi0jjrqaj9y11q"; - type = "gem"; - }; - version = "2.3.0"; - }; winrm-elevated = { dependencies = ["winrm" "winrm-fs"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04krbwnj4cw7jy42w3n2y5kp2fbcp3v9mbf59pdhfk1py18bswcr"; + sha256 = "1saqc3ffh075y6fdkc7iqmn0v3pnidvfw0sh09w9cn6jvpsdxizk"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; winrm-fs = { dependencies = ["erubis" "logging" "rubyzip" "winrm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12g9grzp03knh1nxcicnm93pmlf4r264lhvl5yviyri8swmqlbz5"; + sha256 = "0fy4yj52kssrm5hchq7l2mbry6w6yvi736p1wjpyv8m19rx7k0c3"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch b/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch index 885959428956..7b4ce471c94d 100644 --- a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch +++ b/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch @@ -1,8 +1,8 @@ -diff --git i/bin/vagrant w/bin/vagrant -index 19df75033..682fae226 100755 ---- i/bin/vagrant -+++ w/bin/vagrant -@@ -128,11 +128,6 @@ begin +diff --git a/bin/vagrant b/bin/vagrant +index 0e6abdc..cb36e9c 100755 +--- a/bin/vagrant ++++ b/bin/vagrant +@@ -155,11 +155,6 @@ begin end end @@ -11,6 +11,6 @@ index 19df75033..682fae226 100755 - env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false) - end - - begin - # Execute the CLI interface, and exit with the proper error code - exit_status = env.cli(argv) + # Acceptable experimental flag values include: + # + # Unset - Disables experimental features diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index ab90bb27bd5e..8f3df66ec37f 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -17,10 +17,10 @@ buildPythonApplication rec { disabled = ! pythonAtLeast "3.5"; # Prevent setup.py from adding dependencies in run-time and insisting on specific package versions - patchPhase = '' + postPatch = '' substituteInPlace setup.py --replace "return requires" "return []" - ''; - buildInputs = [ coverage pytest pytestcov ]; + ''; + checkInputs = [ pytest ]; propagatedBuildInputs = [ ansicolor chardet pyyaml ] ; # The acceptance tests check for stdout and location of binary files, which fails in nix-build. diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index e2250297c8eb..211f71693976 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeScript, writeText, php }: +{ stdenv, lib, fetchurl, writeScript, writeText, php, runtimeShell }: let version = "2.0.1"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin $dir cat <<_EOF > $out/bin/wp -#!${stdenv.shell} +#!${runtimeShell} set -euo pipefail diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index b2455095a01a..959c79405e86 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,5 +1,6 @@ { stdenv, lib, buildPackages, makeWrapper, writeText, runCommand , CoreServices, ImageIO, CoreGraphics +, runtimeShell , xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" , xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1" , sdkVer ? stdenv.targetPlatform.sdkVer or "10.10" }: @@ -35,7 +36,7 @@ let ''; xcode-select = writeText "xcode-select" '' -#!${stdenv.shell} +#!${runtimeShell} while [ $# -gt 0 ]; do case "$1" in -h | --help) ;; # noop @@ -50,7 +51,7 @@ done ''; xcrun = writeText "xcrun" '' -#!${stdenv.shell} +#!${runtimeShell} while [ $# -gt 0 ]; do case "$1" in --sdk | -sdk) shift ;; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 8ff02dfe7180..0cd80b6cae33 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser , pkgconfig, which # Updater dependencies -, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix +, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell , gnupg , darwin, xcbuild , procps @@ -104,7 +104,7 @@ in ''; passthru.updateScript = import ./update.nix { - inherit stdenv writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix; + inherit stdenv writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell; inherit (stdenv) lib; inherit majorVersion; }; diff --git a/pkgs/development/web/nodejs/update.nix b/pkgs/development/web/nodejs/update.nix index bf6951dc6882..7b5a4710aa09 100644 --- a/pkgs/development/web/nodejs/update.nix +++ b/pkgs/development/web/nodejs/update.nix @@ -9,10 +9,11 @@ , common-updater-scripts , majorVersion , nix +, runtimeShell }: writeScript "update-nodejs" '' - #!${stdenv.shell} + #!${runtimeShell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq gnupg nix ]} HOME=`mktemp -d` diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 79da49ec64c6..e6825abe7695 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.15.0"; - sha256 = "0gnygq4n7aar4jrynnnslxhlrlrml9f1n9passvj2fxqfi6b6ykr"; + version = "10.15.3"; + sha256 = "1mcijznh481s44i59p571a38bfvcxm9f8x2l0l1005aly0kdj8jf"; } diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix index b2711d29b5ba..4026a1b02bb6 100644 --- a/pkgs/development/web/nodejs/v11.nix +++ b/pkgs/development/web/nodejs/v11.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "11.7.0"; - sha256 = "18md1xz055rxds4i831rmmya0xda7cc0wdmr1jnj8vigfbcbvzh7"; + version = "11.14.0"; + sha256 = "1rvdyvlvh8ddm9y2razshly5kb87kw0js287i0a5dzb5ay41vxlx"; } diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix deleted file mode 100644 index dba6c2648ce3..000000000000 --- a/pkgs/development/web/nodejs/v6.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, callPackage, lib, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix {}; -in - buildNodejs { - inherit enableNpm; - version = "6.16.0"; - sha256 = "0ikmpn1kvp5q8andmiyhpr99zniqs86sdlfk31sj3k0wvalq420d"; - } diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 19b4716892e8..b29add5d0579 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "8.15.0"; - sha256 = "0cy6lzk9sn545kkc0jviv0k0hn30kindrpkkkmv3zk2774rj71cn"; + version = "8.15.1"; + sha256 = "1ldd4p7cf7bjl4yg9d91khzd9662g3wda7g1yr0ljqjjyjiqcr3b"; } diff --git a/pkgs/development/web/remarkjs/generate.sh b/pkgs/development/web/remarkjs/generate.sh index 040aaf977168..59542101812f 100644 --- a/pkgs/development/web/remarkjs/generate.sh +++ b/pkgs/development/web/remarkjs/generate.sh @@ -1,3 +1,3 @@ #!/bin/sh -e -node2nix -6 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix +node2nix -8 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index 3322c58b40d0..a650747eb065 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -4,22 +4,49 @@ let sources = { - "@sinonjs/formatio-2.0.0" = { - name = "_at_sinonjs_slash_formatio"; - packageName = "@sinonjs/formatio"; - version = "2.0.0"; + "@sinonjs/commons-1.4.0" = { + name = "_at_sinonjs_slash_commons"; + packageName = "@sinonjs/commons"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz"; - sha512 = "ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg=="; + url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.4.0.tgz"; + sha512 = "9jHK3YF/8HtJ9wCAbG+j8cD0i0+ATS9A7gXFqS36TblLPNy6rEEc+SB0imo91eCboGaBYGV/MT1/br/J+EE7Tw=="; }; }; - "JSONStream-1.3.3" = { + "@sinonjs/formatio-3.2.1" = { + name = "_at_sinonjs_slash_formatio"; + packageName = "@sinonjs/formatio"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.1.tgz"; + sha512 = "tsHvOB24rvyvV2+zKMmPkZ7dXX6LSLKZ7aOtXY6Edklp0uRcgGpOsQTTGTcWViFyx4uhWc6GV8QdnALbIbIdeQ=="; + }; + }; + "@sinonjs/samsam-3.3.1" = { + name = "_at_sinonjs_slash_samsam"; + packageName = "@sinonjs/samsam"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.1.tgz"; + sha512 = "wRSfmyd81swH0hA1bxJZJ57xr22kC07a1N4zuIL47yTS04bDk6AoCkczcqHEjcRPmJ+FruGJ9WBQiJwMtIElFw=="; + }; + }; + "@sinonjs/text-encoding-0.7.1" = { + name = "_at_sinonjs_slash_text-encoding"; + packageName = "@sinonjs/text-encoding"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz"; + sha512 = "+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ=="; + }; + }; + "JSONStream-1.3.5" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.3.tgz"; - sha512 = "3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg=="; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz"; + sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ=="; }; }; "abbrev-1.1.1" = { @@ -31,31 +58,40 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "acorn-5.7.1" = { + "acorn-6.1.1" = { name = "acorn"; packageName = "acorn"; - version = "5.7.1"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz"; - sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz"; + sha512 = "jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA=="; }; }; - "acorn-dynamic-import-3.0.0" = { + "acorn-dynamic-import-4.0.0" = { name = "acorn-dynamic-import"; packageName = "acorn-dynamic-import"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz"; - sha512 = "zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg=="; + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz"; + sha512 = "d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw=="; }; }; - "acorn-node-1.5.2" = { + "acorn-node-1.6.2" = { name = "acorn-node"; packageName = "acorn-node"; - version = "1.5.2"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.5.2.tgz"; - sha512 = "krFKvw/d1F17AN3XZbybIUzEY4YEPNiGo05AfP3dBlfVKrMHETKpgjpuZkSF8qDNt9UkQcqj7am8yJLseklCMg=="; + url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.6.2.tgz"; + sha512 = "rIhNEZuNI8ibQcL7ANm/mGyPukIaZsRNX9psFNQURyJW0nu6k8wjSDld20z6v2mDBWqX13pIEnk9gGZJHIlEXg=="; + }; + }; + "acorn-walk-6.1.1" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz"; + sha512 = "OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw=="; }; }; "adm-zip-0.2.1" = { @@ -67,13 +103,85 @@ let sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf"; }; }; - "ajv-5.5.2" = { + "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; - version = "5.5.2"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; - sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; + }; + }; + "ansi-colors-3.2.3" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; + sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + }; + "arr-diff-4.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + }; + "arr-flatten-1.1.0" = { + name = "arr-flatten"; + packageName = "arr-flatten"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; + }; + }; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; }; }; "array-filter-0.0.1" = { @@ -85,6 +193,15 @@ let sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; }; }; + "array-from-2.1.1" = { + name = "array-from"; + packageName = "array-from"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz"; + sha1 = "cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"; + }; + }; "array-map-0.0.0" = { name = "array-map"; packageName = "array-map"; @@ -103,6 +220,15 @@ let sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; }; }; + "array-unique-0.3.2" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + }; "asap-2.0.6" = { name = "asap"; packageName = "asap"; @@ -121,13 +247,13 @@ let sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; - "asn1-0.2.3" = { + "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; "asn1.js-4.10.1" = { @@ -166,6 +292,15 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; + "assign-symbols-1.0.0" = { + name = "assign-symbols"; + packageName = "assign-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + }; "async-0.9.2" = { name = "async"; packageName = "async"; @@ -184,6 +319,15 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "atob-2.1.2" = { + name = "atob"; + packageName = "atob"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; + }; + }; "aws-sign2-0.5.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -202,13 +346,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.7.0" = { + "aws4-1.8.0" = { name = "aws4"; packageName = "aws4"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; - sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; }; }; "balanced-match-1.0.0" = { @@ -220,6 +364,15 @@ let sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; + }; + }; "base64-js-1.3.0" = { name = "base64-js"; packageName = "base64-js"; @@ -229,13 +382,13 @@ let sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="; }; }; - "bcrypt-pbkdf-1.0.1" = { + "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; "bn.js-4.11.8" = { @@ -265,6 +418,15 @@ let sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; + "braces-2.3.2" = { + name = "braces"; + packageName = "braces"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; + sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; + }; + }; "brorand-1.1.0" = { name = "brorand"; packageName = "brorand"; @@ -319,13 +481,13 @@ let sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; }; }; - "browserify-des-1.0.1" = { + "browserify-des-1.0.2" = { name = "browserify-des"; packageName = "browserify-des"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz"; - sha512 = "zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw=="; + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; "browserify-rsa-4.0.1" = { @@ -355,22 +517,22 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "buffer-5.1.0" = { + "buffer-5.2.1" = { name = "buffer"; packageName = "buffer"; - version = "5.1.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz"; - sha512 = "YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz"; + sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; }; }; - "buffer-from-1.1.0" = { + "buffer-from-1.1.1" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz"; - sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; }; "buffer-xor-1.0.3" = { @@ -391,13 +553,31 @@ let sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; }; }; - "cached-path-relative-1.0.1" = { - name = "cached-path-relative"; - packageName = "cached-path-relative"; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; - sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; + }; + }; + "cached-path-relative-1.0.2" = { + name = "cached-path-relative"; + packageName = "cached-path-relative"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz"; + sha512 = "5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg=="; + }; + }; + "camelcase-5.3.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; "caseless-0.12.0" = { @@ -409,6 +589,15 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; "cipher-base-1.0.4" = { name = "cipher-base"; packageName = "cipher-base"; @@ -418,6 +607,15 @@ let sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; }; }; + "class-utils-0.3.6" = { + name = "class-utils"; + packageName = "class-utils"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; + }; + }; "cli-1.0.1" = { name = "cli"; packageName = "cli"; @@ -427,13 +625,58 @@ let sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; }; }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; + "cliui-4.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; + sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ=="; + }; + }; + "clone-2.1.2" = { + name = "clone"; + packageName = "clone"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; + sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "collection-visit-1.0.0" = { + name = "collection-visit"; + packageName = "collection-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "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"; }; }; "combine-source-map-0.8.0" = { @@ -454,22 +697,40 @@ let sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }; }; - "combined-stream-1.0.6" = { + "combined-stream-1.0.7" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; - sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; + sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; }; }; - "commander-2.15.1" = { + "commander-2.19.0" = { name = "commander"; packageName = "commander"; - version = "2.15.1"; + version = "2.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; - sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="; + url = "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz"; + sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="; + }; + }; + "commander-2.20.0" = { + name = "commander"; + packageName = "commander"; + version = "2.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz"; + sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="; + }; + }; + "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"; }; }; "concat-map-0.0.1" = { @@ -490,13 +751,13 @@ let sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; }; - "config-chain-1.1.11" = { + "config-chain-1.1.12" = { name = "config-chain"; packageName = "config-chain"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; - sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz"; + sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; "console-browserify-1.1.0" = { @@ -526,6 +787,15 @@ let sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; }; }; + "copy-descriptor-0.1.1" = { + name = "copy-descriptor"; + packageName = "copy-descriptor"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -562,6 +832,15 @@ let sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; + "cross-spawn-6.0.5" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "6.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + }; + }; "cryptiles-0.2.2" = { name = "cryptiles"; packageName = "cryptiles"; @@ -589,6 +868,15 @@ let sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; }; }; + "dash-ast-1.0.0" = { + name = "dash-ast"; + packageName = "dash-ast"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz"; + sha512 = "Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA=="; + }; + }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -607,13 +895,76 @@ let sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; }; }; - "debug-3.1.0" = { + "debug-2.6.9" = { name = "debug"; packageName = "debug"; - version = "3.1.0"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "debug-3.2.6" = { + name = "debug"; + packageName = "debug"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + }; + }; + "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"; + }; + }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "define-properties-1.1.3" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + }; + }; + "define-property-0.2.5" = { + name = "define-property"; + packageName = "define-property"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + }; + "define-property-1.0.0" = { + name = "define-property"; + packageName = "define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + }; + "define-property-2.0.2" = { + name = "define-property"; + packageName = "define-property"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; + sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; }; }; "defined-1.0.0" = { @@ -661,13 +1012,22 @@ let sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; }; }; - "detective-5.1.0" = { + "detect-file-1.0.0" = { + name = "detect-file"; + packageName = "detect-file"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + }; + "detective-5.2.0" = { name = "detective"; packageName = "detective"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz"; - sha512 = "TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ=="; + url = "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz"; + sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg=="; }; }; "diff-3.5.0" = { @@ -688,13 +1048,13 @@ let sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; }; }; - "dom-serializer-0.1.0" = { + "dom-serializer-0.1.1" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; - sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz"; + sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA=="; }; }; "domain-browser-1.2.0" = { @@ -706,22 +1066,13 @@ let sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; }; }; - "domelementtype-1.1.3" = { + "domelementtype-1.3.1" = { name = "domelementtype"; packageName = "domelementtype"; - version = "1.1.3"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; - sha1 = "bd28773e2642881aec51544924299c5cd822185b"; - }; - }; - "domelementtype-1.3.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; - sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; + sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; "domhandler-2.3.0" = { @@ -751,22 +1102,31 @@ let sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; }; }; - "ecc-jsbn-0.1.1" = { + "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "elliptic-6.4.0" = { + "elliptic-6.4.1" = { name = "elliptic"; packageName = "elliptic"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"; - sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz"; + sha512 = "BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ=="; + }; + }; + "end-of-stream-1.4.1" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; + sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; }; }; "entities-1.0.0" = { @@ -778,13 +1138,13 @@ let sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; }; }; - "entities-1.1.1" = { + "entities-1.1.2" = { name = "entities"; packageName = "entities"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; - sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; + url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; + sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; }; }; "errno-0.1.7" = { @@ -796,6 +1156,24 @@ let sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="; }; }; + "es-abstract-1.13.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz"; + sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg=="; + }; + }; + "es-to-primitive-1.2.0" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; + sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; + }; + }; "escape-string-regexp-1.0.5" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -805,6 +1183,15 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; + "esprima-4.0.1" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + }; "events-2.1.0" = { name = "events"; packageName = "events"; @@ -823,6 +1210,15 @@ let sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; }; }; + "execa-1.0.0" = { + name = "execa"; + packageName = "execa"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + }; + }; "exit-0.1.2" = { name = "exit"; packageName = "exit"; @@ -832,13 +1228,58 @@ let sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; }; }; - "extend-3.0.1" = { + "expand-brackets-2.1.4" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + }; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + }; + "extend-3.0.2" = { name = "extend"; packageName = "extend"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; - sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + }; + "extend-shallow-3.0.2" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + }; + "extglob-2.0.4" = { + name = "extglob"; + packageName = "extglob"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; + sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; }; "extsprintf-1.3.0" = { @@ -850,13 +1291,13 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-1.1.0" = { + "fast-deep-equal-2.0.1" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "1.1.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; - sha1 = "c053477817c86b51daa853c81e059b733d023614"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -868,6 +1309,51 @@ let sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; }; + "fill-range-4.0.0" = { + name = "fill-range"; + packageName = "fill-range"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + }; + "find-up-3.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; + }; + }; + "findup-sync-2.0.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; + sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; + }; + }; + "flat-4.1.0" = { + name = "flat"; + packageName = "flat"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz"; + sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; + }; + }; + "for-in-1.0.2" = { + name = "for-in"; + packageName = "for-in"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + }; "forever-agent-0.5.2" = { name = "forever-agent"; packageName = "forever-agent"; @@ -895,13 +1381,22 @@ let sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; }; }; - "form-data-2.3.2" = { + "form-data-2.3.3" = { name = "form-data"; packageName = "form-data"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; - sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; + }; + }; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; }; }; "fs.realpath-1.0.0" = { @@ -931,6 +1426,33 @@ let sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="; }; }; + "get-caller-file-1.0.3" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; + }; + }; + "get-stream-4.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + }; + "get-value-2.0.6" = { + name = "get-value"; + packageName = "get-value"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -940,22 +1462,40 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "glob-7.1.2" = { + "glob-7.1.3" = { name = "glob"; packageName = "glob"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; - sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; + sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; - "graceful-fs-4.1.11" = { + "global-modules-1.0.0" = { + name = "global-modules"; + packageName = "global-modules"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; + sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; + }; + }; + "global-prefix-1.0.2" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + }; + "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.11"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; "growl-1.10.5" = { @@ -976,13 +1516,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.0.3" = { + "har-validator-5.1.3" = { name = "har-validator"; packageName = "har-validator"; - version = "5.0.3"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; - sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "has-1.0.3" = { @@ -1003,6 +1543,51 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; + "has-symbols-1.0.0" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + }; + }; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + }; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + }; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + }; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + }; "hash-base-3.0.4" = { name = "hash-base"; packageName = "hash-base"; @@ -1012,13 +1597,13 @@ let sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; }; }; - "hash.js-1.1.4" = { + "hash.js-1.1.7" = { name = "hash.js"; packageName = "hash.js"; - version = "1.1.4"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz"; - sha512 = "A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw=="; + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; "hawk-1.0.0" = { @@ -1030,13 +1615,13 @@ let sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; }; }; - "he-1.1.1" = { + "he-1.2.0" = { name = "he"; packageName = "he"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; - sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; + url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; "hmac-drbg-1.0.1" = { @@ -1057,6 +1642,15 @@ let sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; }; }; + "homedir-polyfill-1.0.3" = { + name = "homedir-polyfill"; + packageName = "homedir-polyfill"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; + }; + }; "htmlescape-1.1.1" = { name = "htmlescape"; packageName = "htmlescape"; @@ -1102,13 +1696,13 @@ let sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; }; - "ieee754-1.1.12" = { + "ieee754-1.1.13" = { name = "ieee754"; packageName = "ieee754"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz"; - sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; + sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; }; }; "image-size-0.5.5" = { @@ -1192,13 +1786,49 @@ let sha512 = "VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw=="; }; }; - "interpret-1.1.0" = { + "interpret-1.2.0" = { name = "interpret"; packageName = "interpret"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; - sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz"; + sha512 = "mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="; + }; + }; + "invert-kv-2.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; + sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; + }; + }; + "ip-regex-2.1.0" = { + name = "ip-regex"; + packageName = "ip-regex"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"; + sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + }; + }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-accessor-descriptor-1.0.0" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; "is-buffer-1.1.6" = { @@ -1210,6 +1840,168 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; + "is-buffer-2.0.3" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz"; + sha512 = "U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="; + }; + }; + "is-callable-1.1.4" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz"; + sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "is-data-descriptor-1.0.0" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; + }; + }; + "is-date-object-1.0.1" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + }; + }; + "is-descriptor-0.1.6" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + }; + }; + "is-descriptor-1.0.2" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + }; + }; + "is-extendable-0.1.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + }; + "is-extendable-1.0.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; + sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "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"; + }; + }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; + "is-number-3.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + }; + "is-plain-object-2.0.4" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; + }; + }; + "is-regex-1.0.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + }; + "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"; + }; + }; + "is-symbol-1.0.2" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz"; + sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="; + }; + }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -1219,6 +2011,15 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; + "is-windows-1.0.2" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; + }; + }; "isarray-0.0.1" = { name = "isarray"; packageName = "isarray"; @@ -1246,6 +2047,33 @@ let sha512 = "GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA=="; }; }; + "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"; + }; + }; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + }; + "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"; + }; + }; "isstream-0.1.2" = { name = "isstream"; packageName = "isstream"; @@ -1255,6 +2083,15 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; + "js-yaml-3.12.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; + sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; + }; + }; "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; @@ -1273,13 +2110,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "json-schema-traverse-0.3.1" = { + "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; - version = "0.3.1"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; "json-stable-stringify-0.0.1" = { @@ -1327,13 +2164,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "just-extend-1.1.27" = { + "just-extend-4.0.2" = { name = "just-extend"; packageName = "just-extend"; - version = "1.1.27"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz"; - sha512 = "mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g=="; + url = "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz"; + sha512 = "FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw=="; }; }; "kew-0.1.7" = { @@ -1345,6 +2182,42 @@ let sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; }; }; + "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"; + }; + }; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; + }; + }; + "kind-of-6.0.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; + sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="; + }; + }; "labeled-stream-splicer-2.0.1" = { name = "labeled-stream-splicer"; packageName = "labeled-stream-splicer"; @@ -1354,22 +2227,31 @@ let sha512 = "MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg=="; }; }; - "lodash-3.7.0" = { - name = "lodash"; - packageName = "lodash"; - version = "3.7.0"; + "lcid-2.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"; - sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; + url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; + sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; }; }; - "lodash.get-4.4.2" = { - name = "lodash.get"; - packageName = "lodash.get"; - version = "4.4.2"; + "locate-path-3.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; - sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + }; + }; + "lodash-4.17.11" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.11"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; + sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; "lodash.memoize-3.0.4" = { @@ -1381,22 +2263,85 @@ let sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; }; }; - "lolex-2.7.0" = { - name = "lolex"; - packageName = "lolex"; - version = "2.7.0"; + "log-symbols-2.2.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz"; - sha512 = "uJkH2e0BVfU5KOJUevbTOtpDduooSarH5PopO+LfM/vZf8Z9sJzODqKev804JYM2i++ktJfUmC1le4LwFQ1VMg=="; + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; + sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; }; }; - "md5.js-1.3.4" = { + "lolex-2.7.5" = { + name = "lolex"; + packageName = "lolex"; + version = "2.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz"; + sha512 = "l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q=="; + }; + }; + "lolex-3.1.0" = { + name = "lolex"; + packageName = "lolex"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lolex/-/lolex-3.1.0.tgz"; + sha512 = "zFo5MgCJ0rZ7gQg69S4pqBsLURbFw11X68C18OcJjJQbqaXm2NoTrGl1IMM3TIz0/BnN1tIs2tzmmqvCsOMMjw=="; + }; + }; + "map-age-cleaner-0.1.3" = { + name = "map-age-cleaner"; + packageName = "map-age-cleaner"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; + sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w=="; + }; + }; + "map-cache-0.2.2" = { + name = "map-cache"; + packageName = "map-cache"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + }; + "map-visit-1.0.0" = { + name = "map-visit"; + packageName = "map-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + }; + "md5.js-1.3.5" = { name = "md5.js"; packageName = "md5.js"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; - sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; + }; + }; + "mem-4.3.0" = { + name = "mem"; + packageName = "mem"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; + sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; + }; + }; + "micromatch-3.1.10" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; + sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; "miller-rabin-4.0.1" = { @@ -1426,22 +2371,31 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.33.0" = { + "mime-db-1.38.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.33.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; - sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; + sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; - "mime-types-2.1.18" = { + "mime-types-2.1.22" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.18"; + version = "2.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; - sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; + sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; "minimalistic-assert-1.0.1" = { @@ -1489,6 +2443,15 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; + "mixin-deep-1.3.1" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz"; + sha512 = "8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ=="; + }; + }; "mkdirp-0.3.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -1516,13 +2479,13 @@ let sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18"; }; }; - "module-deps-6.1.0" = { + "module-deps-6.2.0" = { name = "module-deps"; packageName = "module-deps"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-6.1.0.tgz"; - sha512 = "NPs5N511VD1rrVJihSso/LiBShRbJALYBKzDW91uZYy7BpjnO4bGnZL3HjZ9yKcFdZUWwaYjDz9zxbuP7vKMuQ=="; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.0.tgz"; + sha512 = "hKPmO06so6bL/ZvqVNVqdTVO8UAYsi3tQWlCa+z9KuWhoN4KDQtb5hcqQQv58qYiDE21wIvnttZEPiDgEbpwbA=="; }; }; "ms-2.0.0" = { @@ -1534,6 +2497,24 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + }; + }; + "nanomatch-1.2.13" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; + sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; + }; + }; "ncp-0.4.2" = { name = "ncp"; packageName = "ncp"; @@ -1543,13 +2524,31 @@ let sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; - "nise-1.4.2" = { + "nice-try-1.0.5" = { + name = "nice-try"; + packageName = "nice-try"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + }; + "nise-1.4.10" = { name = "nise"; packageName = "nise"; - version = "1.4.2"; + version = "1.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/nise/-/nise-1.4.2.tgz"; - sha512 = "BxH/DxoQYYdhKgVAfqVy4pzXRZELHOIewzoesxpjYvpU+7YOalQhGNPf7wAx8pLrTNPrHRDlLOkAl8UI0ZpXjw=="; + url = "https://registry.npmjs.org/nise/-/nise-1.4.10.tgz"; + sha512 = "sa0RRbj53dovjc7wombHmVli9ZihXbXCQ2uH3TNm03DyvOSIQbxg+pbqDKrk2oxMK1rtLGVlKxcB9rrc6X5YjA=="; + }; + }; + "node-environment-flags-1.0.4" = { + name = "node-environment-flags"; + packageName = "node-environment-flags"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.4.tgz"; + sha512 = "M9rwCnWVLW7PX+NUWe3ejEdiLYinRpsEre9hMkU/6NS4h+EEulYaDH1gCEZ2gyXsmw+RXYDaV2JkkTNcsPDJ0Q=="; }; }; "node-uuid-1.4.8" = { @@ -1570,6 +2569,15 @@ let sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; }; }; + "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"; + }; + }; "npmconf-0.0.24" = { name = "npmconf"; packageName = "npmconf"; @@ -1579,6 +2587,15 @@ let sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c"; }; }; + "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"; + }; + }; "oauth-sign-0.3.0" = { name = "oauth-sign"; packageName = "oauth-sign"; @@ -1588,13 +2605,67 @@ let sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; }; }; - "oauth-sign-0.8.2" = { + "oauth-sign-0.9.0" = { name = "oauth-sign"; packageName = "oauth-sign"; - version = "0.8.2"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + }; + "object-keys-1.1.0" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz"; + sha512 = "6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="; + }; + }; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + }; + "object.assign-4.1.0" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; + sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; + }; + }; + "object.getownpropertydescriptors-2.0.3" = { + name = "object.getownpropertydescriptors"; + packageName = "object.getownpropertydescriptors"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; + sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + }; + }; + "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"; }; }; "once-1.1.1" = { @@ -1624,6 +2695,15 @@ let sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; }; }; + "os-locale-3.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; + sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; + }; + }; "osenv-0.0.3" = { name = "osenv"; packageName = "osenv"; @@ -1633,13 +2713,67 @@ let sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; }; }; - "pako-1.0.6" = { + "p-defer-1.0.0" = { + name = "p-defer"; + packageName = "p-defer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; + sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; + }; + }; + "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"; + }; + }; + "p-is-promise-2.0.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz"; + sha512 = "pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="; + }; + }; + "p-limit-2.2.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz"; + sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ=="; + }; + }; + "p-locate-3.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + }; + }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; + "pako-1.0.10" = { name = "pako"; packageName = "pako"; - version = "1.0.6"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz"; - sha512 = "lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="; + url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz"; + sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="; }; }; "parents-1.0.1" = { @@ -1651,13 +2785,31 @@ let sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; }; }; - "parse-asn1-5.1.1" = { + "parse-asn1-5.1.4" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.1"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz"; - sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw=="; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz"; + sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw=="; + }; + }; + "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"; + }; + }; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; }; }; "path-browserify-0.0.1" = { @@ -1669,6 +2821,15 @@ let sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; }; }; + "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"; + }; + }; "path-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -1678,13 +2839,22 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; - "path-parse-1.0.5" = { + "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"; + }; + }; + "path-parse-1.0.6" = { name = "path-parse"; packageName = "path-parse"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; }; "path-platform-0.11.15" = { @@ -1705,13 +2875,13 @@ let sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; }; }; - "pbkdf2-3.0.16" = { + "pbkdf2-3.0.17" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.16"; + version = "3.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz"; - sha512 = "y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA=="; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz"; + sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA=="; }; }; "performance-now-2.1.0" = { @@ -1732,6 +2902,15 @@ let sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b"; }; }; + "posix-character-classes-0.1.1" = { + name = "posix-character-classes"; + packageName = "posix-character-classes"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + }; "process-0.11.10" = { name = "process"; packageName = "process"; @@ -1786,22 +2965,31 @@ let sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; }; }; - "psl-1.1.28" = { + "psl-1.1.31" = { name = "psl"; packageName = "psl"; - version = "1.1.28"; + version = "1.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.28.tgz"; - sha512 = "+AqO1Ae+N/4r7Rvchrdm432afjT9hqJRyBN3DQv9At0tPz4hIFSGKbq64fN9dVoCow4oggIIax5/iONx0r9hZw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; + sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; }; }; - "public-encrypt-4.0.2" = { + "public-encrypt-4.0.3" = { name = "public-encrypt"; packageName = "public-encrypt"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz"; - sha512 = "4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q=="; + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; }; "punycode-1.3.2" = { @@ -1822,6 +3010,15 @@ let sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; "qs-0.6.6" = { name = "qs"; packageName = "qs"; @@ -1858,13 +3055,13 @@ let sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }; }; - "randombytes-2.0.6" = { + "randombytes-2.1.0" = { name = "randombytes"; packageName = "randombytes"; - version = "2.0.6"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; - sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A=="; + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; }; "randomfill-1.0.4" = { @@ -1912,6 +3109,33 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; + "regex-not-1.0.2" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; + sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; + }; + }; + "repeat-element-1.1.3" = { + name = "repeat-element"; + packageName = "repeat-element"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; + sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; + }; + }; + "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"; + }; + }; "request-2.36.0" = { name = "request"; packageName = "request"; @@ -1921,13 +3145,13 @@ let sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5"; }; }; - "request-2.87.0" = { + "request-2.88.0" = { name = "request"; packageName = "request"; - version = "2.87.0"; + version = "2.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; - sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; "request-progress-0.3.1" = { @@ -1939,6 +3163,24 @@ let sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a"; }; }; + "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"; + }; + }; "resolve-1.1.7" = { name = "resolve"; packageName = "resolve"; @@ -1948,13 +3190,40 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-1.8.1" = { + "resolve-1.10.0" = { name = "resolve"; packageName = "resolve"; - version = "1.8.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz"; - sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; + sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; + }; + }; + "resolve-dir-1.0.1" = { + name = "resolve-dir"; + packageName = "resolve-dir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; "rimraf-2.2.8" = { @@ -1984,6 +3253,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-regex-1.1.0" = { + name = "safe-regex"; + packageName = "safe-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -1993,15 +3271,6 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "samsam-1.3.0" = { - name = "samsam"; - packageName = "samsam"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz"; - sha512 = "1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg=="; - }; - }; "semver-1.1.4" = { name = "semver"; packageName = "semver"; @@ -2011,6 +3280,42 @@ let sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540"; }; }; + "semver-5.7.0" = { + name = "semver"; + packageName = "semver"; + version = "5.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; + sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "set-value-0.4.3" = { + name = "set-value"; + packageName = "set-value"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz"; + sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; + }; + }; + "set-value-2.0.0" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; + sha512 = "hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg=="; + }; + }; "sha.js-2.4.11" = { name = "sha.js"; packageName = "sha.js"; @@ -2029,6 +3334,24 @@ let sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; }; }; + "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"; + }; + }; "shell-quote-1.6.1" = { name = "shell-quote"; packageName = "shell-quote"; @@ -2092,6 +3415,15 @@ let sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063"; }; }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; "simple-concat-1.0.0" = { name = "simple-concat"; packageName = "simple-concat"; @@ -2101,6 +3433,33 @@ let sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; }; }; + "snapdragon-0.8.2" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; + sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; + }; + }; + "snapdragon-node-2.1.1" = { + name = "snapdragon-node"; + packageName = "snapdragon-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; + }; + }; + "snapdragon-util-3.0.1" = { + name = "snapdragon-util"; + packageName = "snapdragon-util"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; + }; + }; "sntp-0.2.4" = { name = "sntp"; packageName = "sntp"; @@ -2128,22 +3487,67 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "sshpk-1.14.2" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.14.2"; + "source-map-resolve-0.5.2" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; - sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; + sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; }; }; - "stream-browserify-2.0.1" = { + "source-map-url-0.4.0" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + }; + "split-string-3.1.0" = { + name = "split-string"; + packageName = "split-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; + sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + }; + }; + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + }; + "stream-browserify-2.0.2" = { name = "stream-browserify"; packageName = "stream-browserify"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz"; - sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz"; + sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; }; }; "stream-combiner2-1.1.1" = { @@ -2173,6 +3577,24 @@ let sha1 = "1b63be438a133e4b671cc1935197600175910d83"; }; }; + "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"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + }; + }; "string_decoder-0.10.31" = { name = "string_decoder"; packageName = "string_decoder"; @@ -2191,6 +3613,42 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; + "string_decoder-1.2.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz"; + sha512 = "6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w=="; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; "strip-json-comments-1.0.4" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -2200,6 +3658,15 @@ let sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; }; }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; "subarg-1.0.0" = { name = "subarg"; packageName = "subarg"; @@ -2209,13 +3676,22 @@ let sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; }; }; - "supports-color-5.4.0" = { + "supports-color-5.5.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz"; - sha512 = "zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w=="; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "supports-color-6.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; + sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; }; }; "syntax-error-1.4.0" = { @@ -2227,15 +3703,6 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "text-encoding-0.6.4" = { - name = "text-encoding"; - packageName = "text-encoding"; - version = "0.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz"; - sha1 = "e399a982257a276dae428bb92845cb71bdc26d19"; - }; - }; "throttleit-0.0.2" = { name = "throttleit"; packageName = "throttleit"; @@ -2254,13 +3721,13 @@ let sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; - "through2-2.0.3" = { + "through2-2.0.5" = { name = "through2"; packageName = "through2"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; + url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; "timers-browserify-1.4.2" = { @@ -2281,13 +3748,31 @@ let sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; }; }; - "tough-cookie-2.3.4" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.4"; + "to-object-path-0.3.0" = { + name = "to-object-path"; + packageName = "to-object-path"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; - sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA=="; + url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + }; + "to-regex-3.0.2" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; + sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; + }; + }; + "to-regex-range-2.1.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; }; }; "tough-cookie-2.4.3" = { @@ -2299,6 +3784,15 @@ let sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; }; }; + "tough-cookie-3.0.1" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz"; + sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="; + }; + }; "tty-browserify-0.0.1" = { name = "tty-browserify"; packageName = "tty-browserify"; @@ -2362,13 +3856,49 @@ let sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="; }; }; - "undeclared-identifiers-1.1.2" = { + "undeclared-identifiers-1.1.3" = { name = "undeclared-identifiers"; packageName = "undeclared-identifiers"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz"; - sha512 = "13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ=="; + url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz"; + sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw=="; + }; + }; + "union-value-1.0.0" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz"; + sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + }; + }; + "unset-value-1.0.0" = { + name = "unset-value"; + packageName = "unset-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + }; + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; }; }; "url-0.11.0" = { @@ -2380,6 +3910,15 @@ let sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; }; }; + "use-3.1.1" = { + name = "use"; + packageName = "use"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; + }; + }; "util-0.10.3" = { name = "util"; packageName = "util"; @@ -2407,13 +3946,13 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "uuid-3.3.0" = { + "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; - sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; "verror-1.10.0" = { @@ -2443,6 +3982,42 @@ let sha1 = "460c1da0f810103d0321a9b633af9e575e64486f"; }; }; + "which-1.3.1" = { + name = "which"; + packageName = "which"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + }; + }; + "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"; + }; + }; + "wide-align-1.1.3" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + }; + }; + "wrap-ansi-2.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; @@ -2461,16 +4036,52 @@ let sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; }; }; + "y18n-4.0.0" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + }; + }; + "yargs-12.0.5" = { + name = "yargs"; + packageName = "yargs"; + version = "12.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz"; + sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; + }; + }; + "yargs-parser-11.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "11.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz"; + sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ=="; + }; + }; + "yargs-unparser-1.5.0" = { + name = "yargs-unparser"; + packageName = "yargs-unparser"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.5.0.tgz"; + sha512 = "HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw=="; + }; + }; }; in { marked = nodeEnv.buildNodePackage { name = "marked"; packageName = "marked"; - version = "0.4.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz"; - sha512 = "tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="; + url = "https://registry.npmjs.org/marked/-/marked-0.6.1.tgz"; + sha512 = "+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA=="; }; buildInputs = globalBuildInputs; meta = { @@ -2479,21 +4090,22 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "16.2.2"; + version = "16.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.2.2.tgz"; - sha512 = "fMES05wq1Oukts6ksGUU2TMVHHp06LyQt0SIwbXIHm7waSrQmNBZePsU0iM/4f94zbvb/wHma+D1YrdzWYnF/A=="; + url = "https://registry.npmjs.org/browserify/-/browserify-16.2.3.tgz"; + sha512 = "zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ=="; }; dependencies = [ - sources."JSONStream-1.3.3" - sources."acorn-5.7.1" - sources."acorn-dynamic-import-3.0.0" - sources."acorn-node-1.5.2" + sources."JSONStream-1.3.5" + sources."acorn-6.1.1" + sources."acorn-dynamic-import-4.0.0" + sources."acorn-node-1.6.2" + sources."acorn-walk-6.1.1" sources."array-filter-0.0.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" @@ -2517,15 +4129,15 @@ in }) sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.1" + sources."browserify-des-1.0.2" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."buffer-5.1.0" - sources."buffer-from-1.1.0" + sources."buffer-5.2.1" + sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" - sources."cached-path-relative-1.0.1" + sources."cached-path-relative-1.0.2" sources."cipher-base-1.0.4" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" @@ -2538,11 +4150,12 @@ in sources."create-hash-1.2.0" sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" + sources."dash-ast-1.0.0" sources."date-now-0.1.4" sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."des.js-1.0.0" - (sources."detective-5.1.0" // { + (sources."detective-5.2.0" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -2550,20 +4163,20 @@ in sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - sources."elliptic-6.4.0" + sources."elliptic-6.4.1" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."has-1.0.3" sources."hash-base-3.0.4" - sources."hash.js-1.1.4" + sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" - sources."ieee754-1.1.12" + sources."ieee754-1.1.13" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" @@ -2575,39 +4188,40 @@ in sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.1" sources."lodash.memoize-3.0.4" - sources."md5.js-1.3.4" + sources."md5.js-1.3.5" sources."miller-rabin-4.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."module-deps-6.1.0" + sources."module-deps-6.2.0" sources."once-1.4.0" sources."os-browserify-0.3.0" - sources."pako-1.0.6" + sources."pako-1.0.10" sources."parents-1.0.1" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.4" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."path-platform-0.11.15" - sources."pbkdf2-3.0.16" + sources."pbkdf2-3.0.17" sources."process-0.11.10" sources."process-nextick-args-2.0.0" - sources."public-encrypt-4.0.2" + sources."public-encrypt-4.0.3" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.6" // { dependencies = [ sources."isarray-1.0.0" + sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.8.1" + sources."resolve-1.10.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.1.2" sources."sha.js-2.4.11" @@ -2615,11 +4229,11 @@ in sources."shell-quote-1.6.1" sources."simple-concat-1.0.0" sources."source-map-0.5.7" - sources."stream-browserify-2.0.1" + sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" sources."stream-http-2.8.3" sources."stream-splicer-2.0.0" - sources."string_decoder-1.1.1" + sources."string_decoder-1.2.0" (sources."subarg-1.0.0" // { dependencies = [ sources."minimist-1.2.0" @@ -2627,13 +4241,13 @@ in }) sources."syntax-error-1.4.0" sources."through-2.3.8" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."timers-browserify-1.4.2" sources."to-arraybuffer-1.0.1" sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" sources."umd-3.0.3" - sources."undeclared-identifiers-1.1.2" + sources."undeclared-identifiers-1.1.3" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -2652,18 +4266,18 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz"; - sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.3.tgz"; + sha512 = "rIQPT2UMDnk4jRX+w4WO84/pebU2jiLsjgIyrCktYgSvx28enOE3iYQMr+BD1rHiitWnDmpu0cY/LfIEpKcjcw=="; }; dependencies = [ - sources."commander-2.15.1" + sources."commander-2.19.0" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; @@ -2673,72 +4287,78 @@ in license = "BSD-2-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.0.4"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.0.4.tgz"; - sha512 = "q3SyEnPKbk9zh4l36PGeW2fgynKu+FpbhiUNx/yaiBUQ3V0CbACCgb9FzYWcRgI2DJlP6eI4jc8XPrCTi55YcQ=="; + url = "https://registry.npmjs.org/less/-/less-3.9.0.tgz"; + sha512 = "31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w=="; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."asap-2.0.6" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."aws4-1.8.0" + sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."clone-2.1.2" + sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."errno-0.1.7" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."getpass-0.1.7" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."http-signature-1.2.0" sources."image-size-0.5.5" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."mime-1.6.0" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."promise-7.3.1" sources."prr-1.0.1" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" - sources."request-2.87.0" + sources."request-2.88.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."source-map-0.6.1" - sources."sshpk-1.14.2" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.3.0" + sources."uri-js-4.2.2" + sources."uuid-3.3.2" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; @@ -2748,40 +4368,355 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.2.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz"; - sha512 = "2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-6.0.2.tgz"; + sha512 = "RtTJsmmToGyeTznSOMoM6TPEk1A84FQaHIciKrRqARZx+B5ccJ5tXlmJzEKGBxZdqk9UjpRsesZTUkZmR5YnuQ=="; }; dependencies = [ + sources."ansi-colors-3.2.3" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."atob-2.1.2" sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."browser-stdout-1.3.1" - sources."commander-2.15.1" + sources."cache-base-1.0.1" + sources."camelcase-5.3.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."cliui-4.1.0" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."debug-3.1.0" + sources."copy-descriptor-0.1.1" + sources."cross-spawn-6.0.5" + sources."debug-3.2.6" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."detect-file-1.0.0" sources."diff-3.5.0" + sources."end-of-stream-1.4.1" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."execa-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + sources."expand-tilde-2.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."find-up-3.0.0" + sources."findup-sync-2.0.0" + (sources."flat-4.1.0" // { + dependencies = [ + sources."is-buffer-2.0.3" + ]; + }) + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.2" + sources."function-bind-1.1.1" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."glob-7.1.3" + sources."global-modules-1.0.0" + sources."global-prefix-1.0.2" sources."growl-1.10.5" + sources."has-1.0.3" sources."has-flag-3.0.0" - sources."he-1.1.1" + sources."has-symbols-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."he-1.2.0" + sources."homedir-polyfill-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."invert-kv-2.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-callable-1.1.4" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.1" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-3.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-regex-1.0.4" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."js-yaml-3.12.0" + sources."kind-of-6.0.2" + sources."lcid-2.0.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.11" + sources."log-symbols-2.2.0" + sources."map-age-cleaner-0.1.3" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."mem-4.3.0" + sources."micromatch-3.1.10" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."mkdirp-0.5.1" - sources."ms-2.0.0" + sources."ms-2.1.1" + sources."nanomatch-1.2.13" + sources."nice-try-1.0.5" + sources."node-environment-flags-1.0.4" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-keys-1.1.0" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.0.3" + sources."object.pick-1.3.0" sources."once-1.4.0" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.0.0" + sources."p-limit-2.2.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."parse-passwd-1.0.0" + sources."pascalcase-0.1.1" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."supports-color-5.4.0" + sources."path-key-2.0.1" + sources."posix-character-classes-0.1.1" + sources."pump-3.0.0" + sources."regex-not-1.0.2" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-dir-1.0.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."safe-regex-1.1.0" + sources."semver-5.7.0" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-6.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."wrappy-1.0.2" + sources."y18n-4.0.0" + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + sources."yargs-unparser-1.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -2790,7 +4725,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; mocha-phantomjs = nodeEnv.buildNodePackage { name = "mocha-phantomjs"; @@ -2809,8 +4744,8 @@ in sources."aws-sign2-0.5.0" sources."boom-0.4.2" sources."combined-stream-0.0.7" - sources."commander-2.15.1" - (sources."config-chain-1.1.11" // { + sources."commander-2.20.0" + (sources."config-chain-1.1.12" // { dependencies = [ sources."ini-1.3.5" ]; @@ -2825,6 +4760,7 @@ in sources."http-signature-0.10.1" sources."inherits-1.0.2" sources."ini-1.1.0" + sources."ip-regex-2.1.0" sources."json-stringify-safe-5.0.1" sources."kew-0.1.7" sources."mime-1.2.11" @@ -2840,8 +4776,8 @@ in sources."phantomjs-1.9.7-15" sources."progress-1.1.8" sources."proto-list-1.2.4" - sources."psl-1.1.28" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-0.6.6" sources."request-2.36.0" sources."request-progress-0.3.1" @@ -2849,7 +4785,7 @@ in sources."semver-1.1.4" sources."sntp-0.2.4" sources."throttleit-0.0.2" - sources."tough-cookie-2.4.3" + sources."tough-cookie-3.0.1" sources."tunnel-agent-0.4.3" sources."which-1.0.9" ]; @@ -2859,15 +4795,15 @@ in homepage = "https://github.com/nathanboktae/mocha-phantomjs#readme"; }; production = true; - bypassCache = false; + bypassCache = true; }; should = nodeEnv.buildNodePackage { name = "should"; packageName = "should"; - version = "13.2.1"; + version = "13.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/should/-/should-13.2.1.tgz"; - sha512 = "l+/NwEMO+DcstsHEwPHRHzC9j4UOE3VQwJGcMWSsD/vqpqHbnQ+1iSHy64Ihmmjx1uiRPD9pFadTSc3MJtXAgw=="; + url = "https://registry.npmjs.org/should/-/should-13.2.3.tgz"; + sha512 = "ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ=="; }; dependencies = [ sources."should-equal-2.0.0" @@ -2883,47 +4819,53 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; sinon = nodeEnv.buildNodePackage { name = "sinon"; packageName = "sinon"; - version = "6.0.1"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-6.0.1.tgz"; - sha512 = "rfszhNcfamK2+ofIPi9XqeH89pH7KGDcAtM+F9CsjHXOK3jzWG99vyhyD2V+r7s4IipmWcWUFYq4ftZ9/Eu2Wg=="; + url = "https://registry.npmjs.org/sinon/-/sinon-7.3.1.tgz"; + sha512 = "eQKMaeWovtOtYe2xThEvaHmmxf870Di+bim10c3ZPrL5bZhLGtu8cz+rOBTFz0CwBV4Q/7dYwZiqZbGVLZ+vjQ=="; }; dependencies = [ - sources."@sinonjs/formatio-2.0.0" + sources."@sinonjs/commons-1.4.0" + sources."@sinonjs/formatio-3.2.1" + sources."@sinonjs/samsam-3.3.1" + sources."@sinonjs/text-encoding-0.7.1" + sources."array-from-2.1.1" sources."diff-3.5.0" sources."has-flag-3.0.0" sources."isarray-0.0.1" - sources."just-extend-1.1.27" - sources."lodash.get-4.4.2" - sources."lolex-2.7.0" - sources."nise-1.4.2" + sources."just-extend-4.0.2" + sources."lodash-4.17.11" + sources."lolex-3.1.0" + (sources."nise-1.4.10" // { + dependencies = [ + sources."lolex-2.7.5" + ]; + }) sources."path-to-regexp-1.7.0" - sources."samsam-1.3.0" - sources."supports-color-5.4.0" - sources."text-encoding-0.6.4" + sources."supports-color-5.5.0" sources."type-detect-4.0.8" ]; buildInputs = globalBuildInputs; meta = { description = "JavaScript test spies, stubs and mocks."; - homepage = http://sinonjs.org/; + homepage = https://sinonjs.org/; license = "BSD-3-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.9.5"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz"; - sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz"; + sha512 = "e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -2933,24 +4875,23 @@ in sources."console-browserify-1.1.0" sources."core-util-is-1.0.2" sources."date-now-0.1.4" - (sources."dom-serializer-0.1.0" // { + (sources."dom-serializer-0.1.1" // { dependencies = [ - sources."domelementtype-1.1.3" - sources."entities-1.1.1" + sources."entities-1.1.2" ]; }) - sources."domelementtype-1.3.0" + sources."domelementtype-1.3.1" sources."domhandler-2.3.0" sources."domutils-1.5.1" sources."entities-1.0.0" sources."exit-0.1.2" sources."fs.realpath-1.0.0" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."htmlparser2-3.8.3" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."isarray-0.0.1" - sources."lodash-3.7.0" + sources."lodash-4.17.11" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -2967,31 +4908,31 @@ in license = "(MIT AND JSON)"; }; production = true; - bypassCache = false; + bypassCache = true; }; shelljs = nodeEnv.buildNodePackage { name = "shelljs"; packageName = "shelljs"; - version = "0.8.2"; + version = "0.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.2.tgz"; - sha512 = "pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ=="; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz"; + sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A=="; }; dependencies = [ sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."interpret-1.1.0" + sources."interpret-1.2.0" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."rechoir-0.6.2" - sources."resolve-1.8.1" + sources."resolve-1.10.0" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -3001,6 +4942,6 @@ in license = "BSD-3-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index 846dabb21664..266ec146c786 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../node-packages/node-env.nix { diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index 123d4296c973..d4ff86c424b1 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, requireFile, commercialVersion ? false }: +{ stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, runtimeShell, requireFile, commercialVersion ? false }: let plainName = "andyetitmoves"; version = "1.2.2"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName cat > $out/bin/$binName << EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/opt/andyetitmoves exec ./lib/$binName EOF diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 0f9b4efd61d8..c9a227b98db1 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -33,10 +33,10 @@ let # when updating, also update rev-manual to a recent version of # https://github.com/dae/ankidocs # The manual is distributed independently of the software. - version = "2.1.8"; - sha256-pkg = "08wb9hwpmbq7636h7sinim33qygdwwlh3frqqh2gfgm49f46di2p"; - rev-manual = "3a3d32dd9bfee6f5a7f5bdad2d70938874c881fa"; - sha256-manual = "1kz9ywbb6f42krxg8c5cwpjsnzm863vnkkn07szb3m1j85c10gjy"; + version = "2.1.9"; + sha256-pkg = "0p4admjxs0gwc54hby9kc1isg99ghxd5kpy08w9hrk3mcyq74z3i"; + rev-manual = "c2c443bf991089534b0193029f6ee34908124e80"; + sha256-manual = "1jwm5zrydc6qis7zslfqj56d083kpbzbl51n0x4czhskm9pjh7qd"; manual = stdenv.mkDerivation { name = "anki-manual-${version}"; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 1ac5ce5007d9..a8e9063a35f4 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -1,24 +1,36 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, boost, - openal, glm, freetype, libGLU_combined, glew, SDL2, - dejavu_fonts, inkscape, optipng, imagemagick }: +{ stdenv, fetchFromGitHub, cmake, zlib, boost +, openal, glm, freetype, libGLU, SDL2, epoxy +, dejavu_fonts, inkscape, optipng, imagemagick +, withCrashReporter ? !stdenv.isDarwin +, qt5 ? null +, curl ? null +, gdb ? null +}: + +with stdenv.lib; stdenv.mkDerivation rec { name = "arx-libertatis-${version}"; - version = "2018-08-26"; + version = "2019-02-16"; src = fetchFromGitHub { owner = "arx"; repo = "ArxLibertatis"; - rev = "7b551739cc22fa25dae83bcc1a2b784ddecc729c"; - sha256 = "1ybv3p74rywn0ajdbw7pyk7pd7py1db9h6x2pav2d28ndkkj4z8n"; + rev = "fbce6ccbc7f58583f33f29b838c38ef527edc267"; + sha256 = "0qrygp09dqhpb5q6a1zl6l03qh9bi7xcahd8hy9177z1cix3k0kz"; }; - buildInputs = [ - cmake zlib boost openal glm - freetype libGLU_combined glew SDL2 inkscape - optipng imagemagick + + nativeBuildInputs = [ + cmake inkscape imagemagick optipng ]; + buildInputs = [ + zlib boost openal glm + freetype libGLU SDL2 epoxy + ] ++ optionals withCrashReporter [ qt5.qtbase curl ] + ++ optionals stdenv.isLinux [ gdb ]; + cmakeFlags = [ "-DDATA_DIR_PREFIXES=$out/share" "-DImageMagick_convert_EXECUTABLE=${imagemagick.out}/bin/convert" @@ -33,7 +45,7 @@ stdenv.mkDerivation rec { $out/share/games/arx/misc/dejavusansmono.ttf ''; - meta = with stdenv.lib; { + meta = { description = '' A cross-platform, open source port of Arx Fatalis, a 2002 first-person role-playing game / dungeon crawler diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 91959a1c942b..b2c86222f2b0 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, xlibsWrapper, libGLU_combined, SDL, openal, freealut, libogg, libvorbis }: +{ fetchurl, stdenv, cmake, xlibsWrapper, libGLU_combined, SDL, openal, freealut, libogg, libvorbis, runtimeShell }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp AstroMenace $out cp gamedata.vfs $out cat > $out/bin/AstroMenace << EOF - #!${stdenv.shell} + #!${runtimeShell} $out/AstroMenace --dir=$out EOF chmod 755 $out/bin/AstroMenace diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 2c55911defcb..b39eb987e00d 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, gettext, lua, ncurses , tiles, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, freetype, Cocoa -, debug +, debug, runtimeShell }: let @@ -86,7 +86,7 @@ let mkdir $app/Contents/MacOS launcher=$app/Contents/MacOS/Cataclysm.sh cat << EOF > $launcher - #!${stdenv.shell} + #!${runtimeShell} $out/bin/cataclysm-tiles EOF chmod 555 $launcher diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 45be0a3085e4..4509f8140ce4 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig +{ stdenv, fetchFromGitLab, SDL2, SDL2_image, pkgconfig , libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3 }: stdenv.mkDerivation rec { name = "commandergenius-${version}"; - version = "2.2.2"; + version = "2.3.2"; - src = fetchFromGitHub { - owner = "gerstrong"; + src = fetchFromGitLab { + owner = "Dringgstein"; repo = "Commander-Genius"; rev = "v${version}"; - sha256 = "1mfw25pgr492ayqw3b85mwp20wh6anrr90gdy605nv1yjma62pmj"; + sha256 = "1a8as56ycbq8csnssd5wqv2jand5c9yskld6prh3dn9gy96jbvgj"; }; buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ]; diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index b4dca34b11fd..6da1e8ffe4b5 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: let pname = "duckmarines"; @@ -25,21 +25,21 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-1.0-love.zip"; - sha256 = "0fpzbsgrhbwm1lff9gyzh6c9jigw328ngddvrj5w7qmjcm2lv6lv"; + url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-1.0c.love"; + sha256 = "1rvgpkvi4h9zhc4fwb4knhsa789yjcx4a14fi4vqfdyybhvg5sh9"; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love ]; - phases = [ "unpackPhase" "installPhase" ]; + phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin mkdir -p $out/share/games/lovegames - cp -v ./${pname}-1.0.love $out/share/games/lovegames/${pname}.love + cp -v ${src} $out/share/games/lovegames/${pname}.love makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { description = "Duck-themed action puzzle video game"; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; + hydraPlatforms = []; license = licenses.free; downloadPage = http://tangramgames.dk/games/duckmarines; }; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 859e503e1017..c51f014b179d 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, flac, gtk2, libvorbis, libvpx, makeDesktopItem, libGLU_combined, nasm -, pkgconfig, SDL2, SDL2_mixer }: +, pkgconfig, SDL2, SDL2_mixer, runtimeShell }: let year = "2015"; @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { installPhase = '' # Make wrapper script cat > eduke32-wrapper <$out/bin/fsg + echo -e '#!${runtimeShell}\nLC_ALL=C '$out'/libexec/sand "$@"' >$out/bin/fsg chmod a+x $out/bin/fsg ''; diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index c908a9b75a9c..e645a40aa752 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -40,7 +40,11 @@ stdenv.mkDerivation { installPhase = if stdenv.isDarwin then - (substituteAll { inherit (stdenv) shell; src = ./darwin.sh; }) + (substituteAll { + inherit (stdenv) shell; + isExecutable = true; + src = ./darwin.sh; + }) else jamenv + '' jam -j$NIX_BUILD_CORES install mkdir -p "$out/bin" diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index 52d0bf778f94..8425933928d5 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -1,4 +1,4 @@ -{stdenv, cmake, qtbase, fetchurl, qtdeclarative, qtmultimedia, qttools, qtsensors, qmlbox2d, gettext, qtquickcontrols, qtgraphicaleffects, makeWrapper, +{stdenv, cmake, qtbase, fetchurl, qtdeclarative, qtmultimedia, qttools, qtsensors, qmlbox2d, gettext, qtquickcontrols, qtgraphicaleffects, qtxmlpatterns, makeWrapper, gst_all_1, ninja }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cmakeFlags = "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0"; nativeBuildInputs = [ cmake ninja makeWrapper ]; - buildInputs = [ qtbase qtdeclarative qttools qtsensors qmlbox2d gettext qtquickcontrols qtmultimedia qtgraphicaleffects] ++ soundPlugins; + buildInputs = [ qtbase qtdeclarative qttools qtsensors qmlbox2d gettext qtquickcontrols qtmultimedia qtgraphicaleffects qtxmlpatterns] ++ soundPlugins; soundPlugins = with gst_all_1; [gst-plugins-good gstreamer gst-plugins-base gst-plugins-bad]; postInstall = '' diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index dff122d8b803..ccf6fe58c780 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper -, openal, fluidsynth, soundfont-fluid, libGL, SDL2 +, openal, fluidsynth_1, soundfont-fluid, libGL, SDL2 , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - SDL2 libGL openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123 + SDL2 libGL openal fluidsynth_1 bzip2 zlib libjpeg libsndfile mpg123 game-music-emu ]; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 745b430a95e3..ea229db6a747 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,20 +1,21 @@ { SDL2_image, SDL2_ttf, SDL2_net, fpc, qt5, ghcWithPackages, ffmpeg, freeglut -, stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer +, stdenv, makeWrapper, fetchhg, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGLU_combined, physfs }: let ghc = ghcWithPackages (pkgs: with pkgs; [ - network vector utf8-string bytestring-show random hslogger + network vector utf8-string bytestring random hslogger SHA entropy pkgs.zlib sandi regex-tdfa ]); in stdenv.mkDerivation rec { - version = "0.9.25"; + version = "1.0.0-beta1"; name = "hedgewars-${version}"; - src = fetchurl { - url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2"; - sha256 = "08x7fqpy0hpnbfq2k06g522xayi7s53bca819zfhalvqnqs76pdk"; + src = fetchhg { + url = "https://hg.hedgewars.org/hedgewars/"; + rev = "7ab5cf405686"; + sha256 = "1yrspi82ym5zpavka4cv0vh86g3i2mbbg8ccfcsid4f38lgbb9y4"; }; nativeBuildInputs = [ pkgconfig ]; @@ -74,5 +75,6 @@ stdenv.mkDerivation rec { all movement on the battlefield has ceased).''; maintainers = with maintainers; [ kragniz fpletz ]; platforms = ghc.meta.platforms; + hydraPlatforms = []; }; } diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index ad3baa9d22a9..f84b83a3010d 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ivan-${version}"; - version = "055"; + version = "056"; src = fetchFromGitHub { owner = "Attnam"; repo = "ivan"; rev = "v${version}"; - sha256 = "10qrwzwfzqs7f663x1cbbhisz60axcl51glxq33zaxl0jwnmma2p"; + sha256 = "07mj3b2p3n3bq7rwi31y0vywnr4namqbcnz4c53kl38ajw9viyf0"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index c2f20f53e9a8..cc91d867f1d8 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -36,24 +36,18 @@ let }); in { + minecraft-server_1_14 = common { + version = "1.14"; + url = "https://launcher.mojang.com/v1/objects/f1a0073671057f01aa843443fef34330281333ce/server.jar"; + sha256 = "671e3d334dd601c520bf1aeb96e49038145172bef16bc6c418e969fd8bf8ff6c"; + }; + minecraft-server_1_13_2 = common { version = "1.13.2"; url = "https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar"; sha256 = "13h8dxrrgqa1g6sd7aaw26779hcsqsyjm7xm0sknifn54lnamlzz"; }; - minecraft-server_1_13_1 = common { - version = "1.13.1"; - url = "https://launcher.mojang.com/mc/game/1.13.1/server/fe123682e9cb30031eae351764f653500b7396c9/server.jar"; - sha256 = "1lak29b7dm0w1cmzjn9gyix6qkszwg8xgb20hci2ki2ifrz099if"; - }; - - minecraft-server_1_13_0 = common { - version = "1.13.0"; - url = "https://launcher.mojang.com/mc/game/1.13/server/d0caafb8438ebd206f99930cfaecfa6c9a13dca0/server.jar"; - sha256 = "1fahqnylxzbvc0fdsqk0x15z40mcc5b7shrckab1qcsdj0kkjvz7"; - }; - minecraft-server_1_12_2 = common { version = "1.12.2"; url = "https://s3.amazonaws.com/Minecraft.Download/versions/1.12.2/minecraft_server.1.12.2.jar"; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 110403af2ac7..ea20ff9b92ef 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -72,11 +72,9 @@ let }; v5 = { - version = "git-5.0.0-dev-2019-01-08"; - rev = "95d4ff6d1b62945decc85003a99588bb0539c45b"; - sha256 = "1qn42d2lfgwadb26mix6c7j457zsl8cqqjfwhaa8y34hii1q44bw"; - dataRev = "a2c9523bce5bcefdc930ff6f14d6d94f57473be9"; - dataSha256 = "1p26zvnmq99cqlrby4294mp2fmp8iqdcjld0ph39x41ifc50lfdf"; + version = "5.0.1"; + sha256 = "11i8fqjpdggqfdlx440k5758zy0nbf9phxan9r63mavc7mph88ay"; + dataSha256 = "1hw3n7qqpasq6bivxhq01kr0d58w0gp46s0baxixp1fakd79p8a7"; }; in { diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 6be5c9ee2474..7e6e034a2b50 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -4,14 +4,12 @@ let libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; in stdenv.mkDerivation rec { name = "multimc-${version}"; - # Current release as of 2018-06-23 (v0.6.2) breaks under Qt 5.11—see - # https://github.com/NixOS/nixpkgs/issues/42387 - version = "unstable-2018-06-04"; + version = "0.6.4"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = "19bb50b872da2702b8e0b65f3f7b6b54c1c5b071"; - sha256 = "01frkk2klm1axr7ywnj23ikxn5pkgj8q6w8vqbslsvmh8bni8rk0"; + rev = "0.6.4"; + sha256 = "0z9mhvfsq9m2cmi0dbrjjc51642r6ppdbb8932236gar5j7w3bc2"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 2d636064205b..1d56d86f5301 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -1,11 +1,11 @@ { stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr -, libXrender, fontconfig, freetype, openal }: +, libXrender, fontconfig, freetype, openal, runtimeShell }: let inherit (stdenv.lib) makeLibraryPath; in stdenv.mkDerivation { name = "oilrush"; - src = + src = let url = config.oilrush.url or null; sha256 = config.oilrush.sha256 or null; @@ -54,7 +54,7 @@ stdenv.mkDerivation { cp -r * "$out/opt/oilrush" mkdir -p "$out/bin" cat << EOF > "$out/bin/oilrush" - #!${stdenv.shell} + #!${runtimeShell} LD_LIBRARY_PATH=.:${makeLibraryPath [ openal ]}:\$LD_LIBRARY_PATH cd "$out/opt/oilrush" exec ./launcher_$arch.sh "\$@" @@ -66,7 +66,7 @@ stdenv.mkDerivation { longDescription = '' Oil Rush is a real-time naval strategy game based on group control. It combines the strategic challenge of a classical RTS with the sheer fun - of Tower Defense. + of Tower Defense. ''; homepage = http://oilrush-game.com/; license = stdenv.lib.licenses.unfree; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index e5243aef2d3e..d0e880f5f2cc 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchzip, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true , withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps -, writeScriptBin, makeWrapper +, writeScriptBin, makeWrapper, runtimeShell }: let opengfx = fetchzip { - url = "http://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip"; - sha256 = "1sjzwl8wfdj0izlx2qdq15bqiy1vzq7gq7drydfwwryk173ig5sa"; + url = "http://binaries.openttd.org/extra/opengfx/0.5.5/opengfx-0.5.5-all.zip"; + sha256 = "065l0g5nawcd6fkfbsfgviwgq9610y7gxzkpmd19i423d0lrq6d8"; }; opensfx = fetchzip { @@ -21,7 +21,7 @@ let }; playmidi = writeScriptBin "playmidi" '' - #!${stdenv.shell} + #!${runtimeShell} trap "${procps}/bin/pkill fluidsynth" EXIT ${fluidsynth}/bin/fluidsynth -a ${audioDriver} -i ${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2 $* ''; @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "0zq8xdg0k92p3s4j9x76591zaqz7k9ra69q008m209vdfffjvly2"; + url = "http://proxy.binaries.openttd.org/openttd-releases/${version}/${name}-source.tar.xz"; + sha256 = "06blx844q6a248jwzqlgi82692vvkmvb00bfdx4jhcwp9mayvza5"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 301249789dad..d4945d43c7d7 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; # and a special license for art data # https://sourceforge.net/p/privateer/code/HEAD/tree/privgold/trunk/data/art-license.txt - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux ++ darwin; hydraPlatforms = []; broken = true; # it won't build diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index f48736a56d60..3a9635f67124 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, libGLU_combined, SDL, SDL_image, SDL_mixer -, libpng, zlib, libjpeg, imagemagick, libX11 +, libpng, zlib, libjpeg, imagemagick, libX11, runtimeShell }: stdenv.mkDerivation rec { @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { cp -rv packages $out/share/sauerbraten/ cp -rv data $out/share/sauerbraten/ cat > $out/bin/sauerbraten_server < $out/bin/sauerbraten_client < "$out/bin/simutrans" <> "$out/bin/$(basename "$i")" + echo '#!${runtimeShell}' >> "$out/bin/$(basename "$i")" echo "$i"' "$@"' >> "$out/bin/$(basename "$i")" chmod a+x "$out/bin/$(basename "$i")" done diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 17f25e25e3f7..0082b97eb22d 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -4,6 +4,7 @@ , extraProfile ? "" # string to append to profile , nativeOnly ? false , runtimeOnly ? false +, runtimeShell # DEPRECATED , withJava ? config.steam.java or false @@ -27,6 +28,9 @@ let iana-etc # Steam Play / Proton python3 + # Steam VR + procps + usbutils ] ++ lib.optional withJava jdk ++ lib.optional withPrimus primus ++ extraPkgs pkgs; @@ -34,8 +38,12 @@ let ldPath = map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs); + setupSh = writeScript "setup.sh" '' + #!${runtimeShell} + ''; + runSh = writeScript "run.sh" '' - #!${stdenv.shell} + #!${runtimeShell} runtime_paths="${lib.concatStringsSep ":" ldPath}" if [ "$1" == "--print-steam-runtime-library-paths" ]; then echo "$runtime_paths" @@ -167,6 +175,7 @@ in buildFHSUserEnv rec { ln -s ../lib32/steam-runtime steamrt/${steam-runtime-wrapped-i686.arch} ''} ln -s ${runSh} steamrt/run.sh + ln -s ${setupSh} steamrt/setup.sh '' else '' ln -s /usr/lib/libbz2.so usr/lib/libbz2.so.1.0 ${lib.optionalString (steam-runtime-wrapped-i686 != null) '' @@ -195,7 +204,7 @@ in buildFHSUserEnv rec { '' + extraProfile; runScript = writeScript "steam-wrapper.sh" '' - #!${stdenv.shell} + #!${runtimeShell} if [ -f /host/etc/NIXOS ]; then # Check only useful on NixOS ${glxinfo-i686}/bin/glxinfo >/dev/null 2>&1 # If there was an error running glxinfo, we know something is wrong with the configuration @@ -204,7 +213,7 @@ in buildFHSUserEnv rec { ** WARNING: Steam is not set up. Add the following options to /etc/nixos/configuration.nix and then run \`sudo nixos-rebuild switch\`: - { + { hardware.opengl.driSupport32Bit = true; hardware.pulseaudio.support32Bit = true; } @@ -226,7 +235,7 @@ in buildFHSUserEnv rec { inherit multiPkgs extraBuildCommands; runScript = writeScript "steam-run" '' - #!${stdenv.shell} + #!${runtimeShell} run="$1" if [ "$run" = "" ]; then echo "Usage: steam-run command-to-run args..." >&2 diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index d5532c051d42..bb4decfda4d2 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -4,1809 +4,1854 @@ { amd64 = [ rec { - name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_amd64"; - sha256 = "0qbr4jfqyda0fi3giwizfv3ainsvld9fl4vd7sylpi490yw7yymh"; - url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_amd64.deb"; + name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt2_amd64"; + sha256 = "ffb6ecd54fcfa71c1b0e424993d0bda460c988b1794c71bd18a1b38fe20f518f"; + url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { - name = "freeglut3_2.6.0-1ubuntu3+srt5_amd64"; - sha256 = "08mpxxd12c2kwlab47nfz25vpn7ag2xkmxp2zn48ymxab7qhvr5r"; - url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt5_amd64.deb"; + name = "freeglut3_2.6.0-1ubuntu3+srt6_amd64"; + sha256 = "fd8f63c5b1b6ca45525c3fc8b47cdd4b2a9598825cbf0239dbbf6534c6c88ac3"; + url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "freeglut3.deb"; }; } rec { - name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64"; - sha256 = "16dlf5zdy9njyaj9c9gdqcq73hd49lfm3ivwizs6i4jgfi44a2q0"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64.deb"; + name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt2_amd64"; + sha256 = "5536b70afbf1d8337be4c3923feb6943210452a0ec0b813e761148f7c6754f66"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { - name = "gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt2_amd64"; - sha256 = "1vpdmgq0vbh7x4r6n1b5cxlz6yl2lfy5bwp89xph640kip1j1xax"; - url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt2_amd64.deb"; + name = "gcc-5-base_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "7a83c2837bedbf1713fcada1b662fe00fd35128a5b473a9476a6ef5117a8851f"; + url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "gcc-5-base.deb"; }; } rec { - name = "gtk2-engines_2.20.2-1ubuntu1+srt5_amd64"; - sha256 = "1w2aaddcrfg37fw7bl2jcbx14bp7ar8lyaq25j9pi8298wvbikly"; - url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt5_amd64.deb"; + name = "gtk2-engines_2.20.2-1ubuntu1+srt6_amd64"; + sha256 = "b3662d8327d2125c131960fda3025ebaf4c8eee2d1050b29d00c07788185d7b5"; + url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines.deb"; }; } rec { - name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_amd64"; - sha256 = "0fqbm6502zqw64lbzywz0cllxkj9n44fxb2gg8q160vcqzyvb8jf"; - url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_amd64.deb"; + name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt6_amd64"; + sha256 = "5a080ffc6aaeaf534ec417690b38e0774b8ee2abef27e039d2bb99f003757746"; + url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { - name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_amd64"; - sha256 = "05d43583lj3ffskvmzcr6yb8a3jz1l8gc12mrmaix8w71bv81nr1"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_amd64.deb"; + name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt6_amd64"; + sha256 = "ff475fb9fb6f99f2bafba816365d3c73b1d7c43a7757ba1cdaab83f0c1dd0e55"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { - name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_amd64"; - sha256 = "0anp6yvp59ian96pkzp899sjxl7l86gp0q5lfmwdiv74asixj52j"; - url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_amd64.deb"; + name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt4_amd64"; + sha256 = "569b7e36f1cfe20320d2701573d16040e94f988e78cc5294ad308fe462d62af7"; + url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libacl1.deb"; }; } rec { - name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_amd64"; - sha256 = "19s3s3fc4vcj5cg7fh40w35vjyhi7097vv83lwjzrzhz5jlgczmp"; - url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_amd64.deb"; + name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt2_amd64"; + sha256 = "6186fe0e57e9d19e6e3bd85786ebf0bbe0c85333d187d8fa4fb9ef7b1d24a0e8"; + url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libappindicator1.deb"; }; } rec { - name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "0mib9hy38mbiz40dr7x7c9c0liqswmnnykij7xpp7kbfqlvlshb8"; - url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "482beec798f517ab4f58a898bc5ecec64572ad22e6f694a5f716c17289556484"; + url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { - name = "libasound2_1.1.0-0ubuntu1+steamos1+srt2_amd64"; - sha256 = "05d4ijlc20ss4rm2jxr5lxkgwbn0qcv5a7pj9aizl66klpbzsgay"; - url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt2_amd64.deb"; + name = "libasound2_1.1.0-0ubuntu1+steamos1+srt3_amd64"; + sha256 = "66ef2c49e4d7a25ad0e3e04ef3105150f7a70a99f14d1ae7a1c1a8a6c324bb15"; + url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasound2.deb"; }; } rec { - name = "libasound2-plugins_1.1.0-0ubuntu1+srt2_amd64"; - sha256 = "1dsa9z7ssf39c039a60axh36wgykyapv65gmlxnvxpkhqnw4zywm"; - url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt2_amd64.deb"; + name = "libasound2-plugins_1.1.0-0ubuntu1+srt3_amd64"; + sha256 = "019bd4bf086b573eacf9ddc9c75527f3e8b91a338e6db50b6c9c97435bf55faf"; + url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { - name = "libasyncns0_0.8-4+srt5_amd64"; - sha256 = "00nglm7sryy3y1pagjhv1mq6rvqiawmhf3kgwv0g7bqwgxcpia7p"; - url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt5_amd64.deb"; + name = "libasyncns0_0.8-4+srt6_amd64"; + sha256 = "308bdf466ad5ce87f2a27712d4e4a6e41747d001fc0ded53760238357e14dec8"; + url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasyncns0.deb"; }; } rec { - name = "libatk1.0-0_2.18.0-1+steamrt1+srt1_amd64"; - sha256 = "1rs9k9pcxmpwlwbxgalsqhiv7baqylaxpkhy4524a4b8dw1qx0k4"; - url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt1_amd64.deb"; + name = "libatk1.0-0_2.18.0-1+steamrt1+srt2_amd64"; + sha256 = "925f2a756aaf0a5df10cd67f1cee965e813a1556076a1d72904d32531e37a675"; + url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { - name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt1_amd64"; - sha256 = "1d19qccdzn82iqql513xgg0yb9w9frbq7v24v2i17140c0w0jhvn"; - url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1.1+srt1_amd64.deb"; + name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_amd64"; + sha256 = "d33b00c3e19337f3abbb070f646adda7420f171f5487dca5e253b68b63a4d8fc"; + url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libattr1.deb"; }; } rec { - name = "libavahi-client3_0.6.30-5ubuntu2.2+srt1_amd64"; - sha256 = "04rkaiapl13rxlr2bwxz2q7z6i0091nm1c49kjnl1yckg64d7548"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt1_amd64.deb"; + name = "libavahi-client3_0.6.30-5ubuntu2.2+srt2_amd64"; + sha256 = "029084e3bf5b2a3756b80a1f01c544c59e20f940df025fab366315ee57362955"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavahi-client3.deb"; }; } rec { - name = "libavahi-common3_0.6.30-5ubuntu2.2+srt1_amd64"; - sha256 = "1a2x57s3072na65gr7ys0wl5cm2f1j2m5kkhlhq4i8ms6hxssgrk"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt1_amd64.deb"; + name = "libavahi-common3_0.6.30-5ubuntu2.2+srt2_amd64"; + sha256 = "74e66fe1aa34c4c01b3f97ae66c8d70729041010239b9a29aa44e6a9267224d6"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavahi-common3.deb"; }; } rec { - name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; - sha256 = "0wpmnsnq5njv65iwq2g6819m2j5fda7jm8450qs3lmyc963ds0i2"; - url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; + name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64"; + sha256 = "640d2e1da02b06f0eb07e8523c3e0b80e2cf8e2267e6a108e764608e8ea84567"; + url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavcodec53.deb"; }; } rec { - name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; - sha256 = "1xpxmhhhgc7ap7f2ijlsgx9p58qqyvk2lgfn61dhlibq046px816"; - url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; + name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64"; + sha256 = "ded33a41e70937a85e182146f9250de70afa82382ef9ca6cf5821fcbcf1a7bcc"; + url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavfilter2.deb"; }; } rec { - name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; - sha256 = "0b8vx5lhsbynivm58zhxd0w6g7c7bqjvsr891wbqizbi325yja2b"; - url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; + name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64"; + sha256 = "917fddb6d84cc2d8653d231790fd0f6d156d9952dc7d5943594264b27e6123f8"; + url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavformat53.deb"; }; } rec { - name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; - sha256 = "1g3bdnfs0rgwnzrnwpj5hamynj1z0qs8wmxlfd0iqkah74ymgaaa"; - url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; + name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64"; + sha256 = "8926a2b4ad3455bd52acd79a1856bc56f30dbe0ae707799145bc202d790d98a4"; + url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavutil51.deb"; }; } rec { - name = "libbz2-1.0_1.0.6-1+srt5_amd64"; - sha256 = "046y04ynczpydlrablks51mx4jc1313k89hsi8x4sj2a355819nz"; - url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt5_amd64.deb"; + name = "libbz2-1.0_1.0.6-1+srt6_amd64"; + sha256 = "de6070b158a146130fbcb658c29e15b48b54fa9b30e36f63a624c38e8a37eb53"; + url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { - name = "libcairo2_1.10.2-6.1ubuntu3+srt5_amd64"; - sha256 = "1j82gzl9hfxsrk2s3nxx1dpq6jlmkz5y5mkvxw9d166v0mlvxkq4"; - url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt5_amd64.deb"; + name = "libcairo2_1.10.2-6.1ubuntu3+srt6_amd64"; + sha256 = "ae0bccbd5b92c8973e217b4ef3d203f4a70bffaf9849218c70f869ff875abe41"; + url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcairo2.deb"; }; } rec { - name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_amd64"; - sha256 = "10mfqks3zw2cqn2kbcc0abswnx886bnrgaf51q5r919vwrm11vi6"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_amd64.deb"; + name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt2_amd64"; + sha256 = "9daaabe65bf3a1f6c025f12dfe435a987ad1818c924581167d225c7ee1176e20"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { - name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_amd64"; - sha256 = "1im7a6z47dwlwcvcafg3bmh055fjzrar6zl207hj9h8hkw3gdnxq"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_amd64.deb"; + name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt2_amd64"; + sha256 = "42c3f2eae158e44c20969ae5faec17fe33732ff66ca4d21b824abd98b7adcebb"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { - name = "libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_amd64"; - sha256 = "1blld717yb6npjswczs06khm3b6vp4r0yzlwfxjp76gvmazgc3iq"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_amd64.deb"; + name = "libcanberra0_0.28-3ubuntu3+steamrt1.1+srt2_amd64"; + sha256 = "5897f63afef8ca38ccff2b9a3a125962515b0c662cbff6779520a1170381dcc4"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra0.deb"; }; } rec { - name = "libcap2_2.22-1ubuntu3+srt5_amd64"; - sha256 = "0bsjpbv2p7ir6w7dpjvs8y25skha72406mhgjrff9dvdvc9mwwpy"; - url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt5_amd64.deb"; + name = "libcap2_2.22-1ubuntu3+srt6_amd64"; + sha256 = "f662a8f54a17393aa3933d160c2622b1f5ce2524d791aa5555986c056842af47"; + url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcap2.deb"; }; } rec { - name = "libcg_3.0.0016-0ubuntu1+srt5_amd64"; - sha256 = "1d4lc4krkphvmlvmd4z60l6cg37gd62x9m700s83jxbsz0fhwmrb"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt5_amd64.deb"; + name = "libcg_3.0.0016-0ubuntu1+srt6_amd64"; + sha256 = "6e627aa3ff1724ec8759431f3ead530f4c1511eb2b881d168a1929c8eac2e196"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcg.deb"; }; } rec { - name = "libcomerr2_1.42-1ubuntu2.3+srt1_amd64"; - sha256 = "0ar9lzaxlmhqxpp6v2b3jz3lblkqhqwy0ywbwkdq4zs5za69kh1b"; - url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+srt1_amd64.deb"; + name = "libcomerr2_1.42-1ubuntu2.3+steamrt1.1+srt2_amd64"; + sha256 = "c1169c34025975c72ea3f10034aab4d105d14ce345677c1736c951311433a787"; + url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcomerr2.deb"; }; } rec { - name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_amd64"; - sha256 = "012fv3d528iz1xdrqlk1xckaslda6kq1sm64kwb5zzm9bzzgnl29"; - url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_amd64.deb"; + name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt3_amd64"; + sha256 = "2e3156827d1d62c9aae38096114ad285c3b3e931b74248a9d88e3aca7f1661e2"; + url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcups2.deb"; }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64"; - sha256 = "1zjy6vqay9ssaxvq11gnf9kr8y94idbx7abcrr4nbx7xkdijz0zi"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64"; + sha256 = "a3c56793a0751a819897d5cd40562e0bd04b0c1fe56e4f865f0f1653e7190bab"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64"; - sha256 = "1599nmpk68cn9awqfq0picwclap7fwfsm8gagz95y5a5nsmldii8"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_amd64.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64"; + sha256 = "0692b46e931815d81421198c35b9c0923d7685c3d2541ad8cc3251d18981305d"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { - name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt1_amd64"; - sha256 = "1m1q2q2s6b98x1zbk31hnd80dakfqg2g8yaj662vxrdrr85j6nza"; - url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt1_amd64.deb"; + name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt2_amd64"; + sha256 = "dfe95df67d3777935d834a8008c10135e264c5d6f351e05bf8a716277b6dc27e"; + url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { - name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_amd64"; - sha256 = "1f36vyq505hrfqmhizgplvvk17zhf1230wlrzibdwi04j275sahk"; - url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_amd64.deb"; + name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt6_amd64"; + sha256 = "99654df8544d529f99d7dd1c1f33130ee0559e9eea7d11be482ffc708df18be0"; + url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { - name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_amd64"; - sha256 = "064wwqbjrdvwkjpyi0k6vj7rrwkwcy49mrlsgrv3q4gckiqhjhbz"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_amd64.deb"; + name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt6_amd64"; + sha256 = "306683272e142aca19af212f7cb880a8f61df049a03f3dfa98e7a0a6fd4e7af6"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { - name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_amd64"; - sha256 = "0vagal7jh6biarjf9sy219p2njb5k8ycv4v7glni8prli0c1zzxq"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_amd64.deb"; + name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt6_amd64"; + sha256 = "abe8a9e28aae2486618c88807099f61a207993bf69fdfdf53241705a14697de9"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { - name = "libexif12_0.6.20-2ubuntu0.1+srt5_amd64"; - sha256 = "15rk2yfvsy16azpcwl8xsxigmrdhl0pkg6dvyq2pknp08c72r5r7"; - url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt5_amd64.deb"; + name = "libexif12_0.6.20-2ubuntu0.1+srt6_amd64"; + sha256 = "adb05c68a77601a6c133d8bd2fcd0e6dccc7fd9e75b70b191e0fee26dd03c1ae"; + url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libexif12.deb"; }; } rec { - name = "libexpat1_2.0.1-7.2ubuntu1.4+srt2_amd64"; - sha256 = "0pdn5f20pbmklnvsyl83x0rjafsjy8vxn4zd2nl7h0aabzng9vy2"; - url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt2_amd64.deb"; + name = "libexpat1_2.0.1-7.2ubuntu1.4+srt3_amd64"; + sha256 = "a34f7459aec8881fac938cf0effae996731ad7de5ffa452747b890238e81a9bf"; + url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libexpat1.deb"; }; } rec { - name = "libffi6_3.0.11~rc1-5+srt5_amd64"; - sha256 = "0i428a37s9lma09psy0d7vj2amnimwgx4izmmac4dlzyy6qpfn9s"; - url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt5_amd64.deb"; + name = "libffi6_3.0.11~rc1-5+srt6_amd64"; + sha256 = "20fd1ae66aec76d8e70bf144b910c5b5e2acb426bfaef0f91ab48002c31ef0dc"; + url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libffi6.deb"; }; } rec { - name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_amd64"; - sha256 = "13hkikwbxsm3nf91rc1xa98apwx9y4mr9h20cd0206gm43qfyvh2"; - url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_amd64.deb"; + name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt2_amd64"; + sha256 = "11299782d3bf532468cdd2c1599a170b8f2704a9efb44f703b68d7434a44dc57"; + url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libflac8.deb"; }; } rec { - name = "libfltk1.1_1.1.10-10+srt5_amd64"; - sha256 = "0zrx2mb5rl5hcyh6p0sglark6rh7s993sg26klizkswn2w53rv8j"; - url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt5_amd64.deb"; + name = "libfltk1.1_1.1.10-10+srt6_amd64"; + sha256 = "d730436f36dfaa7084ae920b74c66e647d35824e5c15af5614a96ccb5681b4d1"; + url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfltk1.1.deb"; }; } rec { - name = "libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_amd64"; - sha256 = "1q3sk9ad8y1x6nbd86i417zp0j624m7b7yj6xp4gm96g8l443asj"; - url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_amd64.deb"; + name = "libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt2_amd64"; + sha256 = "304987ffdaf6834666a1fadb7af2eeb9d73d9f07aecfccd3426d9b51c9a05d95"; + url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfontconfig1.deb"; }; } rec { - name = "libfreetype6_2.4.8-1ubuntu2.6+srt1_amd64"; - sha256 = "01z4dwib9d7i7187yw1b0vji587hrj354cz6ll2iybrbg25w510w"; - url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt1_amd64.deb"; + name = "libfreetype6_2.4.8-1ubuntu2.6+srt2_amd64"; + sha256 = "d1450fd3f275513d5721d92f142439e88a5e544ccaa05b33abe5a68f802ee44c"; + url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfreetype6.deb"; }; } rec { - name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt2_amd64"; - sha256 = "1r6nviva9jnkwyg28lxjcr142lda88f3r2312wgdfhry69szw2ld"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt2_amd64.deb"; + name = "libgcc1_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "5b62d49aa9ec9cd8ca7af2e677cba9714be641cbf6eed9835a48a65fc8cd79fa"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgcc1.deb"; }; } rec { - name = "libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_amd64"; - sha256 = "1psyh5bcf3k28ziw0b2sxjyy2va6xahb0696rz0r6y9m924n0dn7"; - url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_amd64.deb"; + name = "libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt2_amd64"; + sha256 = "086f7ba27b92e13149970230a8ce6e30b41c9cd3585ad9dc075114e37d38ef6b"; + url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { - name = "libgcrypt11_1.5.0-3ubuntu0.6+srt2_amd64"; - sha256 = "0p1vywfx5l9zhibr8c20by9w646przfjfaci5c6ifi7f4v5nn9hc"; - url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt2_amd64.deb"; + name = "libgcrypt11_1.5.0-3ubuntu0.6+srt3_amd64"; + sha256 = "cfbaa394f5b70ef67bfe69dbe4b3e1232493f3f9558e9f325a82606c5ca10d95"; + url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgcrypt11.deb"; }; } rec { - name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_amd64"; - sha256 = "1km2w0haybwal9zkhwsrx4i9yi2zkhbbfhh2xljhfw5m5g6s4mq5"; - url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_amd64.deb"; + name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt6_amd64"; + sha256 = "87c93570fafa2c53e86fb2b0e047823cfa59f4e704155b22865237e9bdb26e38"; + url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { - name = "libglew1.10_1.10.0-3+srt6_amd64"; - sha256 = "19w95wfzzr909jgjg8w6fqff8x00izawqicw896fqbf44zmsc2l0"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt6_amd64.deb"; + name = "libgl1-mesa-dri_8.0.4-0ubuntu0.7+srt6_amd64"; + sha256 = "0b6d862d319bd494656d859847fd1e79cd67334ad26bed7a5d32580e28e42752"; + url = "mirror://steamrt/pool/main/m/mesa/libgl1-mesa-dri_8.0.4-0ubuntu0.7+srt6_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libgl1-mesa-dri.deb"; + }; + } + rec { + name = "libgl1-mesa-glx_8.0.4-0ubuntu0.7+srt6_amd64"; + sha256 = "477764d0cccb49972bbabf3b23bed76fee194e95067d5e32e136e542388fb244"; + url = "mirror://steamrt/pool/main/m/mesa/libgl1-mesa-glx_8.0.4-0ubuntu0.7+srt6_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libgl1-mesa-glx.deb"; + }; + } + rec { + name = "libglew1.10_1.10.0-3+srt7_amd64"; + sha256 = "87b1eaba67db9b0bc95af86474cfb3ff58bcfde79dbe6b2109f4d2d8b3ce55f4"; + url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt7_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglew1.10.deb"; }; } rec { - name = "libglew1.6_1.6.0-4+steamrt1.1+srt1_amd64"; - sha256 = "0vh45a8dp2mqmkswam2rssawg0l0karbymqks3f3gj591d0d6fcv"; - url = "mirror://steamrt/pool/main/g/glew1.6/libglew1.6_1.6.0-4+steamrt1.1+srt1_amd64.deb"; + name = "libglew1.6_1.6.0-4+steamrt1.1+srt2_amd64"; + sha256 = "fe4a558b78d54fdd47cee908d49eccfae21cffa612e1f0c0ec5f6a56d8ac4ab3"; + url = "mirror://steamrt/pool/main/g/glew1.6/libglew1.6_1.6.0-4+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglew1.6.deb"; }; } rec { - name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_amd64"; - sha256 = "1zhb0cpyl3vq5hg63j7wgw6bmwrn8xnq1ybnbigw439c0nq4f333"; - url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_amd64.deb"; + name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt3_amd64"; + sha256 = "5668f2b4fc30179312c2b83117f692dfef97cfae8303c6336dd3f03289471c02"; + url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { - name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt5_amd64"; - sha256 = "02fywg8h5jlkrh1qiqd0hpjv4v1hxggm3vjhnfn5rdj3xxmbvr2y"; - url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt5_amd64.deb"; + name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt6_amd64"; + sha256 = "2e137819d70e788476d96532d59da39de8de084386d59e05c37ab0cc60723076"; + url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { - name = "libgmp10_6.1.0+dfsg-2+srt1_amd64"; - sha256 = "1q0qgpldz25pzbnmhw1vxqd0azp9qai9arydmw66f6kwflx6s7as"; - url = "mirror://steamrt/pool/main/g/gmp/libgmp10_6.1.0+dfsg-2+srt1_amd64.deb"; + name = "libgmp10_6.1.0+dfsg-2+srt2_amd64"; + sha256 = "c768e53e58f4baf44707c79cd3c00320f974674a544fd384a8575a4243773689"; + url = "mirror://steamrt/pool/main/g/gmp/libgmp10_6.1.0+dfsg-2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgmp10.deb"; }; } rec { - name = "libgnutls26_2.12.14-5ubuntu3.14+srt1_amd64"; - sha256 = "19jl1ril1h2r66ilwi45j49g2ag9b4x5090ld0gqp4hbx6f67x9g"; - url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt1_amd64.deb"; + name = "libgnutls26_2.12.14-5ubuntu3.14+srt2_amd64"; + sha256 = "6dfc2c19deeaa0272a291d7b3d4fee5ee57b36806b578f1b43f82ab9708c5fad"; + url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgnutls26.deb"; }; } rec { - name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_amd64"; - sha256 = "1a1m1h7x0acympf7lsdn9k30crff4gkg31n82fxsf5mwbg5rzsy4"; - url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_amd64.deb"; + name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_amd64"; + sha256 = "3fb1f7644d1c83c1cf2271dd6e30dde50adf5ada859530431d205ba24cef8734"; + url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgnutls30.deb"; }; } rec { - name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt2_amd64"; - sha256 = "1pcc8jj73bgs2ks0pkxhn3hc43yk0h97jsss6ckhmp3j5mg9szq7"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt2_amd64.deb"; + name = "libgomp1_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "5cc4b7fbddaf915f8024038e13f4d3d13c939295857d5d771706063ef7c5ffd0"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgomp1.deb"; }; } rec { - name = "libgpg-error0_1.10-2ubuntu1+srt5_amd64"; - sha256 = "1pgv5svrqvsyiakqqnbb1ph6sk5yd6lgk53k2isyyz44vdjch9py"; - url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt5_amd64.deb"; + name = "libgpg-error0_1.10-2ubuntu1+srt6_amd64"; + sha256 = "9119af854fbc1228975cebafbd1bf232c421b4929a8928d2a47d3adbbffc047e"; + url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgpg-error0.deb"; }; } rec { - name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; - sha256 = "1nv973s0h9vmnmslxyddd28p4yv8k47d685m8lxv1irc4skqxzzc"; - url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; + name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64"; + sha256 = "cf5f6fcc04896db6d215edcd5503a71460ac4f5109fa74036147aa9bb93a1a35"; + url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { - name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "02h7fqwwg7jpz8b86dbjhh067ah34x3ys9n5df1rksbzpvmqcbiy"; - url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "6492aa21a54ef1c9123df4e30cd35f5ecc096bf519f359bc1a19a93513d42646"; + url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { - name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_amd64"; - sha256 = "186hxj0jvgbxki0v6fx499pp796kcwiz86gqfhkd94k434aaqz1f"; - url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_amd64.deb"; + name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt2_amd64"; + sha256 = "4ef292b7e2e1e449f795a7204bc114c4f4cfcc3a8d34aaa85f7effbb967033b6"; + url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { - name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_amd64"; - sha256 = "1ddfd661703jgd8xai2ysh2gdvf0pkbvg46iazlg5jqr17i1b1sx"; - url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_amd64.deb"; + name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt6_amd64"; + sha256 = "0d3c7975c6ad6306a8010d807ceb31e3b90804c9cca39d639362e8d5c72e7f8c"; + url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { - name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_amd64"; - sha256 = "1bb7yf3ld99a9amdb6r8slw7g3xnj72za2nbpsrm6cwlw9nyxli0"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_amd64.deb"; + name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt6_amd64"; + sha256 = "bebf7d4a6e0629873dab280de0189bf2d6add5b1816715153aba5ecaba33bf10"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { - name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all"; - sha256 = "0rw8iy16ij86abh444jk1xw78b5z81qjxm1292jin3sfhck4bd4x"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all.deb"; + name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt6_all"; + sha256 = "ee703928f39124739c01a456c727376378b9e75ed1a3f3c1d7022a2299350262"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt6_all.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { - name = "libgudev-1.0-0_175-0ubuntu9.10+srt1_amd64"; - sha256 = "1i8k7y464zj3vb17kwim69kh57y9hnlx40xfs0hrfvjjlj3ih30w"; - url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt1_amd64.deb"; + name = "libgudev-1.0-0_175-0ubuntu9.10+srt2_amd64"; + sha256 = "a2cf13c7c60f1deb922471ccac26f5674df0f54cf19e7f1ca50f79b573a345de"; + url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { - name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "1ihzd3ihylrbrwxqx8sam6lwkhkk2c9ys7vxah2yvj43fl8piiz8"; - url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "d1e22d92539b1af50bb7d32f8e15418092b51e6578012eb1a52080cf89433a83"; + url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { - name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "1z4h6zdh5h9yvq4dfizy8ndskny94c86m5b4g9lpypfpzj259kpi"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "5774c538993d0a7e23cc5e8863bb9243f17899b2a861b8029c44110d80228f4c"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { - name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "13fgm887ycb1l5w1hxvlf906wr4k834drykg36ink6g9fi1smn79"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "f4dc8cc860389827d82aa1d2983ae8b6afd2553132253d6da79d618e1ea1d00c"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { - name = "libhogweed4_3.2-1ubuntu0.16.04.1+srt1_amd64"; - sha256 = "1d9746bfwajafd28292q0fl6mwj51in9qg7mbd583y459jyb0ffd"; - url = "mirror://steamrt/pool/main/n/nettle/libhogweed4_3.2-1ubuntu0.16.04.1+srt1_amd64.deb"; + name = "libhogweed4_3.2-1ubuntu0.16.04.1+srt2_amd64"; + sha256 = "a8411a24f3314b11a25f249bb5390a31e7485d81e5941b8823ad0e67af033c32"; + url = "mirror://steamrt/pool/main/n/nettle/libhogweed4_3.2-1ubuntu0.16.04.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libhogweed4.deb"; }; } rec { - name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "0alagksf7h181r86iiddvb9sil9zwf7d8lhnikq2x1i1ncxnwbj9"; - url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "90943a0b1fa563555b3b92805b4ef24cf82557ca3b6cda3aac8d703a008b4372"; + url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { - name = "libice6_1.0.7-2build1+srt5_amd64"; - sha256 = "0v1a4dbs6by8n3yi23xqs4qqvjjdhh1qqmacc2bybjd2qi8dps8y"; - url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt5_amd64.deb"; + name = "libice6_1.0.7-2build1+srt6_amd64"; + sha256 = "b4971686dc20fabbaf3cda5685e627ce9605318eb5ab4b3e5a9895680dba7290"; + url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libice6.deb"; }; } rec { - name = "libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_amd64"; - sha256 = "1qlpfhwvx4m72541rlk934h72hczb0gwiyiav8sd4kcwwkcacqml"; - url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_amd64.deb"; + name = "libidn11_1.32-3ubuntu1.2+steamrt1.1+srt2_amd64"; + sha256 = "18011ae05a4dbe00d4deafb63dabdf0416c1fa2c202d3c0e6ce840d96001f4f6"; + url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.32-3ubuntu1.2+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libidn11.deb"; }; } rec { - name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_amd64"; - sha256 = "0fcj1fmk70y8j1jcbr9dian2zrwf5m7yis4zpq8cc77838cdx0pg"; - url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_amd64.deb"; + name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt2_amd64"; + sha256 = "ee7da6dda4a701bb1e98b22233c27e923050f4cfe6055c96e31b7a13fa96743a"; + url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libindicator7.deb"; }; } rec { - name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_amd64"; - sha256 = "0qpipr1anfy4y6m1syznmarsh3ni6db9dc7a1w0n11zfhp8lpihg"; - url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_amd64.deb"; + name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_amd64"; + sha256 = "9a419baf1b88386cf643ca64965de607321e5d27f13c5bd68be0eb1a803fd7a9"; + url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { - name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_amd64"; - sha256 = "10r393m5xxqjd6hpvlnfvnba081crhs88x1knhi3s6mhg2xhg35y"; - url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_amd64.deb"; + name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt6_amd64"; + sha256 = "682e8d47031aa046787624eb5af560093f6cade3fdc5edcb5875e89ff7cb9d31"; + url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { - name = "libjpeg62_6b1-2ubuntu1.1+srt5_amd64"; - sha256 = "0wn9lgqc95gvck5k8qds9908j5ip3s3bz85a8l2bdprgg1q4rsrl"; - url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt5_amd64.deb"; + name = "libjpeg62_6b1-2ubuntu1.1+srt6_amd64"; + sha256 = "5c931fb6c272af3cefa723a6ba30f55d477c50bd07f6695be4216f2a13ea49f0"; + url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjpeg62.deb"; }; } rec { - name = "libjson0_0.9-1ubuntu1.1+srt3_amd64"; - sha256 = "1pqncc63z9w3jg41xqklappyirajfrchdjp81bldrnmbpbj69xha"; - url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt3_amd64.deb"; + name = "libjson0_0.9-1ubuntu1.1+srt4_amd64"; + sha256 = "a72824685bfa0dc7fab313606d1fcba41565363c8f90d22c7e90d3f35a74859c"; + url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjson0.deb"; }; } rec { - name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; - sha256 = "18xfi5c04s3z9brj1rrmvl9s67apd4d6ax7vfwwjzwh7ygnkp8h8"; - url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; + name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64"; + sha256 = "9d638fd0f44307dfab7b295a53715b199854b71f52b269369f6bb492d7da295c"; + url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libk5crypto3.deb"; }; } rec { - name = "libkeyutils1_1.5.2-2+srt5_amd64"; - sha256 = "14mv4r05r0fzkbl3r4jaa7wwmmaprv3q5w36pyf3xqc3iynxnj2p"; - url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt5_amd64.deb"; + name = "libkeyutils1_1.5.2-2+srt6_amd64"; + sha256 = "2fcb1c31e273de0780db4a07b4ec6272adba221ec3ea40821e4744b86adf5313"; + url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkeyutils1.deb"; }; } rec { - name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "0xhz42f7lnsc69sfnj2w0917jwm82nbc9i56qq3s1g2sw7z6kb3q"; - url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "374b317da50e4ab1688a3514649fbe572d8d73d0e0430c4bd739ce0443c04f5f"; + url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { - name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; - sha256 = "1k3d1775ran10y79s7n5lmdlqlr7kscvxmj1887bnn4yxbwlgy73"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; + name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64"; + sha256 = "3071c486de82102fa73ac263c5d78cb8df1ff6ced3450fd9baf564c4b345b89a"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-3.deb"; }; } rec { - name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; - sha256 = "1xml3gfn253lydqaqk27209sr1x0vvrbbkmb63z5cyy4i1yfpvmr"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; + name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64"; + sha256 = "ba1732a8fb0f64c0cc8eb2ddf5512ad246ec0c31962d84fa91db55fae5756c45"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5support0.deb"; }; } rec { - name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_amd64"; - sha256 = "0wj24yi2ws12lfs0pi0bq9rbr1gyk2nv30rf46bav41mpn2fj9mg"; - url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_amd64.deb"; + name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt6_amd64"; + sha256 = "e55aacce445cf1ac31d1ef35a3b9aa983e9ca18626b0aa28cdfdc3a81ccd5cc3"; + url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "liblcms2-2.deb"; }; } rec { - name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_amd64"; - sha256 = "02w5h7hbapwwsya468v6wcizm9nra5c9nbbf86666mlkgb6y6z20"; - url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_amd64.deb"; + name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt4_amd64"; + sha256 = "487df425cab50adae8d9129eaabf4b52f2332f574a200a582fc808cd72bc3ba7"; + url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { - name = "libltdl7_2.4.2-1ubuntu1+srt5_amd64"; - sha256 = "0ly9p5xilsf0d214mrx96nc3gn1xm1b68dzizsimhqa3bfpckzbb"; - url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt5_amd64.deb"; + name = "libltdl7_2.4.2-1ubuntu1+srt6_amd64"; + sha256 = "f9c6d0ae41527a42576fa16bb170f90e8deb86ffb16c3b78ac8e237400901a33"; + url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libltdl7.deb"; }; } rec { - name = "libmikmod2_3.1.12-2+srt5_amd64"; - sha256 = "1i6kwzy1dz0a78jm0vpa0hjqahkwnj8yab8aky2srsf07y8bz2r8"; - url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt5_amd64.deb"; + name = "libmikmod2_3.1.12-5+srt2_amd64"; + sha256 = "d9fc387579b30b3c555ba2a1706db3956957c0f2e25ef896c4d5bb8c13ff7a6b"; + url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-5+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libmikmod2.deb"; }; } rec { - name = "libmpg123-0_1.25.10-1+steamrt1+srt1_amd64"; - sha256 = "1szlchrl7vmclk80jpjj799in0fnx5263dqlh896qprl63zjnnx3"; - url = "mirror://steamrt/pool/main/m/mpg123/libmpg123-0_1.25.10-1+steamrt1+srt1_amd64.deb"; + name = "libmpg123-0_1.25.10-1+steamrt1+srt2_amd64"; + sha256 = "4dff7550d1eb7666fe53d4705736c7c4760dbbfe8b24483956ca1da62a0876c8"; + url = "mirror://steamrt/pool/main/m/mpg123/libmpg123-0_1.25.10-1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libmpg123-0.deb"; }; } rec { - name = "libncurses5_5.9-4+srt5_amd64"; - sha256 = "1b4j17npqdhj6afcw7cj37k6dr2kmbgpjyv7c0viq82165bjacfp"; - url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt5_amd64.deb"; + name = "libncurses5_5.9-4+srt6_amd64"; + sha256 = "6c342c8e35ab535c2dd20e1f26001e46363ddd4e55b1abbb94d3eee9688b6dbd"; + url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libncurses5.deb"; }; } rec { - name = "libncursesw5_5.9-4+srt5_amd64"; - sha256 = "0gavz5rh8hz6ir3x09p57balxl8zprjsglgf2craq340qpgqw4s6"; - url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt5_amd64.deb"; + name = "libncursesw5_5.9-4+srt6_amd64"; + sha256 = "8efe94b4cb6fb8b137ce87996b263a02d0ca97572025874df0f67ce3072a12ed"; + url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libncursesw5.deb"; }; } rec { - name = "libnettle6_3.2-1ubuntu0.16.04.1+srt1_amd64"; - sha256 = "18f9ymqkmnnx2hxfms2ph7hajl0ghk8ywav5vaihaii47wfzkdww"; - url = "mirror://steamrt/pool/main/n/nettle/libnettle6_3.2-1ubuntu0.16.04.1+srt1_amd64.deb"; + name = "libnettle6_3.2-1ubuntu0.16.04.1+srt2_amd64"; + sha256 = "18f8ac5721849072980c7f8cdffdf2eac3c8621f3aff02bc32fe1945e2abf0ec"; + url = "mirror://steamrt/pool/main/n/nettle/libnettle6_3.2-1ubuntu0.16.04.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnettle6.deb"; }; } rec { - name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64"; - sha256 = "0dw0mfwia3z6icj01558xgdjmi7g6g4nig4vrjbmlz05f9l2rck3"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64.deb"; + name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt2_amd64"; + sha256 = "3bff5db8467fe7289dc6569e6bd78c733dadb4569ebb2e6e6484019d347a53cc"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnm-glib4.deb"; }; } rec { - name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64"; - sha256 = "1r9qw0mx38zisj6lr9bk8yv9f3yf2l80y4rvgxq6k28ccz5sahvs"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64.deb"; + name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt2_amd64"; + sha256 = "2b301b4616aa92f1c1ce9d729255f5314e0307155275213fbed7fe5b6d1df2a6"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnm-util2.deb"; }; } rec { - name = "libnotify4_0.7.5-1+srt5_amd64"; - sha256 = "15ny5m925wrn0m394gn88288zgdjf99m5jg9pxyfirhvjmpp8pmf"; - url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt5_amd64.deb"; + name = "libnotify4_0.7.5-1+srt6_amd64"; + sha256 = "a367220da9ac0918a37799231225a1156bb4431a319242d73d5562bac73a4da9"; + url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnotify4.deb"; }; } rec { - name = "libnspr4_4.12-0ubuntu0.12.04.1+srt2_amd64"; - sha256 = "11y0nj7pc94gs3ndxph50whs1yx8lys48c44vj1207m2mkw3xdq7"; - url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt2_amd64.deb"; + name = "libnspr4_4.12-0ubuntu0.12.04.1+srt3_amd64"; + sha256 = "2824614abe02323087b5d73313aa9ef3e0f3308095bd1f508f78503d2ba10c63"; + url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnspr4.deb"; }; } rec { - name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt1_amd64"; - sha256 = "0a5mqk6fry96jgpn27fv66mzg7s7mn00jhiayh73q4ddlv52p1r6"; - url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt1_amd64.deb"; + name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt2_amd64"; + sha256 = "c9edceea356f57bfc6aa8df7263da54f465313e1e3949a8b7b5771f591dd5788"; + url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnss3.deb"; }; } rec { - name = "libogg0_1.3.2-1+srt1_amd64"; - sha256 = "1x8nrq4gm3n996zqgdy8msbgpflpl2gaqsm68nbfv703gxbzfi5p"; - url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.3.2-1+srt1_amd64.deb"; + name = "libogg0_1.3.2-1+srt2_amd64"; + sha256 = "d5999d3f774c2c3fbb8998d7ed686b38505a67a1fb45ec07aa288fad9c0210b8"; + url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.3.2-1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libogg0.deb"; }; } rec { - name = "libopenal1_1.16.0-3+srt1_amd64"; - sha256 = "02dc0xfwh1jmhm0l4wig3ybs2yy48hdarnbfjv69m9aryjpbh6gj"; - url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt1_amd64.deb"; + name = "libopenal1_1.16.0-3+srt2_amd64"; + sha256 = "649d2fc817024719e6d53078053e956c4c0848b7a26606e8e85188bd0c8e379a"; + url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libopenal1.deb"; }; } rec { - name = "libopus0_1.3-0+steamrt1.1+srt2_amd64"; - sha256 = "1hjff7lm9vjs3rkjmqwchnrli4bwpbx46jy4ngahiywcw3n94959"; - url = "mirror://steamrt/pool/main/o/opus/libopus0_1.3-0+steamrt1.1+srt2_amd64.deb"; + name = "libopus0_1.3-0+steamrt1.1+srt3_amd64"; + sha256 = "2c41ceb74b0da8d6a8e2adbd537ca15b42544a951ccf42454a14abef369a210c"; + url = "mirror://steamrt/pool/main/o/opus/libopus0_1.3-0+steamrt1.1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libopus0.deb"; }; } rec { - name = "libopusfile0_0.11-0+steamrt1.2+srt1_amd64"; - sha256 = "1q5n474br6k0l5xhr1b7bclrmdqpcd98dq4yd92rsybjnf9xiqgq"; - url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.2+srt1_amd64.deb"; + name = "libopusfile0_0.11-0+steamrt1.2+srt2_amd64"; + sha256 = "f45cdaa7b22e8042434f1a5fe72c13b69f031cee9fa1d97970acb072e644212c"; + url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libopusfile0.deb"; }; } rec { - name = "liborc-0.4-0_0.4.16-1ubuntu2+srt5_amd64"; - sha256 = "13s7ni24igdkvmcs3d13ncll36clfmm14ggjqd23dsgyzmip5n18"; - url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt5_amd64.deb"; + name = "liborc-0.4-0_0.4.16-1ubuntu2+srt6_amd64"; + sha256 = "aa26e347d687d40d0e8efff51e45dc1aeb071efd93ab2147baef993aa024bb27"; + url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { - name = "libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_amd64"; - sha256 = "1hm1lqphdp0vk1zyyyxz78k15lqw7w6vmv64pp27cwm8zkqmvj4q"; - url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_amd64.deb"; + name = "libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt2_amd64"; + sha256 = "e994e62fcffb23ec006563ec4a6e184d4f508d70f2b08a567c2e52afa25b497c"; + url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libp11-kit0.deb"; }; } rec { - name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_amd64"; - sha256 = "0dcimf6vsiv51lkavwbw980fll3vpki86i3rqm8vr37iz59798zf"; - url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_amd64.deb"; + name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt6_amd64"; + sha256 = "19343aeada8b22381b29d8ff0752ed9475b1ed92cae1fd18e691b9b505e42c8e"; + url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { - name = "libpci3_3.1.8-2ubuntu6+srt1_amd64"; - sha256 = "167a5rgzyss746s07fkal7vy89i0m5syjm2vdwfiln3ncil4s86y"; - url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt1_amd64.deb"; + name = "libpci3_3.1.8-2ubuntu6+srt2_amd64"; + sha256 = "a7fecb6f3e9657b8a03b70ddfea1c384de5cb65feebe5102339e41d0bd1b8f69"; + url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpci3.deb"; }; } rec { - name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64"; - sha256 = "0x3yzmxvlg2xyy2sm03vvr4c46r7ywbns7gqbshzgn656zqdid00"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64.deb"; + name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt2_amd64"; + sha256 = "b7554d1381c7580a7897657b3ecf11c7554f319c1034da70121d4fa724589be1"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpcre3.deb"; }; } rec { - name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64"; - sha256 = "1rlkj982w99x0mz008snkyqr1v13h165yj2z4jwdczpd1bsrra9h"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64.deb"; + name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt2_amd64"; + sha256 = "053a4754d48e96ff4849fc99232ac74b5d5b58440eb367b3422a5e56d698065b"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { - name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_amd64"; - sha256 = "15sa863fia26lclp821j0c747dv8a8igz5l86n5ff1m3dmlb5hp3"; - url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_amd64.deb"; + name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt3_amd64"; + sha256 = "0d05b046b8870873f8aa4e9f51ac3f9c902b4364a6bd14fa35279b7546b7de29"; + url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { - name = "libpng12-0_1.2.46-3ubuntu4.2+srt2_amd64"; - sha256 = "0gnjsh72c9w1229fk5fx753lpmcqzizx7dizrdh3wk1qmivhddl1"; - url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt2_amd64.deb"; + name = "libpng12-0_1.2.46-3ubuntu4.2+srt3_amd64"; + sha256 = "6d0689067d8476c45918c8c848ffea495e26d118890f040ccd3596b121d4d824"; + url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpng12-0.deb"; }; } rec { - name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_amd64"; - sha256 = "17d3f6gwbdyn058bbd8f0hj4ywp8rmhy9wsf2pnfkh219r5b98h2"; - url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_amd64.deb"; + name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt6_amd64"; + sha256 = "e302a51cfeacd982683bd530a36d8142edf416d6812c02bd9a13939addf9a235"; + url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpulse0.deb"; }; } rec { - name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "16j666k8l85icbgy9ds9hdmcm60axsp8nxjc1n11jd64d9slb792"; - url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "e55b129066b92ab99f518d2f857b54e8754c3c873b5fb603270e3c4c36564a7b"; + url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { - name = "librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_amd64"; - sha256 = "05wm9ddpy2axf0a7vsrfc7prhaqf7npbcfrsy57f66aachpj778r"; - url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_amd64.deb"; + name = "librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt4_amd64"; + sha256 = "27526dac26e2b323ec6dc764671839c3a2c5476fb16c7980959b17af4177486b"; + url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "librtmp0.deb"; }; } rec { - name = "libsamplerate0_0.1.8-4+srt5_amd64"; - sha256 = "1xr5k6zyfw8lc5s6sbg57d7v33045hg9l6a1rh5f46v99hi8k1rr"; - url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt5_amd64.deb"; + name = "libsamplerate0_0.1.8-4+srt6_amd64"; + sha256 = "cfb983b7a89dd8ec43cca84883fc44367d74d341ba4bad2b106793abad7ae145"; + url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsamplerate0.deb"; }; } rec { - name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_amd64"; - sha256 = "1i7hh43fiadg1y35dmjm03s8mcbanv8jfnnjrcccabahsk8fpdj0"; - url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_amd64.deb"; + name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt6_amd64"; + sha256 = "8a12f971d3905b5b84fd9c3fca3c7afe1867f8f5db8359157b0cd1c45dda8fc7"; + url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsasl2-2.deb"; }; } rec { - name = "libsdl-image1.2_1.2.10-3+srt5_amd64"; - sha256 = "180sia6zc48y2f3l1sywp8am0gqzc9swm711fq8b2kdd4rn3wicm"; - url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt5_amd64.deb"; + name = "libsdl-image1.2_1.2.10-3+srt6_amd64"; + sha256 = "a90b7182e92af49e4a2c3c76b5dd85b2f0df334933070c035d48724aafd8d199"; + url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { - name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_amd64"; - sha256 = "0z3zxvsvlnvzsvprvy5q4y99irjkzm4ilv0znaic5x967k3zpjp0"; - url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_amd64.deb"; + name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt6_amd64"; + sha256 = "bc30e755796872bf7a4a3e7dc84f41a265ff1893ea777f809663f76dfeb047fb"; + url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { - name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_amd64"; - sha256 = "11ks71izg46k2pjnd5jdk03xkzz7jmxm5k3mkwq8b42grdiadd6a"; - url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_amd64.deb"; + name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt6_amd64"; + sha256 = "b3e18a7fe335cd623410f3eb3c86a2abda8d83d287e8304c0c7df9e8219938fe"; + url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { - name = "libsdl1.2debian_1.2.15-5+steamrt1+srt5_amd64"; - sha256 = "1i2072wzjmrz97pqxm9mfdqqvx6q6x6w8xqa5f4jxmhm9sb7x7wb"; - url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt5_amd64.deb"; + name = "libsdl1.2debian_1.2.15-5+steamrt1.2+srt1_amd64"; + sha256 = "5641a948c70a41a7ade79de001376686acee7b5a678aaf24be29dbbdefbde7d7"; + url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { - name = "libsdl2_2.0.9.~reimport-0+steamrt1.1+srt1_amd64"; - sha256 = "0iahnd0z5qpdgznq1w88m9b7ham3yr0rcidxm9459qpyan7ny2yc"; - url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.9.~reimport-0+steamrt1.1+srt1_amd64.deb"; + name = "libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_amd64"; + sha256 = "907391ea4512c3372f86afd8a9a409632d90b9e260de43f8082f90175e08c56c"; + url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2.deb"; }; } rec { - name = "libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt1_amd64"; - sha256 = "1xy9l0jzrxr0vz0kgys2g055vdzw3hxkj1xmmzd57bn8dq0yxwfx"; - url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt1_amd64.deb"; + name = "libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_amd64"; + sha256 = "136a0c68b520f4eaec9ff81321785b09dc6843431b10ba6941faee82af3b215d"; + url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-image.deb"; }; } rec { - name = "libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt1_amd64"; - sha256 = "06i3g17rqm729mpgkl24rlbkx4ya4mmqjlsndsznymabk5ly5pz5"; - url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt1_amd64.deb"; + name = "libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_amd64"; + sha256 = "98f77bb9019649440a96e9c70bd160fa03aa0bd306fa51110b861882cb62df0d"; + url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { - name = "libsdl2-net_2.0.1+srt2_amd64"; - sha256 = "1850n1zv9cpbnv5n3nk5knk30pm0f4g8x2cx70kyxbprfkq7894v"; - url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt2_amd64.deb"; + name = "libsdl2-net_2.0.1+srt3_amd64"; + sha256 = "492a6e5f4efc454dd720be4028efd89a212e039d3f3f7b01c94c0144d8d8d621"; + url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-net.deb"; }; } rec { - name = "libsdl2-ttf_2.0.14+srt2_amd64"; - sha256 = "1bwhm58zqh452szjjj3m3ny2samx19qw3x6q7f18h7164d5vvm4a"; - url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt2_amd64.deb"; + name = "libsdl2-ttf_2.0.14+srt3_amd64"; + sha256 = "f117047ffeaf77a93fc0932470e80ace2d07d7e672191c9dd50ca5f2a033f56c"; + url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { - name = "libselinux1_2.1.0-4.1ubuntu1+srt5_amd64"; - sha256 = "001wfrryd549gh1qd4v8fz3m78vpjwdx1vh34cw0dgi3kxmjxp0q"; - url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt5_amd64.deb"; + name = "libselinux1_2.1.0-4.1ubuntu1+srt6_amd64"; + sha256 = "7172d53c8baf857ed8909eb9bbbda93d0ff177b2f3ca723c716d3af34690135d"; + url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libselinux1.deb"; }; } rec { - name = "libsm6_1.2.0-2build1+srt5_amd64"; - sha256 = "0k0hyh6b36wvcn8ss24f7lqp2pb0wdvb5zh57y7zfxglgr9vj083"; - url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt5_amd64.deb"; + name = "libsm6_1.2.0-2build1+srt6_amd64"; + sha256 = "e22295663740d88bcc92f8fa67eb55750b0855be98474de76a3e2bf796eb3c12"; + url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsm6.deb"; }; } rec { - name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_amd64"; - sha256 = "17sds50cyvpfrm6x8hddb0ir5xsch79k8gyghkzi59dav2j4j2f4"; - url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_amd64.deb"; + name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt2_amd64"; + sha256 = "042a5c518bdd3152ef8052bd7a88babb31077840ce85383034c0e54d29f6ed07"; + url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsndfile1.deb"; }; } rec { - name = "libspeex1_1.2~rc1-3ubuntu2+srt5_amd64"; - sha256 = "0b0lrg7arrnszc1hzya04ch3j4lbcrpxqf5hxxz2wm5k5qb9f6rv"; - url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt5_amd64.deb"; + name = "libspeex1_1.2~rc1-3ubuntu2+srt6_amd64"; + sha256 = "a22fc321ca4a9c35109d48a74a2cc5b60131d1ebf7b09683d66e14aff728eda1"; + url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libspeex1.deb"; }; } rec { - name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt5_amd64"; - sha256 = "1vks6i3ipggcd2b4ayhkpzj70rdwvlmgh20z7ac8hcnhfnsmvmbc"; - url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt5_amd64.deb"; + name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt6_amd64"; + sha256 = "7cd488929976b818160d4c6a043468d08ebaf7cec9dfcd44bf36907adc428052"; + url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { - name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt2_amd64"; - sha256 = "0yavzpx56kf27pfjif6s86bg9wmr9078d7p34dpvbzp0aibjifs8"; - url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt2_amd64.deb"; + name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt3_amd64"; + sha256 = "72cd1300cb4725894778d453d9a9a25aa96f033864306c8cc1726078480437ca"; + url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_amd64"; - sha256 = "1s82s5ylmsbbx567bdjv9dh53nzzwqskfpry3a61naw8nsbxg5kb"; - url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_amd64.deb"; + name = "libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt2_amd64"; + sha256 = "e6ccfb7c0505baa106abbab67af5f685e32d24d5cd6afe8468f69526b7a3db92"; + url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { - name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt2_amd64"; - sha256 = "09gn89qdjpwhh4yzydrpjbpwgbfhc0xmy56113an0rk9hs43ym1i"; - url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt2_amd64.deb"; + name = "libstdc++6_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "ed886139ace433f0922c87defd922ec57e54c495e9a5b54a6aaf7c02762d27e2"; + url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6.deb"; }; } rec { - name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64"; - sha256 = "175qkx9blsjidsbg7dkp6anyhfdpv1njqs2hzhjnfnsdz0hsy5pp"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_amd64.deb"; + name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt2_amd64"; + sha256 = "59e784845048714b6ddd02013cb1ccc8a819489a7081c3f479b7fa7121893a4a"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { - name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; - sha256 = "1shni0sdcv1jqkfsqy5j3kkr73lifb3ip9lqz8cxx23dlvbllly9"; - url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; + name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64"; + sha256 = "dda1950d7e1f50547ce57246bc7e19c3c1ab1166ee81ca637ff86d373e20253c"; + url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libswscale2.deb"; }; } rec { - name = "libtasn1-3_2.10-1ubuntu1.5+srt2_amd64"; - sha256 = "1sjklhs977mrvs7qci0hc3w6x3gjrq5c6lfxjma7bjg731xwdivp"; - url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt2_amd64.deb"; + name = "libtasn1-3_2.10-1ubuntu1.5+srt3_amd64"; + sha256 = "f9c6c9b2cd83aaff5e07e0e7a99be8110f8b1b4be0f7ec9cf96aaa097b4da386"; + url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtasn1-3.deb"; }; } rec { - name = "libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_amd64"; - sha256 = "0s6rljgvgcawws574ka2kn944w64fwjan1lri1anszg0m274n5na"; - url = "mirror://steamrt/pool/main/libt/libtasn1-6/libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_amd64.deb"; + name = "libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt2_amd64"; + sha256 = "93f7e1764a6db1e22b33476eb5f9367eca21a61d0d04a2a0cd0de170f21356d6"; + url = "mirror://steamrt/pool/main/libt/libtasn1-6/libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtasn1-6.deb"; }; } rec { - name = "libtbb2_4.0+r233-1+steamrt2+srt1_amd64"; - sha256 = "18rc6jhkpqnqvrw29zffahmjihrdrwmh4ydnx3433j6wc29m8p4v"; - url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt1_amd64.deb"; + name = "libtbb2_4.0+r233-1+steamrt2+srt2_amd64"; + sha256 = "6e91c619b891ef51a53cb86b83b67cc3ba1c223af58e166375c26622efd9575a"; + url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtbb2.deb"; }; } rec { - name = "libtdb1_1.2.9-4+srt5_amd64"; - sha256 = "1wq2956jmq9zhd7gcpgvqq7d1rdjk954hgcx540zwgxs57brzkrw"; - url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt5_amd64.deb"; + name = "libtdb1_1.2.9-4+srt6_amd64"; + sha256 = "d35843de8c8847850477318d00f0159e76492d71d2817f81fc512a56376e3efb"; + url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtdb1.deb"; }; } rec { - name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_amd64"; - sha256 = "15b6sg3dhamlgaq28w3zlwif5aps0ybi0hc29k3vv2s48f6vqfi8"; - url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_amd64.deb"; + name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt6_amd64"; + sha256 = "f8e9e796fd307689143b54e5b4c451c19c0970575241587e8c3a24ce6947c7a3"; + url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtheora0.deb"; }; } rec { - name = "libtiff4_3.9.5-2ubuntu1.9+srt2_amd64"; - sha256 = "038wcp777pj2y3scwkqfdnb6yjsag5dnqajrdiv7pxmvkgn3bc2l"; - url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt2_amd64.deb"; + name = "libtiff4_3.9.5-2ubuntu1.9+srt3_amd64"; + sha256 = "e9f8da291dc5dd48ea5f0f94e628f1e17ace6d1e655b7ffcbca175d85db98d8a"; + url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtiff4.deb"; }; } rec { - name = "libtinfo5_5.9-4+srt5_amd64"; - sha256 = "1w22aqm9zla5cfcvkridgzwnkhj3lyjqf61dl8ppnnbk8rhj07x4"; - url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt5_amd64.deb"; + name = "libtinfo5_5.9-4+srt6_amd64"; + sha256 = "c12b7f27206ba4541468ff5f134973b2f5bb69a4e86d3c2e43f111eaa7db76a0"; + url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtinfo5.deb"; }; } rec { - name = "libudev0_175-0ubuntu9.10+srt1_amd64"; - sha256 = "146kdj719rkgj5v2g0lzs7qqb59a2xgplkqrrafpkssqangvfmq1"; - url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt1_amd64.deb"; + name = "libtxc-dxtn-s2tc0_0~git20131104-1.1+srt2_amd64"; + sha256 = "f3dbcab81697c5206f5b8dbb3176093204a9a8ba1611ddde7e156f844947c763"; + url = "mirror://steamrt/pool/main/s/s2tc/libtxc-dxtn-s2tc0_0~git20131104-1.1+srt2_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libtxc-dxtn-s2tc0.deb"; + }; + } + rec { + name = "libudev0_175-0ubuntu9.10+srt2_amd64"; + sha256 = "6690f89862ebf2104f0d3c477cdfaf46fa99a7060913eb46776536daa64ef0f0"; + url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libudev0.deb"; }; } rec { - name = "libusb-1.0-0_1.0.19-1+srt2_amd64"; - sha256 = "0vnsr4syd7alas356hv1radm5rb8vlh69h5ljlh24sqs923vgg28"; - url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt2_amd64.deb"; + name = "libusb-1.0-0_1.0.19-1+srt3_amd64"; + sha256 = "db8f1014d3642c8d01fcdc319e1cbbf16db4a922bb7abe66b83bc4ce41ee3a39"; + url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { - name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_amd64"; - sha256 = "17f8cqf20fm9yak1i3d25x4a7pznhsc6xj3949zk2pbn4jiz1q3h"; - url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_amd64.deb"; + name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt2_amd64"; + sha256 = "5c2bb10e8a541dd20eac84b7fb02c3ff513642bd1941f548fd2f906e00733fcc"; + url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libuuid1.deb"; }; } rec { - name = "libva-glx1_1.7.0-1+steamos1+srt1_amd64"; - sha256 = "15scnb989xybb4l8gspbjvs058kjfw0r7ajqak3gxrx7vgqb3i92"; - url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt1_amd64.deb"; + name = "libva-glx1_1.7.0-1+steamos1+srt2_amd64"; + sha256 = "c25662535e0bcc1fc349c1f61710f31dcc1be846ea2ba4282225756809b13e15"; + url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva-glx1.deb"; }; } rec { - name = "libva-x11-1_1.7.0-1+steamos1+srt1_amd64"; - sha256 = "0f1hmz4218isrwx8823sm7v08dlvyjwphvbjqsgg9qgim0f13j8a"; - url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt1_amd64.deb"; + name = "libva-x11-1_1.7.0-1+steamos1+srt2_amd64"; + sha256 = "ddfd440a2bfe3174b33ac5b459ce4261ddbcfa36d443ad237d41e5e41dd17bae"; + url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva-x11-1.deb"; }; } rec { - name = "libva1_1.7.0-1+steamos1+srt1_amd64"; - sha256 = "0p3548fnf47vj5kxzrqqpdxvip35xyydkxj7d5iiw9f26fz06drd"; - url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt1_amd64.deb"; + name = "libva1_1.7.0-1+steamos1+srt2_amd64"; + sha256 = "a06f1a3af4679bb44722458d956177468e78d662cf97dc1ec6c8ee38dc7408a2"; + url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva1.deb"; }; } rec { - name = "libvdpau1_0.4.1-3ubuntu1.2+srt2_amd64"; - sha256 = "1f1h77y6mf7xs8biaz77kfimp98v9cpjrbfg0qyi4wafwn7jmnsr"; - url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt2_amd64.deb"; + name = "libvdpau1_0.4.1-3ubuntu1.2+srt3_amd64"; + sha256 = "c40c31da412fec43c201e88458782dad6884e1eab9593815bdf0d9132eb76baf"; + url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvdpau1.deb"; }; } rec { - name = "libvorbis0a_1.3.5-4.2+srt1_amd64"; - sha256 = "1dxl9k7x3vm9zagd03z73k6v86ybp94zilsdg29nsx86g77x87gz"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.5-4.2+srt1_amd64.deb"; + name = "libvorbis0a_1.3.5-4.2+srt2_amd64"; + sha256 = "808411459a4e660ef5b459b19f145d34f6fd7750609e91985e34e95eaab62888"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.5-4.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbis0a.deb"; }; } rec { - name = "libvorbisenc2_1.3.5-4.2+srt1_amd64"; - sha256 = "1b49vbmc7b7113h555s4lrx8j4x2kn90x8g25744z13fbq3ac6qz"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.5-4.2+srt1_amd64.deb"; + name = "libvorbisenc2_1.3.5-4.2+srt2_amd64"; + sha256 = "3273f701ce01742e8eb746b4b4102f05c6ea6771561b73292e94d8d42dad142f"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.5-4.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { - name = "libvorbisfile3_1.3.5-4.2+srt1_amd64"; - sha256 = "1gws44n84b3rj5pmzc58b3bfmm38nrcij39krnx2x8d10627c3cv"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.5-4.2+srt1_amd64.deb"; + name = "libvorbisfile3_1.3.5-4.2+srt2_amd64"; + sha256 = "fdae8ab04379c397ea46df535f64a04b29dcdc46031cd077519c554740f0b156"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.5-4.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { - name = "libvpx1_1.0.0-2+srt1_amd64"; - sha256 = "02r8yklax0nd9z9s0c2iv1pdnwaq7h3ys46vf0wcwfc8n1p6jj9j"; - url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt1_amd64.deb"; + name = "libvpx1_1.0.0-2+srt2_amd64"; + sha256 = "57dc793a94d5be476f84c66751f9b5923d9ee7a507b865fbc4607b6b66760432"; + url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvpx1.deb"; }; } rec { - name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_amd64"; - sha256 = "1f58xi83frcxpq62yfyqjhxzg2ali4hafv8zinial4ixh5nk2a07"; - url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_amd64.deb"; + name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_amd64"; + sha256 = "a3820a7cdceef1cf070b762d81437ec87a4d3a2b41566dadaa1cdcb1f08dad3e"; + url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; - sha256 = "0wfs33djnx2k5clhwn6rq17pmqv7d2xyr5mihhylc4fs7q179pg0"; - url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; + name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; + sha256 = "e72aabe5b6c20bb667e1746918a354cb6151e07a9892ea0735406966dff019af"; + url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { - name = "libwrap0_7.6.q-21+srt5_amd64"; - sha256 = "1rvgmwh2m633mmz78lccs97sr489bc2qv1vvwl1gf6rd01cmgd99"; - url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt5_amd64.deb"; + name = "libwrap0_7.6.q-21+srt6_amd64"; + sha256 = "a05d3c3bbdb0059b2693602dfc614ec458e53987d625a7712f3171fa53642f15"; + url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libwrap0.deb"; }; } rec { - name = "libx11-6_1.6.3-1ubuntu2.1+srt1_amd64"; - sha256 = "0lf1k902i59f3v9jgjav9gzsiq7pnrfnlzmlmyxkcfwkd8pvkign"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt1_amd64.deb"; + name = "libx11-6_1.6.3-1ubuntu2.1+srt2_amd64"; + sha256 = "6217810de68a0fe252f15bb544346383bdd4ee946e34d0352f78c678186b6da6"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libx11-6.deb"; }; } rec { - name = "libx11-data_1.6.3-1ubuntu2.1+srt1_all"; - sha256 = "1imsbk4mg6n1083gjjv6kssm5g842xlbg40vsc4dw97myxycpncw"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.6.3-1ubuntu2.1+srt1_all.deb"; - source = fetchurl { - inherit url sha256; - name = "libx11-data.deb"; - }; - } - rec { - name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt1_amd64"; - sha256 = "0l9zprciyrgn4aq91ddmmfhffvms8p9258vv109l62bar4mmg9sz"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt1_amd64.deb"; + name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt2_amd64"; + sha256 = "cd4fd2fb5ac913a752e20476e612629c802e448539fba9ed74d77b91fc0f47cc"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { - name = "libxau6_1.0.6-4+srt5_amd64"; - sha256 = "1l4ij8c6gmv54yfv24dw9903zjczasd6z9lvzd07c5zj4rj7gx62"; - url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt5_amd64.deb"; + name = "libxau6_1.0.6-4+srt6_amd64"; + sha256 = "8934767e2168cc4e2508c091ec2264048ca6bef145383db191f203c09337c833"; + url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxau6.deb"; }; } rec { - name = "libxaw7_1.0.9-3ubuntu1+srt5_amd64"; - sha256 = "1a15brx602gg6jq708ymngyr3rcbapmk5620wdx094vdclc665g9"; - url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt5_amd64.deb"; + name = "libxaw7_1.0.9-3ubuntu1+srt6_amd64"; + sha256 = "781bdd4ff568750b5147b0242a91ffdb85167af482063883d29bb13d0309bfd2"; + url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxaw7.deb"; }; } rec { - name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "0h0yfv4ana590x038lwbz4cxfb3smcqbd394ggir0kv9m1przp78"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "2639fa857b7c4e75605d6a3c2c3a3f3b9bab478883cfa40ad780252f6ad9710b"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { - name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "1431qrr9kg3mdbag9sfdcqy0g84w074k01r2nyr3bq0w5q8px15l"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "abdd286dfe7d74e3c98d2721528add00cf8967f0aea9e61534e19c38d09b654c"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { - name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "1p2hd14zb1zvqkvgs0apc6m2dwh7kwbxv12py10nr6rzmkr75z1k"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "80b0a477b5e53fab89781181d937579e54cd1c8f5d3ea77fdd8ad1fa77df32ed"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { - name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "1ixndxxr7ff48p4sp6rim5bjjvncyc2qcld13az56hjybyq90ka1"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "bf6aefcf11b46e7c6c45408cd3c9d21028f3c0ddcc7a157c76ca1d81e02aca6c"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { - name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "0l4j5ydzfnzl5wmabwh8jv2qcdgi5blks8ys06cjri8dq4fqq3gg"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "cbb423fab5493fdf1021e58ce1bfcbee1bfe8fe9ab0464d73b184993128da2f8"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { - name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "1shd1g43pq5hqpmxkfp8lykpqzzdn0a0w53m20bkz133jgjwqq1i"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "aaf25e7a0a3e501023a5826043581e9a1172e3f6cd68fb0b87a82f639d02f595"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { - name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "1m3xf4vkbk2iwy64y8ak51b8wrd5g8hyfbankvfaf123dyyk8z7x"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "fd2c110278edc2ba6c6bfab04947c16c54b7744af663429d9b32677289ae6ddc"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-present0.deb"; }; } rec { - name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "047j08nl310s4m8d2gk555bhf1q0s78pq882dqqla2skhfslg645"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "1170a49cbf57d515981e32e26f0a2e9762af3ded254e98d4317992b903c271ac"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { - name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "0qfh1wnd11z8r9a7zyrvsa4banisvmi3vj5zvihppz2698ln53rv"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "58e7ff4e5a9bcaa50748e7df4719c71708982b2ea8e1811c26fffa6d745bd11c"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-record0.deb"; }; } rec { - name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "1yj9hxmdjqqinkx8a1gm7nwyxpj6adxphl2f3i863m0gp679bvag"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "a7eed9a0c59b2a17d1431157f40e16bd3891769f13709e56df9c5025992aae42"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-render0.deb"; }; } rec { - name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "1v8ipbhabg72mc3rf378l0c8x5apndkgjqbvg5qzp4s591w251np"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "d1beca464a4acaff0c8ac43c03a9ed260193678e0ee98a4b70f602c3fa7a2843"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-res0.deb"; }; } rec { - name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "04cm77may727miynsqw0937cvs5kjbh85csrdr86yyayvlqygs02"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "3d04ccf79785c5bb7ab5c6cfae56371a0b8cbbe4e5c7b5897f91a20ee4b516be"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { - name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "1z0jlvv25ya5v4rn7cmpwpdbafjmhrb9b7hp6x9nlwrhbpwjh6q2"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "a0f2dd0be89db8833493edb179974db702a6ec86ee4c15896605ceb6ddaa8e54"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { - name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "0sdajn0sxkvqpy69ccl3l7f7ky4yhj4z304b19wplqfy0qal2gn7"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "0ee8a32a8a8bc96e374e5fe6980acb652d2ca846d1a0998f757e857320abbdbe"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { - name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "1dvq7n1jrsj07hikqvbbbc4wmmk5i9vsvgfcg39vaywmx5fdmfw8"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "07e7b5267f9cfd1ea6ef1c0c4edec41fd19d1e02b9c6cac7898a3c496a427d10"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { - name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "07qsfdyym47shm3n6m7i9flb339xannxlch2h0i5p9ca2z1a34g2"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "fa8a61680c23caee52ca7aa32ce8d46143e5d68e47cc5bd3092a3e32da2673bd"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { - name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "06ha588as5j1njqga4xamfnw79z6y13i596syl0h34pdmsqd2jll"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "6e0e4270580b1b46b32fbb02b1e2ccbea49c94c5463197c238d5410a61a74b7b"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { - name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "1npk19k2qhqm89hk2jhf49acig330myvksamd3xw2gjxa99xz7lz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "77e6ea5019c757a38fee80b4e4bcb54f1304299f8a557ed9b8116cc106d66930"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { - name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "0s117w3a3ql7d6k2bp88hzni3k9cg24qcmbqz50z8b1gqhpw9y6b"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "3ba7479a9d165f2a49b6ef8327a3bbcc1f6dad7e9bc26bc8819467aeb09337fa"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { - name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "0kximpl89ks2simxnz10z836rnvaysys7c2jddhsy1z7z30gpb9h"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "c9d48121969c8607ad47b597be1d261a084fd907885ce0ef02a2dc6924e4421d"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { - name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "1l2lxnwp129sa268n3xbrifq8yyfn292nz9arqp95za091zj2rri"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "a27fbb11170f2fb9730ec935e598ea6d4e9b513d0e3c793a29e5f893501dfa09"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { - name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "1pybcn6rwwg6b4l7a1sn0nxkp2lb5ar9vzwn6ggd8vwrwnppjvq4"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "3393b6248671421de17518320504f9593a25c202cc1a5c3d0fc127d259a7f472"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { - name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "13jyd5jkz8wmbz6n7azxdnbw48c9i5zkwysza50d1c3rlxalpq82"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "20d97a75903b62553b9b61a2a6c2c2a5d1c5476c470a606fde01627e3fd2d155"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { - name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "0l4wagp619qar8g9yji1sf4schlclyl1zvdmp3w2cp9lnnwx1p1w"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "3a35f1fb1a9550ffa5694f973cca72115254880514b519b547f1a8ac8d4c9150"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { - name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; - sha256 = "1a8x128bgbz9gy2wsmhijg4di99k18ybs9mwvv37hkpw6mlfaxdx"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; + name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt2_amd64"; + sha256 = "5c93e80460b2c672a785368995a0e2388400508a4d768c72193e19539f05dc72"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb1.deb"; }; } rec { - name = "libxcomposite1_0.4.3-2build1+srt5_amd64"; - sha256 = "01kkvnndzkzqx9pacrlirn435z7dky7lkm0clv7yya3xaw5fslv4"; - url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt5_amd64.deb"; + name = "libxcomposite1_0.4.3-2build1+srt6_amd64"; + sha256 = "d84cff429e2f4cf5b201c13aa85586d74fc49114309fe9fbb57914b3ab8e187b"; + url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcomposite1.deb"; }; } rec { - name = "libxcursor1_1.1.12-1ubuntu0.1+srt5_amd64"; - sha256 = "0n9dgdi8hb1w5dpasi2pmm5ysrckfch930yvx9grs026dgz3s2g7"; - url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt5_amd64.deb"; + name = "libxcursor1_1.1.12-1ubuntu0.1+srt6_amd64"; + sha256 = "72f53a50de7ce5428291d3336aea501fd18c1a3d62832737590fba25cd8b98b6"; + url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcursor1.deb"; }; } rec { - name = "libxdamage1_1.1.3-2build1+srt5_amd64"; - sha256 = "0l088wzpyn15nmy8c6nx3p97qhklxhyaxm8bhafv9sddpr407p4k"; - url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt5_amd64.deb"; + name = "libxdamage1_1.1.3-2build1+srt6_amd64"; + sha256 = "ce251ec5482f25d3cb055dbaf34912ef26ccb8e752ea8fb426a269c70002c4dc"; + url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxdamage1.deb"; }; } rec { - name = "libxdmcp6_1.1.0-4+srt5_amd64"; - sha256 = "1jx1i0i6vrm6h2sq99f61dix0v8j1f6nq4d2a1hqaw5f1bsra4q7"; - url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt5_amd64.deb"; + name = "libxdmcp6_1.1.0-4+srt6_amd64"; + sha256 = "baeb880ee5485b9ab28631254ad1c59dc0170294201bb01e0de7c42baf4a191b"; + url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxdmcp6.deb"; }; } rec { - name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_amd64"; - sha256 = "0ip72ys964g5569rbgsrcv8b1afmwm1mrskgrgiqjs93bhr5i4c4"; - url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_amd64.deb"; + name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt3_amd64"; + sha256 = "716b73561d9df1b9370eecf3ee523f648cd743e730d6e14d63b9539c4f74949f"; + url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxext6.deb"; }; } rec { - name = "libxfixes3_5.0-4ubuntu4.4+srt2_amd64"; - sha256 = "1x2255fch7g2skiz1x94vrm63ahcwf258w2qjkadnbqwivyf8crz"; - url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt2_amd64.deb"; + name = "libxfixes3_5.0-4ubuntu4.4+srt3_amd64"; + sha256 = "fdd22ee527c9f157bd53c4a2ac374531f0185e751ded24e255dde3cb41c54e6d"; + url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxfixes3.deb"; }; } rec { - name = "libxft2_2.2.0-3ubuntu2+srt5_amd64"; - sha256 = "0ylsvvd28qwz442scylrp9gmmp1y6lvyj1bcjd5d4g0fc9iwm37d"; - url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt5_amd64.deb"; + name = "libxft2_2.2.0-3ubuntu2+srt6_amd64"; + sha256 = "4160f4dc1f4bde50e3ca6609029cc422078017e855e61b0eb986e75bc37fb02c"; + url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxft2.deb"; }; } rec { - name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt2_amd64"; - sha256 = "0g3nazw6w77q91c0dsn040y79d1rmg4njg2n3cv871630zghz6rs"; - url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt2_amd64.deb"; + name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt3_amd64"; + sha256 = "60603bcbd89af27f963bf15a662562c496bf989d7e18689a746c53be62e4cb62"; + url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxi6.deb"; }; } rec { - name = "libxinerama1_1.1.1-3ubuntu0.1+srt5_amd64"; - sha256 = "1icp7syxhfgwpiabl7503ylw66m7z3sq5pn7wkxb2yriqxfj3nmp"; - url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt5_amd64.deb"; + name = "libxinerama1_1.1.1-3ubuntu0.1+srt6_amd64"; + sha256 = "26ae823a08f8c79ca40cfdc5f7e561d10e7677f9012949948e1cbcd94f819e2b"; + url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxinerama1.deb"; }; } rec { - name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_amd64"; - sha256 = "0k5wagjkf60ys0cg639758c1h0cjmziyxvp5597vavbds32sl2hm"; - url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_amd64.deb"; + name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt2_amd64"; + sha256 = "d24a1daf4b399f9f99bb9c9a0047b95039fcf2d9010e4387001ca3f5b87f001e"; + url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxml2.deb"; }; } rec { - name = "libxmu6_1.1.0-3+srt5_amd64"; - sha256 = "0pabx6pyazssqfs775k4l19frqv20225n7jmr1ncvwfikiw48gsl"; - url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt5_amd64.deb"; + name = "libxmu6_1.1.0-3+srt6_amd64"; + sha256 = "42a5a58f0c809d5c761155ca311207970e98d38eb40cf50343a37bf8b84285a5"; + url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxmu6.deb"; }; } rec { - name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_amd64"; - sha256 = "0nv7v30mh3j53h7lcvqm2ixnsbn8328vcfbd2ysx2r2fac9waw7j"; - url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_amd64.deb"; + name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt2_amd64"; + sha256 = "99b0b9a684573156f7d062d6cbfac498b6c5902453d4f12cb7fed7f841c61774"; + url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxpm4.deb"; }; } rec { - name = "libxrandr2_1.5.0-1+srt1_amd64"; - sha256 = "1i55vzgaalxlm0mgi7c52nmpmksyffbf93isg3i2syg5nzain8v2"; - url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt1_amd64.deb"; + name = "libxrandr2_1.5.0-1+srt2_amd64"; + sha256 = "ef4b4a33192873f33d490f7fa8407b4044009c85f40fc10df22fa0e0e97cb2a3"; + url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxrandr2.deb"; }; } rec { - name = "libxrender1_0.9.6-2ubuntu0.2+srt2_amd64"; - sha256 = "0zd4kd5235vn575msfgl48j4czfp4fc44y439gcclpadkhvciviz"; - url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt2_amd64.deb"; + name = "libxrender1_0.9.6-2ubuntu0.2+srt3_amd64"; + sha256 = "3d0bba7e7cfa552d3770c43eae8a52a131ea1e59b6180b345e44113d310b3826"; + url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxrender1.deb"; }; } rec { - name = "libxss1_1.2.1-2+srt5_amd64"; - sha256 = "1k7248hb63ml79nqzij65rmg8x0ayi41zpl9ls6my87a6gzswyhr"; - url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt5_amd64.deb"; + name = "libxss1_1.2.1-2+srt6_amd64"; + sha256 = "bdca1d17584edbae953d21c44b99a6d1e42f2f4733ff3969d39ea75e4964de1a"; + url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxss1.deb"; }; } rec { - name = "libxt6_1.1.1-2ubuntu0.1+srt5_amd64"; - sha256 = "0gd81vk2bzjc9zcdbgj57hwhs6v9dmzajrmngmaxavyzv2fgamka"; - url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt5_amd64.deb"; + name = "libxt6_1.1.1-2ubuntu0.1+srt6_amd64"; + sha256 = "7330731f3623bd177710a28c3a2becf8ec74c69e755686ca14d9b205ee1a5785"; + url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxt6.deb"; }; } rec { - name = "libxtst6_1.2.0-4ubuntu0.1+srt5_amd64"; - sha256 = "1l1l2073b9cd76ckn5f2d4qb4w1k48s0dlki93bfikph8ms6px8d"; - url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt5_amd64.deb"; + name = "libxtst6_1.2.0-4ubuntu0.1+srt6_amd64"; + sha256 = "063b8c7e6187aac43b92731b5e06a5c78382ebd20e448a14b9c294198eda4d3d"; + url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxtst6.deb"; }; } rec { - name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt5_amd64"; - sha256 = "1diqhhj91knlz02b6ha940091yjris46d5swy3zi3r389w2b2crm"; - url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt5_amd64.deb"; + name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt6_amd64"; + sha256 = "7f83864c72c692bb354974e0ebe30b67965810c292dc254d5a0a96c8967b4819"; + url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { - name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_amd64"; - sha256 = "0cr24gybxz7h8s9rijr75dayahy1kx4i6gn5q2q6h4z29v046nc4"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_amd64.deb"; + name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt6_amd64"; + sha256 = "86c4f7c16ac0f6104dfa6c809469f20a750b7391a1e70e916afcbe472f11dc2a"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt5_amd64"; - sha256 = "0ajisfqvlajw0m6kq3yv8j6f38dfhlavrmmfdq5yqmb70wmmkk71"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt5_amd64.deb"; + name = "steamrt-legacy_1.20190624.0+srt1_amd64"; + sha256 = "0a0e96fc8dbe806b2d0b4ac26f217ca5ff49188f295a9a4b0d39cbe0a4da52b0"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20190624.0+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "steamrt-legacy.deb"; + }; + } + rec { + name = "steamrt-libs_1.20190624.0+srt1_amd64"; + sha256 = "ed7124e8d11d9dd435ec7b7516a0d0e2c766f677b2c5a1d0b257790c03f307a2"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20190624.0+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "steamrt-libs.deb"; + }; + } + rec { + name = "zenity_3.4.0-0ubuntu4+steamrt2+srt6_amd64"; + sha256 = "5eb59aa8d2211153c780aab2304e8694d7eb0204f284193ff2a037dc9e1274db"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_amd64"; - sha256 = "0962hhdg3knxnjinkv7m3h510fq8vghjyaxnsnsyijqzfawi4rfj"; - url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_amd64.deb"; + name = "zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all"; + sha256 = "bc8f0b80672833be72c6dd87d406b5fc0ef92e51f91e3a461678fc97844649bc"; + url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all.deb"; + source = fetchurl { + inherit url sha256; + name = "zenity-common.deb"; + }; + } + rec { + name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt7_amd64"; + sha256 = "0cd05ea08abc9f30822a8eee0530d082938341fcd6c1a631b2237be7e1dcaae6"; + url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt7_amd64.deb"; source = fetchurl { inherit url sha256; name = "zlib1g.deb"; @@ -1815,1809 +1860,1854 @@ ]; i386 = [ rec { - name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_i386"; - sha256 = "134fv1d73hnlfn14asgmi36pwbs3mlri290jbl0621mih1iq8b7i"; - url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt1_i386.deb"; + name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt2_i386"; + sha256 = "44366cb9097377fdd517f93bca87181254cfc8acf93e655f80a373c9166885f8"; + url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { - name = "freeglut3_2.6.0-1ubuntu3+srt5_i386"; - sha256 = "0jdn9nvjmhphv9iw1h589cy5q1iq0gp9q4ibm0m69lkazi2v1blb"; - url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt5_i386.deb"; + name = "freeglut3_2.6.0-1ubuntu3+srt6_i386"; + sha256 = "9aecbd438ad4ed3a9ff5953b76d16c54599db5de983e1e7b701ae2f36b706307"; + url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "freeglut3.deb"; }; } rec { - name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_i386"; - sha256 = "0lq2bm237vwjkclxjqldw4cy1mirbw6lx6ryqmjwzwq1ya5490sr"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt1_i386.deb"; + name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt2_i386"; + sha256 = "47ed7a8b051c6fc76025583cdc63d0b68c3052cd476e8c1343209a123e19f089"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { - name = "gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt2_i386"; - sha256 = "1jlyq99j7rgw6m4rvrxcrpk5l386sps36isld18bg7hb67qm5gzy"; - url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.1+srt2_i386.deb"; + name = "gcc-5-base_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "be247eb920a666907820863ef411003c50850ade57cc42fdbf53b503d4db9644"; + url = "mirror://steamrt/pool/main/g/gcc-5/gcc-5-base_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "gcc-5-base.deb"; }; } rec { - name = "gtk2-engines_2.20.2-1ubuntu1+srt5_i386"; - sha256 = "06h5229y2md6d73imgy5wg4msv6s9vl056p97jq2hrf4di0q6a76"; - url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt5_i386.deb"; + name = "gtk2-engines_2.20.2-1ubuntu1+srt6_i386"; + sha256 = "d3c614c5bba71a50e67068b83f66d03516ec1baf9e8d43fb7433562322cae0ed"; + url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines.deb"; }; } rec { - name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_i386"; - sha256 = "1fyha082h0jr26gjnsxzj1c6rl63c9xc2kgf6cfb86dmsmbvpqqg"; - url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_i386.deb"; + name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt6_i386"; + sha256 = "c377c8be32a2f4f8163582a88f99f9226f44499b915c981c4d9bd2da8578db40"; + url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { - name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_i386"; - sha256 = "0ix60pix5cnzd807v8q9mqhyhhksqndd7vc6brs1daknhxn5dsi4"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_i386.deb"; + name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt6_i386"; + sha256 = "73e5414fd8737e64745d886f2180c685e1cfbd78409322222dea4d470a0e8447"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { - name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_i386"; - sha256 = "01cmbrlgzx7djy0xgf4950936s596rp8cn51qadbfz0sad5w7sd9"; - url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt2_i386.deb"; + name = "libacl1_2.2.51-5ubuntu1+steamrt1.1+srt4_i386"; + sha256 = "89baeb400931b59ca75def2c7e747ac23d8e5adec22792b1e8b66490bb23fe77"; + url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+steamrt1.1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libacl1.deb"; }; } rec { - name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_i386"; - sha256 = "1bbf9k50d3df4sjn2idizk2bcpkcxkg0wz8mczgzkh634753pkld"; - url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_i386.deb"; + name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt2_i386"; + sha256 = "1dfff440099992bff06f5e01db3e298ac7272b6fc75786b75c1a5645d4d6df16"; + url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libappindicator1.deb"; }; } rec { - name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "1qgap0ha5vlpz1fnf2fppprzh4lyrvy7k9sj0whhb3f48ass8mh5"; - url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "40f34e384d61dd305412a46bfe6fbd5df859ef0033b0326dc3b88d57265d5c5a"; + url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { - name = "libasound2_1.1.0-0ubuntu1+steamos1+srt2_i386"; - sha256 = "0wa019012di6slf29ambq249fn6w9ldmyxx80k564j9s1k510ivc"; - url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt2_i386.deb"; + name = "libasound2_1.1.0-0ubuntu1+steamos1+srt3_i386"; + sha256 = "9b7eedcafb01118a672a5b42790beec5cd8775cd585a4acaca2832c955511bff"; + url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libasound2.deb"; }; } rec { - name = "libasound2-plugins_1.1.0-0ubuntu1+srt2_i386"; - sha256 = "0hrrpjp4wg13vfam863hwkhzv7ngcydx0iysmfkxjzhmpf3j4ghd"; - url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt2_i386.deb"; + name = "libasound2-plugins_1.1.0-0ubuntu1+srt3_i386"; + sha256 = "d61bb958a41a1bdc2a664ba2a9a83865b874b3e96f8776fedba6ed5810be96dd"; + url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { - name = "libasyncns0_0.8-4+srt5_i386"; - sha256 = "0k8rngiq74b574fc1jqfwf77f57qcflimbs63pa2jx1jqg7gxjx2"; - url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt5_i386.deb"; + name = "libasyncns0_0.8-4+srt6_i386"; + sha256 = "879d0f1173da5b064958150e071ccb5331b894962630546743e293e94bf100d1"; + url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libasyncns0.deb"; }; } rec { - name = "libatk1.0-0_2.18.0-1+steamrt1+srt1_i386"; - sha256 = "0ldl3jsmf16mbf1bs94zkmaa1b1p9d9rvajlyp7iqkbqw6qkszlz"; - url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt1_i386.deb"; + name = "libatk1.0-0_2.18.0-1+steamrt1+srt2_i386"; + sha256 = "67d9d72795c5b94a8980899739a59d2be2aa280cd6a2619f9fe342171d04e748"; + url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { - name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt1_i386"; - sha256 = "0crgd6ww9z1b69g9x1acxnlxaw3nyymq1fhjpxzs1x0vrlhj8wsg"; - url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1.1+srt1_i386.deb"; + name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_i386"; + sha256 = "bcea5d6f2743c617dac44c4d836b6937a64816f3c288a56b656ee4adbf63714a"; + url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libattr1.deb"; }; } rec { - name = "libavahi-client3_0.6.30-5ubuntu2.2+srt1_i386"; - sha256 = "1yyq436zsx8hbfhhv4l8ji85narl6ws8flhfcbqvxldaxlzv4ls7"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt1_i386.deb"; + name = "libavahi-client3_0.6.30-5ubuntu2.2+srt2_i386"; + sha256 = "7fb0b94117ae07e44e89267c518d57c9c654f2cc24cef436dc1da41089d957f6"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavahi-client3.deb"; }; } rec { - name = "libavahi-common3_0.6.30-5ubuntu2.2+srt1_i386"; - sha256 = "0lhvj64i4dqy0lh73kyk32992fqkhxxr7k1cr97a03hdpaa06ycq"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt1_i386.deb"; + name = "libavahi-common3_0.6.30-5ubuntu2.2+srt2_i386"; + sha256 = "0b0463837ad36503c280bc64bd9bcb60648d826f1afeea5fb39c0a8f4332755f"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavahi-common3.deb"; }; } rec { - name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; - sha256 = "129g8jgy4va5gszrq9pxd4p51zja9svcm0hqx8g12ryx5lfkjjc5"; - url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; + name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386"; + sha256 = "56ff2ee6a4044ba8c6d180414828ad0c041a3c42c5667112003b0e0c1e421b0b"; + url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libavcodec53.deb"; }; } rec { - name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; - sha256 = "1vnj97sl686wlkkxbhvn5s3ck60nzrqr60y4wxg9a2hxxf7ba1gf"; - url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; + name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386"; + sha256 = "70d1b49e40f0cfee65eb20c9388d51c6e98c468830fcacd95276908279a3f29d"; + url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libavfilter2.deb"; }; } rec { - name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; - sha256 = "12zikl29fcq5vc0k5n4l8db8q0f95h13hlqgka3cy13nf31kbk06"; - url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; + name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386"; + sha256 = "034e3566a6e8f2b01726bb9d59b1130eb0a09af79ce9d934d040ae11e7923bb1"; + url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libavformat53.deb"; }; } rec { - name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; - sha256 = "1brfvbqwga1hmmyarbwksbrj6kabnfnrk8hv9xrvd99jak3wsipl"; - url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; + name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386"; + sha256 = "67001f81a336cb5480fd06043d9522d62e280022945d22a8be7f3e50ab4dfed5"; + url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libavutil51.deb"; }; } rec { - name = "libbz2-1.0_1.0.6-1+srt5_i386"; - sha256 = "1nngc07hwr96n1k56bi3i2yffad8dhf1zfblqlz8pffi1yl92vjz"; - url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt5_i386.deb"; + name = "libbz2-1.0_1.0.6-1+srt6_i386"; + sha256 = "bbdc900e1531bf5e78256ead401624edb25c65c02dc904e73f61c683d86a94c7"; + url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { - name = "libcairo2_1.10.2-6.1ubuntu3+srt5_i386"; - sha256 = "0vnz2d66q9pkn8ry2ixbmqcyz0kpqqmimaxnrfq42g1lz8k44cs6"; - url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt5_i386.deb"; + name = "libcairo2_1.10.2-6.1ubuntu3+srt6_i386"; + sha256 = "5e2efefd18a8750a22c1b688b0fd19558291fd82319feb58469aa743ae277fe3"; + url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libcairo2.deb"; }; } rec { - name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_i386"; - sha256 = "1lg98x7cr66nq48k3klah9apskvk2cqdpj3g52z5yffkrrd1sqci"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt1_i386.deb"; + name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt2_i386"; + sha256 = "3516a9992c803f770ad3f191dd50c926479300e57eb5ad944f3cc189cc17b2ff"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { - name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_i386"; - sha256 = "0jnqzfshd1f16f3gcq3fw955i6w9pfizli0l0zxl6fl58ad6g9as"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt1_i386.deb"; + name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt2_i386"; + sha256 = "7dfe123753357fcf62367b07ab4dc0c8d98b640efd1f85833583c386850c6393"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { - name = "libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_i386"; - sha256 = "0kfw2ghb47ysww9wrp9gjq449j82a22f5w5xn1vk17bq0kk2vg8c"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1.1+srt1_i386.deb"; + name = "libcanberra0_0.28-3ubuntu3+steamrt1.1+srt2_i386"; + sha256 = "d5a6d693a17a615d89eacfb6ef3893c65e72ed34b61e368e9e311e90720be01d"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra0.deb"; }; } rec { - name = "libcap2_2.22-1ubuntu3+srt5_i386"; - sha256 = "1qy9ggswl8cbp0zbaryc7cd4bcq17qb4llv8v3zcj08wxr6v2ram"; - url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt5_i386.deb"; + name = "libcap2_2.22-1ubuntu3+srt6_i386"; + sha256 = "7224c9dacf70616e5531453b5b6dc0410c2b035366c98d02f8c51890780dd1eb"; + url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libcap2.deb"; }; } rec { - name = "libcg_3.0.0016-0ubuntu1+srt5_i386"; - sha256 = "0gs2q5ql7wq28y2qrs9v9gs75r6ycq7c6xghf4s6g5s8q4cq205k"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt5_i386.deb"; + name = "libcg_3.0.0016-0ubuntu1+srt6_i386"; + sha256 = "a21ba20d03f43163c1222fbc6a570c20783a1d504dcf92306ab029c437fd0df9"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libcg.deb"; }; } rec { - name = "libcomerr2_1.42-1ubuntu2.3+srt1_i386"; - sha256 = "12c8gxi0l0qysbiw81hbysf5hn1kgv956csvrn71yf52zwqwr388"; - url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+srt1_i386.deb"; + name = "libcomerr2_1.42-1ubuntu2.3+steamrt1.1+srt2_i386"; + sha256 = "bf81884166576106fb8f73ac789674218b2a349af94edf3f4c3329e6ebd34240"; + url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libcomerr2.deb"; }; } rec { - name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_i386"; - sha256 = "02p2svhf5zr2q5pga2qbnk5v6v6isjymli8arfarqcawgw8x8abg"; - url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt2_i386.deb"; + name = "libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt3_i386"; + sha256 = "069c28585b6acbab32e621c82969608eb326691f5168ff7d19c58c1dd58a65e0"; + url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.7+steamrt1.2+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libcups2.deb"; }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386"; - sha256 = "18kysm6nj8jfankkarphpzk03cab126pnili4p3kfglw2z7dxci0"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386"; + sha256 = "f92d0bdda8d394104824fca2ac6d19cb9c95a863893ef604e45c43d0eeb16ac1"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386"; - sha256 = "166mcqrwh86qx2dpsi5qx9nczzwyyih51d0ssrbnxzabshkyzmsx"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt4_i386.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386"; + sha256 = "b210ce907bded1db660df24365861a10421d758cfd7fdb2fe64b058ecb92cdce"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { - name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt1_i386"; - sha256 = "1m8aqb9hvprl0hbswha0raz6pp3gs84cmqg40fblbfqya8nibdlk"; - url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt1_i386.deb"; + name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt2_i386"; + sha256 = "a34a745ddad9cf76fc1878380dc68dd6a30f9dc5c17629ec4adf21c481e20336"; + url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { - name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_i386"; - sha256 = "0slsk7cqdrbnm35zqir21ms0vv1hv44i184x8ip1lg936vrvbxka"; - url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_i386.deb"; + name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt6_i386"; + sha256 = "c881add03cc07271b713b7d4607dfaa1def7b851338d35d807aeae8de7cbe908"; + url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { - name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_i386"; - sha256 = "0g4zmrwpifl4kxv311spwyia1xrd76m0aizb3jzv6q8cc4hla3ii"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_i386.deb"; + name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt6_i386"; + sha256 = "f846eda12e233309c903865aee472567cb5b4c43214091b7a41f8c3801cdbbd7"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { - name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_i386"; - sha256 = "0kj6pfpgybkkb5bjfr9qgczwddx5lkbwhknlcymhhi94jcfbcnbc"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_i386.deb"; + name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt6_i386"; + sha256 = "f8fcd3d120593aff181181902191094c646a0747a2dd9c19f979aaaa69078220"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { - name = "libexif12_0.6.20-2ubuntu0.1+srt5_i386"; - sha256 = "06br49sn30hrxlq479xi3vxw3blkr558kz4d7gym3fxnwfa6im9w"; - url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt5_i386.deb"; + name = "libexif12_0.6.20-2ubuntu0.1+srt6_i386"; + sha256 = "b9a25a54b70c2294e96c447bf05775c89eb056ff8eb0b4840506a955fcf78d35"; + url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libexif12.deb"; }; } rec { - name = "libexpat1_2.0.1-7.2ubuntu1.4+srt2_i386"; - sha256 = "0av7wcy104jz6pci7lgwpmvb528v9idx660qrrabdqhpd1m4hv8s"; - url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt2_i386.deb"; + name = "libexpat1_2.0.1-7.2ubuntu1.4+srt3_i386"; + sha256 = "2ffae071d141e08e9dd5c486ba00f91830ca4a73c346c2e3096069c42d80e058"; + url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libexpat1.deb"; }; } rec { - name = "libffi6_3.0.11~rc1-5+srt5_i386"; - sha256 = "0gvhndr5y4zl097h105fr4q60sg38mhkhlw8ha51ypzcm9f8na6d"; - url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt5_i386.deb"; + name = "libffi6_3.0.11~rc1-5+srt6_i386"; + sha256 = "2c6f1291894f467648b922421fa8555b96c02075d3d78f1472efbfa44576c203"; + url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libffi6.deb"; }; } rec { - name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_i386"; - sha256 = "1rdfykm113vps893xdkcrpphb06winv2566yb9myg9m3aybcldrx"; - url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_i386.deb"; + name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt2_i386"; + sha256 = "64f1bfb240d700b9af09a9318ca335c9fd63e48f753fcc306b6071534708a770"; + url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libflac8.deb"; }; } rec { - name = "libfltk1.1_1.1.10-10+srt5_i386"; - sha256 = "1j0bhpgsaw6rphy1wqp40wn8yr6qzrxdmwarc2amryqw7bqslmy5"; - url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt5_i386.deb"; + name = "libfltk1.1_1.1.10-10+srt6_i386"; + sha256 = "5f7149f85e892031d232de4d206b589d5fc204a05d313565016f8688295ee045"; + url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libfltk1.1.deb"; }; } rec { - name = "libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_i386"; - sha256 = "19mqzn0p0x282wvh4njykiar10rc5zd43cl7pji9hkrq4xlv0s3j"; - url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt1_i386.deb"; + name = "libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt2_i386"; + sha256 = "e1d4588b6426cd6fc685463da3c09e6b5483b7492debe4dea054dabb5e510ef2"; + url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libfontconfig1.deb"; }; } rec { - name = "libfreetype6_2.4.8-1ubuntu2.6+srt1_i386"; - sha256 = "1zahvr5h833mppcpg648jv28dywx9jiqdv58wlv1vpsk6d9599bh"; - url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt1_i386.deb"; + name = "libfreetype6_2.4.8-1ubuntu2.6+srt2_i386"; + sha256 = "0143413faf66a0db49c7c478c6aff34bc08a13033b2093b2039fe3630ee01f30"; + url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libfreetype6.deb"; }; } rec { - name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt2_i386"; - sha256 = "0x9sssiqkdpbya6v5slw6lv3ad0w7k4j25bxh0zqxgjfpf3np8m7"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt2_i386.deb"; + name = "libgcc1_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "50d44e8b3821704e15af26322dccc365f1602ee9bda53dee47329974196d98c3"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgcc1.deb"; }; } rec { - name = "libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_i386"; - sha256 = "1rf64kxpbjp0dvd0l5ip8qlrla69zj4h4wsx5hjhbrx2qhf9h31z"; - url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt1_i386.deb"; + name = "libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt2_i386"; + sha256 = "65f0222b28d6c9315c3ba067085e7b3512b447cedb5d362af9918016368f1766"; + url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { - name = "libgcrypt11_1.5.0-3ubuntu0.6+srt2_i386"; - sha256 = "1wbaml6cjdijcaq6c9m0lcdlh350fk9a2prh6z4k7fjhsms60ppc"; - url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt2_i386.deb"; + name = "libgcrypt11_1.5.0-3ubuntu0.6+srt3_i386"; + sha256 = "bc74344b1dc733817522853e7ac03f165440924be176b9dc0e6e5dbb11ff47c4"; + url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libgcrypt11.deb"; }; } rec { - name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_i386"; - sha256 = "0fis055pnc01rb5v9vdqc17w4ijdb6sksf2qjysc4q2j33gvh6d5"; - url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_i386.deb"; + name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt6_i386"; + sha256 = "811794c91c9cd6d8bdcb23d8ab924a98c7a153dada9ec570a5e7abcc0e3714ce"; + url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { - name = "libglew1.10_1.10.0-3+srt6_i386"; - sha256 = "17ki8vb4nbg140fg7vdfyb092lcr3hpsjx0z1gz13bvmzxcff3lf"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt6_i386.deb"; + name = "libgl1-mesa-dri_8.0.4-0ubuntu0.7+srt6_i386"; + sha256 = "de4d68a4288d8a2e48f49c0e56f3d8bad4e0a5b4a795a0a84938158404ce037a"; + url = "mirror://steamrt/pool/main/m/mesa/libgl1-mesa-dri_8.0.4-0ubuntu0.7+srt6_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libgl1-mesa-dri.deb"; + }; + } + rec { + name = "libgl1-mesa-glx_8.0.4-0ubuntu0.7+srt6_i386"; + sha256 = "a952436b43f8d1f0a80f9c8a03dea2363cdae927585ad981bcc017b598aebab7"; + url = "mirror://steamrt/pool/main/m/mesa/libgl1-mesa-glx_8.0.4-0ubuntu0.7+srt6_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libgl1-mesa-glx.deb"; + }; + } + rec { + name = "libglew1.10_1.10.0-3+srt7_i386"; + sha256 = "23a33aeff290e757ab78658a4c649842cf00d32dba32e8ce1fac66e4f89c69ef"; + url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt7_i386.deb"; source = fetchurl { inherit url sha256; name = "libglew1.10.deb"; }; } rec { - name = "libglew1.6_1.6.0-4+steamrt1.1+srt1_i386"; - sha256 = "1rpxqc5a0ys26ckzgsk7725wdvq2warcfyjabl1a4r1vikqj2nsz"; - url = "mirror://steamrt/pool/main/g/glew1.6/libglew1.6_1.6.0-4+steamrt1.1+srt1_i386.deb"; + name = "libglew1.6_1.6.0-4+steamrt1.1+srt2_i386"; + sha256 = "aa6c99ae0af170e22e6073339b99552489ad1a0bcbe5e5c71b6dd5119548e1fd"; + url = "mirror://steamrt/pool/main/g/glew1.6/libglew1.6_1.6.0-4+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libglew1.6.deb"; }; } rec { - name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_i386"; - sha256 = "0l0vjcff86mw1mv5kizg3pcjr8rk9bn2gjf0d22jgljisq47f607"; - url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_i386.deb"; + name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt3_i386"; + sha256 = "c99c82abea66baededa6ce28bb6d330f39a6d0c8a9d9cea6a2e789417ecbafe0"; + url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { - name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt5_i386"; - sha256 = "1bc2hb2cb05j4iw9lrskrqkdh8iy7wv3d1sknqn1ya847w98h9hr"; - url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt5_i386.deb"; + name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt6_i386"; + sha256 = "393b1b93f7d10b35ecbe259860891c70b48b32a3f179f91863cc115d026a7ea1"; + url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { - name = "libgmp10_6.1.0+dfsg-2+srt1_i386"; - sha256 = "0x0ipagi7z9s4cf5wsp1h5vbgx1czsnv3z9rvcz289fb88b7vn2f"; - url = "mirror://steamrt/pool/main/g/gmp/libgmp10_6.1.0+dfsg-2+srt1_i386.deb"; + name = "libgmp10_6.1.0+dfsg-2+srt2_i386"; + sha256 = "a3838b71138cbb3e275b68fb3df63f880e122da10c9284354a80530254a45d55"; + url = "mirror://steamrt/pool/main/g/gmp/libgmp10_6.1.0+dfsg-2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgmp10.deb"; }; } rec { - name = "libgnutls26_2.12.14-5ubuntu3.14+srt1_i386"; - sha256 = "1f5dv4bk2g9ldqfjm7a2a6mx2ignzgxy42ghl9yny6x9xz39g56h"; - url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt1_i386.deb"; + name = "libgnutls26_2.12.14-5ubuntu3.14+srt2_i386"; + sha256 = "be4e85717069a5c9e3ef6644cd555f1122777910c6a855d912f71539c057a8b4"; + url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgnutls26.deb"; }; } rec { - name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_i386"; - sha256 = "12xzkh2fzlnqdpyf18a13dc92pk9fmakcsm89zs1lfq68ad7zlb6"; - url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt3_i386.deb"; + name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_i386"; + sha256 = "a630adb25ecfa209aef8a1b14fac45293f044f652ee91249489dfe9bb0d5001d"; + url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libgnutls30.deb"; }; } rec { - name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt2_i386"; - sha256 = "0z73ay26wi49hg74lwn13gyraqvdim7q79rpckvk7p7cimb65ina"; - url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt2_i386.deb"; + name = "libgomp1_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "913bfbacb76700447d2edc359dbbf9c6720f5a62729fe040e215b013feed6f6b"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgomp1.deb"; }; } rec { - name = "libgpg-error0_1.10-2ubuntu1+srt5_i386"; - sha256 = "19wh8hdp5lcf68w2hwmj8z55j2bcp61ydf37cs796rvzsxbsbamr"; - url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt5_i386.deb"; + name = "libgpg-error0_1.10-2ubuntu1+srt6_i386"; + sha256 = "91a8acb77d3beffca842257e1c6470618e2c0df24df723eda5d61170db12f6cb"; + url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libgpg-error0.deb"; }; } rec { - name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; - sha256 = "1zkvqbm3i297b6pj0japgs3jcvps8my6icsh2n1ka6nvflvdr87h"; - url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; + name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386"; + sha256 = "43de1faddc57d494f29ceb148aa98817b3e81326e6625076adf222020ffa3ff3"; + url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { - name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "0q2r4fmpql34hpd061289ijl40y66wp8rlh78b2ysg8dkvycni0k"; - url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "55dde8ab3fab6899feb9ff4f2e04048a237e0a39afe24fed27cc4f3e625bc816"; + url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { - name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_i386"; - sha256 = "0nq6hvv00b3s5fmay2nm4s869y6lws8v2w9lrqlpgs08z6fh6mjp"; - url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_i386.deb"; + name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt2_i386"; + sha256 = "c8c58b2b6e6566a878b8f66ed75f13d5d41cec3d0969360bbab1b07821b58d96"; + url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { - name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_i386"; - sha256 = "0arypn4k1wvaiqqxc271r5w7bkdk0f4mh88l4np3ngfyzn2w6z61"; - url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_i386.deb"; + name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt6_i386"; + sha256 = "0f8cb2b1a0f37745691f2390c1356f973e9904a2ab7732cfd0f6f3301fb00368"; + url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { - name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_i386"; - sha256 = "0swmpdf7872z0nb3rsfixspg11nvf0k7sm4xcdgvcliaqjhyv570"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_i386.deb"; + name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt6_i386"; + sha256 = "b3306b805c611cfca4e8aaa90f391ae5b4b9334aece7afeecca7a012e099e02b"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { - name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all"; - sha256 = "0rw8iy16ij86abh444jk1xw78b5z81qjxm1292jin3sfhck4bd4x"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all.deb"; + name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt6_all"; + sha256 = "ee703928f39124739c01a456c727376378b9e75ed1a3f3c1d7022a2299350262"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt6_all.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { - name = "libgudev-1.0-0_175-0ubuntu9.10+srt1_i386"; - sha256 = "09gjla6gsx8whbvhzwvgjnm19md7bgpvb76kjfmxzm54hakcjxla"; - url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt1_i386.deb"; + name = "libgudev-1.0-0_175-0ubuntu9.10+srt2_i386"; + sha256 = "a7e9be89ac14ec60774429f46530284463b0ecc21c452da8d51cc2e15d47c791"; + url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { - name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "18v3rqaclhdmbh25p48sa6qidi3birnymdfzg2c8z5bpg1giis83"; - url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "4f96dca07bce11f17c79ebe0451bf0d1a3937a59c8cd9f29ad389c5b64465dba"; + url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { - name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "1546i5h5137ysvcgvyi6hplfx54wqya8sr233vgn838xd2bz024r"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "4ec845e9a562257953d0f15bd95adf534aaf37889cc133efe644b9a583980660"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { - name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "1yk0ap8wsi5k2wz5i9vcdw332kbhnlbf5hb8la9pckfrxy6bca82"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "d4b2942db295130d8b9fc441256e08bbbe56c416ea7c2cf33b2bce5cfcb608da"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { - name = "libhogweed4_3.2-1ubuntu0.16.04.1+srt1_i386"; - sha256 = "1d3p11al48d1ig6kn74wkx298kizvw9i0s25rs1433k9cx5aissp"; - url = "mirror://steamrt/pool/main/n/nettle/libhogweed4_3.2-1ubuntu0.16.04.1+srt1_i386.deb"; + name = "libhogweed4_3.2-1ubuntu0.16.04.1+srt2_i386"; + sha256 = "5d8bb7a98376f0e0c45e7387bad7ef165cb8057cd98f886de2334c94a3df751b"; + url = "mirror://steamrt/pool/main/n/nettle/libhogweed4_3.2-1ubuntu0.16.04.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libhogweed4.deb"; }; } rec { - name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "0y6awbyl4w56qa8vkn9dzsnb3162x4p5nr1cf7ir119nl05987cp"; - url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "d54ce7053229a9131a2b8b522d3ea7b02f633a70c05aa125e491480177bfacc7"; + url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { - name = "libice6_1.0.7-2build1+srt5_i386"; - sha256 = "02nygw4q330jgrfgbp46fjpa97bmgzk7sg9ikh97k4c743lshija"; - url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt5_i386.deb"; + name = "libice6_1.0.7-2build1+srt6_i386"; + sha256 = "4e6f06f6d57e62c4a779190a9287d18e47abf4f33bfcc3893d07bbfc51e8ea6b"; + url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libice6.deb"; }; } rec { - name = "libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_i386"; - sha256 = "0zx078d5ycbmy56lcl3j71r9ygfj1b18msrik36ya5qkqm9335rj"; - url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.32-3ubuntu1.2+steamrt1.1+srt1_i386.deb"; + name = "libidn11_1.32-3ubuntu1.2+steamrt1.1+srt2_i386"; + sha256 = "4d92754e7610cd6013489ff03e4f78e31d64c402027cde05efc0c62f2dec4fa6"; + url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.32-3ubuntu1.2+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libidn11.deb"; }; } rec { - name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_i386"; - sha256 = "1qiyw54y8yra871vzvdlj2cqhf1yvg68h9zckyyv87s753x98kkq"; - url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_i386.deb"; + name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt2_i386"; + sha256 = "e623aa0f247ad95ddfcf480d2ae81a070080b703367f96ae378609210eabcf9e"; + url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libindicator7.deb"; }; } rec { - name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_i386"; - sha256 = "02c4fj82svlkh9whsasclshjlvgbcabsz64ac47hvs2ccaap0gis"; - url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_i386.deb"; + name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_i386"; + sha256 = "a59a4de570335899d10f36b4b9552ee894fc0bb21c4ee4e06ed689f3fa55c2e6"; + url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { - name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_i386"; - sha256 = "0bcp6bxrgdbcgwrg2qgrax111w6xfwyf3rwrpf8j9mwd91hzm0c8"; - url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_i386.deb"; + name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt6_i386"; + sha256 = "5c04f4da2038e4a9ae96e59b64386b598fda9952400b5dc40a0a5819dd328ab9"; + url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { - name = "libjpeg62_6b1-2ubuntu1.1+srt5_i386"; - sha256 = "1l3hm9p30w2kwbjyri452h9v0nprznsl9jh32l9hg4php8kjfidw"; - url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt5_i386.deb"; + name = "libjpeg62_6b1-2ubuntu1.1+srt6_i386"; + sha256 = "eed36437197122519201d4bf233ae3de7fd1b3cd81de286028bd4417dd0b6bc2"; + url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libjpeg62.deb"; }; } rec { - name = "libjson0_0.9-1ubuntu1.1+srt3_i386"; - sha256 = "0jnbwf7j7fmrylav1dck17kajxdyc67gfmpn09wrrqy0zgdbg3zi"; - url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt3_i386.deb"; + name = "libjson0_0.9-1ubuntu1.1+srt4_i386"; + sha256 = "ae3503b9871e27e98bfb37477c4b6e151dcf31fa7af757309d99e70ffe66e570"; + url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libjson0.deb"; }; } rec { - name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; - sha256 = "0czc7vf1q84k252wsx9v9na2jn8vqym62dnb100992cpzj2956c1"; - url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; + name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386"; + sha256 = "4109aa8cab7e7915c226b5be6e4e334b65d896183be880b32777a18fe1b7cd8c"; + url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libk5crypto3.deb"; }; } rec { - name = "libkeyutils1_1.5.2-2+srt5_i386"; - sha256 = "0vmd87b8kk579fi99di79p94nkl0584bsdhgw2gw03czbainq9rx"; - url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt5_i386.deb"; + name = "libkeyutils1_1.5.2-2+srt6_i386"; + sha256 = "5efe0be588ee8a4c41a4f34e30c5adf5b59cd3c71b1970f33099a5a2a1e45e37"; + url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libkeyutils1.deb"; }; } rec { - name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "1hjdfsvqzvssxiamjq9dddlzjjz54grzva2a7rsipbmmvnw254yd"; - url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "5661ba523b59f1426f5f4596ac892bd5ad626ab96f9080618a787e1bfef77fa2"; + url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { - name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; - sha256 = "1cr6z0jv6mchs82p6iyskdq6ppbfpyixanxwdbjdg76cpb5as3ii"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; + name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386"; + sha256 = "ffc2a0cd89ea2344ccb37a0d329380559fe5c4c6fab30f2eb004448212cd46c0"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-3.deb"; }; } rec { - name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; - sha256 = "11v68jp8f24abx7i6b69jimlmv0lvpb5hnlxnj3f281zsz2smpyw"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; + name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386"; + sha256 = "40ff710cad27182ac2a419368bf11c03f884c362fb457b4dcb5d14ce91760046"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5support0.deb"; }; } rec { - name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_i386"; - sha256 = "1bpb8gfach74nibzzd2mk7mkdhlw1j27yrgckpl9pgzq8jd0ch70"; - url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_i386.deb"; + name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt6_i386"; + sha256 = "5381665b17380271b4c605e22b8bc21cb7779b67fc116dae9677d667c7383769"; + url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "liblcms2-2.deb"; }; } rec { - name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_i386"; - sha256 = "072vkbk177xxr0g50vban143m1r67ana3abkv4ha0wk4z8wvvw13"; - url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt3_i386.deb"; + name = "libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt4_i386"; + sha256 = "e966ec5b3ddc132911a0bf1b789540e814b065ad3f8d77d0870e87a744ba6f7a"; + url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.6+steamrt1.2+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { - name = "libltdl7_2.4.2-1ubuntu1+srt5_i386"; - sha256 = "1jv01xk4bf0sbq8jawa0zm1q0imc7nmzdwcmkhgscld02rzwwffs"; - url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt5_i386.deb"; + name = "libltdl7_2.4.2-1ubuntu1+srt6_i386"; + sha256 = "f7442bc77144e4c0930b82ed3c779c9ed0048fb025e02abe7ec2d8a03433a3f2"; + url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libltdl7.deb"; }; } rec { - name = "libmikmod2_3.1.12-2+srt5_i386"; - sha256 = "12dmbmkv3gmi1cz0bs3fsbhgnhzvf8cjp0b6zj2a2dgplw1h6qdr"; - url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt5_i386.deb"; + name = "libmikmod2_3.1.12-5+srt2_i386"; + sha256 = "0db96db4334c39e4b6eb6d2c4b0350e8663047fa8a1a08258201d90d15da65bf"; + url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-5+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libmikmod2.deb"; }; } rec { - name = "libmpg123-0_1.25.10-1+steamrt1+srt1_i386"; - sha256 = "0rk7z6ps3gy6jl4v0apz8sdbfpb6xbwf9fniqii559wkhrr2hfn5"; - url = "mirror://steamrt/pool/main/m/mpg123/libmpg123-0_1.25.10-1+steamrt1+srt1_i386.deb"; + name = "libmpg123-0_1.25.10-1+steamrt1+srt2_i386"; + sha256 = "c686cb91855a4feb793bbae88c62ca18f5393c0f3b7e610f8372e7512e1d91a5"; + url = "mirror://steamrt/pool/main/m/mpg123/libmpg123-0_1.25.10-1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libmpg123-0.deb"; }; } rec { - name = "libncurses5_5.9-4+srt5_i386"; - sha256 = "1jsi7qvwy4h1z1mf9qlhp5pizbn84qgnpgi2y1qjlgym8428k0ga"; - url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt5_i386.deb"; + name = "libncurses5_5.9-4+srt6_i386"; + sha256 = "2f5b6f1c9b181e191142b55c4e910fd32b1f5ba457dfc436639551dd4d892e4d"; + url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libncurses5.deb"; }; } rec { - name = "libncursesw5_5.9-4+srt5_i386"; - sha256 = "17hfrf97qcrw1n7p4nwwwiw3jpqpjphqwnq73pb7p8bsp53qa4h4"; - url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt5_i386.deb"; + name = "libncursesw5_5.9-4+srt6_i386"; + sha256 = "0090723ceef27cd9ad30b5335cc2bde075f2958358ef84dfa59fdb779eb2b54c"; + url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libncursesw5.deb"; }; } rec { - name = "libnettle6_3.2-1ubuntu0.16.04.1+srt1_i386"; - sha256 = "0rpw9fg2xfccdvbq0ji66a52rb401r05cs16z9py9r6b0brrxvsf"; - url = "mirror://steamrt/pool/main/n/nettle/libnettle6_3.2-1ubuntu0.16.04.1+srt1_i386.deb"; + name = "libnettle6_3.2-1ubuntu0.16.04.1+srt2_i386"; + sha256 = "41c26ae8c1022b141a1cd88c1ccb47dfa728e8a5bab9b6e4739c2299a070cdd4"; + url = "mirror://steamrt/pool/main/n/nettle/libnettle6_3.2-1ubuntu0.16.04.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libnettle6.deb"; }; } rec { - name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386"; - sha256 = "0vsd00x0wvqw84zqlqrbmdxfmzshrvwbr2az3ynkaz8azkxj1d6d"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386.deb"; + name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt2_i386"; + sha256 = "6610f000cfcf032bf2fc325618f33ca8f8783cbb77faabbf105f484f8f650eae"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libnm-glib4.deb"; }; } rec { - name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386"; - sha256 = "1vaqqgxzvixvh8cvdspyr7azfn8dmknvsypz628h2xvbldf0p156"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386.deb"; + name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt2_i386"; + sha256 = "666fc57f3747be75b0b8b0a1279f934b9dbd880b2c724cbb45f1fc7116b0c3bb"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libnm-util2.deb"; }; } rec { - name = "libnotify4_0.7.5-1+srt5_i386"; - sha256 = "0420awfss4r2j8ncrvnapdj9gbh68z7qlp1vbq9wiaqraqy7zccw"; - url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt5_i386.deb"; + name = "libnotify4_0.7.5-1+srt6_i386"; + sha256 = "5bace16f956c9160d5334631e4a67741675f9d4b5ff07fb7bbd6c28e7c06b54f"; + url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libnotify4.deb"; }; } rec { - name = "libnspr4_4.12-0ubuntu0.12.04.1+srt2_i386"; - sha256 = "1kfs3afaqrfhajbp6dlwzcbzvl8xsg2c04c6b5l1bby1l4ynmqv2"; - url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt2_i386.deb"; + name = "libnspr4_4.12-0ubuntu0.12.04.1+srt3_i386"; + sha256 = "30c5eec8a06104bb4be77a2c21e553ad67a2daeb9005d762e50d97cd87175cba"; + url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libnspr4.deb"; }; } rec { - name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt1_i386"; - sha256 = "00m55f14ih9xyri197hnslw2mnzgl0dxwqvwiba0hnhfl3qvqi99"; - url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt1_i386.deb"; + name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt2_i386"; + sha256 = "ed32e7feae1b0116d49412393f773ab2e85a8e94e974b915a6f459d7ee433a83"; + url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libnss3.deb"; }; } rec { - name = "libogg0_1.3.2-1+srt1_i386"; - sha256 = "09acap6ghv0rf6cavrnqbfphz69sqs1nqacv8flh8sqnxjbrryr1"; - url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.3.2-1+srt1_i386.deb"; + name = "libogg0_1.3.2-1+srt2_i386"; + sha256 = "03c55a830197401e910417322e64a68fb732bb0b314857dbfe35beded40767e5"; + url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.3.2-1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libogg0.deb"; }; } rec { - name = "libopenal1_1.16.0-3+srt1_i386"; - sha256 = "1barqvh4klpdabc1v9kb2q4l8pnmdx97h00hln32zca5z4y5ff9i"; - url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt1_i386.deb"; + name = "libopenal1_1.16.0-3+srt2_i386"; + sha256 = "6c51952f61eac87b2077bbff461898c2dca61cb0b12675d4a4c7d5cebd5e8915"; + url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libopenal1.deb"; }; } rec { - name = "libopus0_1.3-0+steamrt1.1+srt2_i386"; - sha256 = "1s4n86hjka5cxkn4znm5jvic89rqsky05bs8nlbyv3a1z4sqh83c"; - url = "mirror://steamrt/pool/main/o/opus/libopus0_1.3-0+steamrt1.1+srt2_i386.deb"; + name = "libopus0_1.3-0+steamrt1.1+srt3_i386"; + sha256 = "9e75dedd1f3b7a26f2ee8ccab28652d292e2e5a3cf646fd8dbaf0b9d7b09a683"; + url = "mirror://steamrt/pool/main/o/opus/libopus0_1.3-0+steamrt1.1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libopus0.deb"; }; } rec { - name = "libopusfile0_0.11-0+steamrt1.2+srt1_i386"; - sha256 = "19hsl0h0pgx6qc4sizpgj4mcipq2wk6w316mahv05iskkshwb2il"; - url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.2+srt1_i386.deb"; + name = "libopusfile0_0.11-0+steamrt1.2+srt2_i386"; + sha256 = "e21bc67e69dd8da3e444558b7969b2d0b2bbdc9e58571bb1bd3349ea1561bc47"; + url = "mirror://steamrt/pool/main/o/opusfile/libopusfile0_0.11-0+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libopusfile0.deb"; }; } rec { - name = "liborc-0.4-0_0.4.16-1ubuntu2+srt5_i386"; - sha256 = "0n9fkxs3qkd4mwhm4cwlnljww1yalwqjcgia420ls3h7i4p7ss4v"; - url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt5_i386.deb"; + name = "liborc-0.4-0_0.4.16-1ubuntu2+srt6_i386"; + sha256 = "7b666cf8cb3c085c7814bf43c1282ecc2f429f73c2ce45c9328b578a51512f3f"; + url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { - name = "libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_i386"; - sha256 = "0bvp8xslxfag2kpfyhhgsldb7687q11bj365z2m5xmwlk5ihf0bk"; - url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt1_i386.deb"; + name = "libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt2_i386"; + sha256 = "7964bb2eed3474552410febb241b389ead233483f48f763530892d775562c253"; + url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.23.2-5~ubuntu16.04.1~steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libp11-kit0.deb"; }; } rec { - name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_i386"; - sha256 = "0w6m9ycpmlir2wvb7jj0w1p6sh84bjng9i0549bn0afq58f05biw"; - url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_i386.deb"; + name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt6_i386"; + sha256 = "5ca733d41934a821211a9f19df88fc6ac6ce0de9dcda489b857850aecc134599"; + url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { - name = "libpci3_3.1.8-2ubuntu6+srt1_i386"; - sha256 = "1jdakz038hxpkfh0g10acwlaaiqys7c546srdjhmhl9jxizw9ck8"; - url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt1_i386.deb"; + name = "libpci3_3.1.8-2ubuntu6+srt2_i386"; + sha256 = "dc2a159788b32126fc54de57c6bdfa2cd9562d10f1fd00f82463dd322810113a"; + url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libpci3.deb"; }; } rec { - name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_i386"; - sha256 = "12ycdj8pwxlhhqbg89h6smgvnik2pvy6bqyx9szqmpdcjzddagp5"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_i386.deb"; + name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt2_i386"; + sha256 = "ae551ed76da8280b86afd5d802b2ae9a69091b297cee80f94d1f41d8d8b13f5d"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libpcre3.deb"; }; } rec { - name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_i386"; - sha256 = "0ml6bh7banikn75hzy68s2yx6y6924if4zar10lra1akl63by80l"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_i386.deb"; + name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt2_i386"; + sha256 = "2b851e8a0d6bad221bebd9ff4ca05cd8e675ffb85b61dae5eb75da8304ea6499"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { - name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_i386"; - sha256 = "06ch7dsjmjx2c67f932930rawn1cil6vxfnc0xcx937iwd3sq8i7"; - url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_i386.deb"; + name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt3_i386"; + sha256 = "90a0b2a9949791775f042d24547fe170c5ccedcd4b6fc72f15c3b549b7d6fa16"; + url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { - name = "libpng12-0_1.2.46-3ubuntu4.2+srt2_i386"; - sha256 = "0vv10bzxqxnfmp1p4wl9c19kravqa7pcpcc6xar5przgwfv75fd8"; - url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt2_i386.deb"; + name = "libpng12-0_1.2.46-3ubuntu4.2+srt3_i386"; + sha256 = "0d4e60f28c9c034db42ba3c1332ce1898280aef31bc7d997c9bd473ef174557a"; + url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libpng12-0.deb"; }; } rec { - name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_i386"; - sha256 = "0frhw8cw2ima5j40grmdk0hjf6hg6b029wr3f2g2252wzbhzx6ac"; - url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_i386.deb"; + name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt6_i386"; + sha256 = "0299290b5f4170cbdc60ff2336f06ac3fec72888419ec93c570c171d2abe7abb"; + url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libpulse0.deb"; }; } rec { - name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "1284xglgq9j0dqrgggs6455p0qidq5dxd7axgvi22zhzq3h5adfd"; - url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "8827d782d8fedf7fe0285bbab14914e61d2ac5fe5e7ea297fbff916c7fd73939"; + url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { - name = "librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_i386"; - sha256 = "0c9y8m7ynnchs7mj9nmp7y681mkphqy4p7vca7i5vw2cacd7bbv7"; - url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt3_i386.deb"; + name = "librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt4_i386"; + sha256 = "dd5c06e9754fa7fb48a9d16eb5ee2e4a5e8562140bd95c8367f1b967aa162b94"; + url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+steamrt1.1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "librtmp0.deb"; }; } rec { - name = "libsamplerate0_0.1.8-4+srt5_i386"; - sha256 = "070cz870znj9584a9y9npp7zzkkcb049ar2g6m3v1dzf8ijha38x"; - url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt5_i386.deb"; + name = "libsamplerate0_0.1.8-4+srt6_i386"; + sha256 = "3d412bca2cf9d8748332cf75ec3abb98bc6afc6997f11eecf7918a013dc42a52"; + url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libsamplerate0.deb"; }; } rec { - name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_i386"; - sha256 = "10hnrhzfxbg2ka3wlhbvg1qd15k5vdbpfxhdi3ip6yynr00zb9zs"; - url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_i386.deb"; + name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt6_i386"; + sha256 = "a69496b285f0a647b7ea65cc6cb78515380a34b0b2d59b60ce66ee20862837fa"; + url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libsasl2-2.deb"; }; } rec { - name = "libsdl-image1.2_1.2.10-3+srt5_i386"; - sha256 = "0iam5axnl4is7avn37jc95c3qxb5zacl5kl2zg5mbnm4wgcywr08"; - url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt5_i386.deb"; + name = "libsdl-image1.2_1.2.10-3+srt6_i386"; + sha256 = "32e12a48d336867d123dfe51931291bc29226a6f5d79183f2857f2aea1877409"; + url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { - name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_i386"; - sha256 = "1zv4iq7743y2g0zmycq1aj48s06lcmv60f0xig5s9zj8kj5nbg36"; - url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_i386.deb"; + name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt6_i386"; + sha256 = "f9200b6e6167f98379cce33579778ad48e6b64326de3aab4760f55eb380031ce"; + url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { - name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_i386"; - sha256 = "15rbl3zbmg053ach4d25c988m3kj4gjndj5bz1v1spv46798lya8"; - url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_i386.deb"; + name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt6_i386"; + sha256 = "9e60d12dbeb8ff45a506beff802e7d9848e8c2c9d034e8a40dafdbd8d79b16fe"; + url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { - name = "libsdl1.2debian_1.2.15-5+steamrt1+srt5_i386"; - sha256 = "1da6gg64n9x86ldxns4dfnixxa4sc6bci34sgy08fa3r05aqh84a"; - url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt5_i386.deb"; + name = "libsdl1.2debian_1.2.15-5+steamrt1.2+srt1_i386"; + sha256 = "7308d759f752130d80153e0407ade1c20c8cfa4b60844eac11242a5cff90148c"; + url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { - name = "libsdl2_2.0.9.~reimport-0+steamrt1.1+srt1_i386"; - sha256 = "1y5qnxyrsvzqklhdvk6wihmfsxvfd6c93r8fw192zr3f5awvksg3"; - url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.9.~reimport-0+steamrt1.1+srt1_i386.deb"; + name = "libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_i386"; + sha256 = "b33446315351af70d2cfd602d5ee9e2390e2805b10f199dff383917469a3b344"; + url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2.deb"; }; } rec { - name = "libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt1_i386"; - sha256 = "1l3x865fm2jf1lzj2b5n0w24jykw3vsdqhj6xz5nzp49jksffwps"; - url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt1_i386.deb"; + name = "libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_i386"; + sha256 = "4783fc8d0012b5a1b917336af3fd7db097c0c43153bb088df0fdd9018b8c4072"; + url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-image.deb"; }; } rec { - name = "libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt1_i386"; - sha256 = "0d97ggcbssd07fdan6jzd8j7cp3v6apgysbwgaz5c6bn6g61kj9k"; - url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt1_i386.deb"; + name = "libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_i386"; + sha256 = "4c7f511b947e416898b169694ef112d137674c9add49162ba1185c36e83b3604"; + url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { - name = "libsdl2-net_2.0.1+srt2_i386"; - sha256 = "0fk45d366021s31b8vlry93crm1c30fqiq2r4a4yvp9gkhlkww4a"; - url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt2_i386.deb"; + name = "libsdl2-net_2.0.1+srt3_i386"; + sha256 = "f5eba8169255366fdfc809183c89cd6d7ce88da96c6a56cd3da5f8af68cb31d0"; + url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-net.deb"; }; } rec { - name = "libsdl2-ttf_2.0.14+srt2_i386"; - sha256 = "0v9myv9d04h5rs9x216qjg2lf6pwnngsbyylzc0fs5rlzshwdk9s"; - url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt2_i386.deb"; + name = "libsdl2-ttf_2.0.14+srt3_i386"; + sha256 = "db1b89ffc678d7845adb3fa57b04865921521bd97603d28751248fb8f367d909"; + url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { - name = "libselinux1_2.1.0-4.1ubuntu1+srt5_i386"; - sha256 = "0s5x224hx0q6j49pvb3bflzyzzi4ryl60sx6sf7y6wi7kplvibvg"; - url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt5_i386.deb"; + name = "libselinux1_2.1.0-4.1ubuntu1+srt6_i386"; + sha256 = "ea30a8bf5aa90d59c134b9c5167af679043412ef24f82135fd56471d305dcca8"; + url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libselinux1.deb"; }; } rec { - name = "libsm6_1.2.0-2build1+srt5_i386"; - sha256 = "07vrs3rarjah3q06yfqqpb38j67s7dv2p30izhjzps7xxj2qfw6d"; - url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt5_i386.deb"; + name = "libsm6_1.2.0-2build1+srt6_i386"; + sha256 = "2eb05653d4ab704b9cf3c6c30f904adefd049f226bdaf09e2666b5e12856ac70"; + url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libsm6.deb"; }; } rec { - name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_i386"; - sha256 = "0y4hlf67cdlgcfsw03sjsvm2vch8gsasid58y77rzix43saay229"; - url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_i386.deb"; + name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt2_i386"; + sha256 = "5eb7acd671c15410fbf4cf92259683d5393e9c2c557ee83a10b618462f5cc4e9"; + url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsndfile1.deb"; }; } rec { - name = "libspeex1_1.2~rc1-3ubuntu2+srt5_i386"; - sha256 = "0d662dxr5dh6dvnz49pii1mqd8k2xk0jaw07sgl7nnd01926xa9p"; - url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt5_i386.deb"; + name = "libspeex1_1.2~rc1-3ubuntu2+srt6_i386"; + sha256 = "3829a1931ffe4eed8631662fec5929e343d38b6f04d33ec05b3192d16aab6c02"; + url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libspeex1.deb"; }; } rec { - name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt5_i386"; - sha256 = "1924dczm2sxlfn9ibmp7yvn0chd3y201zhw0a6dv65fwngmzk725"; - url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt5_i386.deb"; + name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt6_i386"; + sha256 = "e78b470eaeee57a603778caab2f674113442a3cc5aa8362d010e4a3d52a7f078"; + url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { - name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt2_i386"; - sha256 = "05cihfj3ap1xwpnlmvl3wdbqrbbm6ic10zbja98c429xxx7y8bgv"; - url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt2_i386.deb"; + name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt3_i386"; + sha256 = "354c0f27b4b09df3f189e376c061919e8a58a7cb7b45aaf115b4efc6ba522133"; + url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_i386"; - sha256 = "1kwi96xyjf2gz021zg2hkd6ks9l2087r9ghh8iqgwqivbvcizvr7"; - url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt1_i386.deb"; + name = "libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt2_i386"; + sha256 = "01bb99e42c7bed8c60f1ef10411b9183e506f207b54a86ff8d8de339b2545d58"; + url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.39+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { - name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt2_i386"; - sha256 = "0l60yc1i7p20gaih1mzjk8c62zq9ba4zvmfmrk5w8xr05dpyq9a6"; - url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt2_i386.deb"; + name = "libstdc++6_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "9f2fa400eff42b165314f024359d843c5509eda6433ec6ca82bd21d638a228ea"; + url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6.deb"; }; } rec { - name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_i386"; - sha256 = "1a5hyz5185fhh64hw8kf6mav7jz07l9c9v3m9wwd92xj39sp0vzw"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt1_i386.deb"; + name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt2_i386"; + sha256 = "1785346063763eac850d46dd7db1736e0ec1b6d8ebc84090f54f5b2b1380829c"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { - name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; - sha256 = "1cj7zfhxrb6mvsd8np6q1s1wja2rdd85h2cs9b2pbnlffbr0b9ad"; - url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; + name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386"; + sha256 = "938ac8ecc9f75f070b65b5d8bddea58d89ba8e1673d004d1b20ca0e1f677ba14"; + url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libswscale2.deb"; }; } rec { - name = "libtasn1-3_2.10-1ubuntu1.5+srt2_i386"; - sha256 = "12lfinrk76laq7hiddsvi0gskyfgrf7nk2kflqryxwrpf1y34bcl"; - url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt2_i386.deb"; + name = "libtasn1-3_2.10-1ubuntu1.5+srt3_i386"; + sha256 = "53b976faaa1439908e3c6863a4bed431f6eb245aed96219ddbd9d7f996651484"; + url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libtasn1-3.deb"; }; } rec { - name = "libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_i386"; - sha256 = "11bdwhyzzy5xa4p0rrirh7wqg3q1iwbw460nh4ya5aafysiw71il"; - url = "mirror://steamrt/pool/main/libt/libtasn1-6/libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt1_i386.deb"; + name = "libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt2_i386"; + sha256 = "d61296eafece7f6117d0693e0e321ea78d7131475941e82ace9af4d6727bee6b"; + url = "mirror://steamrt/pool/main/libt/libtasn1-6/libtasn1-6_4.7-3ubuntu0.16.04.3~steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libtasn1-6.deb"; }; } rec { - name = "libtbb2_4.0+r233-1+steamrt2+srt1_i386"; - sha256 = "0ap5ar8v4ljv138p6kga1vzy96v5ilicxsk8lhp1scvcrcaqfppz"; - url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt1_i386.deb"; + name = "libtbb2_4.0+r233-1+steamrt2+srt2_i386"; + sha256 = "f17214134f0deda6e8340163bc4224c7768f7f6f81dce1f9b6c1444b310ee1a9"; + url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libtbb2.deb"; }; } rec { - name = "libtdb1_1.2.9-4+srt5_i386"; - sha256 = "0snf08x6fsjqxs2gzfa7sdxbznq7h347ndawmras84zi0g0bgj6q"; - url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt5_i386.deb"; + name = "libtdb1_1.2.9-4+srt6_i386"; + sha256 = "83649ae1b0da1d92a5efa5eca63e8b1656cf902e2f84b6b4c90d8a2a579c2fe9"; + url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libtdb1.deb"; }; } rec { - name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_i386"; - sha256 = "1jjbd6yyyw5v5wnvsdc3s4gywm9q0mq32n2dr444qs030nkfvcrp"; - url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_i386.deb"; + name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt6_i386"; + sha256 = "f1f8063d04ce6d4d98f0f7bb44afa87e299f391140167a45486a6aff5d1b740e"; + url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libtheora0.deb"; }; } rec { - name = "libtiff4_3.9.5-2ubuntu1.9+srt2_i386"; - sha256 = "0law24ini5ailgykff6blxqfj6zz0lfx5a2s5fzgf06s4j1n2cjv"; - url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt2_i386.deb"; + name = "libtiff4_3.9.5-2ubuntu1.9+srt3_i386"; + sha256 = "8bf74e45a2a6c7a254d5da76e1671d95e4a3ab2a9d769c352409a6b0b0a9e162"; + url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libtiff4.deb"; }; } rec { - name = "libtinfo5_5.9-4+srt5_i386"; - sha256 = "1476jzkd5mcipafc8cfb03z9yzkxvdxnfc0qa34xq5rbjwcximmd"; - url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt5_i386.deb"; + name = "libtinfo5_5.9-4+srt6_i386"; + sha256 = "9c186721047492fe4b95305921a9cba162b645379625251ea8a6f55ea5ac1212"; + url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libtinfo5.deb"; }; } rec { - name = "libudev0_175-0ubuntu9.10+srt1_i386"; - sha256 = "089z7vv229w6gnnzwwagixxwn2qcl8gfim1zbagg266vlwqvcyka"; - url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt1_i386.deb"; + name = "libtxc-dxtn-s2tc0_0~git20131104-1.1+srt2_i386"; + sha256 = "973a3a2dcedad45fb714a4ba39b10b9bc847c2e29f7ecd955e38256669e2139f"; + url = "mirror://steamrt/pool/main/s/s2tc/libtxc-dxtn-s2tc0_0~git20131104-1.1+srt2_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libtxc-dxtn-s2tc0.deb"; + }; + } + rec { + name = "libudev0_175-0ubuntu9.10+srt2_i386"; + sha256 = "113ae87943a82a200dddbd954400054a285a17a5eb41204d3c26bcab88759384"; + url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libudev0.deb"; }; } rec { - name = "libusb-1.0-0_1.0.19-1+srt2_i386"; - sha256 = "1rjnir1gm768xhn4lqb4rdai6wabdfysnlzb47qxxzshpfphycmh"; - url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt2_i386.deb"; + name = "libusb-1.0-0_1.0.19-1+srt3_i386"; + sha256 = "92a1d5c358c4be0afe7467cf81d9662a2ba74a8d36d0bb6254fae756adfd2e1d"; + url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { - name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_i386"; - sha256 = "1xs58z4431ybrmnks0camc4svqpnd4zd814czchi0cs4h1vfvvb8"; - url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt1_i386.deb"; + name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt2_i386"; + sha256 = "1ff9ef3e7f5bb52c9ec5ff8c403610d42dd82c68a58c062ff7c089062195edd6"; + url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libuuid1.deb"; }; } rec { - name = "libva-glx1_1.7.0-1+steamos1+srt1_i386"; - sha256 = "1q1aasyqlllhj0jhkf7mfcs4n83kj7yddxlsldl77v5x2rhn6ksx"; - url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt1_i386.deb"; + name = "libva-glx1_1.7.0-1+steamos1+srt2_i386"; + sha256 = "d9e84658add810853ef5c07729afa864ea07be31b513a2eb5fd569328a9555a9"; + url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libva-glx1.deb"; }; } rec { - name = "libva-x11-1_1.7.0-1+steamos1+srt1_i386"; - sha256 = "1pk78g722w8j2zl0hij59p4v3j70am167mdd7f58d179j34v7y8p"; - url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt1_i386.deb"; + name = "libva-x11-1_1.7.0-1+steamos1+srt2_i386"; + sha256 = "1d2e3d83d02dbb83156edba8f6b1564baf795e84bf9c4549db100722f42d4a04"; + url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libva-x11-1.deb"; }; } rec { - name = "libva1_1.7.0-1+steamos1+srt1_i386"; - sha256 = "17rlsh8sv8qymd17c8k1mlk5gb8fkjlgi2swxiaqnyzw40k52bi5"; - url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt1_i386.deb"; + name = "libva1_1.7.0-1+steamos1+srt2_i386"; + sha256 = "f32d8049e071903b6b20648b0a30c4300603b2eb0635c71243beb58d9746dce6"; + url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libva1.deb"; }; } rec { - name = "libvdpau1_0.4.1-3ubuntu1.2+srt2_i386"; - sha256 = "1qa6bssw4rnyjxw79pfpbhhlwzkxcxg2cx5i8lns5sxg072as5sj"; - url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt2_i386.deb"; + name = "libvdpau1_0.4.1-3ubuntu1.2+srt3_i386"; + sha256 = "8ec0513551e19a25934d113cf2f9d68cf2c4b3b65a6ba786f7aa780f81fe2cde"; + url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libvdpau1.deb"; }; } rec { - name = "libvorbis0a_1.3.5-4.2+srt1_i386"; - sha256 = "1xx0w861k72k7ksjcizm2j54wiqyvf59r82hcsii96gpx5zc2my4"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.5-4.2+srt1_i386.deb"; + name = "libvorbis0a_1.3.5-4.2+srt2_i386"; + sha256 = "31d23a2774150163005db54371ba02eccaebfa5e1904360242eeeab922f02b5f"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.5-4.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbis0a.deb"; }; } rec { - name = "libvorbisenc2_1.3.5-4.2+srt1_i386"; - sha256 = "02zcqm71dnsxdbgcwcs5ay73y9mp0248pvd2ma8h7rb3waiigky1"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.5-4.2+srt1_i386.deb"; + name = "libvorbisenc2_1.3.5-4.2+srt2_i386"; + sha256 = "7ac2c4e1fe34f2208b0fcc57ddbbf997368a003bea15f22efd34afcc6abde75f"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.5-4.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { - name = "libvorbisfile3_1.3.5-4.2+srt1_i386"; - sha256 = "0703pgi72lrm46nmzpcn723x5m88ki0drm546ng37whs99ca9cb4"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.5-4.2+srt1_i386.deb"; + name = "libvorbisfile3_1.3.5-4.2+srt2_i386"; + sha256 = "84dde5077123a8904c4977830382b608c85a4a50b63b5b5de0469682d93030db"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.5-4.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { - name = "libvpx1_1.0.0-2+srt1_i386"; - sha256 = "08yngwr92m787ycpsc798kgpyw6ixks55kmqmadjp8zx43pjzaai"; - url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt1_i386.deb"; + name = "libvpx1_1.0.0-2+srt2_i386"; + sha256 = "9d31c1bf683110d48f7e720751430f2bdd4b58d22d10f7b29962d727bfbcc596"; + url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libvpx1.deb"; }; } rec { - name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_i386"; - sha256 = "0g9f3nk2bq8knqqs6qplw39p729zxqnxyyhipnziqy8h38bilj86"; - url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_i386.deb"; + name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_i386"; + sha256 = "cac788c3fd6cea1ff7235f9b14f82eb8121e209743f08d15529e54732e692e05"; + url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; - sha256 = "1xzj4q5wk1pjflqqd85cx1788sd89fjdjgwv4qlwyn76magxi7kh"; - url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; + name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; + sha256 = "6eb4a6d45a5a37f96c0b96dd08f9d7dbbf5d67c4dc9627472e5c7f6e8dcdecd2"; + url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { - name = "libwrap0_7.6.q-21+srt5_i386"; - sha256 = "1lhp9v9cpi5dgk0wdrivr50b0g3l4fy8cjgnjai25hb65w2hj33n"; - url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt5_i386.deb"; + name = "libwrap0_7.6.q-21+srt6_i386"; + sha256 = "f16e36075faa59bb1322cfbbfbebf99f858f84e31583c8037377f998d1bacaef"; + url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libwrap0.deb"; }; } rec { - name = "libx11-6_1.6.3-1ubuntu2.1+srt1_i386"; - sha256 = "0mvg378ja1znf6qf5228bmijrznhhzw3r7lxizk9iwhz5pm6h2pm"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt1_i386.deb"; + name = "libx11-6_1.6.3-1ubuntu2.1+srt2_i386"; + sha256 = "8b227320572f1bae0f64fca805558c6dde6b9aab9a8c1276ea8f787ff4d621d0"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libx11-6.deb"; }; } rec { - name = "libx11-data_1.6.3-1ubuntu2.1+srt1_all"; - sha256 = "1imsbk4mg6n1083gjjv6kssm5g842xlbg40vsc4dw97myxycpncw"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.6.3-1ubuntu2.1+srt1_all.deb"; - source = fetchurl { - inherit url sha256; - name = "libx11-data.deb"; - }; - } - rec { - name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt1_i386"; - sha256 = "0vpnnsa4ayvin11c9gl5c8bbaplz1z6pm28k0fhfhla5ggq1kd46"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt1_i386.deb"; + name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt2_i386"; + sha256 = "7da5d7a8704f93ee4b001797bf92377d82effcc9323382e619d253df4378a94d"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { - name = "libxau6_1.0.6-4+srt5_i386"; - sha256 = "1q5qryha5ng0cjcalz5qxd38djxd5n7kb2fnz9mnp4cy2vk5jhmq"; - url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt5_i386.deb"; + name = "libxau6_1.0.6-4+srt6_i386"; + sha256 = "7a8f2c897f4dbca167589e631ed5a2330da95739901a83de227fb73179a1cd7c"; + url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxau6.deb"; }; } rec { - name = "libxaw7_1.0.9-3ubuntu1+srt5_i386"; - sha256 = "17085yj7x9hncbgxw5jsi4inn17f6wzdx2akzv9v3l6hvhy8kmkl"; - url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt5_i386.deb"; + name = "libxaw7_1.0.9-3ubuntu1+srt6_i386"; + sha256 = "bebb30c03a8d2ec3e9c7761467d240884ea9c8af974ccc420f2b68f4dfb25f46"; + url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxaw7.deb"; }; } rec { - name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "00zfy06nf78gs7ji222lcy1cwzsqfbng9119cgkw5c1z25x0q6a5"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "14dcce8eae67f17d6d118f516716c3c37b377e792c70ba8d5eee024330c6cd55"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { - name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "09y48s64kp0maldv9bwwpj8ahrssvrik8xmqzjgvxcxpblb1zfb7"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "eba4177cc53cc9a962021248ed9e10f9644ec9dc0c82ded1d88c741e0db4b281"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { - name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "085b0qhf15kaw9msmsk8jxp4rk7fym506jmiaqxh1i6wgr66ys86"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "6aa16d10d782109331c253e0ad2c34e4b253b035851d9b9d3d1ebc53cb761fdd"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { - name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "1nwdr550axxca7p438c3g9jb4y2zf8gxyd3756vav4jp1n57i1rq"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "4d93975e2ca271f08a5c3767b4cc0732d1bde19d3d316ae86887ec2b219a2330"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { - name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "1vjklblpkdrki48dn890920nx8gcj25sxqp24qkpxja8samvl6gr"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "716024b99a5a9ae8ac2f25bf138872467b2d878457d064d80ed9c123554890f4"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { - name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "0zwc8c896bka6wi5jri78q1pq5ppsi5dwih9rwfl5c96p6r4lbr6"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "dfc32f406c1b8e7d388da08eb44219f2ac0dea671cc904fce2848e5207c01517"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { - name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "0cd4jsyj1r6b7nm8g6342f8dafghzd1dc0k61iw3qncwx949j3gy"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "178eb8ef45f7905e7dda7d072c45ed22ff258a1271b4aa23fa288a6e8f3df259"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-present0.deb"; }; } rec { - name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "1vfrbkq1qqjp0278j70jcldls2g9rmkh9ifb6pnqznagqsrrhwy7"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "80c961ca3c4f65731395f28382563b35716fec8ba1821b67b3d82b676dada3db"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { - name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "0gy7l161idc59a6q8vhgq1krknwmd1cyh5ss2vhp7qznxwh9bd7j"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "647639154c1395f23e9f211b72463855db0514b7773c2f9cf1d3fb2cbc05c867"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-record0.deb"; }; } rec { - name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "0gl7389h5ppfd3p30v8vmwl4kxvsqjhmhazszs7mdgalfjwkf9rf"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "a6d472270333f97a16fd53b91131c24f2ba041638c64e7102e5cf1d7eabc904d"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-render0.deb"; }; } rec { - name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "1ca5lk12qncrfkjakjb7yl5f5x41b3ynn3d9wk6paqrchhfn7yir"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "e775fa90992262b7c95bf7f87a7798b66860a220695658a7126493ce3a6539fd"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-res0.deb"; }; } rec { - name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "0sz49j0z7zl2mx7cf6kw4ljzsbik92az35yj9i0426p1zaqzx0vs"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "b1db9ac5b0769b942b77a848d81192fa7a6ac256a929cf4c2041e9effb514593"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { - name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "1mycsk8ixdn7c8c4ma4vbrilhcdjxqz92nzv9rwxf96vr0dj4bhd"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "408ad0ffea7751ac9284fc98ed4aa515493f2b1bea81ea6cb25f18db66dbbadb"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { - name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "1w0d53d8hgzr5ql9is7x4dap6ny6bfp041qa6hldmg8jbw3x8wc3"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "4974ac189d90500e577b17beec8ea8c6a2cab4dcad1cfe8e81864b23df42602b"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { - name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "1pd0pw5q7h28p0j6h4889dq7fpvkjwclsmg96m6sl7a3459cp6b0"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "9cd68cc830a6ccf81bb2e1e24227bbd6a94b2b0e3f80cd287a1761fe2d58eceb"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { - name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "0nf3s5jff5psab8mv9avkflgwfj2pmbrvc3pyy743b9cwzv7q85p"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "8b538e6e9f305fa25f93f706dbee2fbc5d4ae68ae7e2219a3c8ecd4bccccf767"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { - name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "149dgslf6hhngjjkhdvrsl3hjx3l2llvnwv6jgnc8hqvz7ck1i1h"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "642e4b1fb439e5da1d19cd79e4e3baf5ff2a45095c7943338b5f0c2dc2f9053f"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { - name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "1rjynbvfxxzm5x07xxfq40qhs7b5pwassn1f7j02q3685swqmk0z"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "bfd93b091ee389375bbd5f4a8b8dcd310fc0dfe865ee70036311af2b87a1c1fc"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { - name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "0m0v4c50104c2khx9vcsf3v3xyl031xv2yladxfp168gchrczyk9"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "9f98414285c57d89aa589967e7fb1c15baeb41d1a4029ad1e658cfc16d41f666"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { - name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "0d56vivs4ykanc1v3pbn9mzgcyw4ffx7c59ck1758g2vxfvi837w"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "f2bbade8fa986997e27e4b4f6d58f8d13cf89046f30832d25a2ad2a5bf5b2deb"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { - name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "0gclf7sgd661820bqqj3aabykxp0m38y3wd9m25znqgqqg5bk6im"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "ef3b153da4e557139326e3fe5725a6e81c405a870cfeac0c2b449cb3a57dcb08"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { - name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "0swkpx39gd9n553qrc8dhdv4vvnan1byrkvy935zzimzxv8phxfm"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "1e2e21f204725e8db972eb252d35a44d446f82e7b1fd63e49832f243c90f5270"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { - name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "0mi49k0xfk34x71ap4q9wy4p7cs31z25pg0p41yr859q4y49461r"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "f76bde000e9035f4a3ae98c97f7a8cd0fbdd4061476c33d92d7c82ea7b4e8951"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { - name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "068y30y9ry4hlfc4dsza47z6lakfz2cy0zkdq5rn3nbs59d7f2nh"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "8f86701038d861ab35144640fe811493050e7c66d0b126acaa1d1cf0841026d6"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { - name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt1_i386"; - sha256 = "0sga5mjr5bk5w0mdq0y2hxfdhpfpzv9m9anfy2zkaw60gy6n0qk6"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; + name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt2_i386"; + sha256 = "ac86d7cc48e543a8314df90e22ab5f2f6441c5a9592885075f3ded255f566215"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb1.deb"; }; } rec { - name = "libxcomposite1_0.4.3-2build1+srt5_i386"; - sha256 = "1c23iswcyi5axg5hql3kkfmcvxkzjl1db9klrlsqb2c0455pjlsf"; - url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt5_i386.deb"; + name = "libxcomposite1_0.4.3-2build1+srt6_i386"; + sha256 = "b340871ae381d5c88f548ea401e8716fb2c0ab5f545f20bdaa53c1b86fcb5657"; + url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcomposite1.deb"; }; } rec { - name = "libxcursor1_1.1.12-1ubuntu0.1+srt5_i386"; - sha256 = "18321skl4h2s3izzaaw1jk2blfq93ygk4b2f2g4mnkipn1i9rybx"; - url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt5_i386.deb"; + name = "libxcursor1_1.1.12-1ubuntu0.1+srt6_i386"; + sha256 = "033134cc5bddecff760d23f900fbf82160ae9913d8a775d8449d76521a225523"; + url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcursor1.deb"; }; } rec { - name = "libxdamage1_1.1.3-2build1+srt5_i386"; - sha256 = "01pam4srj0d3vyrrhlsnfkznpxgil3p674i0armxqfydzh4bww8q"; - url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt5_i386.deb"; + name = "libxdamage1_1.1.3-2build1+srt6_i386"; + sha256 = "2312ed64ac73865703a2d52426468e04ab9051e7dca7ee2b5f6adba7465ee5dd"; + url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxdamage1.deb"; }; } rec { - name = "libxdmcp6_1.1.0-4+srt5_i386"; - sha256 = "0vz6w11yld3ii0b3i68wwzx7qsgd64yj8709h32db08izc1a2wdh"; - url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt5_i386.deb"; + name = "libxdmcp6_1.1.0-4+srt6_i386"; + sha256 = "770dd69e60b9480853807ce666efd456ed33a1cc1ef6211120f7ffca5ce0aeb8"; + url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxdmcp6.deb"; }; } rec { - name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_i386"; - sha256 = "11jjds6qk9wvx446rph5n2qsr9b36jlr99ayw98zr89b3y6y8lyf"; - url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_i386.deb"; + name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt3_i386"; + sha256 = "07b6198a9e98a0f2995043ca6801eeb10ab1b448182ac96aa6edec9d5d0a999f"; + url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libxext6.deb"; }; } rec { - name = "libxfixes3_5.0-4ubuntu4.4+srt2_i386"; - sha256 = "19rm8s1dq7vysijlksbac04045x5j4g30s377im4ydljjh2vajh6"; - url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt2_i386.deb"; + name = "libxfixes3_5.0-4ubuntu4.4+srt3_i386"; + sha256 = "8821073c0b8742d9376e97040ae57b99350f501ddeb11559c0ab22b575f79c85"; + url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libxfixes3.deb"; }; } rec { - name = "libxft2_2.2.0-3ubuntu2+srt5_i386"; - sha256 = "0pcd8bvdlh41bixbdkrl0sm6libgns7ndjzyvj86s3qks7k11g97"; - url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt5_i386.deb"; + name = "libxft2_2.2.0-3ubuntu2+srt6_i386"; + sha256 = "d5321b1d50842e1fdea5d6ddffc68deb04561c3113b1999f175ff3b890460ad4"; + url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxft2.deb"; }; } rec { - name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt2_i386"; - sha256 = "0pykpahh9j7cp91mbkqw22drl5npq3pbd712chbrmkdjdqm14x9p"; - url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt2_i386.deb"; + name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt3_i386"; + sha256 = "403a6d281489c734eb221b4345445c85e1d08726de5424c0977eb075ad65c39d"; + url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libxi6.deb"; }; } rec { - name = "libxinerama1_1.1.1-3ubuntu0.1+srt5_i386"; - sha256 = "0xd0rfr6h25s3h6n8in5kby4fm88s1ykw2y8clymk79znmgby0av"; - url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt5_i386.deb"; + name = "libxinerama1_1.1.1-3ubuntu0.1+srt6_i386"; + sha256 = "a1433017837dfef1e89a59da96fc762d777f424ec0576c844df299e1f8c1de23"; + url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxinerama1.deb"; }; } rec { - name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_i386"; - sha256 = "1ss7fpdqdgm8hmcgm1d59x5mfr4n7zps8bjg1304nn29a3cck26z"; - url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_i386.deb"; + name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt2_i386"; + sha256 = "01c070b6cf8b9bbc89691680ecd283124a221f4f9a774b92da320a994ff9934c"; + url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxml2.deb"; }; } rec { - name = "libxmu6_1.1.0-3+srt5_i386"; - sha256 = "0z39zacqis2cq1gdwam1wk5xmisdhsrly7r1a8g5h8h6hbrri72w"; - url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt5_i386.deb"; + name = "libxmu6_1.1.0-3+srt6_i386"; + sha256 = "8af5a4dbbd4543273660a993b5844fe3e4fe08039029cdb831cdfad913189784"; + url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxmu6.deb"; }; } rec { - name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_i386"; - sha256 = "02k70n6v245l0kqf7gjjv4bm12zmxcw8cayjv9xh8cp6svsxdzsq"; - url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_i386.deb"; + name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt2_i386"; + sha256 = "fc122b2d9b319e2b2d6820f99991340be84c897934c215dd45992f1cdd93cc3e"; + url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxpm4.deb"; }; } rec { - name = "libxrandr2_1.5.0-1+srt1_i386"; - sha256 = "10nqrxs2dxs06wah8dy48v7v8vdllpg9wwhcn67i7dkgfli27ykj"; - url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt1_i386.deb"; + name = "libxrandr2_1.5.0-1+srt2_i386"; + sha256 = "7cac5a272f54cbbe4d4a6ebec57f916ce27558ad4658e2a7bf7a0da821ea4814"; + url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxrandr2.deb"; }; } rec { - name = "libxrender1_0.9.6-2ubuntu0.2+srt2_i386"; - sha256 = "0i48bi4zfv90dgc190mr8wd8hymbhdldrk1q2qag0l9fmn5hkwqv"; - url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt2_i386.deb"; + name = "libxrender1_0.9.6-2ubuntu0.2+srt3_i386"; + sha256 = "ca115703917963c881e4a5e2fdd46bf407750b2b21d5cb68f3d9de1848a37607"; + url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libxrender1.deb"; }; } rec { - name = "libxss1_1.2.1-2+srt5_i386"; - sha256 = "015n1l1hl4vvgb53zx6gisl44p2pjj339adabqlfy1fqwjf0ff4z"; - url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt5_i386.deb"; + name = "libxss1_1.2.1-2+srt6_i386"; + sha256 = "b7eefbf2398837f0edc399a0814270549622309c70cea499ff8f360a0ed553e2"; + url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxss1.deb"; }; } rec { - name = "libxt6_1.1.1-2ubuntu0.1+srt5_i386"; - sha256 = "0yqb6j6rh9y65bfbqv1hrggl1719lsm6yzydbmpnilz15p3f4sa9"; - url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt5_i386.deb"; + name = "libxt6_1.1.1-2ubuntu0.1+srt6_i386"; + sha256 = "2a0047b8b965e88e4102251adeaa8ee06f1f8a5c473b05b66780737c078e3a14"; + url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxt6.deb"; }; } rec { - name = "libxtst6_1.2.0-4ubuntu0.1+srt5_i386"; - sha256 = "1h21nyc2bigm3brpzmdaafvry4wszmykbs13vagmibwhb6rls7xd"; - url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt5_i386.deb"; + name = "libxtst6_1.2.0-4ubuntu0.1+srt6_i386"; + sha256 = "3f71448e6e4c2268a6b7d2434857fad087dcf5ab7bffffabd4dac85cc9b6101f"; + url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxtst6.deb"; }; } rec { - name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt5_i386"; - sha256 = "133xi181g1pcd08px9yz7wqz93axy0cq9x5y76qp34dj7i9pscsg"; - url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt5_i386.deb"; + name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt6_i386"; + sha256 = "e35a581221121685d195a30fa8d9f380b97d4ceda381c6283dea2cc055b8a9b1"; + url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { - name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_i386"; - sha256 = "0nvhk0xyi1cc12j2j97x763irk2d9l8n0p3fjyg7s3jgm4va3yjj"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_i386.deb"; + name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt6_i386"; + sha256 = "b1910781d9fc65f75cdf0c73aed63274185c6fcd9e9ee02ea5500fefa10e3dcb"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt5_i386"; - sha256 = "04j0mbdcv8891apw3lak161fbvpyl8qykvqvn6ljl3mimf3qabcd"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt5_i386.deb"; + name = "steamrt-legacy_1.20190624.0+srt1_i386"; + sha256 = "22bb83259ee421abdb7cb9877365460619011c859eaf4119615e55726defa56b"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20190624.0+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "steamrt-legacy.deb"; + }; + } + rec { + name = "steamrt-libs_1.20190624.0+srt1_i386"; + sha256 = "f9a38284deb9c08fbe6f3b8d1617bec74bb803d639a0a77d77736f19a1de765a"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20190624.0+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "steamrt-libs.deb"; + }; + } + rec { + name = "zenity_3.4.0-0ubuntu4+steamrt2+srt6_i386"; + sha256 = "1c772d4f96424d204ab4913efcafbe43518257ca5032ca7b23d6c6ab76439117"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_i386"; - sha256 = "1qbqclnhhwfxj5ajsb05c3pg5iq5imf4pl6yisx5hw5jndgmzch7"; - url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_i386.deb"; + name = "zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all"; + sha256 = "bc8f0b80672833be72c6dd87d406b5fc0ef92e51f91e3a461678fc97844649bc"; + url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all.deb"; + source = fetchurl { + inherit url sha256; + name = "zenity-common.deb"; + }; + } + rec { + name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt7_i386"; + sha256 = "998b190f03be3de22d1e4822bb0b6e77db15a90321b4ae51abf1f0bd5b9f9190"; + url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt7_i386.deb"; source = fetchurl { inherit url sha256; name = "zlib1g.deb"; diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index dd6e9a070b19..95493498f5e7 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, traceDeps ? false}: +{stdenv, fetchurl, runtimeShell, traceDeps ? false}: let traceLog = "/tmp/steam-trace-dependencies.log"; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { rm $out/bin/steamdeps ${stdenv.lib.optionalString traceDeps '' cat > $out/bin/steamdeps <> ${traceLog} cat \$1 >> ${traceLog} echo >> ${traceLog} diff --git a/pkgs/games/steam/update-runtime.py b/pkgs/games/steam/update-runtime.py index aed42cdd5668..d33165b309da 100755 --- a/pkgs/games/steam/update-runtime.py +++ b/pkgs/games/steam/update-runtime.py @@ -35,12 +35,11 @@ def parse_args(): parser.add_argument("--repo", help="source repository", default=REPO) return parser.parse_args() -def download_file(file_base, file_name, file_url): +def download_file(file_base, file_name, file_url, sha256): file_shortname = file_base + ".deb" - sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--name", file_shortname, file_url]) out.write(" rec {\n") out.write(" name = \"%s\";\n" % file_name) - out.write(" sha256 = \"%s\";\n" % sha256.strip()) + out.write(" sha256 = \"%s\";\n" % sha256) out.write(" url = \"%s\";\n" % file_url.replace(REPO, "mirror://steamrt", 1)) out.write(" source = fetchurl {\n") out.write(" inherit url sha256;\n") @@ -49,8 +48,20 @@ def download_file(file_base, file_name, file_url): out.write(" }\n") +def parse_dependencies (arch, binarylist): + packages_url = "%s/dists/%s/%s/binary-%s/Packages" % (REPO, DIST, COMPONENT, arch) + for stanza in deb822.Packages.iter_paragraphs(urllib.urlopen(packages_url)): + p = stanza['Package'] + if p in binarylist: + for deps in stanza.relations['depends']: + for dep in deps: + binarylist.add(dep['name']) + return binarylist + def install_binaries (arch, binarylist): - installset = binarylist.copy() + installset = parse_dependencies(arch, binarylist.copy()) + # Steam doesn't start if we include their libc + installset.remove("libc6") # # Load the Packages file so we can find the location of each binary package @@ -66,7 +77,7 @@ def install_binaries (arch, binarylist): # Download the package and install it # file_url="%s/%s" % (REPO,stanza['Filename']) - download_file(p, os.path.splitext(os.path.basename(stanza['Filename']))[0], file_url) + download_file(p, os.path.splitext(os.path.basename(stanza['Filename']))[0], file_url, stanza["SHA256"]) installset.remove(p) for p in installset: @@ -108,22 +119,13 @@ if args.debug: COMPONENT = "debug" # Process packages.txt to get the list of source and binary packages -source_pkgs = set() binary_pkgs = set() print ("Creating runtime-generated.nix") -pkgs_list = urllib.urlopen("https://raw.githubusercontent.com/ValveSoftware/steam-runtime/master/packages.txt").readlines() -for line in pkgs_list: - if line[0] != '#': - toks = line.split() - if len(toks) > 1: - source_pkgs.add(toks[0]) - binary_pkgs.update(toks[1:]) - -# remove development packages for end-user runtime -if not args.debug: - binary_pkgs -= {x for x in binary_pkgs if re.search('-dbg$|-dev$|-multidev$',x)} +# https://github.com/ValveSoftware/steam-runtime/blob/173ef028fb6b84e804f4e1b0ef11c12ffd4f3a8e/build-runtime.py#L264 +binary_pkgs.add("steamrt-libs") +binary_pkgs.add("steamrt-legacy") for arch in arches: out.write(" %s = [\n" % arch) diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 4f9406abd835..75d28d467762 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, cmake, nasm +{ clangStdenv, lib, fetchFromGitHub, cmake, nasm , gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis , glew, libpulseaudio, udev }: -stdenv.mkDerivation rec { +clangStdenv.mkDerivation rec { name = "stepmania-${version}"; version = "5.0.12"; diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index c147bfb77ad7..3865d8fbef9e 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { name = "stunt-rally-${version}"; - version = "2.6"; + version = "2.6.1"; src = fetchurl { url = "https://github.com/stuntrally/stuntrally/archive/${version}.tar.gz"; - sha256 = "1jmsxd2isq9q5paz43c3xw11vr5md1ym8h34b768vxr6gp90khwc"; + sha256 = "1zxq3x2g9pzafa2awx9jzqd33z6gnqj231cs07paxzrm89y51w4v"; }; tracks = fetchurl { url = "https://github.com/stuntrally/tracks/archive/${version}.tar.gz"; - sha256 = "0yv88l9s03kp1xkkwnigh0jj593vi3r7vgyg0jn7i8d22q2p1kjb"; + sha256 = "0x6lgpa4c2grl0vrhqrcs7jcysa3mmvpdl1v5xa0dsf6vkvfr0zs"; }; # include/OGRE/OgreException.h:265:126: error: invalid conversion from @@ -22,14 +22,10 @@ stdenv.mkDerivation rec { preConfigure = '' pushd data tar xf ${tracks} - mv tracks-2.6 tracks + mv tracks-${version} tracks popd ''; - patches = [ - ./gcc6.patch - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis makeWrapper enet libXcursor bullet openal diff --git a/pkgs/games/stuntrally/gcc6.patch b/pkgs/games/stuntrally/gcc6.patch deleted file mode 100644 index 6632ea4e8856..000000000000 --- a/pkgs/games/stuntrally/gcc6.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git i/source/ogre/CarModel_Create.cpp w/source/ogre/CarModel_Create.cpp -index 834eac7..47ec647 100644 ---- i/source/ogre/CarModel_Create.cpp -+++ w/source/ogre/CarModel_Create.cpp -@@ -130,7 +130,8 @@ void CarModel::Load(int startId) - - /// load config .car - string pathCar; -- pApp->gui->GetCarPath(&pathCar, 0, 0, sDirname, pApp->mClient); // force orig for newtorked games -+ string empty; -+ pApp->gui->GetCarPath(&pathCar, &empty, &empty, sDirname, bool(pApp->mClient)); // force orig for newtorked games - LoadConfig(pathCar); - - -diff --git i/source/ogre/Gui_Tweak.cpp w/source/ogre/Gui_Tweak.cpp -index 76ed8e9..9444271 100644 ---- i/source/ogre/Gui_Tweak.cpp -+++ w/source/ogre/Gui_Tweak.cpp -@@ -412,8 +412,8 @@ bool CGui::GetCarPath(std::string* pathCar, - pathUserD = PATHMANAGER::CarSimU() + "/" + pSet->game.sim_mode + "/cars/", - pathUser = pathUserD + file; - -- if (pathSave) *pathSave = pathUser; -- if (pathSaveDir) *pathSaveDir = pathUserD; -+ if (pathSave != "") *pathSave = pathUser; -+ if (pathSaveDir != "") *pathSaveDir = pathUserD; - - if (!forceOrig && PATHMANAGER::FileExists(pathUser)) - { -diff --git i/source/vdrift/cartire.cpp w/source/vdrift/cartire.cpp -index dd6dd48..083fa0c 100644 ---- i/source/vdrift/cartire.cpp -+++ w/source/vdrift/cartire.cpp -@@ -3,6 +3,7 @@ - #include "cardefs.h" - //#include "../ogre/common/Def_Str.h" - -+using namespace std; - - void CARTIRE::FindSigmaHatAlphaHat(Dbl load, Dbl & output_sigmahat, Dbl & output_alphahat, int iterations) - { -diff --git i/source/vdrift/model_obj.cpp w/source/vdrift/model_obj.cpp -index 338d122..e67c1db 100644 ---- i/source/vdrift/model_obj.cpp -+++ w/source/vdrift/model_obj.cpp -@@ -205,7 +205,7 @@ bool MODEL_OBJ::Save(const std::string & strFileName, std::ostream & error_outpu - std::ofstream f(strFileName.c_str()); - if (!f) - { -- error_output << "Error opening file for writing: " << error_output << endl; -+ error_output << "Error opening file for writing: " << endl; - return false; - } - -diff --git i/source/vdrift/texture.h w/source/vdrift/texture.h -index b21846a..c115fd6 100644 ---- i/source/vdrift/texture.h -+++ w/source/vdrift/texture.h -@@ -125,7 +125,7 @@ class TEXTURELIBRARY - bool FileExists(const std::string & filename) - { - std::ifstream f(filename.c_str()); -- return f; -+ return bool(f); - } - - public: diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index a7b82b8913f5..a81d7f33d43f 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig +{ stdenv, fetchFromGitHub, fetchsvn, fetchpatch, cmake, pkgconfig , openal, freealut, libGLU_combined, libvorbis, libogg, gettext, curl, freetype , fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr }: @@ -34,6 +34,14 @@ in stdenv.mkDerivation rec { curl fribidi bluez libjpeg libpng ]; + # https://github.com/supertuxkart/stk-code/issues/3557#issuecomment-440794379 + patches = [ + (fetchpatch { + url = "https://github.com/supertuxkart/stk-code/commit/3a3953f38c3555e87f3608d0291dbfccf34e9775.patch"; + sha256 = "13mr5pwf45g7frpxzlxiyiq39qi3z9spd7l6gi8i3dr3li9wrb1k"; + }) + ]; + enableParallelBuilding = true; cmakeFlags = [ diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 48fa0a3b5181..57e7217fcdbd 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tcllib }: +{ stdenv, fetchurl, tcl, tcllib, runtimeShell }: stdenv.mkDerivation { name = "tcl2048-0.4.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { mkdir -pv $out/bin cp $src $out/2048.tcl cat > $out/bin/2048 << EOF - #!${stdenv.shell} + #!${runtimeShell} # wrapper for tcl2048 export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index cfef1ed0db2b..02c55d7d06c9 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, libX11, libGLU_combined }: +{ stdenv, fetchurl, glibc, libX11, runtimeShell, libGLU_combined }: with stdenv.lib; stdenv.mkDerivation { @@ -38,7 +38,7 @@ stdenv.mkDerivation { # The wrapper script itself. We use $LD_LIBRARY_PATH for libGL. cat << EOF > "$out/bin/Tibia" - #!${stdenv.shell} + #!${runtimeShell} cd $out/res ${glibc.out}/lib/ld-linux.so.2 --library-path \$LD_LIBRARY_PATH ./Tibia "\$@" EOF diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index f1718201998c..67d7f82457f9 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -12,25 +12,30 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/gcc6-isnan.patch"; + url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/gcc6-isnan.patch"; sha256 = "16scmq30vwb8429ah9d4ws0v1w6ai59lvn7hcgnvfzyap42ry876"; }) (fetchpatch { - url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/format-argument.patch"; + url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/format-argument.patch"; sha256 = "04advcx88yh23ww767iysydzhp370x7cqp2wf9hk2y1qvw7mxsja"; }) (fetchpatch { - url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/glibc-default-source.patch"; + url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/glibc-default-source.patch"; sha256 = "0k4hgpddnhv68mdc9ics7ah8q54j60g394d7zmcmzg6l3bjd9pyp"; }) + (fetchpatch { + url = "https://salsa.debian.org/games-team/torcs/raw/32bbe77c68b4de07b28c34497f3c0ad666ee618d/debian/patches/gcc7.patch"; + sha256 = "09iilnvdv8h7b4nb1372arszkbz9hbzsck4rimzz1xjdh9ydniw9"; + }) ]; postPatch = '' sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libGLU freeglut libX11 plib openal freealut libXrandr xorgproto - libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ]; + libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis ]; installTargets = "install datainstall"; diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index fd1a3e178d59..470856af90e6 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal }: +{ stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal, runtimeShell }: stdenv.mkDerivation rec { name = "tremulous-${version}"; version = "1.1.0"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { for b in tremulous tremded do cat << EOF > $out/bin/$b - #!${stdenv.shell} + #!${runtimeShell} cd $out/opt/tremulous exec ./$b.$arch "\$@" EOF diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 85157d8df189..0050ef19cea2 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -1,11 +1,12 @@ -{ fetchurl, stdenv, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU_combined, glew }: +{ fetchurl, stdenv, runtimeShell +, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU_combined, glew }: stdenv.mkDerivation rec { - name = "trigger-rally-0.6.5"; + name = "trigger-rally-0.6.6"; src = fetchurl { url = "mirror://sourceforge/trigger-rally/${name}.tar.gz"; - sha256 = "095s4sx0s1ijlarkh84rvzlv4nxh9llrsal1lb3m3pf0v228gnzj"; + sha256 = "08qa2f2s8zyn42ff6jb1gsi64d916020ixkzvl16kbb88rabqra8"; }; buildInputs = [ SDL2 freealut SDL2_image openal physfs zlib libGLU_combined glew ]; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/bin cat < $out/bin/trigger-rally - #!${stdenv.shell} + #!${runtimeShell} exec $out/games/trigger-rally "$@" EOF chmod +x $out/bin/trigger-rally diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 83fce64ca329..483912bab45e 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -1,14 +1,14 @@ -{ stdenv, requireFile, SDL, libpulseaudio, alsaLib }: +{ stdenv, requireFile, SDL, libpulseaudio, alsaLib, runtimeShell }: stdenv.mkDerivation rec { name = "vessel-12082012"; - goBuyItNow = '' + goBuyItNow = '' We cannot download the full version automatically, as you require a license. Once you bought a license, you need to add your downloaded version to the nix store. You can do this by using "nix-prefetch-url file://\$PWD/${name}-bin" in the directory where you saved it. - ''; + ''; src = if (stdenv.isi686) then requireFile { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { phases = "installPhase"; ld_preload = ./isatty.c; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + ":" + stdenv.lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ; installPhase = '' @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { # allow scripting of the mojoinstaller gcc -fPIC -shared -o isatty.so $ld_preload - echo @@@ + echo @@@ echo @@@ this next step appears to hang for a while - echo @@@ + echo @@@ - # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. + # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. LD_PRELOAD=./isatty.so $(cat $NIX_CC/nix-support/dynamic-linker) $src << IM_A_BOT n $out/libexec/strangeloop/vessel/ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { rm $out/libexec/strangeloop/vessel/x86/libstdc++* # props to Ethan Lee (the Vessel porter) for understanding - # how $ORIGIN works in rpath. There is hope for humanity. + # how $ORIGIN works in rpath. There is hope for humanity. patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { done cat > $out/bin/Vessel << EOW - #!${stdenv.shell} + #!${runtimeShell} cd $out/libexec/strangeloop/vessel/ exec ./x86/vessel.x86 EOW diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 97bfd9e730c7..7d8380e9f7ce 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -1,25 +1,26 @@ { stdenv, requireFile , libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, libGLU_combined +, runtimeShell , demo ? false }: # TODO: add i686 support stdenv.mkDerivation rec { - name = if demo + name = if demo then "WorldOfGooDemo-1.41" else "WorldofGoo-1.41"; arch = if stdenv.hostPlatform.system == "x86_64-linux" then "supported" else throw "Sorry. World of Goo only is only supported on x86_64 now."; - goBuyItNow = '' + goBuyItNow = '' We cannot download the full version automatically, as you require a license. Once you bought a license, you need to add your downloaded version to the nix store. You can do this by using "nix-prefetch-url file://\$PWD/WorldOfGooSetup.1.41.tar.gz" in the directory where you saved it. - Or you can install the demo version: 'nix-env -i -A pkgs.worldofgoo_demo'. - ''; + Or you can install the demo version: 'nix-env -i -A pkgs.worldofgoo_demo'. + ''; getTheDemo = '' We cannot download the demo version automatically. Please go to @@ -28,8 +29,8 @@ stdenv.mkDerivation rec { directory where you saved it. ''; - src = if demo - then + src = if demo + then requireFile { message = getTheDemo; name = "WorldOfGooDemo.1.41.tar.gz"; @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { phases = "unpackPhase installPhase"; # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis libGLU_combined ] + ":" + stdenv.cc.cc + "/lib64"; @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { #makeWrapper doesn't do cd. :( cat > $out/bin/WorldofGoo << EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/libexec/2dboy/WorldOfGoo exec ./WorldOfGoo.bin64 EOF diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index 86412c0fa768..2ae25e957bb2 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -1,23 +1,20 @@ -{stdenv, fetchurl, libX11, libSM, SDL, libGLU_combined, expat, SDL_ttf, SDL_image, zlib}: -let - buildInputs = [ - libX11 libSM SDL SDL_ttf SDL_image libGLU_combined expat zlib - ]; -in +{ stdenv, fetchurl, libX11, libSM, SDL, libGLU_combined, expat, SDL_ttf +, SDL_image, zlib, libXxf86misc }: stdenv.mkDerivation rec { - version = "4.7.3"; name = "xpilot-ng-${version}"; - inherit buildInputs; + version = "4.7.3"; src = fetchurl { url = "mirror://sourceforge/xpilot/xpilot_ng/${name}/${name}.tar.gz"; sha256 = "02a7pnp88kh88fzda5q8mzlckk6y9r5fw47j00h26wbsfly0k1zj"; }; - meta = { - inherit version; - description = ''A multiplayer X11 space combat game''; + buildInputs = [ + libX11 libSM SDL SDL_ttf SDL_image libGLU_combined expat zlib libXxf86misc + ]; + meta = with stdenv.lib; { + description = "A multiplayer X11 space combat game"; homepage = http://xpilot.sf.net/; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix new file mode 100644 index 000000000000..20efe6342859 --- /dev/null +++ b/pkgs/misc/acpilight/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, python36, udev, coreutils }: + +stdenv.mkDerivation rec { + pname = "acpilight"; + version = "1.1"; + + src = fetchgit { + url = "https://gitlab.com/wavexx/acpilight.git"; + rev = "v${version}"; + sha256 = "0kykrl71fb146vaq8207c3qp03h2djkn8hn6psryykk8gdzkv3xd"; + }; + + pyenv = python36.withPackages (pythonPackages: with pythonPackages; [ + ConfigArgParse + ]); + + postConfigure = '' + substituteInPlace 90-backlight.rules --replace /bin ${coreutils}/bin + ''; + + buildInputs = [ pyenv udev ]; + + makeFlags = [ "DESTDIR=$(out) prefix=" ]; + + meta = with stdenv.lib; { + homepage = "https://gitlab.com/wavexx/acpilight"; + description = "ACPI backlight control"; + license = licenses.gpl3; + maintainers = with maintainers; [ "smakarov" ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/base16-builder/default.nix b/pkgs/misc/base16-builder/default.nix index 3d713848223b..af57f2a90de3 100644 --- a/pkgs/misc/base16-builder/default.nix +++ b/pkgs/misc/base16-builder/default.nix @@ -1,14 +1,6 @@ { stdenv, pkgs }: let - # node-packages*.nix generated via: - # - # % node2nix --input node-packages.json \ - # --output node-packages-generated.nix \ - # --composition node-packages.nix \ - # --node-env ./../../development/node-packages/node-env.nix \ - # --pkg-name nodejs-6_x - # nodePackages = import ./node-packages.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; diff --git a/pkgs/misc/base16-builder/generate.sh b/pkgs/misc/base16-builder/generate.sh new file mode 100755 index 000000000000..e1e436010b4b --- /dev/null +++ b/pkgs/misc/base16-builder/generate.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix +exec node2nix -8 \ + --input node-packages.json \ + --output node-packages-generated.nix \ + --composition node-packages.nix \ + --node-env ./../../development/node-packages/node-env.nix \ diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix index 52f3446e8c41..5c5de54ee54a 100644 --- a/pkgs/misc/base16-builder/node-packages-generated.nix +++ b/pkgs/misc/base16-builder/node-packages-generated.nix @@ -58,15 +58,6 @@ let sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; }; }; - "builtin-modules-1.1.1" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - }; "bulk-replace-0.0.1" = { name = "bulk-replace"; packageName = "bulk-replace"; @@ -94,13 +85,13 @@ let sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; - "capture-stack-trace-1.0.0" = { + "capture-stack-trace-1.0.1" = { name = "capture-stack-trace"; packageName = "capture-stack-trace"; - version = "1.0.0"; + 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/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"; + sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="; }; }; "chalk-1.1.3" = { @@ -229,13 +220,13 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "esprima-4.0.0" = { + "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; - sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="; + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; "filled-array-1.1.0" = { @@ -283,13 +274,13 @@ let sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; }; }; - "graceful-fs-4.1.11" = { + "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.11"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; "has-ansi-2.0.0" = { @@ -301,22 +292,22 @@ let sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; }; - "hepburn-1.0.0" = { + "hepburn-1.1.1" = { name = "hepburn"; packageName = "hepburn"; - version = "1.0.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/hepburn/-/hepburn-1.0.0.tgz"; - sha1 = "49ce862942a77570cd4f5c8fe100b85d942cb61b"; + url = "https://registry.npmjs.org/hepburn/-/hepburn-1.1.1.tgz"; + sha512 = "Ok3ZmMJN3ek4WFAL4f5t8k+BmrDRlS5qGjI4um+3cHH0SrYVzJgUTYwIfGvU8s/eWqOEY+gsINwjJSoaBG3A9g=="; }; }; - "hosted-git-info-2.6.1" = { + "hosted-git-info-2.7.1" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.6.1"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz"; - sha512 = "Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz"; + sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="; }; }; "imurmurhash-0.1.4" = { @@ -364,15 +355,6 @@ let sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; }; }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - }; "is-finite-1.0.2" = { name = "is-finite"; packageName = "is-finite"; @@ -454,13 +436,13 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "js-yaml-3.12.0" = { + "js-yaml-3.13.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; - sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz"; + sha512 = "pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ=="; }; }; "keypress-0.1.0" = { @@ -481,13 +463,13 @@ let sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; }; }; - "limax-1.6.0" = { + "limax-1.7.0" = { name = "limax"; packageName = "limax"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/limax/-/limax-1.6.0.tgz"; - sha1 = "996163291c7e8c6e7dd5b438c0190b69622f1b33"; + url = "https://registry.npmjs.org/limax/-/limax-1.7.0.tgz"; + sha512 = "ibcGylOXT5vry2JKfKwLWx2tZudRYWm4SzG9AE/cc5zqwW+3nQy/uPLUvfAUChRdmqxVrK6SNepmO7ZY8RoKfA=="; }; }; "load-json-file-1.1.0" = { @@ -580,22 +562,22 @@ let sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; }; }; - "nodejieba-2.2.6" = { + "nodejieba-2.3.0" = { name = "nodejieba"; packageName = "nodejieba"; - version = "2.2.6"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.2.6.tgz"; - sha1 = "17cd416705b7b01c062e6cd9d7179b30453eb4a3"; + url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.3.0.tgz"; + sha512 = "ZzLsVuNDlrmcBQa/b8G/yegdXje2iFmktYmPksk6qLha1brKEANYqg4XPiBspF1D0y7Npho91KTmvKFcDr0UdA=="; }; }; - "normalize-package-data-2.4.0" = { + "normalize-package-data-2.5.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw=="; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; "number-is-nan-1.0.1" = { @@ -679,6 +661,15 @@ let sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; }; }; + "path-parse-1.0.6" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + }; + }; "path-type-1.1.0" = { name = "path-type"; packageName = "path-type"; @@ -796,13 +787,13 @@ let sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; }; }; - "registry-auth-token-3.3.2" = { + "registry-auth-token-3.4.0" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "3.3.2"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; - sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ=="; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz"; + sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A=="; }; }; "registry-url-3.1.0" = { @@ -823,6 +814,15 @@ let sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; + "resolve-1.10.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; + sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; + }; + }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -832,13 +832,13 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; - "semver-5.5.0" = { + "semver-5.7.0" = { name = "semver"; packageName = "semver"; - version = "5.5.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; - sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; + url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; + sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; }; }; "semver-diff-2.1.0" = { @@ -868,22 +868,22 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "spdx-correct-3.0.0" = { + "spdx-correct-3.1.0" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz"; - sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g=="; + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; }; }; - "spdx-exceptions-2.1.0" = { + "spdx-exceptions-2.2.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz"; - sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; }; }; "spdx-expression-parse-3.0.0" = { @@ -895,13 +895,13 @@ let sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; }; }; - "spdx-license-ids-3.0.0" = { + "spdx-license-ids-3.0.3" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.0"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz"; - sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz"; + sha512 = "uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="; }; }; "speakingurl-14.0.1" = { @@ -1048,13 +1048,13 @@ let sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; - "validate-npm-package-license-3.0.3" = { + "validate-npm-package-license-3.0.4" = { name = "validate-npm-package-license"; packageName = "validate-npm-package-license"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz"; - sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g=="; + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; "widest-line-1.0.0" = { @@ -1102,11 +1102,10 @@ in sources."argparse-1.0.10" sources."array-find-index-1.0.2" sources."boxen-0.3.1" - sources."builtin-modules-1.1.1" sources."bulk-replace-0.0.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" sources."code-point-at-1.1.0" sources."commander-1.1.1" @@ -1121,22 +1120,21 @@ in sources."ejs-2.6.1" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."filled-array-1.1.0" sources."find-up-1.1.2" sources."fs-promise-0.3.1" sources."get-stdin-4.0.1" sources."got-5.7.1" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."has-ansi-2.0.0" - sources."hepburn-1.0.0" - sources."hosted-git-info-2.6.1" + sources."hepburn-1.1.1" + sources."hosted-git-info-2.7.1" sources."imurmurhash-0.1.4" sources."indent-string-2.1.0" sources."inherits-2.0.3" sources."ini-1.3.5" sources."is-arrayish-0.2.1" - sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" sources."is-npm-1.0.0" @@ -1146,10 +1144,10 @@ in sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" - sources."js-yaml-3.12.0" + sources."js-yaml-3.13.0" sources."keypress-0.1.0" sources."latest-version-2.0.0" - sources."limax-1.6.0" + sources."limax-1.7.0" sources."load-json-file-1.1.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" @@ -1163,8 +1161,8 @@ in }) sources."nan-2.10.0" sources."node-status-codes-1.0.0" - sources."nodejieba-2.2.6" - sources."normalize-package-data-2.4.0" + sources."nodejieba-2.3.0" + sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."open-0.0.5" @@ -1174,6 +1172,7 @@ in sources."package-json-2.4.0" sources."parse-json-2.2.0" sources."path-exists-2.1.0" + sources."path-parse-1.0.6" sources."path-type-1.1.0" sources."pify-2.3.0" sources."pinkie-2.0.4" @@ -1187,18 +1186,19 @@ in sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" sources."redent-1.0.0" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."repeating-2.0.1" + sources."resolve-1.10.0" sources."safe-buffer-5.1.2" - sources."semver-5.5.0" + sources."semver-5.7.0" sources."semver-diff-2.1.0" sources."signal-exit-3.0.2" sources."slide-1.1.6" - sources."spdx-correct-3.0.0" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.3" sources."speakingurl-14.0.1" sources."sprintf-js-1.0.3" sources."string-width-1.0.2" @@ -1215,7 +1215,7 @@ in sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" sources."uuid-2.0.3" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."widest-line-1.0.0" sources."write-file-atomic-1.3.4" sources."xdg-basedir-2.0.0" @@ -1227,6 +1227,6 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index 8e6e01237eae..47020a413e9b 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index 51ef47fe4693..2df3cfe67334 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { description = "Brother BrGenML1 LPR driver"; homepage = http://www.brother.com; platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.unfreeRedistributable; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index 607e3c2c57f9..e22a159c428a 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, utillinux, xxd +{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, utillinux, xxd, runtimeShell , ghostscript, a2ps }: # Why: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { unpackPhase = "true"; brprintconf_mfcj6510dw_script = '' - #!${stdenv.shell} + #!${runtimeShell} cd $(mktemp -d) ln -s @out@/usr/bin/brprintconf_mfcj6510dw_patched brprintconf_mfcj6510dw_patched ln -s @out@/opt/brother/Printers/mfcj6510dw/inf/brmfcj6510dwfunc brmfcj6510dwfunc diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 348b7c6550e2..3d2eafee1687 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.21.6"; + version = "1.22.0"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "0k0x9p40bahq44189vy9zai2ia9i91h26chrddr0m9agzsy5s3k3"; + sha256 = "0gdv33g7dr1i7756n07zwgsv9b1i15rp7n1z1xr3n8f59br4fds4"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index f03d75dfa02d..bdbd7b22bb08 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -12,16 +12,16 @@ let name = "hplip-${version}"; - version = "3.18.5"; + version = "3.19.1"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0xb7ga2wgbwjxsss67mjn2y6fmqsfwzmv11ivvfzhnl36lh22hkb"; + sha256 = "1kl1q4753xx1w76dhp92wgrhn5k1yx1ib35pyi0vi3mw0njbhrzm"; }; plugin = fetchurl { url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "1jf74jya071zqvwhy9n0c3007pzgcxydkw7qdh4sx70brly81i7p"; + sha256 = "1fwjypy1ycyi7rr1vk1yxhbdhx51n7fxhvjb36mzw8qz71dif2i3"; }; hplipState = substituteAll { @@ -77,6 +77,7 @@ pythonPackages.buildPythonApplication { sip ] ++ stdenv.lib.optionals withQt5 [ pyqt5 + enum-compat ]; makeWrapperArgs = [ "--prefix" "PATH" ":" "${nettools}/bin" ]; diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index 64b485bea310..a57fda56ddd4 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,15 +1,20 @@ -{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, gnome3, gdk_pixbuf, librsvg, intltool }: +{ callPackage, makeWrapper, gobject-introspection, cmake +, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk_pixbuf, librsvg, intltool, libmirage }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.2"; pkgName = "image-analyzer"; - pkgSha256 = "1pr23kxx83xp83h27fkdv86f3bxclkx056f9jx8jhnpn113xp7r2"; + pkgSha256 = "0by3nd5c413cvk3jmv3md6q0axbiidy061g9dhf37qzwgcakcx8j"; }; in callPackage pkg { - buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper - gnome3.defaultIconTheme gdk_pixbuf librsvg intltool ]; + buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper + gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool + python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ]; drvParams = { + nativeBuildInputs = [ gobject-introspection cmake ]; postFixup = '' wrapProgram $out/bin/image-analyzer \ + --set PYTHONPATH "$PYTHONPATH" \ + --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; }; diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix index ec4341a29459..dbf471d35d1d 100644 --- a/pkgs/misc/emulators/cdemu/client.nix +++ b/pkgs/misc/emulators/cdemu/client.nix @@ -1,11 +1,11 @@ -{ callPackage, pythonPackages, intltool, makeWrapper }: +{ callPackage, python3Packages, intltool, makeWrapper }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.1"; pkgName = "cdemu-client"; - pkgSha256 = "0s6q923g5vkahw5fki6c7a25f68y78zfx4pfsy0xww0z1f5hfsik"; + pkgSha256 = "1d8m24qvv62xcwafw5zs4yf39vs64kxl4idqcngd8yyjhrb2ykg5"; }; in callPackage pkg { - buildInputs = [ pythonPackages.python pythonPackages.dbus-python pythonPackages.pygobject3 + buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 intltool makeWrapper ]; drvParams = { postFixup = '' diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix index 587224e71d78..a80327ce91c0 100644 --- a/pkgs/misc/emulators/cdemu/daemon.nix +++ b/pkgs/misc/emulators/cdemu/daemon.nix @@ -1,9 +1,9 @@ -{ callPackage, glib, libao, intltool }: +{ callPackage, glib, libao, intltool, libmirage }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.2"; pkgName = "cdemu-daemon"; - pkgSha256 = "0kxwhwjvcr40sjlrvln9gasjwkkfc3wxpcz0rxmffp92w8phz3s9"; + pkgSha256 = "0himyrhhfjsr4ff5aci7240bpm9x34h20pid412ci8fm16nk929b"; }; in callPackage pkg { - buildInputs = [ glib libao (callPackage ./libmirage.nix {}) intltool ]; + buildInputs = [ glib libao libmirage intltool ]; } diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 9403a969e8f4..331ad0ded248 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -1,15 +1,17 @@ -{ callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gnome3, gdk_pixbuf, librsvg }: +{ callPackage, makeWrapper, gobject-introspection, cmake +, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk_pixbuf, librsvg }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.1"; pkgName = "gcdemu"; - pkgSha256 = "0rmnw302fk9vli22v54qx19lqxy23syxi154klxz2vma009q0p02"; + pkgSha256 = "0lmyvhbf57wcm8k2a33j2dhy4gblaiycy33q070gdrxi37xk7w5g"; }; - inherit (pythonPackages) python pygobject3; + inherit (python3Packages) python pygobject3; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper - gnome3.defaultIconTheme gdk_pixbuf librsvg ]; + gnome3.adwaita-icon-theme gdk_pixbuf librsvg ]; drvParams = { + nativeBuildInputs = [ gobject-introspection cmake ]; postFixup = '' wrapProgram $out/bin/gcdemu \ --set PYTHONPATH "$PYTHONPATH" \ diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix index 3813ceef6115..0ead78305cd0 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/misc/emulators/cdemu/libmirage.nix @@ -1,9 +1,18 @@ -{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool }: +{ callPackage, gobject-introspection, cmake, pkgconfig +, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool +, pcre, utillinux, libselinux, libsepol }: + let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.2"; pkgName = "libmirage"; - pkgSha256 = "0qvkvnvxqx8hqzcqzh7sqjzgbc1nrd91lzv33lr8c6fgaq8cqzmn"; + pkgSha256 = "0gwrfia0fyhi0b3p2pfyyvrcfcb0qysfzgpdqsqjqbx4xaqx5wpi"; }; in callPackage pkg { buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate intltool ]; + drvParams = { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + nativeBuildInputs = [ cmake gobject-introspection pkgconfig ]; + propagatedBuildInputs = [ pcre utillinux libselinux libsepol ]; + }; } diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 73ef7bc6a180..2ce3f606d733 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 = "20170610"; + version = "20190302"; src = fetchurl { url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2"; - sha256 = "1v6r0bgx0a65vlh36b1l2965xybngbpga6rp54k4z74xk0zwjw3r"; + sha256 = "0wvxxc064i8czza91gh0dhmh55x2nbs7szzyh4g30w0c98hmc1n5"; }; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index b720bf142d4a..e57c3854926f 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -20,13 +20,13 @@ let }; in stdenv.mkDerivation rec { name = "dolphin-emu-${version}"; - version = "2018-12-25"; + version = "2019-02-16"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "ca2a2c98f252d21dc609d26f4264a43ed091b8fe"; - sha256 = "0903hp7fkh08ggjx8zrsvwhh1x8bprv3lh2d8yci09al1cqqj5cb"; + rev = "286aafd4ed2949f0b93230fee969c6a32fe75f07"; + sha256 = "0l0cpq8s7wnng7mhbnzf4v84zggqsqdykrzfyz5avvbv9pla7jwp"; }; enableParallelBuilding = true; diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 878e98fa1665..61a6b4317c79 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng }: +{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng, fetchpatch }: stdenv.mkDerivation rec { name = "dosbox-0.74-2"; @@ -8,6 +8,20 @@ stdenv.mkDerivation rec { sha256 = "1ksp1b5szi0vy4x55rm3j1y9wq5mlslpy8llpg87rpdyjlsk0xvh"; }; + patches = [ + (fetchpatch { + name = "cve-2019-7165.patch"; + url = "https://salsa.debian.org/debian/dosbox/raw/30989a35ee478f8f4bc8e167fccbf92fc77e1519/debian/patches/cve-2019-7165.patch?inline=false"; + sha256 = "12c2wq6l62x9iggg1hvs82xbdm5g5hirixvbzjpnjmkm8c4h4k38"; + }) + (fetchpatch { + name = "cve-2019-12594.patch"; + url = "https://salsa.debian.org/debian/dosbox/raw/30989a35ee478f8f4bc8e167fccbf92fc77e1519/debian/patches/cve-2019-12594.patch?inline=false"; + excludes = ["configure.in"]; + sha256 = "1zrv2vnb86gdq9z4irqflzf7lz3r6rc6m46k1hdb8ldl1c88w8jj"; + }) + ]; + hardeningDisable = [ "format" ]; buildInputs = [ SDL SDL_net SDL_sound libGLU_combined libpng ]; diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 45b2f79146c1..1349fa0f0b6f 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -4,7 +4,8 @@ , udev , libGLU_combined, SDL , libao, openal, libpulseaudio -, gtk2, gtksourceview }: +, gtk2, gtksourceview +, runtimeShell }: with stdenv.lib; stdenv.mkDerivation rec { @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { # stuff needed by higan at runtime cat < $out/bin/higan-init.sh - #!${stdenv.shell} + #!${runtimeShell} cp --recursive --update $out/share/higan/*.sys \$HOME/.local/share/higan/ @@ -69,8 +70,8 @@ stdenv.mkDerivation rec { longDescription = '' 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); + - Nintendo's Famicom, Super Famicom (with subsystems: + Super Game Boy, BS-X Satellaview, Sufami Turbo); Game Boy, Game Boy Color, Game Boy Advance; - Sega's Master System, Game Gear, Mega Drive; - NEC's PC Engine, SuperGrafx; diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix index bdc372c7ca23..4f40c10b0377 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/misc/emulators/kega-fusion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk_pixbuf, pango, libXinerama, mpg123 }: +{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk_pixbuf, pango, libXinerama, mpg123, runtimeShell }: let libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk_pixbuf pango libXinerama ]; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; runner = writeText "kega-fusion" '' - #!${stdenv.shell} -ex + #!${runtimeShell} -ex kega_libdir="@out@/lib/kega-fusion" kega_localdir="$HOME/.Kega Fusion" diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 7fb804d31e41..09c3d8e762d2 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper, pkgconfig +{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, pkgconfig , cmake, epoxy, libzip, ffmpeg, imagemagick, SDL2, qtbase, qtmultimedia, libedit , qttools, minizip }: @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { name = "mgba-${version}"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "0m1pkxa6i94gq95cankv390wsbp88b3x41c7hf415rp9rkfq25vk"; + sha256 = "0s4dl4pi8rxqahvzxnh37xdgsfax36cn5wlh1srdcmabwsrfpb3w"; }; enableParallelBuilding = true; @@ -32,11 +32,6 @@ in stdenv.mkDerivation rec { qttools ]; - patches = [(fetchpatch { - url = "https://github.com/mgba-emu/mgba/commit/7f41dd354176b720c8e3310553c6b772278b9dca.patch"; - sha256 = "0j334v8wf594kg8s1hngmh58wv1pi003z8avy6fjhj5qpjmbbavh"; - })]; - postInstall = '' cp -r ${desktopItem}/share/applications $out/share wrapProgram $out/bin/mgba-qt --suffix QT_PLUGIN_PATH : \ diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix index 6b708cccc8f8..1072a66e0eac 100644 --- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, cores }: +{ stdenv, pkgs, cores, runtimeShell }: assert cores != []; @@ -7,7 +7,7 @@ with pkgs.lib; let script = exec: '' - #!${stdenv.shell} + #!${runtimeShell} nohup sh -c "pkill -SIGTSTP kodi" & # https://forum.kodi.tv/showthread.php?tid=185074&pid=1622750#pid1622750 nohup sh -c "sleep 10 && ${exec} '$@' -f;pkill -SIGCONT kodi" diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index fa2121f5bc16..2537669bbc42 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkgconfig -, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib +, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { mv $out/share/retrofe/example/retrofe $out/bin/ cat > $out/bin/retrofe-init << EOF - #!${stdenv.shell} + #!${runtimeShell} echo "This will install retrofe's example files into this directory" echo "Example files location: $out/share/retrofe/example/" diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 318993d08b66..313b61b393e4 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 alsaLib SDL ]; hardeningDisable = [ "format" ]; + LDFLAGS = [ "-lm" ]; meta = { description = "Ultimate/Unix/Unusable Amiga Emulator"; diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index e63d27ec4039..1199f987bb6a 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { export CXXFLAGS="-I${libX11.dev}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\"" export LDFLAGS="-lwx_gtk2u_adv-2.9" - configureFlagsArray+=("--mupenapi=$APIDIR" "--wxconfig=`type -P wx-config`") + wafConfigureFlagsArray+=("--mupenapi=$APIDIR" "--wxconfig=`type -P wx-config`") ''; NIX_CFLAGS_COMPILE = "-fpermissive"; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index cd944a6788f3..6a020fa3869a 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec -, libiconv, ijs +, libiconv, ijs, fetchpatch, lcms2 , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null , x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little }: @@ -46,6 +46,11 @@ stdenv.mkDerivation rec { patches = [ ./urw-font-files.patch ./doc-no-ref.diff + (fetchpatch { + name = "CVE-2019-6116"; + url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=d3537a54740d78c5895ec83694a07b3e4f616f61"; + sha256 = "1hr8bpi87bbg1kvv28kflmfh1dhzxw66p9q0ddvbrj72qd86p3kx"; + }) ]; outputs = [ "out" "man" "doc" ]; @@ -56,16 +61,15 @@ stdenv.mkDerivation rec { buildInputs = [ zlib expat openssl libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec - libiconv ijs + libiconv ijs lcms2 ] ++ lib.optional x11Support xlibsWrapper ++ lib.optional cupsSupport cups ; - # No lcms2; upstream "is in process of forking it" and thus won't use one from a library. preConfigure = '' # requires in-tree (heavily patched) openjpeg - rm -rf jpeg libpng zlib jasper expat tiff lcms{,2} jbig2dec freetype cups/libs ijs + rm -rf jpeg libpng zlib jasper expat tiff lcms2mt jbig2dec freetype cups/libs ijs sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@; s@INCLUDE=/usr/include@INCLUDE=/no-such-path@" -i base/unix-aux.mak sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index db2afa5ba631..991be274ecc9 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -14,10 +14,10 @@ , enableQt ? false, qt4 ? null # media -, enableFFmpeg ? true, ffmpeg_2 ? null +, enableFFmpeg ? true, ffmpeg_2 ? null # misc -, enableJemalloc ? true, jemalloc ? null +, enableJemalloc ? true, jemalloc ? null , enableHwAccel ? true , enablePlugins ? false, xulrunner ? null, npapi_sdk ? null }: @@ -66,12 +66,12 @@ assert length renderers == 0 -> throw "at least one renderer must be enabled"; stdenv.mkDerivation rec { name = "gnash-${version}"; - version = "0.8.11-2017-03-08"; + version = "0.8.11-2019-30-01"; src = fetchgit { url = "git://git.sv.gnu.org/gnash.git"; - rev = "8a11e60585db4ed6bc4eafadfbd9b3123ced45d9"; - sha256 = "1qas084gc4s9cb2jbwi2s1h4hk7m92xmrsb596sd14h0i44dai02"; + rev = "583ccbc1275c7701dc4843ec12142ff86bb305b4"; + sha256 = "0fh0bljn0i6ypyh6l99afi855p7ki7lm869nq1qj6k8hrrwhmfry"; }; postPatch = '' diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index a47c20184442..556b66befe63 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" ''; - configureFlags = [ + wafConfigureFlags = [ "--classic" "--autostart=${if (optDbus != null) then "dbus" else "classic"}" ] ++ optional (optDbus != null) "--dbus" diff --git a/pkgs/misc/logging/beats/5.x.nix b/pkgs/misc/logging/beats/5.x.nix index e92613025ff9..fb8bb5a85c8b 100644 --- a/pkgs/misc/logging/beats/5.x.nix +++ b/pkgs/misc/logging/beats/5.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "00g90i58c6gnyzszsx7y75vn1350hrkzrsb50xx700jqg9ii8yin"; + sha256 = "0sslcwjdf7zb9xj2c98jid3rb09l96m22k3af48gppimxg1lkh9b"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index ce8bf44bfc05..2f7e38692eb1 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "1qnrq9bhk7csgcxycb8c7975lq0p7cxw29i6sji777zv4hn7442m"; + sha256 = "0if08dxibdnqpsxs8f6hvw147j0j8bavhcm11scn28j9id65absq"; }; goPackagePath = "github.com/elastic/beats"; @@ -45,5 +45,8 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; + postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + ''; }; } diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix new file mode 100644 index 000000000000..12e08dfeec69 --- /dev/null +++ b/pkgs/misc/logging/beats/7.x.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: + +let beat = package : extraArgs : buildGoPackage (rec { + name = "${package}-${version}"; + version = elk7Version; + + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "1ca6a4zm062jpqwhmd8ivvzha1cvrw7mg5342vnmn99xdlr1pk9j"; + }; + + goPackagePath = "github.com/elastic/beats"; + + subPackages = [ package ]; + + meta = with stdenv.lib; { + homepage = https://www.elastic.co/products/beats; + license = licenses.asl20; + maintainers = with maintainers; [ fadenb basvandijk ]; + platforms = platforms.linux; + }; + } // extraArgs); +in { + filebeat7 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; + heartbeat7 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; + metricbeat7 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + packetbeat7 = beat "packetbeat" { + buildInputs = [ libpcap ]; + meta.description = "Network packet analyzer that ships data to Elasticsearch"; + meta.longDescription = '' + Packetbeat is an open source network packet analyzer that ships the + data to Elasticsearch. + + Think of it like a distributed real-time Wireshark with a lot more + analytics features. The Packetbeat shippers sniff the traffic between + your application processes, parse on the fly protocols like HTTP, MySQL, + PostgreSQL, Redis or Thrift and correlate the messages into transactions. + ''; + }; + journalbeat7 = beat "journalbeat" { + meta.description = '' + Journalbeat is an open source data collector to read and forward + journal entries from Linuxes with systemd. + ''; + buildInputs = [ systemd.dev ]; + postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + ''; + }; +} diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index f38851d6fa0c..0b840448f2c0 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -1,44 +1,69 @@ { stdenv , fetchFromGitHub -, which -, xfce -, glib +, meson +, ninja , pkgconfig +, gtk3 +, glib +, intltool +, dbus-glib , libX11 , libXScrnSaver -, libXxf86misc -, gtk3 -, dbus-glib +, libXxf86vm +, libXext , systemd +, pantheon , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "${basename}-${version}"; - basename = "light-locker"; - version = "1.8.0"; + pname = "light-locker"; + version = "1.9.0"; + + outputs = [ "out" "man" ]; src = fetchFromGitHub { owner = "the-cavalry"; - repo = basename; + repo = pname; rev = "v${version}"; - sha256 = "1zsafc10bmliknf12h3mgy7f73lvgph0q0wkaqp42iagmw11yaj8"; + sha256 = "1z5lcd02gqax65qc14hj5khifg7gr53zy3s5i6apba50lbdlfk46"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which xfce.xfce4-dev-tools glib systemd - libX11 libXScrnSaver libXxf86misc gtk3 dbus-glib wrapGAppsHook ]; + nativeBuildInputs = [ + intltool + meson + ninja + pkgconfig + ]; - preConfigure = '' - ./autogen.sh + buildInputs = [ + dbus-glib + glib + gtk3 + libX11 + libXScrnSaver + libXext + libXxf86vm + systemd + wrapGAppsHook + ]; + + mesonFlags = [ + "-Dmit-ext=true" + "-Ddpms-ext=true" + "-Dxf86gamma-ext=true" + "-Dsystemd=true" + "-Dupower=true" + "-Dlate-locking=true" + "-Dlock-on-suspend=true" + "-Dlock-on-lid=true" + "-Dgsettings=true" + ]; + + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas ''; - configureFlags = [ "--with-xf86gamma-ext" "--with-mit-ext" - "--with-dpms-ext" "--with-systemd" - # ConsoleKit and UPower were dropped in favor - # of systemd replacements - "--without-console-kit" "--without-upower" ]; - meta = with stdenv.lib; { homepage = https://github.com/the-cavalry/light-locker; description = "A simple session-locker for LightDM"; @@ -52,7 +77,7 @@ stdenv.mkDerivation rec { ConsoleKit/UPower or logind/systemd. ''; license = licenses.gpl2; - maintainers = with maintainers; [ obadz ]; + maintainers = with maintainers; [ obadz ] ++ pantheon.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 6e4ae16e9c82..8539db5e0027 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/pipeseroni/pipes.sh; description = "Animated pipes terminal screensaver"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.unix; }; } diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index f088b176c504..6a9dfaef497a 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11 +{ stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU_combined, gtk2 , libxml2, libglade, intltool, xorg, makeWrapper, gle , forceInstallAllHacks ? false @@ -37,6 +37,11 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/xscreensaver-text \ --prefix PATH : ${stdenv.lib.makeBinPath [xorg.appres]} + wrapProgram $out/bin/xscreensaver-getimage-file \ + --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${with perlPackages; makePerlPath [ + EncodeLocale HTTPDate HTTPMessage IOSocketSSL LWP LWPProtocolHttps + MozillaCA NetHTTP NetSSLeay TryTiny URI + ]}" '' + stdenv.lib.optionalString forceInstallAllHacks '' make -C hacks/glx dnalogo diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index e356e83436dd..e10fa1b06b78 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "urbit-${version}"; - version = "0.6.0"; + version = "0.7.3"; src = fetchFromGitHub { owner = "urbit"; repo = "urbit"; - rev = "urbit-${version}"; - sha256 = "158mz6c6y5z1b6piid8hvrl5mcqh8q1ny185gz51jayia51azmgs"; + rev = "v${version}"; + sha256 = "192843pjzh8z55fd0x70m3l1vncmixljia3nphgn7j7x4976xkp2"; fetchSubmodules = true; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 8b7789cf6226..9fcbf123c5c1 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -1,5 +1,5 @@ { lib, stdenv -, python, cmake, vim, ruby +, python, cmake, meson, vim, ruby , which, fetchgit, fetchurl , llvmPackages, rustPlatform , xkb-switch, fzf, skim @@ -160,6 +160,12 @@ self: super: { dependencies = with super; [ webapi-vim ]; }); + meson = buildVimPluginFrom2Nix { + inherit (meson) pname version src; + preInstall = "cd data/syntax-highlighting/vim"; + meta.maintainers = with stdenv.lib.maintainers; [ vcunat ]; + }; + ncm2 = super.ncm2.overrideAttrs(old: { dependencies = with super; [ nvim-yarp ]; }); diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 360a98fd5670..ac5bdfda15e5 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -1,6 +1,6 @@ { stdenv, vim, vimPlugins, vim_configurable, neovim, buildEnv, writeText, writeScriptBin , nix-prefetch-hg, nix-prefetch-git -, fetchFromGitHub +, fetchFromGitHub, runtimeShell }: /* @@ -362,7 +362,7 @@ rec { vimWithRC = {vimExecutable, name ? null, vimrcFile ? null, gvimrcFile ? null}: let rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}"; in writeScriptBin (if name == null then "vim" else name) '' - #!${stdenv.shell} + #!${runtimeShell} exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" ''; diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index e5b83511e72e..2a9eeae3d579 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, vscode-utils, jq, mono, clang-tools, writeScript +{ stdenv, fetchzip, vscode-utils, jq, mono, clang-tools, writeScript, runtimeShell , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: @@ -53,7 +53,7 @@ let }; openDebugAD7Script = writeScript "OpenDebugAD7" '' - #!${stdenv.shell} + #!${runtimeShell} BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)" ${if gdbUseFixed then '' diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 59938b76fe0b..9117364b8205 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -11,6 +11,19 @@ in # "${mktplcRef.publisher}.${mktplcRef.name}". # rec { + + alanz.vscode-hie-server = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-hie-server"; + publisher = "alanz"; + version = "0.0.25"; # see the note above + sha256 = "0m21w03v94qxm0i54ki5slh6rg7610zfxinfpngr0hfpgw2nnxvc"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + bbenoist.Nix = buildVscodeMarketplaceExtension { mktplcRef = { name = "Nix"; @@ -23,6 +36,18 @@ rec { }; }; + justusadam.language-haskell = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "language-haskell"; + publisher = "justusadam"; + version = "2.5.0"; # see the note above + sha256 = "10jqj8qw5x6da9l8zhjbra3xcbrwb4cpwc3ygsy29mam5pd8g6b3"; + }; + meta = { + license = stdenv.lib.licenses.bsd3; + }; + }; + ms-vscode.cpptools = callPackage ./cpptools {}; ms-python.python = callPackage ./python {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 4fa0c0e3e47f..c9473bca06d4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, fetchzip, pkgs, fetchurlBoot }: +{ stdenv, buildPackages, fetchurl, fetchzip, pkgs }: let # This attrset can in theory be computed automatically, but for that to work nicely we need @@ -141,7 +141,7 @@ let # in an infinite recursion without this. It's not clear why this # worked fine when not cross-compiling fetch = if name == "libiconv" - then fetchurlBoot + then stdenv.fetchurlBoot else fetchurl; in fetch { url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${versions.${version}.${name}}.tar.gz"; diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index db33b78a4aba..3b5e8f1207a2 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -52,4 +52,9 @@ stdenv.mkDerivation { passthru = { inherit targetPrefix; }; + + meta = { + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + priority = 10; + }; } diff --git a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch new file mode 100644 index 000000000000..9aae2be1d033 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch @@ -0,0 +1,98 @@ +diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +index 09c0e12..ac6b085 100644 +--- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp ++++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +@@ -187,6 +187,7 @@ struct DynamicLibrary { + ld::File::ObjcConstraint _objcConstraint; + Options::Platform _platform; + std::vector _allowedClients; ++ std::vector _allowableClients; + std::vector _reexportedLibraries; + std::vector _symbols; + std::vector _classes; +@@ -246,6 +247,14 @@ class TBDFile { + }); + } + ++ void parseAllowableClients(DynamicLibrary& lib) { ++ if ( !hasOptionalToken("allowable-clients") ) ++ return; ++ parseFlowSequence([&](Token name) { ++ lib._allowableClients.emplace_back(name); ++ }); ++ } ++ + void parseReexportedDylibs(DynamicLibrary& lib) { + if ( !hasOptionalToken("re-exports") ) + return; +@@ -306,6 +315,21 @@ class TBDFile { + return false; + } + ++ void skipUUIDs(DynamicLibrary& lib) { ++ expectToken("uuids"); ++ while ( true ) { ++ auto token = next(); ++ if ( token == "]" ) ++ break; ++ } ++ } ++ ++ void skipParentUmbrella(DynamicLibrary& lib) { ++ if (!hasOptionalToken("parent-umbrella")) ++ return; ++ next(); ++ } ++ + void parsePlatform(DynamicLibrary& lib) { + expectToken("platform"); + +@@ -410,6 +434,7 @@ class TBDFile { + } + + parseAllowedClients(lib); ++ parseAllowableClients(lib); + parseReexportedDylibs(lib); + parseSymbols(lib); + if ( !hasOptionalToken("-") ) +@@ -455,17 +480,21 @@ class TBDFile { + return result.front(); + } + +- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) { ++ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) { + auto selectedArchName = parseAndSelectArchitecture(requestedArchName); + if (selectedArchName.empty()) + throwf("invalid arch"); + ++ if(isTbdV2) ++ skipUUIDs(lib); + parsePlatform(lib); + parseInstallName(lib); + parseCurrentVersion(lib); + parseCompatibilityVersion(lib); + parseSwiftVersion(lib); + parseObjCConstraint(lib); ++ if(isTbdV2) ++ skipParentUmbrella(lib); + parseExportsBlock(lib, selectedArchName); + } + +@@ -476,7 +505,8 @@ public: + _tokenizer.reset(); + DynamicLibrary lib; + expectToken("---"); +- parseDocument(lib, requestedArchName); ++ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2"); ++ parseDocument(lib, requestedArchName, isTbdV2); + expectToken("..."); + return lib; + } +@@ -486,6 +516,7 @@ public: + auto token = next(); + if ( token != "---" ) + return false; ++ hasOptionalToken("!tapi-tbd-v2"); + return !parseAndSelectArchitecture(requestedArchName).empty(); + } + diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index d41f571cf97b..caf85b227bed 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,10 +1,18 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook +{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2, autoreconfHook , libcxxabi, libuuid, llvm , libobjc ? null, maloader ? null +, enableDumpNormalizedLibArgs ? false }: let + # We need to use an old version of cctools-port to support linking TBD files + # in the iOS SDK. Note that this only provides support for SDK versions up to + # 10.x. For 11.0 and higher we will need to upgrade to a newer cctools than the + # default version here, which can support the new TBD format via Apple's + # libtapi. + useOld = stdenv.targetPlatform.isiOS; + # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. targetPrefix = stdenv.lib.optionalString @@ -15,27 +23,47 @@ in # Non-Darwin alternatives assert (!stdenv.hostPlatform.isDarwin) -> maloader != null; +assert enableDumpNormalizedLibArgs -> (!useOld); + let baseParams = rec { name = "${targetPrefix}cctools-port-${version}"; - version = "895"; + version = if useOld then "886" else "895"; - src = fetchFromGitHub { + src = fetchFromGitHub (if enableDumpNormalizedLibArgs then { owner = "tpoechtrager"; repo = "cctools-port"; - rev = "07619027f8311fa61b4a549c75994b88739a82d8"; - sha256 = "12g94hhz5v5bmy2w0zb6fb4bjlmn992gygc60h9nai15kshj2spi"; - }; + # master with https://github.com/tpoechtrager/cctools-port/pull/34 + rev = "8395d4b2c3350356e2fb02f5e04f4f463c7388df"; + sha256 = "10vbf1cfzx02q8chc77s84fp2kydjpx2y682mr6mrbb7sq5rwh8f"; + } else if useOld then { + owner = "tpoechtrager"; + repo = "cctools-port"; + rev = "02f0b8ecd87a3951653d838a321ae744815e21a5"; + sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1"; + } else { + owner = "tpoechtrager"; + repo = "cctools-port"; + rev = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2 + sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52"; + }); outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoconf automake libtool autoreconfHook ]; + nativeBuildInputs = [ autoconf automake libtool_2 autoreconfHook ]; buildInputs = [ libuuid ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]; - patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch ]; + patches = [ + ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch + ] ++ stdenv.lib.optionals useOld [ + # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed. + ./undo-unknown-triple.patch + ./ld-tbd-v2.patch + ./support-ios.patch + ]; - __propagatedImpureHostDeps = [ + __propagatedImpureHostDeps = stdenv.lib.optionals (!useOld) [ # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them "/usr/lib/libobjc.A.dylib" "/usr/lib/libobjc.dylib" @@ -48,9 +76,7 @@ let ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; configureFlags = [ "--disable-clang-as" ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace cctools/Makefile.am --replace libobjc2 "" - '' + '' + postPatch = '' sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp # FIXME: there are far more absolute path references that I don't want to fix right now @@ -99,6 +125,7 @@ let homepage = http://www.opensource.apple.com/source/cctools/; description = "MacOS Compiler Tools (cross-platform port)"; license = stdenv.lib.licenses.apsl20; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; }; }; in stdenv.mkDerivation baseParams diff --git a/pkgs/os-specific/darwin/cctools/support-ios.patch b/pkgs/os-specific/darwin/cctools/support-ios.patch new file mode 100644 index 000000000000..f78c6b63ac80 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/support-ios.patch @@ -0,0 +1,13 @@ +diff --git a/cctools/configure.ac b/cctools/configure.ac +index 56e8f24..0b4b3ff 100644 +--- a/cctools/configure.ac ++++ b/cctools/configure.ac +@@ -39,7 +39,7 @@ EXTRACXXFLAGS="" + WARNINGS="" + + case $host_os in +- darwin* ) ++ darwin* | ios*) + isdarwin=yes + AM_CONDITIONAL([ISDARWIN], [true]) + ;; diff --git a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch new file mode 100644 index 000000000000..7df9bdd16dab --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch @@ -0,0 +1,17 @@ +diff --git a/cctools/as/driver.c b/cctools/as/driver.c +index b06d085..c03397a 100644 +--- a/cctools/as/driver.c ++++ b/cctools/as/driver.c +@@ -363,12 +363,6 @@ char **envp) + /* Add -c or clang will run ld(1). */ + new_argv[j] = "-c"; + j++; +- /* cctools-port start */ +- new_argv[j] = "-target"; +- j++; +- new_argv[j] = "unknown-apple-darwin"; +- j++; +- /* cctools-port end */ + new_argv[j] = NULL; + if(execute(new_argv, verbose)) + exit(0); diff --git a/pkgs/os-specific/darwin/stubs/default.nix b/pkgs/os-specific/darwin/stubs/default.nix index ec8f948a00b1..6fedf0a451e3 100644 --- a/pkgs/os-specific/darwin/stubs/default.nix +++ b/pkgs/os-specific/darwin/stubs/default.nix @@ -1,7 +1,7 @@ -{ stdenv, writeScriptBin }: +{ stdenv, writeScriptBin, runtimeShell }: let fake = name: stdenv.lib.overrideDerivation (writeScriptBin name '' - #!${stdenv.shell} + #!${runtimeShell} echo >&2 "Faking call to ${name} with arguments:" echo >&2 "$@" '') (drv: { diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index f819429f4deb..6f7caa8ec02c 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -8,7 +8,9 @@ let url = "https://raw.githubusercontent.com/apple/swift-corelibs-foundation/9a5d8420f7793e63a8d5ec1ede516c4ebec939f0/CoreFoundation/Base.subproj/CFSystemDirectories.c"; sha256 = "0krfyghj4f096arvvpf884ra5czqlmbrgf8yyc0b3avqmb613pcc"; }; -in stdenv.mkDerivation { +in + +stdenv.mkDerivation { name = "swift-corefoundation"; src = fetchFromGitHub { @@ -34,6 +36,10 @@ in stdenv.mkDerivation { --replace "cf.CFLAGS += '-DDEPLOYMENT" '#' \ --replace "cf.LDFLAGS += '-ldispatch" '#' + # Fix sandbox impurities. + substituteInPlace ../lib/script.py \ + --replace '/bin/cp' cp + # Includes xpc for some initialization routine that they don't define anyway, so no harm here substituteInPlace PlugIn.subproj/CFBundlePriv.h \ --replace '#if (TARGET_OS_MAC' '#if (0' @@ -53,7 +59,7 @@ in stdenv.mkDerivation { BUILD_DIR = "./Build"; CFLAGS = "-DINCLUDE_OBJC -I${libxml2.dev}/include/libxml2"; # They seem to assume we include objc in some places and not in others, make a PR; also not sure why but libxml2 include path isn't getting picked up from buildInputs - + # I'm guessing at the version here. https://github.com/apple/swift-corelibs-foundation/commit/df3ec55fe6c162d590a7653d89ad669c2b9716b1 imported "high sierra" # and this version is a version from there. No idea how accurate it is. LDFLAGS = "-current_version 1454.90.0 -compatibility_version 150.0.0 -init ___CFInitialize"; diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index c8edd865479e..87ca4686ab74 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { # and pulls in an extra openldap dependency otherwise "--disable-zos-remote" (if enablePython then "--with-python" else "--without-python") + "--with-arm" + "--with-aarch64" ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 1227d22916c9..671b13c4d79c 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 = "2019.0"; + ver = "2019.1"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0sml6z90kpchmn61597j7yag97gk59fscz4xjxdfh9zycd3nfsn0"; + sha256 = "0nsi5g77zsl0s683r0hqz91xs2bz91ic9c1qdsa3ikd46z8s8lkj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index b84338ed258b..44c975b8dcc1 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 = "2019.0"; + ver = "2019.1"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0cdmb3zkjh8xcsicwyrimwzj8f4x3rjsfzk9im7695pkdw4j2xwr"; + sha256 = "14wp8rvm2m1r5qz7p1m08bzg2gmqyldkw1p6gk8rkdyqb3q0abg8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 52ef018cbfeb..c6e23be8b89d 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-2019.0"; in +let base = "batman-adv-2019.1"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "1h5xxf6nkdhk9dxf3d4fsasmiahy0y7bhlicyhnppgfdf6kxi5ry"; + sha256 = "1af5q4631b72q0gg0xmhxx2k3adky2ahk4dq97k0436a0rg617dr"; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index f5bc7458240a..4b9148600686 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, kernel }: +{ stdenv, fetchurl, fetchpatch, kernel, runtimeShell }: let baseName = "bbswitch"; @@ -36,12 +36,12 @@ stdenv.mkDerivation { mkdir -p $out/bin tee $out/bin/discrete_vga_poweroff << EOF - #!${stdenv.shell} + #!${runtimeShell} echo -n OFF > /proc/acpi/bbswitch EOF tee $out/bin/discrete_vga_poweron << EOF - #!${stdenv.shell} + #!${runtimeShell} echo -n ON > /proc/acpi/bbswitch EOF diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index d66c5dad7716..885de8163be3 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -19,7 +19,7 @@ python.pkgs.buildPythonApplication rec { buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped kernel elfutils luajit netperf iperf - systemtap.stapBuild + systemtap.stapBuild flex ]; patches = [ diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index a917175b90ce..be43d23d6115 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, - python3, readline, udev, libical, systemd, + python3, readline, udev, libical, systemd, fetchpatch, enableWiimote ? false, enableMidi ? false, enableSixaxis ? false }: stdenv.mkDerivation rec { @@ -23,7 +23,19 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "test" ]; - patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ]; + patches = [ + ./bluez-5.37-obexd_without_systemd-1.patch + (fetchpatch { + url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=1880b299086659844889cdaf687133aca5eaf102"; + name = "CVE-2018-10910-1.patch"; + sha256 = "17spsxza27gif8jpxk7360ynvwii1llfdfwg35rwywjjmvww0qj4"; + }) + (fetchpatch { + url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9213ff7642a33aa481e3c61989ad60f7985b9984"; + name = "CVE-2018-10910-2.patch"; + sha256 = "0j7klbhym64yhn86dbsmybqmwx47bviyyhx931izl1p29z2mg8hn"; + }) + ]; postConfigure = '' substituteInPlace tools/hid2hci.rules \ diff --git a/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch b/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch new file mode 100644 index 000000000000..0853bcea9167 --- /dev/null +++ b/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch @@ -0,0 +1,12 @@ +diff --git a/scripts/meson-install.sh b/scripts/meson-install.sh +index 859ae81..05a1c58 100644 +--- a/scripts/meson-install.sh ++++ b/scripts/meson-install.sh +@@ -7,5 +7,5 @@ fi + + BOLT_DBDIR=$1 + +-echo "Creating database dir: ${BOLT_DBDIR}" +-mkdir -p "${DESTDIR}/${BOLT_DBDIR}" ++# echo "Creating database dir: ${BOLT_DBDIR}" ++# mkdir -p "${DESTDIR}/${BOLT_DBDIR}" diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix new file mode 100644 index 000000000000..f57fb1310c67 --- /dev/null +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -0,0 +1,61 @@ +{ stdenv, meson, ninja, pkgconfig, fetchFromGitLab, + python3, umockdev, gobject-introspection, dbus, + asciidoc, libxml2, libxslt, docbook_xml_dtd_45, docbook_xsl, + glib, systemd, polkit +}: + +stdenv.mkDerivation rec { + pname = "bolt"; + version = "0.7"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "bolt"; + repo = "bolt"; + rev = "${version}"; + sha256 = "0xn2c31kcjh1j76gq1qrcxwjyjyqnsxygkfrvh3xk07qc92f99xd"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig + asciidoc libxml2 libxslt docbook_xml_dtd_45 docbook_xsl + ] ++ stdenv.lib.optional (!doCheck) python3; + + buildInputs = [ + glib systemd polkit + ]; + + doCheck = true; + + preCheck = '' + export LD_LIBRARY_PATH=${umockdev.out}/lib/ + ''; + + checkInputs = [ + dbus umockdev gobject-introspection + (python3.withPackages + (p: [ p.pygobject3 p.dbus-python p.python-dbusmock ])) + ]; + + # meson install tries to create /var/lib/boltd + patches = [ ./0001-skip-mkdir.patch ]; + + postPatch = '' + patchShebangs tests/test-integration + ''; + + mesonFlags = [ + "-Dlocalstatedir=/var" + ]; + + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + + meta = with stdenv.lib; { + description = "Thunderbolt 3 device management daemon"; + homepage = https://gitlab.freedesktop.org/bolt/bolt; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.callahad ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 73bea1c7da69..4b2877250821 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -32,14 +32,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.29.3"; + name = "busybox-1.30.1"; # 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 = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1dzg45vgy2w1xcd3p6h8d76ykhabbvk1h0lf8yb24ikrwlv8cr4p"; + sha256 = "1p7vbnwj60q6zkzrzq3pa8ybb7mviv2aa5a8g7s4hh6kvfj0879x"; }; hardeningDisable = [ "format" "pie" ] diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index c6920eab8551..f4c83a58823c 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = https://gitlab.com/cryptsetup/cryptsetup/; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index df917888dc77..ee0a02763d14 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2019-02-13"; + version = "2019-03-12"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "710963fe53ee3f227556d36839df3858daf6e232"; - sha256 = "1q3jvlqqxba08s2mrh9hwl0d5w6nhkwj63j0m6amxqpf10k49jxp"; + rev = "20190312"; + sha256 = "1wk8l75rg7idvsyli29a1fii4xwz3vnm8d65fjw8d3azihdrhbyy"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { # Firmware blobs do not need fixing and should not be modified dontFixup = true; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "13gqnr6gm7336pm48v5p37clphwwdmgbrcipsg3w44wdwgc7fa2f"; - meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; homepage = http://packages.debian.org/sid/firmware-linux-nonfree; diff --git a/pkgs/os-specific/linux/fuse/fuse3-install.patch b/pkgs/os-specific/linux/fuse/fuse3-install.patch index 320c328cbd92..6f938536974a 100644 --- a/pkgs/os-specific/linux/fuse/fuse3-install.patch +++ b/pkgs/os-specific/linux/fuse/fuse3-install.patch @@ -32,3 +32,13 @@ -fi - - +diff --git a/util/meson.build b/util/meson.build +index aa0e734..06d4378 100644 +--- a/util/meson.build ++++ b/util/meson.build +@@ -1,4 +1,4 @@ +-fuseconf_path = join_paths(get_option('prefix'), get_option('sysconfdir'), 'fuse.conf') ++fuseconf_path = join_paths('/', get_option('sysconfdir'), 'fuse.conf') + + executable('fusermount3', ['fusermount.c', '../lib/mount_util.c'], + include_directories: include_dirs, diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 3a6e0a081031..b1b5401b88db 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -3,62 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "2.6"; + version = "2.7"; src = fetchurl { url = "https://w1.fi/releases/${name}.tar.gz"; - sha256 = "0z8ilypad82q3l6q6kbv6hczvhjn8k63j8051x5yqfyjq686nlh1"; + sha256 = "0hd181sghdk944hxd7d41s7zhqd4dmsbkxipjj27bgisrjixvc11"; }; - patches = [ - (fetchurl { - url = "https://w1.fi/cgit/hostap/patch/?id=0d42179e1246f996d334c8bd18deca469fdb1add"; - sha256 = "0w5n3ypwavq5zlyfxpcyvbaf96g59xkwbw9xwpjyzb7h5j264615"; - }) - (fetchurl { - url = "https://w1.fi/cgit/hostap/patch/?id=df426738fb212d62b132d9bb447f0128194e00ab"; - sha256 = "0ps2prjijlcgv1i97xb5ypw840dhkc7ja1aw8zhlbrap7pbgi1mm"; - }) - (fetchurl { - url = "https://w1.fi/cgit/hostap/patch/?id=b70d508c50e8e2d2b8fb96ae44ae10f84cf0c1ae"; - sha256 = "0pslmsbay2cy1k07w1mdcr0b8w059jkrqrr9zi1aljvkm3vbwhj1"; - }) - - #KRACKAttack.com - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"; - sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"; - sha256 = "1mrmqg00x1bqa43dyhxb14msk74lh3kvr4avni43c3qpfjmlfvfq"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"; - sha256 = "10byyi8wfpcc8i788ag7ndycd3xvq2iwnssyb3rwf34sfcv5wlyl"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"; - sha256 = "02z2rsbh4sw81wsc56xjbblbi76ii0clmpnr1m1szdb1h5s58fkr"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"; - sha256 = "17pbrn5h6l5v14y6gn2yr2knqya9i0n2vyq4ck8hasb00yz8lz0l"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"; - sha256 = "19mgcqbdyzm4myi182jcn1rn26xi3jib74cpxbbrx1gaccxlsvar"; - }) - #(fetchurl { # wpa-supplicant only - # url = "http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch"; - # sha256 = "0di71j8762dkvr0c7h5mrbkqyfdy8mljvnp0dk2qhbgc9bw7m8f5"; - #}) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"; - sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168"; - }) - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libnl openssl sqlite ]; diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index 55bc80a173ea..0fff9ac95c3c 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ openssl attr keyutils asciidoc libxslt ]; + patches = [ ./xattr.patch ]; + buildPhase = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"; meta = { diff --git a/pkgs/os-specific/linux/ima-evm-utils/xattr.patch b/pkgs/os-specific/linux/ima-evm-utils/xattr.patch new file mode 100644 index 000000000000..2d27570a5786 --- /dev/null +++ b/pkgs/os-specific/linux/ima-evm-utils/xattr.patch @@ -0,0 +1,73 @@ +commit 6aea54d2ad2287b3e8894c262ee895f3d4a60516 +Author: André Draszik +Date: Mon Oct 17 12:45:32 2016 +0100 + + evmctl: use correct include for xattr.h + + The xattr API/ABI is provided by both the c-library, as well as by the + libattr package. The c-library's header file is sys/xattr.h, whereas + libattr's header file can be found in attr/xattr.h. + + Given none of the code here *links* against the libattr.so shared library, it + is wrong to *compile* against libattr's API (header file). + + Doing so avoids confusion as to which xattr.h is used as the least problem, + and potential ABI differences as the worst problem due the mismatching header + file used. + + So make sure we compile and link against the same thing, the c-library in + both cases. + + Signed-off-by: André Draszik + Signed-off-by: Mimi Zohar + +diff --git a/configure.ac b/configure.ac +index 0497eb7..a5b4288 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,7 +30,7 @@ AC_SUBST(OPENSSL_LIBS) + AC_CHECK_HEADER(unistd.h) + AC_CHECK_HEADERS(openssl/conf.h) + +-AC_CHECK_HEADERS(attr/xattr.h, , [AC_MSG_ERROR([attr/xattr.h header not found. You need the libattr development package.])]) ++AC_CHECK_HEADERS(sys/xattr.h, , [AC_MSG_ERROR([sys/xattr.h header not found. You need the c-library development package.])]) + AC_CHECK_HEADERS(keyutils.h, , [AC_MSG_ERROR([keyutils.h header not found. You need the libkeyutils development package.])]) + + #debug support - yes for a while +diff --git a/packaging/ima-evm-utils.spec b/packaging/ima-evm-utils.spec +index a11a27a..63388d2 100644 +--- a/packaging/ima-evm-utils.spec ++++ b/packaging/ima-evm-utils.spec +@@ -11,7 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + BuildRequires: autoconf + BuildRequires: automake + BuildRequires: openssl-devel +-BuildRequires: libattr-devel + BuildRequires: keyutils-libs-devel + + %description +diff --git a/packaging/ima-evm-utils.spec.in b/packaging/ima-evm-utils.spec.in +index 7ca6c6f..65c32f9 100644 +--- a/packaging/ima-evm-utils.spec.in ++++ b/packaging/ima-evm-utils.spec.in +@@ -11,7 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + BuildRequires: autoconf + BuildRequires: automake + BuildRequires: openssl-devel +-BuildRequires: libattr-devel + BuildRequires: keyutils-libs-devel + + %description +diff --git a/src/evmctl.c b/src/evmctl.c +index 2ffee78..3fbcd33 100644 +--- a/src/evmctl.c ++++ b/src/evmctl.c +@@ -49,7 +49,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index d604c9ef6b79..38069981723d 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "5.0-63503"; src = fetchzip { - url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip"; + url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/11396/SRB5.0_linux64.zip"; sha256 = "0qbp63l74s0i80ysh9ya8x7r79xkddbbz4378nms9i7a0kprg9p2"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index ff6ce3b4889d..fcb573bef835 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { url = "https://git.netfilter.org/iptables/patch/?id=2908eda10bf9fc81119d4f3ad672c67918ab5955"; sha256 = "1dci4c8b7gcdrf77l2aicrcwlbp320xjz76fhavams0b4kgs6yr3"; }) + (fetchpatch { + url = "https://git.netfilter.org/iptables/patch/iptables/xshared.c?id=2ae1099a42e6a0f06de305ca13a842ac83d4683e"; + name = "CVE-2019-11360.patch"; + sha256 = "0ssk2ad5lfb1ifa6jgk76s4mm68hdkz7g8bjmdzi2yv3l06lf2dp"; + }) ]; nativeBuildInputs = [ bison flex pkgconfig pruneLibtoolFiles ]; diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 7e50babc80aa..387792b86313 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,17 +1,18 @@ {stdenv, fetchurl, libnl, pkgconfig}: stdenv.mkDerivation rec { - name = "iw-4.14"; + pname = "iw"; + version = "5.0.1"; src = fetchurl { - url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz"; - sha256 = "12ddd6vh6vs97135bnlyr0szv7hvpbnmfh48584frzab0z0725ph"; + url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; + sha256 = "03awbfrr9i78vgwsa6z2c8g14mia9z8qzrvzxar2ad9299wylf0y"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libnl ]; - makeFlags = [ "PREFIX=\${out}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = { description = "Tool to use nl80211"; diff --git a/pkgs/os-specific/linux/kbd/keymaps.nix b/pkgs/os-specific/linux/kbd/keymaps.nix index ecb7045ed278..32c9f6906806 100644 --- a/pkgs/os-specific/linux/kbd/keymaps.nix +++ b/pkgs/os-specific/linux/kbd/keymaps.nix @@ -24,7 +24,8 @@ src = fetchurl { name = "neo.map"; - url = "https://svn.neo-layout.org/linux/console/neo.map?r=${version}"; + url = "https://raw.githubusercontent.com/neo-layout/neo-layout/" + + "a0dee06fed824abfad658b7f10e6d907b270be0a/linux/console/neo.map"; sha256 = "19mfrd31vzpsjiwc7pshxm0b0sz5dd17xrz6k079cy4im1vf0r4g"; }; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e8126c23d3d1..65f0ab24480e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -240,7 +240,7 @@ let FANOTIFY = yes; TMPFS = yes; TMPFS_POSIX_ACL = yes; - FS_ENCRYPTION = { optional = true; tristate = whenAtLeast "4.9" "m"; }; + FS_ENCRYPTION = if (versionAtLeast version "5.1") then yes else whenAtLeast "4.9" (option module); EXT2_FS_XATTR = yes; EXT2_FS_POSIX_ACL = yes; @@ -426,6 +426,12 @@ let VFIO_PCI_VGA = mkIf stdenv.is64bit yes; + # VirtualBox guest drivers in the kernel conflict with the ones in the + # official additions package and prevent the vboxsf module from loading, + # so disable them for now. + VBOXGUEST = option no; + DRM_VBOXVIDEO = option no; + } // optionalAttrs (stdenv.isx86_64 || stdenv.isi686) ({ XEN = option yes; @@ -592,6 +598,8 @@ let BLK_DEV_INTEGRITY = yes; + BLK_SED_OPAL = whenAtLeast "4.14" yes; + BSD_PROCESS_ACCT_V3 = yes; BT_HCIUART_BCSP = option yes; @@ -634,6 +642,8 @@ let MLX4_EN_VXLAN = whenOlder "4.8" yes; MLX5_CORE_EN = option yes; + PSI = whenAtLeast "4.20" yes; + MODVERSIONS = whenOlder "4.9" yes; MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension MTRR_SANITIZER = yes; @@ -689,6 +699,9 @@ let # Bump the maximum number of CPUs to support systems like EC2 x1.* # instances and Xeon Phi. NR_CPUS = freeform "384"; + } // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { + PREEMPT = no; + PREEMPT_VOLUNTARY = yes; }; }; in diff --git a/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch b/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch new file mode 100644 index 000000000000..205497aee2da --- /dev/null +++ b/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch @@ -0,0 +1,60 @@ +From 245e0f743d814c9ff2d1c748175e321301eb16cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Thu, 2 May 2019 05:28:08 +0100 +Subject: [PATCH] x86/fpu: Export __kernel_fpu_{begin,end}() + +This partially undo commit: + +12209993 x86/fpu: Don't export __kernel_fpu_{begin,end}() + +We need this symbol in zfs for AES-NI/AVX support. +--- + arch/x86/include/asm/fpu/api.h | 2 ++ + arch/x86/kernel/fpu/core.c | 6 ++++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/arch/x86/include/asm/fpu/api.h b/arch/x86/include/asm/fpu/api.h +index b56d504af6545..7d53388d266ea 100644 +--- a/arch/x86/include/asm/fpu/api.h ++++ b/arch/x86/include/asm/fpu/api.h +@@ -18,6 +18,8 @@ + * If you intend to use the FPU in softirq you need to check first with + * irq_fpu_usable() if it is possible. + */ ++extern void __kernel_fpu_begin(void); ++extern void __kernel_fpu_end(void); + extern void kernel_fpu_begin(void); + extern void kernel_fpu_end(void); + extern bool irq_fpu_usable(void); +diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c +index 2e5003fef51a9..2ea85b32421a0 100644 +--- a/arch/x86/kernel/fpu/core.c ++++ b/arch/x86/kernel/fpu/core.c +@@ -93,7 +93,7 @@ bool irq_fpu_usable(void) + } + EXPORT_SYMBOL(irq_fpu_usable); + +-static void __kernel_fpu_begin(void) ++void __kernel_fpu_begin(void) + { + struct fpu *fpu = ¤t->thread.fpu; + +@@ -111,8 +111,9 @@ static void __kernel_fpu_begin(void) + __cpu_invalidate_fpregs_state(); + } + } ++EXPORT_SYMBOL(__kernel_fpu_begin); + +-static void __kernel_fpu_end(void) ++void __kernel_fpu_end(void) + { + struct fpu *fpu = ¤t->thread.fpu; + +@@ -121,6 +122,7 @@ static void __kernel_fpu_end(void) + + kernel_fpu_enable(); + } ++EXPORT_SYMBOL(__kernel_fpu_end); + + void kernel_fpu_begin(void) + { diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 95050a37d28f..a3b77ee8d96c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.101"; + version = "4.14.141"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16mnrn2lb6xhcmpqx8brk2w4g6igfb1cwkqkpvlnc7003g2zfbql"; + sha256 = "05rs411rw10hhnfzvaxmcik3pq20i1i05shvvra4bv164f0z1f8b"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index ac6b3dad86bb..fb25fbb7ddcd 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.23"; + version = "4.19.69"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "02hkiz5vlx2qhyi1hxar9d1cr2gfnrpjdrjjkh83yzxci9kjb6rd"; + sha256 = "11yrw8ixd5ni9rlpndqsz2ihx6k8qaf35a1lf164lkhaa85pd4f0"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 8edd744ba66c..0d3ce63325f6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.174"; + version = "4.4.190"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0fdsxfwhn1xqic56c4aafxw1rdqy7s4w0inmkhcnh98lj3fi2lmy"; + sha256 = "1rf28cjrrmj7mm8xqlfld6k20ddk15j4mmyarqibjx9pk9acij7y"; }; } // (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 cdebebc74824..0008219efb9a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.158"; + version = "4.9.190"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1vvm2gw5cddy40amxxr1hcw0bis2zldzyicvjhy11wg6j3snk2lc"; + sha256 = "05ha3snfk0vdqk9i27icwpq2if0h2jvshavn69ldwqm4h2h1r2py"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.20.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix similarity index 77% rename from pkgs/os-specific/linux/kernel/linux-4.20.nix rename to pkgs/os-specific/linux/kernel/linux-5.1.nix index 382747b69d95..ad3b292656e9 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.20.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.20.10"; + version = "5.1.21"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -12,7 +12,7 @@ buildLinux (args // rec { extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1y1w3j65n2k4ibn9clapbhy5m2rbyspg2maql7q9k27vmplnppjk"; + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1xj1wfhjz2s5a8j6zx3fsd7rrrkvw5waszzylf2gn3ag6615yjan"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix new file mode 100644 index 000000000000..bf28ac53df09 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "5.2.11"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1y9kn1zny3xpmbi5an3g7hbzywnycys8chfaw6laij1xk4gq6ahc"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index 6bc692385912..df741d9a029b 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -1,10 +1,10 @@ { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.14.94-155"; + version = "4.14.120-160"; # modDirVersion needs to be x.y.z. - modDirVersion = "4.14.94"; + modDirVersion = "4.14.120"; # branchVersion needs to be x.y. extraMeta.branch = "4.14"; @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "hardkernel"; repo = "linux"; rev = version; - sha256 = "1jg4m17y5wkmfmw8y9y9nh14xzw6011gbzlckqabmbazcdpbmf9d"; + sha256 = "0sb7k8kpbm4h98jsqjnjmj0ysp55n9cpczpw0jsg0x0sj9qp73nr"; }; defconfig = "odroidxu4_defconfig"; diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 5267f43a5a5c..e4a4e40f370c 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -4,8 +4,8 @@ # Update this if linux_latest-libre fails to build. # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/ | grep -Eo 'Revision [0-9]+' - rev = "15951"; - sha256 = "196k8zr5xsfnvbrgh9cvr70yfdl9bngxrc4bh0bq3a4w6nnh1cda"; + rev = "16604"; + sha256 = "0d2dh52zv073zr74ilspy0fy3ivys5pq32j7fljs4fwi2bcljf51"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 82326a2ee73f..53478d92dcc8 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.20.2019.02.09"; + version = "4.20.2019.02.20"; modDirVersion = "4.20.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "09a546543006b60d44c4c51e7b40cd3ec7837a5e"; - sha256 = "0p187vp9df0nnhawql0f2bj2sdim0f2b424106d41yxc8ayhz0d9"; + rev = "2d1aed5672ad55f86544cb5352560d5395012136"; + sha256 = "0b4swx0z36y4gglkjwxn3x1q0wknv4k2lbprhbing3ms0d45z9f2"; }; extraConfig = "BCACHEFS_FS m"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index ed6852464445..8ad18aaa4b28 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,17 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; buildLinux (args // rec { - version = "5.0-rc7"; - modDirVersion = "5.0.0-rc7"; - extraMeta.branch = "5.0"; + version = "5.1-rc4"; + extraMeta.branch = "5.1"; + + # modDirVersion needs to be x.y.z, will always add .0 + modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0x5jvv4n9l1gisc0q9m9r7173d9qwpl6crd59fbmasbmvi9lnp41"; + sha256 = "1cqr80b3jfr4g48fpni0pj2p5zs9930q6k6m9xjjdnsrhax1isr6"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 4b570c1fe940..3576a2f4f263 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf +, libelf, cpio , utillinux , writeTextFile }: @@ -277,10 +277,11 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] - ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools - ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf - ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux + ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools + ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf + ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] + ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4c338b37deca..e941cd4ea413 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -57,4 +57,9 @@ rec { sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv"; }; }; + + export_kernel_fpu_functions = rec { + name = "export_kernel_fpu_functions"; + patch = ./export_kernel_fpu_functions.patch; + }; } diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 840d4cc9cf7b..1e5c987d508b 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,6 +1,6 @@ { lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils -, libiberty, audit, libbfd, openssl, systemtap, numactl +, libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl , zlib, withGtk ? false, gtk2 ? null }: @@ -40,6 +40,7 @@ stdenv.mkDerivation { ]; buildInputs = [ elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl + libopcodes ] ++ stdenv.lib.optional withGtk gtk2; # Note: we don't add elfutils to buildInputs, since it provides a diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index 878c3c14fe47..7dcbcbe2e35e 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -48,10 +48,7 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do sed -i "s/sha256 = \".*\"/sha256 = \"$HASH\"/g" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Rewrite the expression - sed -i -e '/version = /d' -e '/modDirVersion = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - if grep -q '^[0-9]\+.[0-9]\+$' <<< "$V"; then - sed -i "\#buildLinux (args // rec {#a \ modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - fi + sed -i -e '/version = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE sed -i "\#buildLinux (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Commit the changes diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/os-specific/linux/ledger-udev-rules/default.nix new file mode 100644 index 000000000000..28027fd4510a --- /dev/null +++ b/pkgs/os-specific/linux/ledger-udev-rules/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ledger-udev-rules"; + version = "unstable-2019-02-13"; + + src = fetchFromGitHub { + owner = "LedgerHQ"; + repo = "udev-rules"; + rev = "20cc1651eb551c4855aaa56628c77eaeb3031c22"; + sha256 = "0riydkc4in10pv4qlrvbg3w78qsvxly5caa3zwyqcmsm5fmprqky"; + }; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + mkdir -p $out/lib/udev/rules.d + cp 20-hw1.rules $out/lib/udev/rules.d/20-ledger.rules + ''; + + meta = with stdenv.lib; { + description = "udev rules for Ledger devices"; + license = licenses.asl20; + maintainers = with maintainers; [ asymmetric ]; + platforms = platforms.linux; + homepage = https://github.com/LedgerHQ/udev-rules; + }; +} diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index cbcab06f56ad..07d6dcb4a5f7 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, libarchive, iucode-tool }: +{ stdenv, fetchFromGitHub, libarchive, iucode-tool }: stdenv.mkDerivation rec { - name = "microcode-intel-${version}"; - version = "20180807a"; + pname = "microcode-intel"; + version = "20190618"; - src = fetchurl { - url = "https://downloadmirror.intel.com/28087/eng/microcode-${version}.tgz"; - sha256 = "0dw1akgzdqk95pwmc8gfdmv7kabw9pn4c67f076bcbn4krliias6"; + src = fetchFromGitHub { + owner = "intel"; + repo = "Intel-Linux-Processor-Microcode-Data-Files"; + rev = "microcode-${version}"; + sha256 = "0fdhrpxvsq0rm5mzj82gvmfb3lm7mhc9hwvimv7dl1jaidbp6lvs"; }; nativeBuildInputs = [ iucode-tool libarchive ]; - sourceRoot = "."; - installPhase = '' runHook preInstall diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index f6f6c10112a7..9490bc911819 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "mwprocapture-1.2.${version}-${kernel.version}"; - version = "3950"; + version = "4054"; src = fetchurl { url = "http://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz"; - sha256 = "1im3k533r6c0dx08h9wjfbhadzk7zawrxxaz7v94c92m3q133ys6"; + sha256 = "0ylx75jcwlqds8w6lm11nxdlzxvy7xlz4rka2k5d6gmqa5fv19c2"; }; nativeBuildInputs = [ kernel.moduleBuildDependencies ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 46ea5a55aa5b..56012aafea9c 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -74,7 +74,9 @@ installPhase() { if [ -n "$bin" ]; then # Install the X drivers. mkdir -p $bin/lib/xorg/modules - cp -p libnvidia-wfb.* $bin/lib/xorg/modules/ + if [ -f libnvidia-wfb.so ]; then + cp -p libnvidia-wfb.* $bin/lib/xorg/modules/ + fi mkdir -p $bin/lib/xorg/modules/drivers cp -p nvidia_drv.so $bin/lib/xorg/modules/drivers mkdir -p $bin/lib/xorg/modules/extensions @@ -129,6 +131,8 @@ installPhase() { for i in nvidia-cuda-mps-control nvidia-cuda-mps-server nvidia-smi nvidia-debugdump; do if [ -e "$i" ]; then install -Dm755 $i $bin/bin/$i + # unmodified binary backup for mounting in containers + install -Dm755 $i $bin/origBin/$i patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $out/lib:$libPath $bin/bin/$i fi diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index d76a1452455f..31c188ebd53e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -16,35 +16,43 @@ let in rec { # Policy: use the highest stable version as the default (on our master). - stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_415 else legacy_390; + stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_418 else legacy_390; # No active beta right now beta = stable; - stable_415 = generic { - version = "415.27"; - sha256_64bit = "12ylf1h1wpgkd0g7r30c33hhhialn315k5sbxyzks0rm42k7cay8"; - settingsSha256 = "0m8hfxb6fhanqlkkk4ayn1blgdsvnn0ipxdl19ifdl200ln6j053"; - persistencedSha256 = "0i6ik6xv6rnwcd6vg5xrxcd9g7nzca3vkiy2srbv0simw86nwgdz"; + stable_418 = generic { + version = "418.74"; + sha256_64bit = "03qj42ppzkc9nphdr9zc12968bb8fc9cpcx5f66y29wnrgg3d1yw"; + settingsSha256 = "15mbqdx5wyk7iq13kl2vd99lykpil618izwpi1kfldlabxdxsi9d"; + persistencedSha256 = "0442qbby0r1b6l72wyw0b3iwvln6k20s6dn0zqlpxafnia9bvc8c"; }; # Last one supporting x86 legacy_390 = generic { - version = "390.87"; - sha256_32bit = "0rlr1f4lnpb8c4qz4w5r8xw5gdy9bzz26qww45qyl1qav3wwaaaw"; - sha256_64bit = "07k1kq8lkgbvjyr2dnbxcz6nppcwpq17wf925w8kfq78345hla9q"; - settingsSha256 = "0xlaiy7jr95z0v2c6cwll89nxnb142pybw7m08jg44r7n13ffv3r"; - persistencedSha256 = "0mhwk321garyl6m12261cj03ycv0qz1sbrlbq6cqwjpq4f1s7h58"; + version = "390.116"; + sha256_32bit = "0aavzi99ps7r6nrchf4h9gw3fkvm2z6wppkqkz5fwcy7x03ky4qk"; + sha256_64bit = "106qc62a7m9imchqfq8rfn8fwyrjxg383354q7z2wr8112fyhyg1"; + settingsSha256 = "0n4pj8dzkr7ccwrn5p46mn59cnijdhg8zmn3idjzrk56pq0hbgjr"; + persistencedSha256 = "0bnjr0smhlwlqpyg9m6lca3b7brl2mw8aypc6p7525dn9d9kv6kb"; - patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch; + patches = [ + (fetchurl { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-4.16.patch?h=2ad07241ea525a6b6b555b6cb96a97634a4b2cb0"; + sha256 = "11b3dp0na496rn13v5q4k66bf61174800g36rcwj42r0xj9cfak2"; + }) + (fetchurl { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-5.1.patch?h=42d50ef8d6048608d18bdf2c296dd335260c5a1a"; + sha256 = "03v46ym2bcckg9q2xrilkg21hfiwypr6gl4jmly2q3m4yza9ja6r"; + })]; }; legacy_340 = generic { version = "340.107"; sha256_32bit = "0mh83affz6bim26ws7kkwwcfj2s6vkdy4d45hifsbshr82qd52wd"; sha256_64bit = "0pv9yv3x0kg9hfkmc50xb54ahxkbnyy2vyy4hj2h0s6m9sb5kqz3"; - settingsSha256 = "1rgaa24acdyqa1rqrx56293vxpskr792njqqpigqmps04llsx703"; - persistencedSha256 = "0nwv6kh4gxgy80x1zs6gcg5hy3amg25xhsfa2v4mwqa36sblxz6l"; + settingsSha256 = "1zf0fy9jj6ipm5vk153swpixqm75iricmx7x49pmr97kzyczaxa7"; + persistencedSha256 = "0v225jkiqk9rma6whxs1a4fyr4haa75bvi52ss3vsyn62zzl24na"; useGLVND = false; patches = [ ./vm_operations_struct-fault.patch ]; @@ -54,7 +62,7 @@ rec { version = "304.137"; sha256_32bit = "1y34c2gvmmacxk2c72d4hsysszncgfndc4s1nzldy2q9qagkg66a"; sha256_64bit = "1qp3jv6279k83k3z96p6vg3dd35y9bhmlyyyrkii7sib7bdmc7zb"; - settingsSha256 = "0i5znfq6jkabgi8xpcy12pdpww6a67i8mq60z1kjq36mmnb25pmi"; + settingsSha256 = "129f0j0hxzjd7g67qwxn463rxp295fsq8lycwm6272qykmab46cj"; persistencedSha256 = null; useGLVND = false; useProfiles = false; diff --git a/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch b/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch deleted file mode 100644 index 58cf06fae45f..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ura a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c ---- a/kernel/nvidia-drm/nvidia-drm-connector.c 2018-09-07 17:38:31.807453997 -0400 -+++ b/kernel/nvidia-drm/nvidia-drm-connector.c 2018-09-07 17:39:22.446185824 -0400 -@@ -226,7 +226,7 @@ - - - if (nv_connector->edid != NULL) { -- drm_mode_connector_update_edid_property( -+ drm_connector_update_edid_property( - connector, nv_connector->edid); - } - -diff -ura a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c ---- a/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-09-07 17:38:31.807453997 -0400 -+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-09-07 17:39:35.083798484 -0400 -@@ -216,7 +216,7 @@ - - /* Attach encoder and connector */ - -- ret = drm_mode_connector_attach_encoder(connector, encoder); -+ ret = drm_connector_attach_encoder(connector, encoder); - - if (ret != 0) { - NV_DRM_DEV_LOG_ERR( diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 474d3a69119c..58fcd0f68b7f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -1,13 +1,15 @@ nvidia_x11: sha256: -{ stdenv, fetchurl, m4 }: +{ stdenv, fetchFromGitHub, m4 }: stdenv.mkDerivation rec { - name = "nvidia-persistenced-${nvidia_x11.version}"; + pname = "nvidia-persistenced"; inherit (nvidia_x11) version; - src = fetchurl { - url = "https://download.nvidia.com/XFree86/nvidia-persistenced/${name}.tar.bz2"; + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nvidia-persistenced"; + rev = nvidia_x11.version; inherit sha256; }; @@ -16,6 +18,11 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; postFixup = '' + # Save a copy of persistenced for mounting in containers + mkdir $out/origBin + cp $out/{bin,origBin}/nvidia-persistenced + patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 $out/origBin/nvidia-persistenced + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-persistenced):${nvidia_x11}/lib" \ $out/bin/nvidia-persistenced ''; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index e2ef51da3803..d6ef55f65f61 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,18 +1,20 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau +{ stdenv, lib, fetchFromGitHub, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau , librsvg, wrapGAppsHook , withGtk2 ? false, withGtk3 ? true }: let - src = fetchurl { - url = "https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${nvidia_x11.version}.tar.bz2"; + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nvidia-settings"; + rev = nvidia_x11.version; inherit sha256; }; libXNVCtrl = stdenv.mkDerivation { - name = "libXNVCtrl-${nvidia_x11.version}"; + pname = "libXNVCtrl"; inherit (nvidia_x11) version; inherit src; @@ -35,7 +37,7 @@ let in stdenv.mkDerivation rec { - name = "nvidia-settings-${nvidia_x11.version}"; + pname = "nvidia-settings"; inherit (nvidia_x11) version; inherit src; diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 58e3f79d42b2..72846e185ebd 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pam_u2f-${version}"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; - sha256 = "1kz7d3vr5dag1d5zq14kcp887p5d0q079dy1sqyl8ndi567asjh3"; + sha256 = "16awjzx348imjz141fzzldy00qpdmw2g37rnq430w5mnzak078jj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index baf24b275626..9b9157255142 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript }: +{ stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript, runtimeShell }: let @@ -11,7 +11,7 @@ let bin = "${drv}${path}"; in assert name != ""; writeScript "setUID-${name}" '' - #!${stdenv.shell} + #!${runtimeShell} inode=$(stat -Lc %i ${bin}) for file in $(type -ap ${name}); do case $(stat -Lc %a $file) in diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 9be17ade149e..e177b284bbda 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -3,8 +3,8 @@ , gobject-introspection }: python3.pkgs.buildPythonApplication rec { - pname = "piper-${version}"; - version = "0.2.902"; + pname = "piper"; + version = "0.2.903"; format = "other"; @@ -12,11 +12,11 @@ python3.pkgs.buildPythonApplication rec { owner = "libratbag"; repo = "piper"; rev = version; - sha256 = "1ny0vf8ym9v040cb5h084k5wwn929fnhq9infbdq8f8vvy61magb"; + sha256 = "0zh4lm074x5gwvx663bapdyv8lf84yjwfg8cpf77rszyja1hx13a"; }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; - buildInputs = [ gtk3 glib gnome3.defaultIconTheme python3 ]; + buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ]; propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; postPatch = '' diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index f24f5a5d06fd..54fdfb354d1f 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Analyze power consumption on Intel-based laptops"; homepage = https://01.org/powertop; license = licenses.gpl2; - maintainers = with maintainers; [ chaoflow fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 272812ccb588..1ed85bc94cb7 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://gitlab.com/procps-ng/procps; description = "Utilities that give information about processes using the /proc filesystem"; - priority = 10; # less than coreutils, which also provides "kill" and "uptime" + priority = 11; # less than coreutils, which also provides "kill" and "uptime" license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.typetetris ]; diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix index 1efbd7bc2c9f..b6c169483393 100644 --- a/pkgs/os-specific/linux/pscircle/default.nix +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pscircle-${version}"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitLab { owner = "mildlyparallel"; repo = "pscircle"; rev = "v${version}"; - sha256 = "1sxdnhkcr26l29nk0zi1zkvkd7128xglfql47rdb1bx940vflgb6"; + sha256 = "0qsif00dkqa8ky3vl2ycx5anx2yk62nrv47f5lrlqzclz91f00fx"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index de23071f0260..f9d6dc99db83 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -10,7 +10,7 @@ # Add a hook script in the managed etc directory, e.g.: # etc = [ # { source = pkgs.writeScript "rtfkill.hook" '' -# #!${stdenv.shell} +# #!${pkgs.runtimeShell} # # if [ "$RFKILL_STATE" -eq "1" ]; then # exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-on @@ -27,9 +27,10 @@ let rfkillHook = substituteAll { - inherit (stdenv) shell; - src = ./rfkill-hook.sh; - }; + inherit (stdenv) shell; + isExecutable = true; + src = ./rfkill-hook.sh; + }; in stdenv.mkDerivation { name = "rfkill-udev"; @@ -39,12 +40,11 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p "$out/etc/udev/rules.d/"; cat > "$out/etc/udev/rules.d/90-rfkill.rules" << EOF - SUBSYSTEM=="rfkill", ATTR{type}=="wlan", RUN+="$out/bin/rfkill-hook.sh" + SUBSYSTEM=="rfkill", ATTR{type}=="wlan", RUN+="$out/bin/rfkill-hook.sh" EOF mkdir -p "$out/bin/"; cp ${rfkillHook} "$out/bin/rfkill-hook.sh" - chmod +x "$out/bin/rfkill-hook.sh"; ''; meta = { diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index 52542aabfded..57544659e868 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { name = "rtl8192eu-${kernel.version}-${version}"; - version = "4.4.1"; + version = "4.4.1.20190319"; src = fetchFromGitHub { owner = "Mange"; repo = "rtl8192eu-linux-driver"; - rev = "4094004"; - sha256 = "0rgcsp8bd5i5ik9b35qipdhq0xd8pva8kdijixxfaxm4vw6kbrvr"; + rev = "0a7199b"; + sha256 = "0xxb8z7fd997ny53bgmf95hyqsmwjplbj6fry0rf65k9x9nggx71"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 9cb28d5dc8dc..ca63c5c6a8df 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8821au-${kernel.version}-${version}"; - version = "5.1.5"; + version = "5.1.5+41"; src = fetchFromGitHub { owner = "zebulon2"; repo = "rtl8812au"; - rev = "61d0cd95afc01eae64da0c446515803910de1a00"; - sha256 = "0dlzyiaa3hmb2qj3lik52px88n4mgrx7nblbm4s0hn36g19ylssw"; + rev = "ecd3494c327c54110d21346ca335ef9e351cb0be"; + sha256 = "1kmdxgbh0s0v9809kdsi39p0jbm5cf10ivy40h8qj9hn70g1gw8q"; }; nativeBuildInputs = [ bc ]; diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/os-specific/linux/service-wrapper/default.nix index 6c9635b3aee4..8adb2e5413c4 100644 --- a/pkgs/os-specific/linux/service-wrapper/default.nix +++ b/pkgs/os-specific/linux/service-wrapper/default.nix @@ -7,6 +7,7 @@ in runCommand "${name}" { script = substituteAll { src = ./service-wrapper.sh; + isExecutable = true; inherit (stdenv) shell; inherit coreutils; }; diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 89375563ae67..039d875060a2 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -17,8 +17,8 @@ buildPythonApplication rec { sha256 = "0iyj35fff93cprjkzbkg9dn5xz8dg5h2kjx3476fl625nxxskndn"; }; - nativeBuildInputs = [ bison flex ]; - buildInputs = [ libsepol swig ]; + nativeBuildInputs = [ bison flex swig ]; + buildInputs = [ libsepol ]; propagatedBuildInputs = [ enum34 libselinux networkx ] ++ optionals withGraphics [ pyqt5 ]; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index d8714d9c1729..4e49256be9fc 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk - +, fetchpatch # Kernel dependencies , kernel }: @@ -10,17 +10,22 @@ assert kernel != null; stdenv.mkDerivation rec { name = "spl-${version}-${kernel.version}"; - version = "0.7.12"; + version = "0.7.13"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "13zqh1g132g63zv54l3bsg5kras9mllkx9wvlnfs13chfr7vpp4p"; + sha256 = "1rzqgiszy8ad2gx20577azp1y5jgad0907slfzl5y2zb05jgaipa"; }; patches = [ ./install_prefix.patch ]; + # Backported fix for 0.7.13 to build with 5.1, please remove when updating to 0.7.14 + postPatch = optionalString (versionAtLeast kernel.version "5.1") '' + sed -i 's/get_ds()/KERNEL_DS/g' module/spl/spl-vnode.c + ''; + nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "fortify" "stackprotector" "pic" ]; diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch index 114ca1231470..566aab828ef7 100644 --- a/pkgs/os-specific/linux/spl/install_prefix.patch +++ b/pkgs/os-specific/linux/spl/install_prefix.patch @@ -136,14 +136,12 @@ index 7faab0a..8148b3d 100644 +kerneldir = @prefix@/libexec/spl/include/vm kernel_HEADERS = $(KERNEL_H) endif -diff --git a/module/Makefile.in b/module/Makefile.in -index d4e62e1..73fa01c 100644 --- a/module/Makefile.in +++ b/module/Makefile.in -@@ -21,15 +21,15 @@ clean: +@@ -21,22 +21,22 @@ modules_install: @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ + $(MAKE) -C @LINUX_OBJ@ M=`pwd` $@ \ - INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ + INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ @@ -160,3 +158,11 @@ index d4e62e1..73fa01c 100644 if [ -f $$sysmap ]; then \ depmod -ae -F $$sysmap @LINUX_VERSION@; \ fi + + modules_uninstall: + @# Uninstall the kernel modules +- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ ++ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ + list='$(subdir-m)'; for subdir in $$list; do \ + $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ + done diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 79a79ac34a0f..fdde2bedf552 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -12,21 +12,13 @@ let in stdenv.mkDerivation rec { name = "sssd-${version}"; - version = "1.16.3"; + version = "1.16.4"; src = fetchurl { url = "https://fedorahosted.org/released/sssd/${name}.tar.gz"; - sha256 = "1i2fq37w0k71xwqcq1i4l3nglmwybc4694xbrccrih33qsh1fpgf"; + sha256 = "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb"; }; - patches = [ - (fetchpatch { - name = "duplicate-case-value.diff"; - url = "https://github.com/SSSD/sssd/commit/1ee12b05570fcfb8.diff"; - sha256 = "01y8i8cfs2gydn84097cl5fynx0db8b0vr345gh57ypp84in3ixw"; - }) - ]; - # Something is looking for instead of NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 33f1bbdd893f..3001c8f07c56 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, cmake, kernel -, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb +, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, c-ares, protobuf, grpc }: with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.24.2"; + version = "0.26.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "16gz6gcp0zfhrqldw9cms38w0x5h3qhlx64dayqgsqbkw914b31a"; + sha256 = "0mvm14s5lyxddf6fcfwrv7vd8r8vfw9z4447jl5mcvji2rnyywqz"; }; nativeBuildInputs = [ cmake perl ]; buildInputs = [ - zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb + zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb c-ares protobuf grpc ] ++ optional (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { ]; preConfigure = '' + cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl") + export INSTALL_MOD_PATH="$out" '' + optionalString (kernel != null) '' export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d4623ccd633d..3edcb92877ac 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -18,7 +18,7 @@ let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); in stdenv.mkDerivation rec { - version = "239.20190110"; + version = "239.20190219"; name = "systemd-${version}"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -27,17 +27,19 @@ in stdenv.mkDerivation rec { owner = "NixOS"; repo = "systemd"; rev = "nixos-v${version}"; - sha256 = "1m9mhv7b4kfa43z79106gpgxx51zlhvvfjrlmimdsvsiw72nzldj"; + sha256 = "0aczg25ih2gfjq810x8rw6rnpr6sw1lz6z0lvlyw2qphyih68b4x"; }; prePatch = let # Upstream's maintenance branches are still too intrusive: # https://github.com/systemd/systemd-stable/tree/v239-stable patches-deb = fetchurl { - # When the URL disappears, it typically means that Debian has new patches - # (probably security) and updating to new tarball will apply them as well. + # This URL should point to a stable location that does not easily + # disappear. In the past we were using `mirror://debian` but that + # eventually causes the files to disappear. While that was a good sign + # for us to update our patch collection it does break reproducibility. name = "systemd-debian-patches.tar.xz"; - url = mirror://debian/pool/main/s/systemd/systemd_239-12~bpo9+1.debian.tar.xz; + url = http://snapshot.debian.org/archive/debian/20190301T035241Z/pool/main/s/systemd/systemd_239-12%7Ebpo9%2B1.debian.tar.xz; sha256 = "0v9f62gyfiw5icdrdlcvjcipsqrsm49w6n8bqp9nb8s2ih6rsfhg"; }; # Note that we skip debian-specific patches, i.e. ./debian/patches/debian/* @@ -218,6 +220,7 @@ in stdenv.mkDerivation rec { description = "A system and service manager for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; + priority = 10; maintainers = [ maintainers.eelco ]; }; } diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 6ad232e0b1dd..13a5f2a2bffb 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts +{ stdenv, lib, fetchFromGitHub, kernel, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, runtimeShell }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.updateScript = import ./update.nix { - inherit stdenv lib writeScript coreutils gnugrep jq curl common-updater-scripts; + inherit stdenv lib writeScript coreutils gnugrep jq curl common-updater-scripts runtimeShell; }; meta = { diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix index 1b6dfd90b1e4..b89912434ec5 100644 --- a/pkgs/os-specific/linux/tp_smapi/update.nix +++ b/pkgs/os-specific/linux/tp_smapi/update.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts }: +{ stdenv, lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts, runtimeShell }: writeScript "update-tp_smapi" '' -#!${stdenv.shell} +#!${runtimeShell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq ]} tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags` diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index e103de3e1b71..02e08bec7ad7 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ] ++ kernel.moduleBuildDependencies; - buildPhase = "make module"; + buildFlags = [ "module" ]; + installTargets = [ "module-install" ]; meta = with stdenv.lib; { inherit (wireguard-tools.meta) homepage license maintainers; diff --git a/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch b/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch deleted file mode 100644 index a186cdad9697..000000000000 --- a/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile -index 0f82af9..70564ff 100644 ---- a/wpa_supplicant/Makefile -+++ b/wpa_supplicant/Makefile -@@ -1558,6 +1558,7 @@ OBJS += $(CONFIG_MAIN).o - ifdef CONFIG_PRIVSEP - OBJS_priv += $(OBJS_d) ../src/drivers/drivers.o - OBJS_priv += $(OBJS_l2) -+OBJS_priv += ../src/crypto/crypto_openssl.o - OBJS_priv += ../src/utils/os_$(CONFIG_OS).o - OBJS_priv += ../src/utils/$(CONFIG_ELOOP).o - OBJS_priv += ../src/utils/common.o diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 176eef3b8615..b2851116ce8e 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, openssl, pkgconfig, libnl +{ stdenv, fetchpatch, fetchurl, openssl, pkgconfig, libnl , dbus, readline ? null, pcsclite ? null }: with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6"; + version = "2.8"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "https://w1.fi/releases/${name}.tar.gz"; - sha256 = "0l0l5gz3d5j9bqjsbjlfcv4w4jwndllp9fmyai4x9kg6qhs6v4xl"; + sha256 = "15ixzm347n8w6gdvi3j3yks3i15qmp6by9ayvswm34d929m372d6"; }; # TODO: Patch epoll so that the dbus actually responds @@ -81,50 +81,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - patches = [ - ./build-fix.patch - - # KRACKAttack.com - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"; - sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"; - sha256 = "1mrmqg00x1bqa43dyhxb14msk74lh3kvr4avni43c3qpfjmlfvfq"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"; - sha256 = "10byyi8wfpcc8i788ag7ndycd3xvq2iwnssyb3rwf34sfcv5wlyl"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"; - sha256 = "02z2rsbh4sw81wsc56xjbblbi76ii0clmpnr1m1szdb1h5s58fkr"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"; - sha256 = "17pbrn5h6l5v14y6gn2yr2knqya9i0n2vyq4ck8hasb00yz8lz0l"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"; - sha256 = "19mgcqbdyzm4myi182jcn1rn26xi3jib74cpxbbrx1gaccxlsvar"; - }) - (fetchurl { # wpa-supplicant only - url = "http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch"; - sha256 = "0di71j8762dkvr0c7h5mrbkqyfdy8mljvnp0dk2qhbgc9bw7m8f5"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"; - sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168"; - }) - - # Unauthenticated EAPOL-Key decryption (CVE-2018-14526) - (fetchurl { - url = "https://w1.fi/security/2018-1/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch"; - sha256 = "0z0zxc9wrikmvciyqpdhx0l5v7qsd8c6b5ph9h5rniqllpr3q34n"; - }) - ]; - postInstall = '' mkdir -p $out/share/man/man5 $out/share/man/man8 cp -v "doc/docbook/"*.5 $out/share/man/man5/ diff --git a/pkgs/os-specific/linux/zfs/build-fixes-unstable.patch b/pkgs/os-specific/linux/zfs/build-fixes-unstable.patch new file mode 100644 index 000000000000..ff2c6e2e1503 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/build-fixes-unstable.patch @@ -0,0 +1,36 @@ +From b323e7a7ebb2327943851fa3fd139399eb24d3dd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Mon, 13 Aug 2018 22:58:21 +0200 +Subject: [PATCH] build fixes needed for nixos + +--- + module/Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/module/Makefile.in b/module/Makefile.in +index 935bd2663..afb08df81 100644 +--- a/module/Makefile.in ++++ b/module/Makefile.in +@@ -44,15 +44,15 @@ clean: + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ M=`pwd` $@ \ +- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ ++ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ + KERNELRELEASE=@LINUX_VERSION@ + @# Remove extraneous build products when packaging +- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ +- if [ -n "$(DESTDIR)" ]; then \ ++ kmoddir=@prefix@$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ ++ if [ -n "@prefix@" ]; then \ + find $$kmoddir -name 'modules.*' | xargs $(RM); \ + fi +- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ ++ sysmap=@prefix@$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi +-- +2.19.2 + diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 73be13e17afe..6fce69161cdf 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -159,17 +159,18 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.20"; + # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "0.7.12"; + version = "0.7.13"; - sha256 = "1j432nb3a86isghdysir9xi6l5djmb5fbc5s9zr0rwg4ziisskbh"; + sha256 = "1l77bq7pvc54vl15pnrjd0njgpf00qjzy0x85dpfh5jxng84x1fb"; extraPatches = [ + # in case this gets out of date, just send Mic92 a pull request! (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch"; - sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh"; + url = "https://github.com/Mic92/zfs/commit/cf23c1d38bfc698a8a729fc0c5f9ca41591f4d95.patch"; + sha256 = "14v3x9ipvg2qd1vyf70nv909jd5zdxlsw5y8k60pfyvwm7g80wr5"; }) ]; @@ -181,16 +182,15 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "0.8.0-rc3"; + # This is now "stable". Move to zfsStable after it's tested more. + version = "0.8.1"; - sha256 = "0wmkis0q2gbj7sgx3ipxngbgzjcf7ay353v3mglf2ay50q4da5i7"; + sha256 = "0wlbziijx08a9bmbyq4gfz4by9l5jrx44g18i99qnfm78k2q8a84"; isUnstable = true; extraPatches = [ - (fetchpatch { - url = "https://github.com/Mic92/zfs/commit/bc29b5783da0af2c80c85126a1831ce1d52bfb69.patch"; - sha256 = "1sdcr1w2jp3djpwlf1f91hrxxmc34q0jl388smdkxh5n5bpw5gzw"; - }) + # in case this gets out of date, just send Mic92 a pull request! + ./build-fixes-unstable.patch ]; spl = null; diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index db80682d8993..ca241192156a 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.13.0"; + version = "6.15.2"; src = fetchurl { - url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "1ckpcb0dq964gwdls5q71260r0i8zxgx8nzv8y4sizr37jvpi8mw"; + url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz"; + sha256 = "01b7k4i38xjjkfjcphylyxhsff6ckgi4nsz6nlw2ax8a3avrmnfd"; }; buildPhase = '' diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 6bde7e187d78..58893f83a923 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "atlassian-crowd-${version}"; - version = "3.3.3"; + version = "3.4.4"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz"; - sha256 = "1mdjxr4p56rlsgnv78bfnlwmniv8hv3hdxnfvqzsmvv88s3z7c66"; + sha256 = "0bs3l2s5f8ymyvvxn6z3wwccbvac42giahmfqiam51m9zkfhf0rk"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 3c7c0dc6156a..408e6d81fac5 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "8.0.1"; + version = "8.1.2"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0cf0j781k23fs3jzrd4ranzvqnhdnza8dbaqxx31dk3p7c7168bw"; + sha256 = "040x4fh8qqhpzgqk25phfkq86vwph9diy871k0dflkmb5ccq5nx6"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index a8db20cede79..a6f1629a4b28 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.11.1"; + version = "0.11.4"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "0v35d3dy0f88wgk1vzznbx7p15vjjf7xm3qfi2c3192rsxgzvy0l"; + sha256 = "1h7zx5gzv40xkxab8pc6hgd9zkpbnhiy1hnldriybpf2ya2lac9a"; }; buildFlagsArray = '' diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index 76d925418550..21a5bad72fc8 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -51,6 +51,6 @@ buildGoPackage rec { maintainers = with maintainers; [ hodapp ]; # 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; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 38d79eb2ba4c..7894ec01d5bd 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "consul-${version}"; - version = "1.4.1"; + version = "1.4.4"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "consul"; inherit rev; - sha256 = "1xd2chx69jdbq2r82d4cgyc8pf1cmmxqvbfz29bf3nvvi6bgq7d5"; + sha256 = "1dg6kdkk2rgzlpvwbxvrlb9mc3z0pg2s5wmhn6da6rs7hq9vdffz"; }; preBuild = '' diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index c7a1a8be1021..0c21c475abd7 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "coturn-${version}"; - version = "4.5.1.0"; + version = "4.5.1.1"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = "${version}"; - sha256 = "16fp9vppdz825949vpqi82iwscc2k4gajw1kl2p9pf3d3mv1flsk"; + sha256 = "12x604lgva1d3g4wvl3f66rdj6lkjk5cqr0l3xas33xgzgm13pwr"; }; buildInputs = [ openssl libevent ]; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 550a8fa13cca..23d19a733452 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl +{ config, stdenv, lib, fetchurl, fetchpatch , perl , libcap, libtool, libxml2, openssl , enablePython ? config.bind.enablePython or false, python3 ? null @@ -8,19 +8,29 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.12.3-P1"; in +let version = "9.12.4-P2"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0wzdbn6ig851354cjdys5q3gvqcvl2gmmih1gzr8ldl7sy4r7dvc"; + sha256 = "1l7wbw3c2fxffaqal062m1bjsxg678dzf7q8bkarwghb1pgn1kmp"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ + [ + # Workaround for missing atomic operations on aarch64. Upstream added the + # below patch after the release. Can probably be dropped with the next + # version. + (fetchpatch { + name = "client-atomics-as-refcount.patch"; + url = https://gitlab.isc.org/isc-projects/bind9/commit/d72f436b7d7c697b262968c48c2d7643069ab17f.diff; + sha256 = "0sidlab9wcv21751fbq3h9m4wy6hk7frag9ar2jndw8rn3axr2qy"; + }) + ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; nativeBuildInputs = [ perl ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 659f8d5dea43..718028b2bc0c 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -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.7.6"; + version = "2.8.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "a1cb1877f04f7c2549c977c2658cfafd07c7e0e924f8e8aa8d4ae4b707f697a2"; + sha256 = "8a62d81e5cf3df938f469b60ed4e46d9161007c2b89fbf7ae07525fa68368bad"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 2affc8ceff25..f5ab35889e80 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,63 +1,83 @@ -{ stdenv, fetchurl, runCommand, pkgconfig, hexdump, which -, knot-dns, luajit, libuv, lmdb, gnutls, nettle -, cmocka, systemd, dns-root-data, makeWrapper +{ stdenv, fetchurl +# native deps. +, runCommand, pkgconfig, meson, ninja, makeWrapper +# build+runtime deps. +, knot-dns, luajitPackages, libuv, gnutls, lmdb, systemd, dns-root-data +# test-only deps. +, cmocka, which, cacert , extraFeatures ? false /* catch-all if defaults aren't enough */ -, luajitPackages }: let # un-indented, over the whole file result = if extraFeatures then wrapped-full else unwrapped; -inherit (stdenv.lib) optional concatStringsSep; +inherit (stdenv.lib) optional optionals concatStringsSep; +lua = luajitPackages; + +# FIXME: remove these usages once resolving +# https://github.com/NixOS/nixpkgs/pull/63108#issuecomment-508670438 +exportLuaPathsFor = luaPkgs: '' + export LUA_PATH='${ concatStringsSep ";" (map lua.getLuaPath luaPkgs)}' + export LUA_CPATH='${concatStringsSep ";" (map lua.getLuaCPath luaPkgs)}' +''; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "3.2.1"; + version = "4.1.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b"; + sha256 = "2fe470f9bb1007667cdd448f758087244b7195a0234c2b100a9beeed0a2d3e68"; }; + # https://gitlab.labs.nic.cz/knot/knot-resolver/issues/496 + postPatch = "sed '/prefill.test.lua/d' -i modules/meson.build"; + outputs = [ "out" "dev" ]; - configurePhase = "patchShebangs scripts/"; + preConfigure = '' + patchShebangs scripts/ + '' + + stdenv.lib.optionalString doInstallCheck (exportLuaPathsFor [ lua.cqueues lua.basexx ]); - nativeBuildInputs = [ pkgconfig which hexdump ]; + nativeBuildInputs = [ pkgconfig meson ninja ]; # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements - buildInputs = [ knot-dns luajit libuv gnutls nettle lmdb ] - ++ optional stdenv.isLinux systemd # sd_notify + buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] + ++ optional stdenv.isLinux systemd # passing sockets, sd_notify ## optional dependencies; TODO: libedit, dnstap ; - checkInputs = [ cmocka ]; - - makeFlags = [ - "PREFIX=$(out)" - "ROOTHINTS=${dns-root-data}/root.hints" - "KEYFILE_DEFAULT=${dns-root-data}/root.ds" + mesonFlags = [ + "-Dkeyfile_default=${dns-root-data}/root.ds" + "-Droot_hints=${dns-root-data}/root.hints" + "-Dinstall_kresd_conf=disabled" # not really useful; examples are inside share/doc/ + "--default-library=static" # not used by anyone + ] + # kres-cache-gc won't work on Darwin before 10.12 due to missing clock_gettime() + ++ optional stdenv.hostPlatform.isDarwin "-Dutils=disabled" + ++ optionals doInstallCheck [ + "-Dunit_tests=enabled" + #"-Dconfig_tests=enabled" #FIXME: check-no-ca-store.diff - as gnutls isn't patched + #"-Dextra_tests=enabled" # not suitable as in-distro tests; many deps, too. ]; - CFLAGS = [ "-O2" "-DNDEBUG" ]; - - enableParallelBuilding = true; - - doCheck = true; - doInstallCheck = false; # FIXME - preInstallCheck = '' - patchShebangs tests/config/runtest.sh - ''; postInstall = '' - rm "$out"/etc/knot-resolver/root.hints # using system-wide instead + rm "$out"/lib/libkres.a + ''; + + # aarch64: see https://github.com/wahern/cqueues/issues/223 + doInstallCheck = with stdenv; hostPlatform == buildPlatform && !hostPlatform.isAarch64; + installCheckInputs = [ cmocka which ]; + installCheckPhase = '' + meson test --print-errorlogs ''; meta = with stdenv.lib; { description = "Caching validating DNS resolver, from .cz domain registry"; homepage = https://knot-resolver.cz; license = licenses.gpl3Plus; - # Platforms using negative pointers for stack won't work ATM due to LuaJIT impl. - platforms = filter (p: p != "aarch64-linux") platforms.unix; + platforms = platforms.unix; maintainers = [ maintainers.vcunat /* upstream developer */ ]; }; }; @@ -75,13 +95,18 @@ wrapped-full = with luajitPackages; let preferLocalBuild = true; allowSubstitutes = false; } - '' + (exportLuaPathsFor luaPkgs + + '' mkdir -p "$out/sbin" "$out/share" makeWrapper '${unwrapped}/sbin/kresd' "$out"/sbin/kresd \ - --set LUA_PATH '${concatStringsSep ";" (map getLuaPath luaPkgs)}' \ - --set LUA_CPATH '${concatStringsSep ";" (map getLuaCPath luaPkgs)}' + --set LUA_PATH "$LUA_PATH" \ + --set LUA_CPATH "$LUA_CPATH" ln -sr '${unwrapped}/share/man' "$out"/share/ ln -sr "$out"/{sbin,bin} - ''; + + echo "Checking that 'http' module loads, i.e. lua search paths work:" + echo "modules.load('http')" > test-http.lua + echo -e 'quit()' | env -i "$out"/bin/kresd -a 127.0.0.1#53535 -c test-http.lua + ''); in result diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index fff678395319..50ac39cd01ed 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "powerdns-${version}"; - version = "4.1.6"; + version = "4.1.10"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "0ggpcvzj90a31qf71m8788ql0hbxnkb9y6c3wgqr9l0qwv8dsgpm"; + sha256 = "1iqmrg0dhf39gr2mq9d8r3s5c6yqkb5mm8grbbla5anajbgcyijs"; }; nativeBuildInputs = [ pkgconfig ]; @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Authoritative DNS server"; homepage = https://www.powerdns.com; - platforms = platforms.linux; - # cannot find postgresql libs on macos x + platforms = platforms.unix; + broken = stdenv.isDarwin; license = licenses.gpl2; maintainers = with maintainers; [ mic92 disassembler ]; }; diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index baed66bb4bdb..92ec5d97dcd5 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "homeassistant-cli"; - version = "0.5.0"; + version = "0.6.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "4ad137d336508ab74840a34b3cc488ad884cc75285f5d7842544df1c3adacf8d"; + sha256 = "0yjqjfqr1gc4c9k5z5i7ngcpcwmyp3lzs4xv7allgqvglmw26ji4"; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 27eff24d7043..4dc9f9f8f010 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -28,10 +28,27 @@ let "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69") (mkOverride "bcrypt" "3.1.5" "136243dc44e5bab9b61206bd46fff3018bd80980b1a1dfbab64a22ff5745957f") - (mkOverride "pyjwt" "1.6.4" - "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176") - (mkOverride "cryptography" "2.3.1" - "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6") + (self: super: { + pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { + version = "1.6.4"; + src = oldAttrs.src.override { + inherit version; + sha256 = "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176"; + }; + doCheck = false; # https://github.com/jpadilla/pyjwt/issues/382 + }); + }) + (self: super: { + cryptography = super.cryptography.overridePythonAttrs (oldAttrs: rec { + version = "2.3.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6"; + }; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ self.idna ]; + checkInputs = with self; [ pytest_3 pretend iso8601 pytz hypothesis ]; + }); + }) (mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1 "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46") (mkOverride "python-slugify" "1.2.6" diff --git a/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch b/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch deleted file mode 100644 index 219187644360..000000000000 --- a/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/esphomeyaml/__main__.py b/esphomeyaml/__main__.py -index 26f42c1..529d2e0 100644 ---- a/esphomeyaml/__main__.py -+++ b/esphomeyaml/__main__.py -@@ -167,13 +167,10 @@ def compile_program(args, config): - - - def upload_using_esptool(config, port): -- import esptool -- - path = os.path.join(CORE.build_path, '.pioenvs', CORE.name, 'firmware.bin') -- cmd = ['esptool.py', '--before', 'default_reset', '--after', 'hard_reset', -+ cmd = ['@esptool@/bin/esptool.py', '--before', 'default_reset', '--after', 'hard_reset', - '--chip', 'esp8266', '--port', port, 'write_flash', '0x0', path] -- # pylint: disable=protected-access -- return run_external_command(esptool._main, *cmd) -+ return run_external_command(*cmd) - - - def upload_program(config, args, host): -diff --git a/esphomeyaml/platformio_api.py b/esphomeyaml/platformio_api.py -index df29491..f991701 100644 ---- a/esphomeyaml/platformio_api.py -+++ b/esphomeyaml/platformio_api.py -@@ -13,12 +13,9 @@ _LOGGER = logging.getLogger(__name__) - - - def run_platformio_cli(*args, **kwargs): -- import platformio.__main__ -- - os.environ["PLATFORMIO_FORCE_COLOR"] = "true" -- cmd = ['platformio'] + list(args) -- return run_external_command(platformio.__main__.main, -- *cmd, **kwargs) -+ cmd = ['@platformio@/bin/platformio'] + list(args) -+ return run_external_command(*cmd, **kwargs) - - - def run_platformio_cli_run(config, verbose, *args, **kwargs): -diff --git a/esphomeyaml/util.py b/esphomeyaml/util.py -index eebb4b7..9e9e58f 100644 ---- a/esphomeyaml/util.py -+++ b/esphomeyaml/util.py -@@ -4,6 +4,7 @@ import io - import logging - import re - import sys -+import subprocess - - _LOGGER = logging.getLogger(__name__) - -@@ -79,42 +80,25 @@ class RedirectText(object): - return True - - --def run_external_command(func, *cmd, **kwargs): -- def mock_exit(return_code): -- raise SystemExit(return_code) -- -- orig_argv = sys.argv -- orig_exit = sys.exit # mock sys.exit -+def run_external_command(*cmd, **kwargs): - full_cmd = u' '.join(shlex_quote(x) for x in cmd) - _LOGGER.info(u"Running: %s", full_cmd) - -- orig_stdout = sys.stdout -- sys.stdout = RedirectText(sys.stdout) -- orig_stderr = sys.stderr -- sys.stderr = RedirectText(sys.stderr) -- - capture_stdout = kwargs.get('capture_stdout', False) - if capture_stdout: -- cap_stdout = sys.stdout = io.BytesIO() -+ cap_stdout = io.BytesIO() -+ else: -+ cap_stdout = sys.stdout - - try: -- sys.argv = list(cmd) -- sys.exit = mock_exit -- return func() or 0 -- except KeyboardInterrupt: -- return 1 -- except SystemExit as err: -- return err.args[0] -+ completed_process = subprocess.run(cmd, -+ stdout=RedirectText(cap_stdout), -+ stderr=RedirectText(sys.stderr)) -+ return completed_process.returncode - except Exception as err: # pylint: disable=broad-except - _LOGGER.error(u"Running command failed: %s", err) - _LOGGER.error(u"Please try running %s locally.", full_cmd) - finally: -- sys.argv = orig_argv -- sys.exit = orig_exit -- -- sys.stdout = orig_stdout -- sys.stderr = orig_stderr -- - if capture_stdout: - # pylint: disable=lost-exception - return cap_stdout.getvalue() -diff --git a/setup.py b/setup.py -index 78a5378..8ce80de 100755 ---- a/setup.py -+++ b/setup.py -@@ -23,12 +23,10 @@ DOWNLOAD_URL = '{}/archive/{}.zip'.format(GITHUB_URL, const.__version__) - - REQUIRES = [ - 'voluptuous>=0.11.1', -- 'platformio>=3.5.3', - 'pyyaml>=3.12', - 'paho-mqtt>=1.3.1', - 'colorlog>=3.1.2', - 'tornado>=5.0.0', -- 'esptool>=2.3.1', - 'typing>=3.0.0', - 'protobuf>=3.4', - 'tzlocal>=1.4', diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/servers/home-assistant/esphome.nix index e089c83239b4..2e0b4abc9391 100644 --- a/pkgs/servers/home-assistant/esphome.nix +++ b/pkgs/servers/home-assistant/esphome.nix @@ -1,29 +1,27 @@ -{ lib, python3, fetchpatch, substituteAll, platformio, esptool }: +{ lib, python3, fetchpatch, platformio, esptool, git }: python3.pkgs.buildPythonApplication rec { - pname = "esphomeyaml"; - version = "1.10.1"; + pname = "esphome"; + version = "1.11.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "426cd545b4e9505ce5b4f5c63d2d54cb038f93fe3ba9d4d56b6b6431b222485d"; + sha256 = "1764q4wyl8qlk2514gikv8178c8fwhhvbw64zkd76nb107hxzrk5"; }; - patches = [ - (substituteAll { - src = ./dont-import-platformio-esptool.patch; - inherit platformio esptool; - }) - ]; - - postPatch = '' - # typing is part of the standard library since Python 3.5 - substituteInPlace setup.py --replace "'typing>=3.0.0'," "" - ''; + ESPHOME_USE_SUBPROCESS = ""; propagatedBuildInputs = with python3.pkgs; [ voluptuous pyyaml paho-mqtt colorlog - tornado protobuf tzlocal pyserial + tornado protobuf tzlocal pyserial ifaddr + ]; + + makeWrapperArgs = [ + # platformio is used in esphomeyaml/platformio_api.py + # esptool is used in esphomeyaml/__main__.py + # git is used in esphomeyaml/writer.py + "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}" + "--set ESPHOME_USE_SUBPROCESS ''" ]; checkPhase = '' @@ -36,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Make creating custom firmwares for ESP32/ESP8266 super easy"; - homepage = https://esphomelib.com/esphomeyaml; + homepage = https://esphome.io/; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 64e57f64236e..5933a71e5159 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.38"; + version = "2.4.39"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0jiriyyf3pm6axf4mrz6c2z08yhs21hb4d23viq87jclm5bmiikx"; + sha256 = "18ngvsjq65qxk3biggnkhkq8jlll9dsg9n3csra9p99sfw2rvjml"; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 19a9be8e86e8..463eacb7573f 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheHttpd, python2 }: +{ stdenv, fetchurl, apacheHttpd, python, ncurses }: stdenv.mkDerivation rec { name = "mod_wsgi-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1q75ifadjd5frr5i2b9swbjiwfv4fr4ny8npsm09w6mjp7w0bgjw"; }; - buildInputs = [ apacheHttpd python2 ]; + buildInputs = [ apacheHttpd python ncurses ]; patchPhase = '' sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \ diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 691ca014257b..614c190127ca 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -64,7 +64,23 @@ stdenv.mkDerivation { preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); - patches = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + patches = [ + # HTTP/2: reject zero length headers with PROTOCOL_ERROR (from 1.16.1) + (fetchpatch { + url = https://github.com/nginx/nginx/commit/dbdd9ffea81d9db46fb88b5eba828f2ad080d388.patch; + sha256 = "a481901729be3ada3ac86f200772f326ef655b3ed0f55a0b1355e16fd4698adc"; + }) + # HTTP/2: limited number of DATA frames (from 1.16.1) + (fetchpatch { + url = https://github.com/nginx/nginx/commit/94c5eb142e58a86f81eb1369fa6fcb96c2f23d6b.patch; + sha256 = "af591ae3c711fc7c58f53ad493899f986dd5dabf3a154f9f597f3059e752c601"; + }) + # HTTP/2: limited number of PRIORITY frames (from 1.16.1) + (fetchpatch { + url = https://github.com/nginx/nginx/commit/39bb3b9d4a33bd03c8ae0134dedc8a7700ae7b2b.patch; + sha256 = "1ad8fecdb343d40224de0f63724a21a691c141f52274439d13eca6d53f0a9128"; + }) + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ (fetchpatch { url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/102-sizeof_test_fix.patch"; sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a"; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 3f4f99acbc65..d7ee0a0af0a9 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.15.8"; - sha256 = "11q7njr0khv8hb96bclyw5f75gvm12nw3jjgmq9rifbym2yazgd8"; + version = "1.15.10"; + sha256 = "0g3wadbf9r730p0j5c0pnsmbmbrwvvnpyzhgbmsf9g2jplx78rdq"; }) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 40d865e2f56c..fded6bdfafba 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -44,13 +44,13 @@ in { tomcat85 = common { versionMajor = "8"; - versionMinor = "5.35"; - sha256 = "0n6agr2wn8m5mv0asz73hy2194n9rk7mh5wsp2pz7aq0andbhh5s"; + versionMinor = "5.42"; + sha256 = "1d90abwwvl0ghr0g0drk48j37wr2zgw74vws9z2rshyzrwgbvgp3"; }; tomcat9 = common { versionMajor = "9"; - versionMinor = "0.13"; - sha256 = "1rsrnmkkrbzrj56jk2wh8hrr79kfkk3fz1j0abk3midn1jnbgxxq"; + versionMinor = "0.21"; + sha256 = "0nsylbqvky4pf3wpsx3a29b85lvwk91ay37mljk9636qffjj1vjh"; }; } diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index dc53ee36f702..f5876687f8e7 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -87,9 +87,28 @@ stdenv.mkDerivation { dontAddPrefix = true; postInstall = ''. ${postInstall}''; postInstallCheck = ''. ${./post-install-check.sh}''; - meta.description = "enterprise-class system for sending and receiving facsimiles"; - meta.homepage = http://hylafax.sourceforge.net; - meta.license = lib.licenses.bsd3; - meta.maintainers = [ lib.maintainers.yarny ]; - meta.platforms = lib.platforms.linux; + meta = { + description = "enterprise-class system for sending and receiving facsimiles"; + downloadPage = https://hylafax.sourceforge.io/download.php; + homepage = https://hylafax.sourceforge.io; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.yarny ]; + platforms = lib.platforms.linux; + longDescription = '' + HylaFAX is a scalable and time-proven solution + for sending and receiving facsimiles via modem(s). + It is based on a client-server architecture, + loosely comparable to CUPS: + A client connects to a server to issue outbound jobs, + the server then chooses a modem to + connect to the receiving fax machine. + The server notifies users about their + outbound jobs as well as about inbound jobs. + HylaFAX+ is a fork of HylaFAX that -- in general -- + contains a superset of the features of + HylaFAX and produces releases more often. + This package contains the client + and the server parts of HylaFAX+. + ''; + }; } diff --git a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch index 1914933c558c..422bfad92e6a 100644 --- a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch +++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch @@ -1,8 +1,8 @@ diff --git a/src/auth/main.c b/src/auth/main.c -index 5a87c57..74bff52 100644 +index 2dbf9e1..b1e778a 100644 --- a/src/auth/main.c +++ b/src/auth/main.c -@@ -194,7 +194,7 @@ static void main_preinit(void) +@@ -192,7 +192,7 @@ static void main_preinit(void) mod_set.debug = global_auth_settings->debug; mod_set.filter_callback = auth_module_filter; @@ -11,7 +11,7 @@ index 5a87c57..74bff52 100644 module_dir_init(modules); if (!worker) -@@ -225,7 +225,7 @@ void auth_module_load(const char *names) +@@ -223,7 +223,7 @@ void auth_module_load(const char *names) mod_set.debug = global_auth_settings->debug; mod_set.ignore_missing = TRUE; @@ -21,19 +21,19 @@ index 5a87c57..74bff52 100644 module_dir_init(modules); } diff --git a/src/config/all-settings.c b/src/config/all-settings.c -index de223a5..2df2d21 100644 +index 4a2ab53..5057d63 100644 --- a/src/config/all-settings.c +++ b/src/config/all-settings.c -@@ -836,7 +836,7 @@ static const struct mail_user_settings mail_user_default_settings = { +@@ -1079,7 +1079,7 @@ static const struct mail_user_settings mail_user_default_settings = { .last_valid_gid = 0, .mail_plugins = "", - .mail_plugin_dir = MODULEDIR, + .mail_plugin_dir = "/etc/dovecot/modules", - .mail_log_prefix = "%s(%u): ", + .mail_log_prefix = "%s(%u)<%{pid}><%{session}>: ", -@@ -3545,7 +3545,7 @@ const struct doveadm_settings doveadm_default_settings = { +@@ -4723,7 +4723,7 @@ const struct doveadm_settings doveadm_default_settings = { .base_dir = PKG_RUNDIR, .libexec_dir = PKG_LIBEXECDIR, .mail_plugins = "", @@ -43,12 +43,12 @@ index de223a5..2df2d21 100644 .auth_socket_path = "auth-userdb", .doveadm_socket_path = "doveadm-server", diff --git a/src/config/config-parser.c b/src/config/config-parser.c -index 2a5009a..134f92b 100644 +index 6894123..07e9fec 100644 --- a/src/config/config-parser.c +++ b/src/config/config-parser.c -@@ -1047,7 +1047,7 @@ void config_parse_load_modules(void) +@@ -1077,7 +1077,7 @@ void config_parse_load_modules(void) - memset(&mod_set, 0, sizeof(mod_set)); + i_zero(&mod_set); mod_set.abi_version = DOVECOT_ABI_VERSION; - modules = module_dir_load(CONFIG_MODULE_DIR, NULL, &mod_set); + modules = module_dir_load("/etc/dovecot/modules/settings", NULL, &mod_set); @@ -56,10 +56,10 @@ index 2a5009a..134f92b 100644 i_array_init(&new_roots, 64); diff --git a/src/dict/main.c b/src/dict/main.c -index e6c945e..06ad6c5 100644 +index 722ed02..4ed12ae 100644 --- a/src/dict/main.c +++ b/src/dict/main.c -@@ -62,7 +62,7 @@ static void main_init(void) +@@ -104,7 +104,7 @@ static void main_init(void) mod_set.abi_version = DOVECOT_ABI_VERSION; mod_set.require_init_funcs = TRUE; @@ -69,10 +69,10 @@ index e6c945e..06ad6c5 100644 /* Register only after loading modules. They may contain SQL drivers, diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c -index df12284..19c18da 100644 +index 88da40c..141ed05 100644 --- a/src/doveadm/doveadm-settings.c +++ b/src/doveadm/doveadm-settings.c -@@ -81,7 +81,7 @@ const struct doveadm_settings doveadm_default_settings = { +@@ -86,7 +86,7 @@ const struct doveadm_settings doveadm_default_settings = { .base_dir = PKG_RUNDIR, .libexec_dir = PKG_LIBEXECDIR, .mail_plugins = "", @@ -82,7 +82,7 @@ index df12284..19c18da 100644 .auth_socket_path = "auth-userdb", .doveadm_socket_path = "doveadm-server", diff --git a/src/lib-fs/fs-api.c b/src/lib-fs/fs-api.c -index b50fbe0..ace3aff 100644 +index a939f61..846cf86 100644 --- a/src/lib-fs/fs-api.c +++ b/src/lib-fs/fs-api.c @@ -114,7 +114,7 @@ static void fs_class_try_load_plugin(const char *driver) @@ -95,10 +95,10 @@ index b50fbe0..ace3aff 100644 module_dir_init(fs_modules); diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream-ssl.c -index a0659ab..dba3729 100644 +index f857ec9..0d1023b 100644 --- a/src/lib-ssl-iostream/iostream-ssl.c +++ b/src/lib-ssl-iostream/iostream-ssl.c -@@ -34,7 +34,7 @@ static int ssl_module_load(const char **error_r) +@@ -53,7 +53,7 @@ int ssl_module_load(const char **error_r) mod_set.abi_version = DOVECOT_ABI_VERSION; mod_set.setting_name = ""; mod_set.require_init_funcs = TRUE; @@ -108,15 +108,28 @@ index a0659ab..dba3729 100644 &mod_set, error_r) < 0) return -1; diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c -index e2233bf..bbf981e 100644 +index b314b52..7055094 100644 --- a/src/lib-storage/mail-storage-settings.c +++ b/src/lib-storage/mail-storage-settings.c -@@ -274,7 +274,7 @@ static const struct mail_user_settings mail_user_default_settings = { +@@ -337,7 +337,7 @@ static const struct mail_user_settings mail_user_default_settings = { .last_valid_gid = 0, .mail_plugins = "", - .mail_plugin_dir = MODULEDIR, + .mail_plugin_dir = "/etc/dovecot/modules", - .mail_log_prefix = "%s(%u): ", + .mail_log_prefix = "%s(%u)<%{pid}><%{session}>: ", +diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c +index 1666ec9..8a27200 100644 +--- a/src/lmtp/lmtp-settings.c ++++ b/src/lmtp/lmtp-settings.c +@@ -89,7 +89,7 @@ static const struct lmtp_settings lmtp_default_settings = { + .login_trusted_networks = "", + + .mail_plugins = "", +- .mail_plugin_dir = MODULEDIR, ++ .mail_plugin_dir = "/etc/dovecot/modules", + }; + + static const struct setting_parser_info *lmtp_setting_dependencies[] = { diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 2d9d2fe0f154..bcec3a535847 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl +{ stdenv, lib, fetchurl, fetchpatch, perl, pkgconfig, systemd, openssl , bzip2, zlib, lz4, inotify-tools, pam, libcap , clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl , nixosTests @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.4.1"; + name = "dovecot-2.3.7.2"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "01xa8d08c0j51w5kmqb3vnzrvh17hkzx5a5p7fb5hgn3wln3x1xq"; + sha256 = "0q0jgcv3ni2znkgyhc966ffphj1wk73y76wssh0yciqafs2f0v36"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 73d6b5d593c9..038b97afaa0d 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, dovecot, openssl }: +{ stdenv, fetchurl, dovecot, openssl, fetchpatch }: stdenv.mkDerivation rec { name = "dovecot-pigeonhole-${version}"; - version = "0.5.4"; + version = "0.5.7.2"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; - sha256 = "05l5y0gc8ycswdbl58j7kbx5gq1z7mjkazjccmgbq6h0gbk9jyal"; + sha256 = "1c0ijjmdskxydmvfk8ixxgg8ndnxx1smvycbp7jjd895a9f0r7fm"; }; buildInputs = [ dovecot openssl ]; + patches = [ + ]; + preConfigure = '' substituteInPlace src/managesieve/managesieve-settings.c --replace \ ".executable = \"managesieve\"" \ diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index f4581023c064..60ff9cab2d3d 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString enableLDAP '' s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1: s:^# \(LOOKUP_LDAP=yes\)$:\1: - s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lldap: - s:^# \(LOOKUP_LIBS\)=.*:\1=-lldap: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lldap -llber: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lldap -llber: ''} ${stdenv.lib.optionalString enableMySQL '' s:^# \(LOOKUP_MYSQL=yes\)$:\1: diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index a418e2af4685..634bba2e57c9 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.3.2"; + version = "3.4.5"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "0nxkszdgs6fs86j6w1lf3vhxvjh1hw2jmrii5icqx9a9xqgg74rw"; + sha256 = "17riwr21i9p1h17wpagfiwkpx9bbx7dy4gpdl219a11akm7saawb"; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index c3fcd13a41f8..431e66e38fb8 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -35,7 +35,7 @@ perlPackages.buildPerlPackage rec { homepage = http://spamassassin.apache.org/; description = "Open-Source Spam Filter"; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ peti qknight ]; }; } diff --git a/pkgs/servers/mail/system-sendmail/default.nix b/pkgs/servers/mail/system-sendmail/default.nix index fe0aeb5b3afa..7bd7df849244 100644 --- a/pkgs/servers/mail/system-sendmail/default.nix +++ b/pkgs/servers/mail/system-sendmail/default.nix @@ -1,7 +1,7 @@ -{ stdenv, writeText }: +{ stdenv, writeText, runtimeShell }: let script = writeText "script" '' - #!${stdenv.shell} + #!${runtimeShell} if command -v sendmail > /dev/null 2>&1 && [ "$(command -v sendmail)" != "{{MYPATH}}" ]; then exec sendmail "$@" diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 46d74c06013d..8245069bbd87 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,8 +1,20 @@ -{ lib, stdenv, python3 -, enableSystemd ? true +{ lib, stdenv, fetchFromGitHub, python3, openssl +, enableSystemd ? stdenv.isLinux }: -with python3.pkgs; +with python3.pkgs.override { + overrides = self: super: { + service-identity = super.service-identity.overrideAttrs (oldAttrs: rec { + version = "18.1.0"; + src = fetchFromGitHub { + owner = "pyca"; + repo = "service_identity"; + rev = version; + sha256 = "1aw475ksmd4vpl8cwfdcsw2v063nbhnnxpy633sb75iqp9aazhlx"; + }; + }); + }; +}; let matrix-synapse-ldap3 = buildPythonPackage rec { @@ -23,13 +35,18 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "0.99.1.1"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1ych13x3c2cam7af4q2ariwvzwvr65g3j2x8ajjn33ydwxxbqbg6"; + sha256 = "0pr17n52vdq490q6c282nqnn51j5k0lf7mzaazpxjy4q86pxdfy5"; }; + patches = [ + # adds an entry point for the service + ./homeserver-script.patch + ]; + propagatedBuildInputs = [ bcrypt bleach @@ -67,16 +84,16 @@ in buildPythonApplication rec { unpaddedbase64 ] ++ lib.optional enableSystemd systemd; - checkInputs = [ mock parameterized ]; + checkInputs = [ mock parameterized openssl ]; checkPhase = '' - PYTHONPATH=".:$PYTHONPATH" trial tests + PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests ''; meta = with stdenv.lib; { homepage = https://matrix.org; description = "Matrix reference homeserver"; license = licenses.asl20; - maintainers = with maintainers; [ ralith roblabla ekleog ]; + maintainers = with maintainers; [ ralith roblabla ekleog pacien ]; }; } diff --git a/pkgs/servers/matrix-synapse/homeserver-script.patch b/pkgs/servers/matrix-synapse/homeserver-script.patch new file mode 100644 index 000000000000..554a2c5f66c1 --- /dev/null +++ b/pkgs/servers/matrix-synapse/homeserver-script.patch @@ -0,0 +1,23 @@ +diff --git a/homeserver b/homeserver +new file mode 120000 +index 000000000..2f1d41351 +--- /dev/null ++++ b/homeserver +@@ -0,0 +1 @@ ++synapse/app/homeserver.py +\ No newline at end of file +diff --git a/setup.py b/setup.py +index 5ce06c898..f1ccd95bc 100755 +--- a/setup.py ++++ b/setup.py +@@ -115,6 +115,6 @@ setup( + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + ], +- scripts=["synctl"] + glob.glob("scripts/*"), ++ scripts=["synctl", "homeserver"] + glob.glob("scripts/*"), + cmdclass={"test": TestCommand}, + ) +-- +2.22.0 + diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 9aa4fc24e4bf..eae547db8b0d 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -1,30 +1,16 @@ -{ lib, fetchpatch, python3 }: +{ lib, python3 }: with python3.pkgs; buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.4.0.post1"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "7a51e55a7f362013ce1cce7d850c65dc8d4651dd05c63004429bc521b461d029"; + sha256 = "fbed41838e1ef7e43f6e47ff38f9906cb311cfc5b3b6bc6f704babd7c83b193d"; }; - patches = [ - (fetchpatch { - url = "https://github.com/tulir/mautrix-telegram/commit/a258c59ca3558ad91b1fee190c624763ca835d2f.patch"; - sha256 = "04z4plsmqmg38rsw9irp5xc9wdgjvg6xba69mixi5v82h9lg3zzp"; - }) - - ./fix_patch_conflicts.patch - - (fetchpatch { - url = "https://github.com/tulir/mautrix-telegram/commit/8021fcc24cbf8c88d9bcb2601333863c9615bd4f.patch"; - sha256 = "0cdfv8ggnjdwdhls1lk6498b233lvnb6175xbxr206km5mxyvqyk"; - }) - ]; - propagatedBuildInputs = [ aiohttp mautrix-appservice @@ -36,10 +22,16 @@ buildPythonPackage rec { python_magic telethon telethon-session-sqlalchemy + pillow + lxml ]; - # No tests available - doCheck = false; + checkInputs = [ + pytest + pytestrunner + pytest-mock + pytest-asyncio + ]; meta = with lib; { homepage = https://github.com/tulir/mautrix-telegram; diff --git a/pkgs/servers/mautrix-telegram/fix_patch_conflicts.patch b/pkgs/servers/mautrix-telegram/fix_patch_conflicts.patch deleted file mode 100644 index 99c902ce03b7..000000000000 --- a/pkgs/servers/mautrix-telegram/fix_patch_conflicts.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/mautrix_telegram/abstract_user.py b/mautrix_telegram/abstract_user.py -index 11273f8..aadaf5d 100644 ---- a/mautrix_telegram/abstract_user.py -+++ b/mautrix_telegram/abstract_user.py -@@ -21,14 +21,14 @@ import logging - import platform - - from sqlalchemy import orm --from telethon.tl.types import Channel, ChannelForbidden, Chat, ChatForbidden, Message, \ -- MessageActionChannelMigrateFrom, MessageService, PeerUser, TypeUpdate, \ -- UpdateChannelPinnedMessage, UpdateChatAdmins, UpdateChatParticipantAdmin, \ -- UpdateChatParticipants, UpdateChatUserTyping, UpdateDeleteChannelMessages, \ -- UpdateDeleteMessages, UpdateEditChannelMessage, UpdateEditMessage, UpdateNewChannelMessage, \ -- UpdateNewMessage, UpdateReadHistoryOutbox, UpdateShortChatMessage, UpdateShortMessage, \ -- UpdateUserName, UpdateUserPhoto, UpdateUserStatus, UpdateUserTyping, User, UserStatusOffline, \ -- UserStatusOnline -+from telethon.tl.patched import MessageService, Message -+from telethon.tl.types import ( -+ Channel, ChannelForbidden, Chat, ChatForbidden, MessageActionChannelMigrateFrom, PeerUser, -+ TypeUpdate, UpdateChannelPinnedMessage, UpdateChatAdmins, UpdateChatParticipantAdmin, -+ UpdateChatParticipants, UpdateChatUserTyping, UpdateDeleteChannelMessages, UpdateDeleteMessages, -+ UpdateEditChannelMessage, UpdateEditMessage, UpdateNewChannelMessage, UpdateNewMessage, -+ UpdateReadHistoryOutbox, UpdateShortChatMessage, UpdateShortMessage, UpdateUserName, -+ UpdateUserPhoto, UpdateUserStatus, UpdateUserTyping, User, UserStatusOffline, UserStatusOnline) - - from mautrix_appservice import MatrixRequestError, AppService - from alchemysession import AlchemySessionContainer diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index ea3fbd58e2eb..824f8ea20259 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "mautrix-unstable-${version}"; - version = "2019-02-11"; + version = "2019-07-04"; goPackagePath = "maunium.net/go/mautrix-whatsapp"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "f689297ba6704265a938951f307b365e829fcfa1"; - sha256 = "1658bika9ylhm64k9lxavp43dxilygn6vx7yn6y1l10j8by2akxk"; + rev = "29f5ae45c4b22f463003b23e355b951831f08b3e"; + sha256 = "12209m3x01i7bnnkg57ag1ivsk6n6pqaqfin7y02irgi3i3rm31r"; }; goDeps = ./deps.nix; diff --git a/pkgs/servers/mautrix-whatsapp/deps.nix b/pkgs/servers/mautrix-whatsapp/deps.nix index 8a1543ac012f..2dd35846bf5d 100644 --- a/pkgs/servers/mautrix-whatsapp/deps.nix +++ b/pkgs/servers/mautrix-whatsapp/deps.nix @@ -1,21 +1,22 @@ +# NOTE: this file isn't entirely generated, while performing the bump +# from 2019-02-24 to 2019-06-01, a lot of stuff broke during `vgo2nix` as the +# tool is unable to parse `replace` statements atm. +# +# The following sources were altered manually: +# * github.com/Rhymen/go-whatsapp -> github.com/tulir/go-whatsapp (at 36ed380bdc18) +# * github.com/golang/protobuf: v1.2.0 -> v1.3.1 +# * maunium.net/go/mautrix: v0.1.0-alpha3 -> ca5d9535b6cc +# * maunium.net/go/mautrix-appservice: v0.1.0-alpha3 -> 6e6c9bb47548 + # file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ - { - goPackagePath = "github.com/Baozisoftware/qrcode-terminal-go"; - fetch = { - type = "git"; - url = "https://github.com/Baozisoftware/qrcode-terminal-go"; - rev = "c0650d8dff0f"; - sha256 = "166h9zy9y7ygayhybg7d080hpdcf1mvkf3rwnq5lqg8i3cg71s7b"; - }; - } { goPackagePath = "github.com/Rhymen/go-whatsapp"; fetch = { type = "git"; - url = "https://github.com/Rhymen/go-whatsapp"; - rev = "2ca6af00572c"; - sha256 = "0lrscj59n9nmd5z0h9r2c952m0da672r3aj33bi443ap0h97w19i"; + url = "https://github.com/tulir/go-whatsapp"; + rev = "36ed380bdc188e35fe804d6dd4809ee170136670"; + sha256 = "1ida4j5hgqc5djwfsaqp8g6iynn150rwj42kqk9q2srwz5075n4p"; }; } { @@ -32,8 +33,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + rev = "v1.3.1"; + sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; }; } { @@ -54,6 +55,15 @@ sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; }; } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.1.1"; + sha256 = "0g64wlg1l1ybq4x44idksl4pgm055s58jxc6r6x4qhqm5q76h0km"; + }; + } { goPackagePath = "github.com/mattn/go-colorable"; fetch = { @@ -82,7 +92,16 @@ }; } { - goPackagePath = "github.com/russross/blackfriday"; + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { + goPackagePath = "gopkg.in/russross/blackfriday.v2"; fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; @@ -113,8 +132,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "ff983b9c42bc"; - sha256 = "1hpr06kzn8jnn3gvzp0p9zn4fz4l9h69f7x66idx142w4xdlaanz"; + rev = "b8fe1690c613"; + sha256 = "1mbfpbrirsz8fsdkibm9l4sccpm774p9201mpmfh4hxshz3girq3"; }; } { @@ -135,15 +154,6 @@ sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; }; } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "48ac38b7c8cb"; - sha256 = "037vs8sdvq310j3b6z9k62zlby1mzmsr9ha01rcy98dv5v8bkhin"; - }; - } { goPackagePath = "gopkg.in/check.v1"; fetch = { @@ -185,8 +195,8 @@ fetch = { type = "git"; url = "https://github.com/tulir/mautrix-go.git"; - rev = "v0.1.0-alpha.3"; - sha256 = "12nlyij57ss2a5d1f1k1vsmjjvxp1fannlrbnp2jsj6rrsq0d2wr"; + rev = "ca5d9535b6ccee8fdf473f9cc935932ef3e53ae7"; + sha256 = "1qrh77c8vh2k6ffwf0cymjmhcp7d0rdad1ixqx5r1xig27f7v0qg"; }; } { @@ -194,8 +204,8 @@ fetch = { type = "git"; url = "https://github.com/tulir/mautrix-appservice-go.git"; - rev = "v0.1.0-alpha.3"; - sha256 = "17y11wgqbrafbq6bnn4rp2lzd50fjz9d6f8j3382jsara7ps95vr"; + rev = "6e6c9bb4754849443cb3c64d9510f8d2eb3e668d"; + sha256 = "1zwsfvgxs2zbc6yvgnk16w2wkh891kihrzar3qzz9cvsgjznlyvy"; }; } ] diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 132f812bf464..b677b6080d1f 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, zlib, patchelf }: +{ stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let bootstrap = fetchurl { @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # otherwise it fails spectacularly. mkdir -p $out/bin cat << EOF > $out/bin/meteor - #!${stdenv.shell} + #!${runtimeShell} if [[ ! -f \$HOME/.meteor/package-metadata/v2.0.1/packages.data.db ]]; then mkdir -p \$HOME/.meteor/package-metadata/v2.0.1 diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 1dcac1f9a822..faec807c4b8e 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "minio-${version}"; - version = "2019-01-31T00-31-19Z"; + version = "2019-02-26T19-51-46Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0rvvjgnbk9khi443bahrg6iqa5lhmv8gydg96vgkrby13r1yy84k"; + sha256 = "1f2c7wzcb47msb0iqrcc0idz39wdm9fz61q835ks1nx4qs6hi2db"; }; goPackagePath = "github.com/minio/minio"; diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 059a6b8f0aaa..8dd294bcdf84 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "airsonic-${version}"; - version = "10.1.2"; + version = "10.2.1"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "0hpk801dipmzsswgx0y6m0xhwn5iz97agnb2bzbr5xhkl4a0d33k"; + sha256 = "1gjyg9qnrckm2gmym13yhlvw0iaspl8x0534zdw558gi3mjykm4v"; }; buildCommand = '' diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index 63925d30c644..f15b7ca2e821 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = https://taskwarrior.org; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ]; }; } diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index 905244833602..c8eb07319245 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { license = licenses.mit; homepage = https://bosun.org; maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 1d8f9ca3c799..87e696d624cd 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,20 +1,22 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.4.3"; + version = "6.3.4"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; + excludedPackages = [ "release_publisher" ]; + src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "11fwb80a9qqlzmg11vw4llfa0mz80jkljg0gmp0sbv6c9jspqncv"; + sha256 = "06xbz6y1vmj44ppm2gbb71qiv8myd5ysygi3s06d6dia07ngw3v2"; }; srcStatic = fetchurl { - url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "141msgrxdn4nmwp6jhh3zg5zcbj82pxdr7ysc5v28rh9paj79yyd"; + url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; + sha256 = "0lhfy3crwis6464icxq0h3hgxvk2dgk6w7k6z2mmaxqm0j15scc8"; }; postPatch = '' @@ -34,7 +36,7 @@ buildGoPackage rec { meta = with lib; { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; license = licenses.asl20; - homepage = https://grafana.org/; + homepage = "https://grafana.com"; maintainers = with maintainers; [ offline fpletz willibutz ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index a0f7341571ce..3e6eaa4766e8 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook -, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl }: +, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl +, runtimeShell }: with stdenv.lib; @@ -50,7 +51,7 @@ in stdenv.mkDerivation rec { preBuild = '' mkdir -p $out cat <<_EOF > $out/share -#!${stdenv.shell} +#!${runtimeShell} exit 0 _EOF chmod 755 $out/share diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 03080376ec2a..548049cdac5d 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,8 +2,8 @@ let goPackagePath = "github.com/prometheus/prometheus"; - - generic = { version, sha256, ... }@attrs: +in rec { + buildPrometheus = { version, sha256, doCheck ? true, ... }@attrs: let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in buildGoPackage ({ name = "prometheus-${version}"; @@ -17,8 +17,6 @@ let inherit sha256; }; - doCheck = true; - buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' -ldflags= -X ${t}.Version=${version} @@ -43,14 +41,14 @@ let platforms = platforms.unix; }; } // attrs'); -in rec { - prometheus_1 = generic { + + prometheus_1 = buildPrometheus { version = "1.8.2"; sha256 = "088flpg3qgnj9afl9vbaa19v2s1d21yxy38nrlv5m7cxwy2pi5pv"; }; - prometheus_2 = generic { - version = "2.6.0"; - sha256 = "1d9zwzs280pw9zspqwp7xx3ji04lfg2v9l5qhrfy3y633ghcmpxz"; + prometheus_2 = buildPrometheus { + version = "2.8.1"; + sha256 = "0x8w0qdh4lcf19nmdlhvgzpy08c2a932d3k49cjwhi5npcsf858n"; }; } diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 6509f55d46ed..3c3835913865 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,8 +1,8 @@ -{ stdenv, go, buildGoPackage, go-bindata, fetchFromGitHub }: +{ stdenv, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "pushgateway-${version}"; - version = "0.4.0"; + version = "0.8.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/pushgateway"; @@ -11,33 +11,39 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "19hsv42addcx4dsjdbh64y7ggjvaaay9gag0342gz7gyl9sr719f"; + sha256 = "1mzwkxnznv6wzy7dc8rksa8gr7z92plrzls8gb8rk432zfqcbv6a"; }; - buildInputs = [ go-bindata ]; - - preBuild = '' - ( - cd "go/src/$goPackagePath" - go-bindata ./resources/ - ) - ''; + buildUser = "nix@nixpkgs"; + buildDate = "19700101-00:00:00"; buildFlagsArray = '' -ldflags= - -X main.buildVersion=${version} - -X main.buildRev=${rev} - -X main.buildBranch=${rev} - -X main.buildUser=nix@nixpkgs - -X main.buildDate=19700101-00:00:00 + -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Version=${version} + -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Revision=${rev} + -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev} + -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser} + -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate} -X main.goVersion=${stdenv.lib.getVersion go} ''; + doInstallCheck = true; + installCheckPhase = '' + export PATH=$PATH:$bin/bin + + pushgateway --help + + # Make sure our -X options were included in the build + for s in ${version} ${rev} ${buildUser} ${buildDate}; do + pushgateway --version 2>&1 | fgrep -q -- "$s" || { echo "pushgateway --version output missing $s"; exit 1; } + done + ''; + meta = with stdenv.lib; { description = "Allows ephemeral and batch jobs to expose metrics to Prometheus"; homepage = https://github.com/prometheus/pushgateway; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz ]; + maintainers = with maintainers; [ benley fpletz ivan ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index c6c52bcbda58..ee3b9d818ce1 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.9.2"; + version = "1.10.2"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "1416nx7mxa0b3bmnkarksicgvw6wja6s8xrf22yzak38qmmrpz2m"; + sha256 = "0g27yczb49xf8nbhkzx7lv8378613afq9qx1gr5yhlpfrl4sgb69"; }; buildFlagsArray = [ ''-ldflags= @@ -28,6 +28,6 @@ buildGoPackage rec { license = licenses.mit; homepage = https://www.influxdata.com/time-series-platform/telegraf/; maintainers = with maintainers; [ mic92 roblabla ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/telegraf/deps-1.9.2.nix b/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix similarity index 92% rename from pkgs/servers/monitoring/telegraf/deps-1.9.2.nix rename to pkgs/servers/monitoring/telegraf/deps-1.10.2.nix index f65115a8622e..2655595ee693 100644 --- a/pkgs/servers/monitoring/telegraf/deps-1.9.2.nix +++ b/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix @@ -90,15 +90,6 @@ sha256 = "0mzw88fdggmrab6yavq702lq2x2k785gy6ag5ryl5n5k6bqnlp13"; }; } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } { goPackagePath = "github.com/alecthomas/units"; fetch = { @@ -153,6 +144,15 @@ sha256 = "000rklq9jx66bbbdklsvm7l9fd9r8d6k3qxx18xfjklblk1v9y19"; }; } + { + goPackagePath = "github.com/caio/go-tdigest"; + fetch = { + type = "git"; + url = "https://github.com/caio/go-tdigest"; + rev = "f3c8d94f65d3096ac96eda54ffcd10c0fe1477f1"; + sha256 = "0w3imv58rhb34x63w8m0k18yr6bnc2bf2rpz23dh82yvdg57nl6r"; + }; + } { goPackagePath = "github.com/cenkalti/backoff"; fetch = { @@ -315,6 +315,15 @@ sha256 = "1qv7iggr4144g4bwqm1slnnjp6zs2dh370p4yfqp7id3sxk3893n"; }; } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "25d852aebe32c875e9c044af3eef9c7dc6bc777f"; + sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz"; + }; + } { goPackagePath = "github.com/go-ini/ini"; fetch = { @@ -329,8 +338,8 @@ fetch = { type = "git"; url = "https://github.com/go-logfmt/logfmt"; - rev = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + rev = "07c9b44f60d7ffdfb7d8efe1ad539965737836dc"; + sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; }; } { @@ -450,6 +459,15 @@ sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny"; }; } + { + goPackagePath = "github.com/harlow/kinesis-consumer"; + fetch = { + type = "git"; + url = "https://github.com/harlow/kinesis-consumer"; + rev = "2f58b136fee036f5de256b81a8461cc724fdf9df"; + sha256 = "1m8ns5gipxxs2fkln494gqy1axhz8393cjan5wkdxc6xfchd0wa5"; + }; + } { goPackagePath = "github.com/hashicorp/consul"; fetch = { @@ -558,6 +576,15 @@ sha256 = "149hwk6nils3vff38znc89vzdnhppp227i7ds14hy1nighjwr77c"; }; } + { + goPackagePath = "github.com/karrick/godirwalk"; + fetch = { + type = "git"; + url = "https://github.com/karrick/godirwalk"; + rev = "2de2192f9e35ce981c152a873ed943b93b79ced4"; + sha256 = "014n3pq9b4m2gx7h3ncf5xk7kw8g89yhbvnfc6dqg006r9q26w4w"; + }; + } { goPackagePath = "github.com/kballard/go-shellquote"; fetch = { @@ -576,6 +603,15 @@ sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; }; } + { + goPackagePath = "github.com/kubernetes/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "d41becfba9ee9bf8e55cec1dd3934cd7cfc04b99"; + sha256 = "0d7akj020fahqgmicig39vfbs1nvkxachwbyw8wk2w90pfsicff1"; + }; + } { goPackagePath = "github.com/leodido/ragel-machinery"; fetch = { @@ -761,8 +797,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "c5b7fccd204277076155f10851dad72b76a49317"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + rev = "505eaef017263e299324067d40ca2c48f6a2cf50"; + sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; }; } { @@ -824,8 +860,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "8048a2e9c5773235122027dd585cf821b2af1249"; - sha256 = "17ri1ijhvg6gxscaw4sy0r5pkcyiqdsf6nn2d4q36hd0nrswvk29"; + rev = "071446942108a03a13cf0717275ad3bdbcb691b4"; + sha256 = "0ai246kqsfm3xlnp4pp4d197djh6jrbjja832f355zhg3l9fqwfp"; }; } { @@ -932,8 +968,17 @@ fetch = { type = "git"; url = "https://github.com/vmware/govmomi"; - rev = "e3a01f9611c32b2362366434bcd671516e78955d"; - sha256 = "0cicd4m8ll7y1n0c97drmvmqwsqaspwpzc6nfp73f887m8ff1xis"; + rev = "3617f28d167d448f93f282a867870f109516d2a5"; + sha256 = "1a82g4vzfgzp8ppcq3dhgv8van85am467ckx788yqk7rj4c3i5ir"; + }; + } + { + goPackagePath = "github.com/wavefronthq/wavefront-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/wavefronthq/wavefront-sdk-go"; + rev = "fa87530cd02a8ad08bd179e1c39fb319a0cc0dae"; + sha256 = "000ynkkpg2m4xynkmdx47asydw66nzp94f276gifws1a90yacay0"; }; } { @@ -976,7 +1021,7 @@ goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; - url = "https://go.googlesource.com/crypto"; + url = "https://github.com/golang/crypto.git"; rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"; sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by"; }; @@ -999,20 +1044,29 @@ sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; }; } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://github.com/golang/sync.git"; + rev = "42b317875d0fa942474b76e1b46a6060d720ae6e"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + }; + } { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"; - sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm"; + rev = "7c4c994c65f702f41ed7d6620a2cb34107576a77"; + sha256 = "19ss1k6id7dc0i61vw9arz03vpvwc2mxwdn99qq2galy0z3b8hbi"; }; } { goPackagePath = "golang.org/x/text"; fetch = { type = "git"; - url = "https://go.googlesource.com/text"; + url = "https://github.com/golang/text.git"; rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; @@ -1053,15 +1107,6 @@ sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3"; }; } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } { goPackagePath = "gopkg.in/asn1-ber.v1"; fetch = { @@ -1098,6 +1143,15 @@ sha256 = "1k4flhx93jbrcsi8k35dcdm7rcq3r8i8my4h8zhf5y9ayhcyph1m"; }; } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://github.com/go-inf/inf"; + rev = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"; + sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; + }; + } { goPackagePath = "gopkg.in/ldap.v2"; fetch = { @@ -1143,4 +1197,4 @@ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } -] +] \ No newline at end of file diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index a8203ce1b168..75a0498dd3f1 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, docbook_xsl, libxslt -, openssl, libuuid, libwebsockets, c-ares, libuv }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, docbook_xsl, libxslt +, openssl, libuuid, libwebsockets, c-ares, libuv +, systemd ? null }: -stdenv.mkDerivation rec { +let + withSystemd = stdenv.isLinux; + +in stdenv.mkDerivation rec { name = "mosquitto-${version}"; - version = "1.5.5"; + version = "1.5.8"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "1sfwmvrglfy5gqfk004kvbjldqr36dqz6xmppbgfhr47j5zs66xc"; + sha256 = "1rf8g6fq7g1mhwsajsgvvlynasybgc51v0qg5j6ynsxfh8yi7s6r"; }; postPatch = '' - substituteInPlace man/manpage.xsl \ - --replace /usr/share/xml/docbook/stylesheet/ ${docbook_xsl}/share/xml/ + for f in html manpage ; do + substituteInPlace man/$f.xsl \ + --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl + done for f in {lib,lib/cpp,src}/CMakeLists.txt ; do - substituteInPlace $f --replace /sbin/ldconfig ldconfig + substituteInPlace $f --replace /sbin/ldconfig true done # the manpages are not generated when using cmake @@ -26,7 +32,9 @@ stdenv.mkDerivation rec { popd ''; - buildInputs = [ openssl libuuid libwebsockets c-ares libuv ]; + buildInputs = [ + openssl libuuid libwebsockets c-ares libuv + ] ++ lib.optional withSystemd systemd; nativeBuildInputs = [ cmake docbook_xsl libxslt ]; @@ -35,7 +43,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_THREADING=ON" "-DWITH_WEBSOCKETS=ON" - ]; + ] ++ lib.optional withSystemd "-DWITH_SYSTEMD=ON"; meta = with stdenv.lib; { description = "An open source MQTT v3.1/3.1.1 broker"; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index e26a97dc6f30..8ed75d0a8d2e 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "15.0.4"; + version = "16.0.3"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0xwg7p31y1pkjk1pzygh9shpqxnfkafrab52j7in7xblq53v0zgq"; + sha256 = "1ww1517i05gaf71szx0qpdc87aczllcb39cvc8c26dm18z76hgx1"; }; installPhase = '' diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index a25eff5b05c9..c4dbbbddffbf 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nginx-sso-${version}"; - version = "0.15.1"; + version = "0.16.0"; rev = "v${version}"; goPackagePath = "github.com/Luzifer/nginx-sso"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "Luzifer"; repo = "nginx-sso"; - sha256 = "0mm6yhm22wf32yl9wvl8fy9m5jjd491khyy4cl73fn381h3n5qi2"; + sha256 = "062ni683x22ss6kj7jmdx0nrhrcgmzsfw24z5l0jj7b4wvpcn02b"; }; postInstall = '' diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 1d3240fae716..7880c6db7fd9 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, mono, v8 }: +{ stdenv, fetchFromGitHub, git, mono, v8, runtimeShell }: # There are some similarities with the pinta derivation. We should # have a helper to make it easy to package these Mono apps. @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib/eventstore/clusternode} cp -r bin/clusternode/* $out/lib/eventstore/clusternode/ cat > $out/bin/clusternode << EOF - #!${stdenv.shell} + #!${runtimeShell} exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@" EOF chmod +x $out/bin/clusternode diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index d6cade72a87e..0ce948c715e0 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "5.0.3"; + version = "5.0.5"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "00iyv4ybcgm5xxcm85lg1p99q7xijm05cpadlxa65chpz3fv9472"; + sha256 = "0xd3ak527cnkz2cn422l2ag9nsa6mhv7y2y49zwqy7fjk6bh0f91"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix index cf807e70596d..36b29b57bf97 100644 --- a/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -65,5 +65,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.asl20; maintainers = with maintainers; [ mdaiter ]; + knownVulnerabilities = [ "CVE-2017-3163 - see https://github.com/NixOS/nixpkgs/issues/33876" ]; }; } diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index a09b4543cbbe..170b0d5f22f9 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { description = "Dynamo inspired NoSQL DB by Basho"; platforms = [ "x86_64-linux" ]; license = licenses.asl20; + knownVulnerabilities = [ "CVE-2017-3163 - see https://github.com/NixOS/nixpkgs/issues/33876" ]; }; } diff --git a/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch b/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch new file mode 100644 index 000000000000..96710d6162d7 --- /dev/null +++ b/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch @@ -0,0 +1,27 @@ +From c1832eabb99cec47f1714f696275285e1e28da34 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Tue, 2 Apr 2019 16:20:50 +0200 +Subject: [PATCH] Don't resolve symlinks when trying to find INSTALL_PATH + +Nix specific patch. This behavior breaks roundcube setups where plugins +are in a store path with symlinks to the actual source. +--- + bin/update.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/update.sh b/bin/update.sh +index 08e3bb5..b2ad498 100755 +--- a/bin/update.sh ++++ b/bin/update.sh +@@ -19,7 +19,7 @@ + +-----------------------------------------------------------------------+ + */ + +-define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' ); ++define('INSTALL_PATH', __DIR__ . '/../' ); + + require_once INSTALL_PATH . 'program/include/clisetup.php'; + +-- +2.19.2 + diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index cda5ae1d6c55..685e856644ea 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -1,14 +1,21 @@ -{ lib, stdenv, fetchzip, buildEnv, roundcube, roundcubePlugins }: -let +{ lib, fetchurl, stdenv, buildEnv, roundcube, roundcubePlugins }: + +stdenv.mkDerivation rec { + pname = "roundcube"; version = "1.3.8"; -in -fetchzip rec { - name= "roundcube-${version}"; - url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "1lhwr13bglm8rqgamnb480b07wpqhw9bskjj2xxb0x8kdjly29ks"; + src = fetchurl { + url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; + sha256 = "018djad7ygfl9c9f2l2j42qkg31ml3hs2f01f0dk361zckwk77n4"; + }; - extraPostFetch = '' + patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; + + dontBuild = true; + + installPhase = '' + mkdir $out + cp -r * $out/ ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php rm -rf $out/installer ''; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 3d421e7a6ecb..4da3ae362c4d 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -20,11 +20,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.7.10"; + version = "4.7.12"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0w5y6a7kiw5ap7hd84yglzk7cjax6lxlszd0wz1sxnmqx4a6hn9l"; + sha256 = "0jmg39xigrh48j39r4f1390kmr1p3xbfxzfabln4b0r9qdmki70f"; }; outputs = [ "out" "dev" "man" ]; @@ -72,7 +72,9 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" ] - ++ optional (!enableDomainController) "--without-ad-dc" + ++ [(if enableDomainController + then "--with-experimental-mit-ad-dc" + else "--without-ad-dc")] ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ] ++ optional (!enableAcl) "--without-acl-support" ++ optional (!enablePam) "--without-pam"; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 07ebf97ab2bf..0d67988e8208 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 = "0sm99m4m4mmigj6ll22kyaw7zkp1s2i0mhzx15fzidnybdnlifb4"; + sha256 = "0zy7awb2cm2fk3c7zc7v8b8pl0jw49awqwpa1jvilmvx6dcml0vb"; }; patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/6.x.nix similarity index 89% rename from pkgs/servers/search/elasticsearch/default.nix rename to pkgs/servers/search/elasticsearch/6.x.nix index d22395e0133a..73bee6c47f3c 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation (rec { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; sha256 = if enableUnfree - then "096i8xiy7mfwlslym9mkjb2f5vqdcqhk65583526rcybqxc2zkqp" - else "0j3q02c4rw8272w07hm64sk5ssmj4gj8s3qigsbrq5pgf8b03fvs"; + then "1a88yyl0x4bsx92m3wjsz1fgm76gbfdzcd4bzp2x652rha667vfh" + else "04fa0fk25d5yxcjdj0bwqvdrswgwj31fwjvbq4gpg66c6bqwzcn6"; }; patches = [ ./es-home-6.x.patch ]; postPatch = '' substituteInPlace bin/elasticsearch-env --replace \ - "ES_CLASSPATH=\"\$ES_HOME/lib/\*\"" \ + "ES_CLASSPATH=\"\$ES_HOME/lib/*\"" \ "ES_CLASSPATH=\"$out/lib/*\"" substituteInPlace bin/elasticsearch-cli --replace \ - "ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/\*\"" \ - "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/\*\"" + "ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/*\"" \ + "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" ''; buildInputs = [ makeWrapper jre_headless utillinux ] diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix new file mode 100644 index 000000000000..a55a43baa0be --- /dev/null +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -0,0 +1,83 @@ +{ elk7Version +, enableUnfree ? true +, stdenv +, fetchurl +, makeWrapper +, jre_headless +, utillinux +, autoPatchelfHook +, zlib +}: + +with stdenv.lib; +let + info = splitString "-" stdenv.hostPlatform.system; + arch = elemAt info 0; + plat = elemAt info 1; + shas = + if enableUnfree + then { + "x86_64-linux" = "1jkfllafcjqhfydsy90jx2ghpv5cmm6gabv206niwg9qc6y6r1ik"; + "x86_64-darwin" = "1lgyxq3yahdww0wpqmpc1mz57kmk5hy2drb1dha69k9l0ibmjf18"; + } + else { + "x86_64-linux" = "0pg22wi2xcjla44azfvn9c58r4xq3x9jiwh7qb0d8f3nv30vfd10"; + "x86_64-darwin" = "0d9xg3bf06mr7mw2bd16gb2xrfjncrhj19846rrj4j5gb2qjz0x2"; + }; +in +stdenv.mkDerivation (rec { + version = elk7Version; + name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz"; + sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + }; + + patches = [ ./es-home-6.x.patch ]; + + postPatch = '' + substituteInPlace bin/elasticsearch-env --replace \ + "ES_CLASSPATH=\"\$ES_HOME/lib/*\"" \ + "ES_CLASSPATH=\"$out/lib/*\"" + + substituteInPlace bin/elasticsearch-cli --replace \ + "ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/*\"" \ + "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" + ''; + + buildInputs = [ makeWrapper jre_headless utillinux ] + ++ optional enableUnfree zlib; + + installPhase = '' + mkdir -p $out + cp -R bin config lib modules plugins $out + + chmod +x $out/bin/* + + wrapProgram $out/bin/elasticsearch \ + --prefix PATH : "${utillinux}/bin/" \ + --set JAVA_HOME "${jre_headless}" + + wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" + ''; + + passthru = { inherit enableUnfree; }; + + meta = { + description = "Open Source, Distributed, RESTful Search Engine"; + license = if enableUnfree then licenses.elastic else licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ apeschar basvandijk ]; + }; +} // optionalAttrs enableUnfree { + dontPatchELF = true; + nativeBuildInputs = [ autoPatchelfHook ]; + runtimeDependencies = [ zlib ]; + postFixup = '' + for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do + echo "patching $exe..." + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe" + done + ''; +}) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 4451b0104464..b87fbcba9fdc 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -1,12 +1,18 @@ -{ pkgs, stdenv, fetchurl, unzip, elasticsearch-oss, javaPackages, elk6Version }: +{ pkgs, lib, stdenv, fetchurl, unzip, javaPackages, elasticsearch }: let + esVersion = elasticsearch.version; + + majorVersion = lib.head (builtins.splitVersion esVersion); + esPlugin = a@{ pluginName, installPhase ? '' mkdir -p $out/config mkdir -p $out/plugins - ES_HOME=$out ${elasticsearch-oss}/bin/elasticsearch-plugin install --batch -v file://$src + ln -s ${elasticsearch}/lib $out/lib + ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin install --batch -v file://$src + rm $out/lib '', ... }: @@ -15,19 +21,25 @@ let unpackPhase = "true"; buildInputs = [ unzip ]; meta = a.meta // { - platforms = elasticsearch-oss.meta.platforms; + platforms = elasticsearch.meta.platforms; maintainers = (a.meta.maintainers or []) ++ (with stdenv.lib.maintainers; [ offline ]); }; }); -in { +in rec { - elasticsearch_analysis_lemmagen = esPlugin rec { + # The following alias is for backwards compatibility with 19.03. + elasticsearch_analysis_lemmagen = analysis-lemmagen; + + analysis-lemmagen = esPlugin rec { name = "elasticsearch-analysis-lemmagen-${version}"; pluginName = "elasticsearch-analysis-lemmagen"; - version = "${elk6Version}"; + version = esVersion; src = fetchurl { - url = "https://github.com/vhyza/elasticsearch-analysis-lemmagen/releases/download/v${version}/${name}-plugin.zip"; - sha256 = "0299ldqwjn1gn44yyjiqjrxvs6mlclhzl1dbn6xlgg1a2lkaal4v"; + url = "https://github.com/vhyza/${pluginName}/releases/download/v${version}/${name}-plugin.zip"; + sha256 = + if version == "7.0.1" then "155zj9zw81msx976c952nk926ndav1zqhmy2xih6nr82qf0p71hm" + else if version == "6.7.2" then "1r176ncjbilkmri2c5rdxh5xqsrn77m1f0p98zs47czwlqh230iq" + else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with stdenv.lib; { homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen; @@ -39,10 +51,14 @@ in { discovery-ec2 = esPlugin rec { name = "elasticsearch-discovery-ec2-${version}"; pluginName = "discovery-ec2"; - version = "${elk6Version}"; + version = esVersion; src = pkgs.fetchurl { - url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/discovery-ec2/discovery-ec2-${elk6Version}.zip"; - sha256 = "1mg9knbc4r21kaiqnmkd8nzf2i23w5zxqnxyz484q0l2jf4hlkq1"; + url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; + sha256 = + if version == "7.0.1" then "0nrvralh4fygs0ys2ikg3x08jdyh9276d5w7yfncbbi0xrg9hk6g" + else if version == "6.7.2" then "1p0cdz3lfksfd2kvlcj0syxhbx27mimsaw8q4kgjpjjjwqayg523" + else if version == "5.6.16" then "1300pfmnlpfm1hh2jgas8j2kqjqiqkxhr8czshj9lx0wl4ciknin" + else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with stdenv.lib; { homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2; @@ -51,17 +67,65 @@ in { }; }; - search_guard = esPlugin rec { - name = "elastic-search-guard-${version}"; + repository-s3 = esPlugin rec { + name = "elasticsearch-repository-s3-${version}"; + pluginName = "repository-s3"; + version = esVersion; + src = pkgs.fetchurl { + url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; + sha256 = + if version == "7.0.1" then "17bf8m1q92j5yhgldckl4hlsfv6qgwwqdc1da9kzgidgky7jwkbc" + else if version == "6.7.2" then "1l353zfyv3qziz8xkann9cbzx4wj5s14wnknfw351j6vgdq26l12" + else if version == "5.6.16" then "0k3li5xv1270ygb9lqk6ji3nngngl2im3z38k08nd627vxdrzij2" + else throw "unsupported version ${version} for plugin ${pluginName}"; + }; + meta = with stdenv.lib; { + homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/repository-s3; + description = "The S3 repository plugin adds support for using AWS S3 as a repository for Snapshot/Restore."; + license = licenses.asl20; + }; + }; + + repository-gcs = esPlugin rec { + name = "elasticsearch-repository-gcs-${version}"; + pluginName = "repository-gcs"; + version = esVersion; + src = pkgs.fetchurl { + url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; + sha256 = + if version == "7.0.1" then "0a3rc2gggsj7xfncil1s53dmq799lcm82h0yncs94jnb182sbmzc" + else if version == "6.7.2" then "0afccbvb7x6y3nrwmal09vpgxyz4lar6lffw4mngalcppsk8irvv" + else if version == "5.6.16" then "0hwqx4yhdn4c0ccdpvgrg30ag8hy3mgxgk7h7pibdmzvy7qw7501" + else throw "unsupported version ${version} for plugin ${pluginName}"; + }; + meta = with stdenv.lib; { + homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/repository-gcs; + description = "The GCS repository plugin adds support for using Google Cloud Storage as a repository for Snapshot/Restore."; + license = licenses.asl20; + }; + }; + + search-guard = let + majorVersion = lib.head (builtins.splitVersion esVersion); + in esPlugin rec { + name = "elasticsearch-search-guard-${version}"; pluginName = "search-guard"; - version = "${elk6Version}-23.2"; - src = fetchurl rec { - url = "mirror://maven/com/floragunn/search-guard-6/${version}/search-guard-6-${version}.zip"; - sha256 = "05310wyxzhylxr0dfgzr10pb0pak30ry8r97g49n6iqj8dw3csnb"; + version = + if esVersion == "7.0.1" then "${esVersion}-35.0.0" + else if esVersion == "6.7.2" then "${esVersion}-25.1" + else if esVersion == "5.6.16" then "${esVersion}-19.3" + else throw "unsupported version ${esVersion} for plugin ${pluginName}"; + src = fetchurl { + url = "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip"; + sha256 = + if version == "7.0.1-35.0.0" then "0wsiqq7j7ph9g2vhhvjmwrh5a2q1wzlysgr75gc35zcvqz6cq8ha" + else if version == "6.7.2-25.1" then "119r1zibi0z40mfxrpkx0zzay0yz6c7syqmmw8i2681wmz4nksda" + else if version == "5.6.16-19.3" then "1q70anihh89c53fnk8wlq9z5dx094j0f9a0y0v2zsqx18lz9ikmx" + else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with stdenv.lib; { homepage = https://github.com/floragunncom/search-guard; - description = "Plugin to fetch data from JDBC sources for indexing into Elasticsearch"; + description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. "; license = licenses.asl20; }; }; diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index aaeb810eca0b..27b4a5123462 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { "--with-alsa" "--with-pipe" "--with-pa" "--with-stdout" "--with-avahi" "--with-ssl=openssl" "--with-soxr" "--without-configfiles" + "--sysconfdir=/etc" ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index ffbeb2fca34c..90768e8f66ee 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -99,6 +99,6 @@ perlPackages.buildPerlPackage rec { # https://github.com/Logitech/slimserver/blob/public/7.9/License.txt license = licenses.unfree; maintainers = [ maintainers.phile314 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 8111991cd38a..3409fc00066f 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "smcroute-${version}"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "troglobit"; repo = "smcroute"; rev = version; - sha256 = "1bdz3dic12lwl3rfczd9bxpgjbpw2g7yap2zddz6dvgkqvyjjf1h"; + sha256 = "0mjq9cx093b0825rqbcq3z0lzy81pd8h0fz6rda6npg3604rxj81"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index c1c70955d1ff..1f5ba6150edc 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -13,13 +13,13 @@ let in buildGoPackage rec { name = "cockroach-${version}"; - version = "2.1.3"; + version = "2.1.5"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "0glk2qg4dq7gzkr6wjamxksjn668zsny8mmd0jph4w7166hm3n0n"; + sha256 = "0bdbkz917175vp28kc513996ik0m61hfbvnqnv0alxv0mfx8djzn"; }; inherit nativeBuildInputs buildInputs; diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index c23bdcd24761..835f2c8d4858 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bison +{ stdenv, fetchurl, cmake, bison, pkgconfig , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl , cctools, CoreServices, developer_cmds }: @@ -6,12 +6,12 @@ let self = stdenv.mkDerivation rec { - name = "mysql-${version}"; - version = "5.7.25"; + pname = "mysql"; + version = "5.7.27"; src = fetchurl { - url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "0gvjcdnba7nf2dx3fbqk1qyg49zclfvaihb78l8h6qc08di1qxak"; + url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz"; + sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' @@ -19,13 +19,11 @@ self = stdenv.mkDerivation rec { export PATH=$PATH:$TMPDIR ''; - nativeBuildInputs = [ cmake bison ]; + nativeBuildInputs = [ cmake bison pkgconfig ]; buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; - enableParallelBuilding = true; - outputs = [ "out" "static" ]; cmakeFlags = [ @@ -76,7 +74,7 @@ self = stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.mysql.com/; + homepage = "https://www.mysql.com/"; description = "The world's most popular open source database"; platforms = platforms.unix; license = with licenses; [ diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index e440f11b2e44..c77330bd2ace 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "percona-server-${version}"; - version = "5.6.35-80.0"; + version = "5.6.43-84.3"; src = fetchurl { url = "https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${version}/source/tarball/percona-server-${version}.tar.gz"; - sha256 = "0szjywx902da09pg8yqj8l2acplmh69hn5smrk45i291qsi5m6r5"; + sha256 = "1cc0lfmpq4pw90bcsszsygw06vd4j4bh3ph5x0yn3z7wddvmjlpw"; }; buildInputs = [ cmake bison ncurses openssl zlib libaio perl ]; @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { postInstall = '' sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db rm -r $out/mysql-test $out/sql-bench $out/data "$out"/lib/*.a - rm $out/share/man/man1/mysql-test-run.pl.1 ''; passthru.mysqlVersion = "5.6"; @@ -57,6 +56,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ grahamc ]; - broken = true; # 2018-04-11 }; } diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index b61382974b7a..1f5069506967 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -157,41 +157,41 @@ let in self: { postgresql_9_4 = self.callPackage generic { - version = "9.4.20"; + version = "9.4.24"; psqlSchema = "9.4"; - sha256 = "0zzqjz5jrn624hzh04drpj6axh30a9k6bgawid6rwk45nbfxicgf"; + sha256 = "0acl1wmah3r1a0qjjmpc256glccrjnzq4pkwklx4d9s6vmkks9aj"; this = self.postgresql_9_4; inherit self; }; postgresql_9_5 = self.callPackage generic { - version = "9.5.15"; + version = "9.5.19"; psqlSchema = "9.5"; - sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv"; + sha256 = "1cqvbsyfs9048wbvdv0vhhaksjyjqv2vvh6ij4vqmjibc4kal34n"; this = self.postgresql_9_5; inherit self; }; postgresql_9_6 = self.callPackage generic { - version = "9.6.11"; + version = "9.6.15"; psqlSchema = "9.6"; - sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q"; + sha256 = "02hp69h2p02asfblkaahblzdz2zmawd2r11h6237y5j7yadgxn9w"; this = self.postgresql_9_6; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.6"; - psqlSchema = "10.0"; - sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38"; + version = "10.10"; + psqlSchema = "10.0"; # should be 10, but changing it is invasive + sha256 = "0lzj46dwd9cw94gnqm36bxd7jlhfdyqjrfzr3c4xd3prfn2rnkxd"; this = self.postgresql_10; inherit self; }; postgresql_11 = self.callPackage generic { - version = "11.2"; - psqlSchema = "11.2"; - sha256 = "01clq2lw0v83zh5dc89xdr3mmap0jr37kdkh401ph6f2177bjxi6"; + version = "11.5"; + psqlSchema = "11.1"; # should be 11, but changing it is invasive + sha256 = "106ikalvrilihlvhq7xj7snq98hgbgq6qsgjrd252wgw1c327pvz"; this = self.postgresql_11; inherit self; }; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix new file mode 100644 index 000000000000..b8ca074f6627 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + pname = "pg_partman"; + version = "4.1.0"; + + buildInputs = [ postgresql ]; + + src = fetchFromGitHub { + owner = "pgpartman"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "0bzv92x492jcwzhal9x4vc3vszixscdpxc6yq5rrqld26dhmsp06"; + }; + + installPhase = '' + mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 + mkdir -p $out/{lib,share/extension} + + cp src/*.so $out/lib + cp updates/* $out/share/extension + cp -r sql/* $out/share/extension + cp *.control $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Partition management extension for PostgreSQL"; + homepage = https://github.com/pgpartman/pg_partman; + maintainers = with maintainers; [ ggpeti ]; + platforms = postgresql.meta.platforms; + license = licenses.postgresql; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index a1ca71d2c8cf..94b71a20abff 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -34,4 +34,6 @@ self: super: { timescaledb = super.callPackage ./ext/timescaledb.nix { }; tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { }; -} \ No newline at end of file + + pg_partman = super.callPackage ./ext/pg_partman.nix { }; +} diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix index 4b6f710242a0..a0d71bdb0dd9 100644 --- a/pkgs/servers/squid/4.nix +++ b/pkgs/servers/squid/4.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap -, expat, libxml2, openssl }: +, expat, libxml2, openssl, fetchpatch }: stdenv.mkDerivation rec { name = "squid-4.4"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "10pfx44mps5ng1806rqdwx8jv8b2n25kjvx37dcd4x2mgzdfc1a9"; }; + patches = [ + (fetchpatch { + name = "4.x-CVE-2019-13345.patch"; + url = "https://github.com/squid-cache/squid/commit/be1dc8614e7514103ba84d4067ed6fd15ab8f82e.patch"; + sha256 = "0vqbnkib695xk5cvldrh993k8387rpghxw3x94la8mq3w7lga9m3"; + }) + ]; + buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 2fdbc29caedf..fde29dc7e80c 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap -, expat, libxml2, openssl }: +, expat, libxml2, openssl, fetchpatch }: stdenv.mkDerivation rec { name = "squid-3.5.28"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1n4f55g56b11qz4fazrnvgzx5wp6b6637c4qkbd1lrjwwqibchgx"; }; + patches = [ + (fetchpatch { + name = "3.5-CVE-2019-13345.patch"; + url = "https://github.com/squid-cache/squid/commit/5730c2b5cb56e7639dc423dd62651c8736a54e35.patch"; + sha256 = "0955432g9a00vwxzcrwpjzx6vywspx1cxhr7bknr7jzbzam5sxi3"; + }) + ]; + buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 0f08d94a052f..9ba60416119c 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -36,6 +36,6 @@ buildGoPackage rec { homepage = "https://gravitational.com/teleport/"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.tomberek ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 98079c37f1f8..e193a3601fdd 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "trezord-go-${version}"; - version = "2.0.25"; + version = "2.0.26"; # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) hardeningDisable = [ "fortify" ]; @@ -13,14 +13,14 @@ buildGoPackage rec { owner = "trezor"; repo = "trezord-go"; rev = "v${version}"; - sha256 = "151szgfbikijpwqrvqj43kw38kbbgx2g1khlbj6l4925qba7fycd"; + sha256 = "0z6x3rf0wm1d7ws1n3m0vq8jmjjki2r9qrq4hkdq4nv61mw4ivyc"; }; meta = with stdenv.lib; { description = "TREZOR Communication Daemon aka TREZOR Bridge"; homepage = https://trezor.io; license = licenses.lgpl3; - maintainers = with maintainers; [ canndrew jb55 maintainers."1000101"]; - platforms = platforms.linux; + maintainers = with maintainers; [ canndrew jb55 "1000101" prusnak ]; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix index 710775f3f16b..d0b279eb859b 100644 --- a/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -14,7 +14,7 @@ installPhase = '' mkdir $out - cp -ra feedly feedly.css $out + cp -ra feedly *.css $out ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 674d96e54622..e05d9e919d17 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -3,7 +3,7 @@ , which, zlib }: let - version = "4.2.7"; + version = "4.2.8"; in stdenv.mkDerivation rec { name = "tvheadend-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "tvheadend"; repo = "tvheadend"; rev = "v${version}"; - sha256 = "09q6lddkld22z9nbxx5v3v3z5yvcnl4lgjirvrdprwkv67fld70g"; + sha256 = "1xq059r2bplaa0nd0wkhw80jfwd962x0h5hgd7fz2yp6largw34m"; }; buildInputs = [ diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 768fdf0b46f8..297a0215aac7 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.8"; + version = "4.9.9"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "16g54372xy5apk485xz9bp1hfci15mssw7m7givls4lpwhc67379"; + sha256 = "0j5af6vicv6zhyjmqnlba10c86qb9nz61wk98985fggwi1dcfjy0"; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index efdf5914e189..e68f5b9d4086 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -44,13 +44,13 @@ in rec { # https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions unifiLTS = generic { - version = "5.6.39"; - sha256 = "025qq517j32r1pnabg2q8lhy65c6qsk17kzw3aijhrc2gpgj2pa7"; + version = "5.6.42"; + sha256 = "0wxkv774pw43c15jk0sg534l5za4j067nr85r5fw58iar3w2l84x"; }; unifiStable = generic { - version = "5.10.17"; - sha256 = "0mkbyz14c0i435afj4wyhnp45hbhvmhvcg02yxd2xs3zmcr8sjgz"; + version = "5.10.23"; + sha256 = "0ak8crx3anxsx4r3b9k0rihgafkgsxj7f64z48nrk1l8m7f0wwxg"; }; unifiTesting = unifiStable; diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/default.nix b/pkgs/servers/web-apps/codimd/CodeMirror/default.nix index e4899597de4f..fa636601ec24 100644 --- a/pkgs/servers/web-apps/codimd/CodeMirror/default.nix +++ b/pkgs/servers/web-apps/codimd/CodeMirror/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, buildEnv, fetchFromGitHub, nodejs-6_x, phantomjs2, which }: +{ stdenv, pkgs, buildEnv, fetchFromGitHub, nodejs-8_x, phantomjs2, which }: let nodePackages = import ./node.nix { @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which ]; - buildInputs = [ nodejs-6_x phantomjs-prebuilt ] ++ (stdenv.lib.attrVals [ + buildInputs = [ nodejs-8_x phantomjs-prebuilt ] ++ (stdenv.lib.attrVals [ "blint-^1" "node-static-0.6.0" "rollup-^0.41.0" diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh b/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh index c42da7340c31..7a9fa8cb1cf1 100755 --- a/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh +++ b/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -node2nix -6 -i deps.json \ +node2nix -8 -i deps.json \ -e ../../../../development/node-packages/node-env.nix \ --no-copy-node-env \ -c node.nix diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix b/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix index a2d475d5831a..8059c901a954 100644 --- a/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix +++ b/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix @@ -13,13 +13,13 @@ let sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; }; }; - "acorn-5.7.1" = { + "acorn-5.7.3" = { name = "acorn"; packageName = "acorn"; - version = "5.7.1"; + version = "5.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz"; - sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz"; + sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; }; }; "acorn-jsx-3.0.1" = { @@ -40,13 +40,13 @@ let sha1 = "48ead0f4a8eb16995a17a0db9ffc6acaada4ba68"; }; }; - "ajv-5.5.2" = { + "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; - version = "5.5.2"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; - sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; }; }; "align-text-0.1.4" = { @@ -148,13 +148,13 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; - "big.js-3.2.0" = { + "big.js-5.2.2" = { name = "big.js"; packageName = "big.js"; - version = "3.2.0"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz"; - sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="; + url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; + sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; "brace-expansion-1.1.11" = { @@ -238,22 +238,13 @@ let sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; }; }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; - }; - }; - "combined-stream-1.0.6" = { + "combined-stream-1.0.7" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; - sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; + sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; }; }; "concat-map-0.0.1" = { @@ -337,13 +328,13 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; - "es6-promise-4.2.4" = { + "es6-promise-4.2.6" = { name = "es6-promise"; packageName = "es6-promise"; - version = "4.2.4"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz"; - sha512 = "/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ=="; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz"; + sha512 = "aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q=="; }; }; "escape-string-regexp-1.0.5" = { @@ -391,13 +382,13 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-1.1.0" = { + "fast-deep-equal-2.0.1" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "1.1.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; - sha1 = "c053477817c86b51daa853c81e059b733d023614"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -427,13 +418,13 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "form-data-2.3.2" = { + "form-data-2.3.3" = { name = "form-data"; packageName = "form-data"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; - sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; "fs-extra-1.0.0" = { @@ -454,13 +445,13 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "graceful-fs-4.1.11" = { + "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.11"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; "har-schema-2.0.0" = { @@ -472,13 +463,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.1.0" = { + "har-validator-5.1.3" = { name = "har-validator"; packageName = "har-validator"; - version = "5.1.0"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz"; - sha512 = "+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA=="; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "has-ansi-2.0.0" = { @@ -598,13 +589,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "json-schema-traverse-0.3.1" = { + "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; - version = "0.3.1"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; "json-stringify-safe-5.0.1" = { @@ -616,13 +607,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "json5-0.5.1" = { + "json5-1.0.1" = { name = "json5"; packageName = "json5"; - version = "0.5.1"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; }; "jsonfile-2.4.0" = { @@ -679,13 +670,13 @@ let sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; }; - "loader-utils-1.1.0" = { + "loader-utils-1.2.3" = { name = "loader-utils"; packageName = "loader-utils"; - version = "1.1.0"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"; - sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz"; + sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA=="; }; }; "longest-1.0.1" = { @@ -715,22 +706,22 @@ let sha1 = "591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"; }; }; - "mime-db-1.35.0" = { + "mime-db-1.38.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.35.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz"; - sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; + sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; - "mime-types-2.1.19" = { + "mime-types-2.1.22" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.19"; + version = "2.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz"; - sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; + sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; }; }; "minimatch-3.0.4" = { @@ -859,13 +850,13 @@ let sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; }; }; - "psl-1.1.29" = { + "psl-1.1.31" = { name = "psl"; packageName = "psl"; - version = "1.1.29"; + version = "1.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz"; - sha512 = "AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; + sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; }; }; "punycode-1.4.1" = { @@ -877,6 +868,15 @@ let sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; "qs-6.5.2" = { name = "qs"; packageName = "qs"; @@ -985,13 +985,13 @@ let sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA=="; }; }; - "sshpk-1.14.2" = { + "sshpk-1.16.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.2"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; - sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; "string_decoder-1.1.1" = { @@ -1093,6 +1093,15 @@ let sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; }; }; + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -1186,7 +1195,7 @@ in sha512 = "6RwH3oJYMujQNd38WWU+jUSRqWfECrmpfL8o3fn3Q3fE9nn5iAktLZJHGEHqeecownbZZwZneTLbaNbIWwU9/A=="; }; dependencies = [ - sources."acorn-5.7.1" + sources."acorn-5.7.3" sources."ansi-styles-1.0.0" sources."chalk-0.4.0" sources."has-color-0.1.7" @@ -1200,7 +1209,7 @@ in homepage = http://github.com/marijnh/blint; }; production = true; - bypassCache = false; + bypassCache = true; }; "node-static-0.6.0" = nodeEnv.buildNodePackage { name = "node-static"; @@ -1216,7 +1225,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "phantomjs-prebuilt-^2.1.12" = nodeEnv.buildNodePackage { name = "phantomjs-prebuilt"; @@ -1227,7 +1236,7 @@ in sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef"; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -1236,28 +1245,27 @@ in sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.6" sources."extend-3.0.2" sources."extract-zip-1.6.7" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fd-slicer-1.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."fs-extra-1.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" - sources."har-validator-5.1.0" + sources."har-validator-5.1.3" sources."hasha-2.2.0" sources."http-signature-1.2.0" sources."inherits-2.0.3" @@ -1268,14 +1276,14 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."kew-0.7.0" sources."klaw-1.3.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."ms-2.0.0" @@ -1286,21 +1294,26 @@ in sources."pinkie-promise-2.0.1" sources."process-nextick-args-2.0.0" sources."progress-1.1.8" - sources."psl-1.1.29" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.88.0" sources."request-progress-2.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" + sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."throttleit-1.0.0" - sources."tough-cookie-2.4.3" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" @@ -1314,7 +1327,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "rollup-^0.41.0" = nodeEnv.buildNodePackage { name = "rollup"; @@ -1335,7 +1348,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "rollup-plugin-buble-^0.15.0" = nodeEnv.buildNodePackage { name = "rollup-plugin-buble"; @@ -1375,7 +1388,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "rollup-watch-^3.2.0" = nodeEnv.buildNodePackage { name = "rollup-watch"; @@ -1395,7 +1408,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "uglify-js-^2.8.15" = nodeEnv.buildNodePackage { name = "uglify-js"; @@ -1430,7 +1443,7 @@ in license = "BSD-2-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; "url-loader-^0.5.7" = nodeEnv.buildNodePackage { name = "url-loader"; @@ -1441,11 +1454,12 @@ in sha512 = "B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q=="; }; dependencies = [ - sources."big.js-3.2.0" + sources."big.js-5.2.2" sources."emojis-list-2.1.0" - sources."json5-0.5.1" - sources."loader-utils-1.1.0" + sources."json5-1.0.1" + sources."loader-utils-1.2.3" sources."mime-1.3.6" + sources."minimist-1.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -1454,6 +1468,6 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/node.nix b/pkgs/servers/web-apps/codimd/CodeMirror/node.nix index 85aedb8a5a4c..7f95c2b88019 100644 --- a/pkgs/servers/web-apps/codimd/CodeMirror/node.nix +++ b/pkgs/servers/web-apps/codimd/CodeMirror/node.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../../development/node-packages/node-env.nix { @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/servers/web-apps/codimd/default.nix b/pkgs/servers/web-apps/codimd/default.nix index c48a9f938bdf..79ad58dddd8d 100644 --- a/pkgs/servers/web-apps/codimd/default.nix +++ b/pkgs/servers/web-apps/codimd/default.nix @@ -1,9 +1,26 @@ { stdenv, pkgs, buildEnv, fetchFromGitHub, makeWrapper -, fetchpatch, nodejs-6_x, phantomjs2 }: +, fetchpatch, nodejs-8_x, phantomjs2, runtimeShell }: let - nodePackages = import ./node.nix { - inherit pkgs; - system = stdenv.system; + nodePackages = let + # Some packages fail to install with ENOTCACHED due to a mistakenly added + # package-lock.json that bundles optional dependencies not resolved with `node2nix. + # See also https://github.com/svanderburg/node2nix/issues/134 + dontInstall = n: v: + if builtins.match ".*babel.*" n == null + then v + else v.override { dontNpmInstall = true; }; + + packages = stdenv.lib.mapAttrs (dontInstall) ( + import ./node.nix { + inherit pkgs; + system = stdenv.system; + } + ); + in packages // { + "js-url-^2.3.0" = packages."js-url-^2.3.0".overrideAttrs (_: { + # Don't download chromium (this isn't needed anyway for our case). + PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "1"; + }); }; addPhantomjs = (pkgs: @@ -14,12 +31,17 @@ let drvName = drv: (builtins.parseDrvName drv).name; linkNodeDeps = ({ pkg, deps, name ? "" }: - nodePackages.${pkg}.override (oldAttrs: { - postInstall = stdenv.lib.concatStringsSep "\n" (map (dep: '' - ln -s ${nodePackages.${dep}}/lib/node_modules/${drvName dep} \ - $out/lib/node_modules/${if name != "" then name else drvName pkg}/node_modules - '') deps - ); + let + targetModule = if name != "" then name else drvName pkg; + in nodePackages.${pkg}.override (oldAttrs: { + postInstall = '' + mkdir -p $out/lib/node_modules/${targetModule}/node_modules + ${stdenv.lib.concatStringsSep "\n" (map (dep: '' + ln -s ${nodePackages.${dep}}/lib/node_modules/${drvName dep} \ + $out/lib/node_modules/${targetModule}/node_modules/${drvName dep} + '') deps + )} + ''; }) ); @@ -43,8 +65,6 @@ let linkNodeDeps args ) [ { pkg = "select2-^3.5.2-browserify"; deps = [ "url-loader-^0.5.7" ]; } - { pkg = "js-sequence-diagrams-^1000000.0.6"; - deps = [ "lodash-^4.17.4" ]; } { pkg = "ionicons-~2.0.1"; deps = [ "url-loader-^0.5.7" "file-loader-^0.9.0" ]; } { pkg = "font-awesome-^4.7.0"; @@ -66,18 +86,34 @@ let name = "codimd-env"; paths = pkgsWithPhantomjs ++ pkgsWithExtraDeps ++ [ codemirror + + # `js-sequence-diagrams` has been removed from the registry + # and replaced by a security holding package (the tarballs weren't published by + # upstream as upstream only supports bower, + # see https://github.com/bramp/js-sequence-diagrams/issues/212). + # + # As the tarballs are still there, we build this manually for now until codimd's upstream + # has resolved the issue. + (import ./js-sequence-diagrams { + inherit pkgs; + nodejs = nodejs-8_x; + extraNodePackages = { + lodash = nodePackages."lodash-^4.17.4"; + eve = nodePackages."eve-^0.5.4"; + }; + }) ] ++ filterNodePackagesToList [ "bootstrap" "codemirror-git+https://github.com/hackmdio/CodeMirror.git" "font-awesome" "ionicons" - "js-sequence-diagrams" "js-url" "markdown-it" "markdown-pdf" -"node-uuid" + "node-uuid" "raphael-git+https://github.com/dmitrybaranovskiy/raphael" "select2-browserify" + "url-loader" ] nodePackages; }; @@ -107,7 +143,7 @@ stdenv.mkDerivation rec { inherit name version src; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ nodejs-6_x ]; + buildInputs = [ nodejs-8_x ]; NODE_PATH = "${nodeEnv}/lib/node_modules"; @@ -118,6 +154,12 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + # due to the `dontNpmInstall` workaround, `node_modules/.bin` isn't created anymore. + substituteInPlace package.json \ + --replace "webpack --config" "${nodejs-8_x}/bin/node ./node_modules/webpack/bin/webpack.js --config" + ''; + buildPhase = '' ln -s ${nodeEnv}/lib/node_modules node_modules npm run build @@ -126,8 +168,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cat > $out/bin/codimd <=4.14" = nodeEnv.buildNodePackage { name = "express"; packageName = "express"; - version = "4.16.3"; + version = "4.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.16.3.tgz"; - sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; + url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz"; + sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg=="; }; dependencies = [ sources."accepts-1.3.5" sources."array-flatten-1.1.1" - sources."body-parser-1.18.2" + sources."body-parser-1.18.3" sources."bytes-3.0.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" @@ -14467,31 +15190,26 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."http-errors-1.6.3" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.23" sources."inherits-2.0.3" sources."ipaddr.js-1.8.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."on-finished-2.3.0" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-2.0.4" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."range-parser-1.2.0" - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."setprototypeof-1.0.3" - ]; - }) - sources."safe-buffer-5.1.1" + sources."raw-body-2.3.3" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."send-0.16.2" sources."serve-static-1.13.2" sources."setprototypeof-1.1.0" @@ -14508,7 +15226,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "express-session-^1.14.2" = nodeEnv.buildNodePackage { name = "express-session"; @@ -14525,7 +15243,7 @@ in sources."debug-2.6.9" sources."depd-1.1.2" sources."ms-2.0.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."parseurl-1.3.2" sources."random-bytes-1.0.0" sources."uid-safe-2.1.5" @@ -14538,7 +15256,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "file-saver-^1.3.3" = nodeEnv.buildNodePackage { name = "file-saver"; @@ -14555,7 +15273,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "flowchart.js-^1.6.4" = nodeEnv.buildNodePackage { name = "flowchart.js"; @@ -14576,7 +15294,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "font-awesome-^4.7.0" = nodeEnv.buildNodePackage { name = "font-awesome"; @@ -14593,7 +15311,7 @@ in license = "(OFL-1.1 AND MIT)"; }; production = true; - bypassCache = false; + bypassCache = true; }; "formidable-^1.0.17" = nodeEnv.buildNodePackage { name = "formidable"; @@ -14610,7 +15328,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "gist-embed-~2.6.0" = nodeEnv.buildNodePackage { name = "gist-embed"; @@ -14627,15 +15345,15 @@ in license = "BSD-2-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; "graceful-fs-^4.1.11" = nodeEnv.buildNodePackage { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.11"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; buildInputs = globalBuildInputs; meta = { @@ -14644,46 +15362,24 @@ in license = "ISC"; }; production = true; - bypassCache = false; + bypassCache = true; }; "handlebars-^4.0.6" = nodeEnv.buildNodePackage { name = "handlebars"; packageName = "handlebars"; - version = "4.0.11"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz"; - sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz"; + sha512 = "3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA=="; }; dependencies = [ - sources."align-text-0.1.4" - sources."amdefine-1.0.1" - sources."async-1.5.2" - sources."camelcase-1.2.1" - sources."center-align-0.1.3" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) - sources."decamelize-1.2.0" - sources."is-buffer-1.1.6" - sources."kind-of-3.2.2" - sources."lazy-cache-1.0.4" - sources."longest-1.0.1" + sources."commander-2.19.0" sources."minimist-0.0.10" + sources."neo-async-2.6.0" sources."optimist-0.6.1" - sources."repeat-string-1.6.1" - sources."right-align-0.1.3" - sources."source-map-0.4.4" - (sources."uglify-js-2.8.29" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."uglify-to-browserify-1.0.2" - sources."window-size-0.1.0" + sources."source-map-0.6.1" + sources."uglify-js-3.5.3" sources."wordwrap-0.0.3" - sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -14692,30 +15388,32 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "helmet-^3.3.0" = nodeEnv.buildNodePackage { name = "helmet"; packageName = "helmet"; - version = "3.13.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-3.13.0.tgz"; - sha512 = "rCYnlbOBkeP6fCo4sXZNu91vIAWlbVgolwnUANtnzPANRf2kJZ2a6yjRnCqG23Tyl2/ExvJ8bDg4xUdNCIWnrw=="; + url = "https://registry.npmjs.org/helmet/-/helmet-3.16.0.tgz"; + sha512 = "rsTKRogc5OYGlvSHuq5QsmOsOzF6uDoMqpfh+Np8r23+QxDq+SUx90Rf8HyIKQVl7H6NswZEwfcykinbAeZ6UQ=="; }; dependencies = [ sources."camelize-1.0.0" sources."content-security-policy-builder-2.0.0" sources."dasherize-2.0.0" + sources."depd-2.0.0" sources."dns-prefetch-control-0.1.0" sources."dont-sniff-mimetype-1.0.0" sources."expect-ct-0.1.1" + sources."feature-policy-0.2.0" sources."frameguard-3.0.0" sources."helmet-crossdomain-0.3.0" sources."helmet-csp-2.7.1" sources."hide-powered-by-1.0.0" sources."hpkp-2.0.0" - sources."hsts-2.1.0" - sources."ienoopen-1.0.0" + sources."hsts-2.2.0" + sources."ienoopen-1.1.0" sources."nocache-2.0.0" sources."platform-1.3.5" sources."referrer-policy-1.1.0" @@ -14728,7 +15426,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "highlight.js-~9.12.0" = nodeEnv.buildNodePackage { name = "highlight.js"; @@ -14745,7 +15443,7 @@ in license = "BSD-3-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; "i18n-^0.8.3" = nodeEnv.buildNodePackage { name = "i18n"; @@ -14759,7 +15457,11 @@ in sources."abbrev-1.1.1" (sources."ambi-2.5.0" // { dependencies = [ - sources."typechecker-4.5.0" + (sources."typechecker-4.7.0" // { + dependencies = [ + sources."editions-2.1.3" + ]; + }) ]; }) sources."async-1.5.2" @@ -14767,9 +15469,14 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."csextends-1.2.0" - sources."debug-3.1.0" + sources."debug-4.1.1" sources."eachr-2.0.4" sources."editions-1.3.4" + (sources."errlop-1.1.1" // { + dependencies = [ + sources."editions-2.1.3" + ]; + }) (sources."extendr-2.1.0" // { dependencies = [ sources."typechecker-2.0.8" @@ -14781,7 +15488,7 @@ in ]; }) sources."glob-6.0.4" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."ignorefs-1.2.0" sources."ignorepatterns-1.1.0" sources."inflight-1.0.6" @@ -14791,14 +15498,15 @@ in sources."messageformat-0.3.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."ms-2.0.0" - sources."mustache-2.3.0" + sources."ms-2.1.1" + sources."mustache-3.0.1" sources."nopt-3.0.6" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."safefs-3.2.2" sources."scandirectory-2.5.0" - sources."sprintf-js-1.1.1" + sources."semver-5.7.0" + sources."sprintf-js-1.1.2" sources."taskgroup-4.3.1" sources."typechecker-2.1.0" sources."watchr-2.4.13" @@ -14812,31 +15520,31 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "imgur-git+https://github.com/hackmdio/node-imgur.git" = nodeEnv.buildNodePackage { name = "imgur"; packageName = "imgur"; - version = "0.2.0"; + version = "0.3.1"; src = fetchgit { url = "https://github.com/hackmdio/node-imgur.git"; - rev = "0fba6d163428c946942cd2c3022634cbb8754e38"; - sha256 = "b7dc96b2ccefdca42dca10138d3121b405b2b7e70ffa055ce225ad63bc3f3c7a"; + rev = "4fe9cfa3893505c34c49067483d85d3ad4376cd6"; + sha256 = "60c728bf600ffe40db8c0b902fc1974b50f367a2bff2cea6bb9f1e9d29fb3dae"; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" + sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."combined-stream-1.0.7" + sources."commander-2.20.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -14844,14 +15552,15 @@ in sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" + sources."fs.realpath-1.0.0" sources."getpass-0.1.7" - sources."glob-4.5.3" + sources."glob-7.1.3" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -14859,36 +15568,46 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" - sources."minimatch-2.0.10" - sources."oauth-sign-0.8.2" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."minimatch-3.0.4" + sources."oauth-sign-0.9.0" sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" - sources."punycode-1.4.1" - sources."q-1.5.1" + sources."pop-iterate-1.0.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" + sources."q-2.0.3" sources."qs-6.5.2" - sources."request-2.87.0" + sources."request-2.88.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" sources."uuid-3.3.2" sources."verror-1.10.0" + sources."weak-map-1.0.5" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { description = "Upload images to imgur.com"; homepage = https://github.com/kaimallea/node-imgur; + license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "ionicons-~2.0.1" = nodeEnv.buildNodePackage { name = "ionicons"; @@ -14905,7 +15624,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "jquery-^3.1.1" = nodeEnv.buildNodePackage { name = "jquery"; @@ -14922,7 +15641,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "jquery-mousewheel-^3.1.13" = nodeEnv.buildNodePackage { name = "jquery-mousewheel"; @@ -14938,7 +15657,7 @@ in homepage = https://github.com/jquery/jquery-mousewheel; }; production = true; - bypassCache = false; + bypassCache = true; }; "jquery-ui-^1.12.1" = nodeEnv.buildNodePackage { name = "jquery-ui"; @@ -14955,7 +15674,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "js-cookie-^2.1.3" = nodeEnv.buildNodePackage { name = "js-cookie"; @@ -14972,29 +15691,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; - }; - "js-sequence-diagrams-^1000000.0.6" = nodeEnv.buildNodePackage { - name = "js-sequence-diagrams"; - packageName = "js-sequence-diagrams"; - version = "1000000.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/js-sequence-diagrams/-/js-sequence-diagrams-1000000.0.6.tgz"; - sha1 = "e95db01420479c5ccbc12046af1da42fde649e5c"; - }; - dependencies = [ - sources."eve-git://github.com/adobe-webplatform/eve.git#eef80ed" - sources."raphael-2.1.4" - sources."underscore-1.4.4" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Fucks NPM and draws simple SVG sequence diagrams from textual representation of the diagram"; - homepage = "https://github.com/Moeditor/js-sequence-diagrams#readme"; - license = "BSD-2-Clause"; - }; - production = true; - bypassCache = false; + bypassCache = true; }; "js-url-^2.3.0" = nodeEnv.buildNodePackage { name = "js-url"; @@ -15005,75 +15702,55 @@ in sha1 = "e0c02b622e89710749399f440d49056e72f70078"; }; dependencies = [ - sources."ajv-5.5.2" + sources."agent-base-4.2.1" sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."async-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."ansi-styles-3.2.1" + sources."async-limiter-1.0.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" - sources."caseless-0.12.0" - sources."chalk-1.1.3" + sources."chalk-2.4.2" sources."cli-1.0.1" - sources."co-4.6.0" - sources."colors-1.0.3" - sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."commander-2.19.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."console-browserify-1.1.0" sources."core-util-is-1.0.2" - sources."cycle-1.0.3" - sources."dashdash-1.14.1" sources."date-now-0.1.4" - sources."debug-2.6.9" - sources."delayed-stream-1.0.0" - (sources."dom-serializer-0.1.0" // { + sources."debug-4.1.1" + (sources."dom-serializer-0.1.1" // { dependencies = [ - sources."domelementtype-1.1.3" - sources."entities-1.1.1" + sources."entities-1.1.2" ]; }) - sources."domelementtype-1.3.0" + sources."domelementtype-1.3.1" sources."domhandler-2.3.0" sources."domutils-1.5.1" sources."duplexer-0.1.1" - sources."ecc-jsbn-0.1.2" sources."entities-1.0.0" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.6" + sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - sources."eventemitter2-0.4.14" + sources."eventemitter2-5.0.1" sources."exit-0.1.2" - sources."extend-3.0.2" - sources."extract-zip-1.6.7" - sources."extsprintf-1.3.0" - sources."eyes-0.1.8" - sources."fast-deep-equal-1.1.0" - sources."fast-json-stable-stringify-2.0.0" + (sources."extract-zip-1.6.7" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."fd-slicer-1.0.1" sources."figures-1.7.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.2" - sources."fs-extra-1.0.0" sources."fs.realpath-1.0.0" - sources."getpass-0.1.7" - sources."glob-7.1.2" - sources."graceful-fs-4.1.11" - sources."grunt-contrib-jshint-1.1.0" - sources."grunt-contrib-qunit-2.0.0" - sources."grunt-contrib-uglify-3.4.0" - sources."grunt-lib-phantomjs-1.1.0" + sources."glob-7.1.3" + sources."grunt-contrib-jshint-2.1.0" + sources."grunt-contrib-qunit-3.1.0" + sources."grunt-contrib-uglify-4.0.1" sources."gzip-size-3.0.0" - sources."har-schema-2.0.0" - sources."har-validator-5.0.3" sources."has-ansi-2.0.0" - sources."hasha-2.2.0" + sources."has-flag-3.0.0" sources."hooker-0.2.3" (sources."htmlparser2-3.8.3" // { dependencies = [ @@ -15082,80 +15759,55 @@ in sources."string_decoder-0.10.31" ]; }) - sources."http-signature-1.2.0" + (sources."https-proxy-agent-2.2.1" // { + dependencies = [ + sources."debug-3.2.6" + ]; + }) sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."jshint-2.9.6" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-2.4.0" - sources."jsprim-1.4.1" - sources."kew-0.7.0" - sources."klaw-1.3.1" - sources."lodash-4.17.10" - sources."maxmin-2.1.0" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."jshint-2.10.2" + sources."lodash-4.17.11" + (sources."maxmin-2.1.0" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."supports-color-2.0.0" + ]; + }) + sources."mime-2.4.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."number-is-nan-1.0.1" - sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."package-1.0.1" + sources."p-each-series-1.0.0" + sources."p-reduce-1.0.0" sources."path-is-absolute-1.0.1" sources."pend-1.2.0" - sources."performance-now-2.1.0" - sources."phantom-4.0.12" - sources."phantomjs-prebuilt-2.1.16" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" sources."pretty-bytes-3.0.1" sources."process-nextick-args-2.0.0" - sources."progress-1.1.8" - sources."punycode-1.4.1" - sources."qs-6.5.2" + sources."progress-2.0.3" + sources."proxy-from-env-1.0.0" + sources."puppeteer-1.14.0" sources."readable-stream-2.3.6" - sources."request-2.87.0" - sources."request-progress-2.0.1" - sources."rimraf-2.6.2" + sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."semver-5.5.0" sources."shelljs-0.3.0" sources."source-map-0.6.1" - sources."split-1.0.1" - sources."sshpk-1.14.2" - sources."stack-trace-0.0.10" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-1.0.4" - sources."supports-color-2.0.0" - sources."temporary-0.0.8" - sources."throttleit-1.0.0" - sources."through-2.3.8" - sources."tough-cookie-2.3.4" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" + sources."supports-color-5.5.0" sources."typedarray-0.0.6" - sources."uglify-js-3.4.6" - sources."unicode-5.2.0-0.7.5" + sources."uglify-js-3.5.3" sources."uri-path-1.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" - sources."verror-1.10.0" - sources."which-1.3.1" - sources."winston-2.4.3" sources."wrappy-1.0.2" + sources."ws-6.2.1" sources."yauzl-2.4.1" ]; buildInputs = globalBuildInputs; @@ -15165,15 +15817,15 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "js-yaml-^3.7.0" = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.12.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; - sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; }; dependencies = [ sources."argparse-1.0.10" @@ -15187,7 +15839,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "jsdom-nogyp-^0.8.3" = nodeEnv.buildNodePackage { name = "jsdom-nogyp"; @@ -15198,72 +15850,71 @@ in sha1 = "924b3f03cfe487dfcdf6375e6324252ceb80d0cc"; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."cssom-0.2.5" (sources."cssstyle-0.2.37" // { dependencies = [ - sources."cssom-0.3.4" + sources."cssom-0.3.6" ]; }) sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - sources."domelementtype-1.3.0" + sources."dom-serializer-0.1.1" + sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."ecc-jsbn-0.1.2" - sources."entities-1.1.1" + sources."entities-1.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" - sources."htmlparser2-3.9.2" + sources."har-validator-5.1.3" + sources."htmlparser2-3.10.1" sources."http-signature-1.2.0" sources."inherits-2.0.3" sources."is-typedarray-1.0.0" - sources."isarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."nwmatcher-1.3.9" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."process-nextick-args-2.0.0" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" - sources."readable-stream-2.3.6" - sources."request-2.87.0" + sources."readable-stream-3.3.0" + sources."request-2.88.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" - sources."string_decoder-1.1.1" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + sources."string_decoder-1.2.0" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" @@ -15278,7 +15929,7 @@ in }; }; production = true; - bypassCache = false; + bypassCache = true; }; "keymaster-^1.6.2" = nodeEnv.buildNodePackage { name = "keymaster"; @@ -15294,7 +15945,7 @@ in homepage = https://github.com/madrobby/keymaster; }; production = true; - bypassCache = false; + bypassCache = true; }; "list.js-^1.5.0" = nodeEnv.buildNodePackage { name = "list.js"; @@ -15305,7 +15956,7 @@ in sha1 = "a4cbfc8281ddefc02fdb2d30c8748bfae25fbcda"; }; dependencies = [ - sources."string-natural-compare-2.0.2" + sources."string-natural-compare-2.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -15314,15 +15965,15 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "lodash-^4.17.4" = nodeEnv.buildNodePackage { name = "lodash"; packageName = "lodash"; - version = "4.17.10"; + version = "4.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; - sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; + sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; buildInputs = globalBuildInputs; meta = { @@ -15331,7 +15982,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "lz-string-1.4.4" = nodeEnv.buildNodePackage { name = "lz-string"; @@ -15348,7 +15999,7 @@ in license = "WTFPL"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-^8.2.2" = nodeEnv.buildNodePackage { name = "markdown-it"; @@ -15360,11 +16011,11 @@ in }; dependencies = [ sources."argparse-1.0.10" - sources."entities-1.1.1" - sources."linkify-it-2.0.3" + sources."entities-1.1.2" + sources."linkify-it-2.1.0" sources."mdurl-1.0.1" sources."sprintf-js-1.0.3" - sources."uc.micro-1.0.5" + sources."uc.micro-1.0.6" ]; buildInputs = globalBuildInputs; meta = { @@ -15373,7 +16024,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-abbr-^1.0.4" = nodeEnv.buildNodePackage { name = "markdown-it-abbr"; @@ -15390,7 +16041,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-container-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-container"; @@ -15407,7 +16058,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-deflist-^2.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-deflist"; @@ -15424,7 +16075,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-emoji-^1.3.0" = nodeEnv.buildNodePackage { name = "markdown-it-emoji"; @@ -15441,7 +16092,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-footnote-^3.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-footnote"; @@ -15458,7 +16109,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-imsize-^2.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-imsize"; @@ -15475,7 +16126,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-ins-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-ins"; @@ -15492,7 +16143,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-mark-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-mark"; @@ -15509,7 +16160,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-mathjax-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-mathjax"; @@ -15526,7 +16177,7 @@ in license = "ISC"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-regexp-^0.4.0" = nodeEnv.buildNodePackage { name = "markdown-it-regexp"; @@ -15543,7 +16194,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-sub-^1.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-sub"; @@ -15560,7 +16211,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-sup-^1.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-sup"; @@ -15577,7 +16228,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-pdf-^8.0.0" = nodeEnv.buildNodePackage { name = "markdown-pdf"; @@ -15588,7 +16239,7 @@ in sha512 = "lpRyiNptdwArH6bG6Y8X13G5Qr/usTTDXxTp7zjhwxJ+cQO7Z6A1T265ZiN6PVDLzRNxxtcquQCIOpTC0U1NFg=="; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."argparse-0.1.16" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -15596,13 +16247,12 @@ in sources."asynckit-0.4.0" sources."autolinker-0.15.3" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."combined-stream-1.0.7" + sources."commander-2.20.0" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -15610,22 +16260,22 @@ in sources."delayed-stream-1.0.0" sources."duplexer-0.1.1" sources."ecc-jsbn-0.1.2" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.6" sources."extend-3.0.2" sources."extract-zip-1.6.7" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fd-slicer-1.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."fs-extra-1.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."hasha-2.2.0" - sources."highlight.js-9.12.0" + sources."highlight.js-9.15.6" sources."http-signature-1.2.0" sources."inherits-2.0.3" sources."is-stream-1.1.0" @@ -15635,18 +16285,18 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."kew-0.7.0" sources."klaw-1.3.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."os-tmpdir-1.0.2" sources."pend-1.2.0" sources."performance-now-2.1.0" @@ -15655,27 +16305,33 @@ in sources."pinkie-promise-2.0.1" sources."process-nextick-args-2.0.0" sources."progress-1.1.8" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."remarkable-1.7.1" - sources."request-2.87.0" + sources."request-2.88.0" sources."request-progress-2.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."series-stream-1.0.1" - sources."sshpk-1.14.2" + sources."sshpk-1.16.1" sources."stream-from-to-1.4.3" sources."string_decoder-1.1.1" sources."throttleit-1.0.0" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."tmp-0.0.33" - sources."tough-cookie-2.3.4" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."underscore-1.7.0" sources."underscore.string-2.4.0" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" @@ -15690,7 +16346,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "mathjax-~2.7.0" = nodeEnv.buildNodePackage { name = "mathjax"; @@ -15707,7 +16363,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "mermaid-~7.1.0" = nodeEnv.buildNodePackage { name = "mermaid"; @@ -15721,11 +16377,11 @@ in sources."d3-3.5.17" sources."dagre-d3-renderer-0.4.26" sources."dagre-layout-0.8.8" - sources."graphlib-2.1.5" + sources."graphlib-2.1.7" sources."graphlibrary-2.2.0" - sources."he-1.1.1" - sources."lodash-4.17.10" - sources."moment-2.22.2" + sources."he-1.2.0" + sources."lodash-4.17.11" + sources."moment-2.24.0" ]; buildInputs = globalBuildInputs; meta = { @@ -15734,7 +16390,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "mattermost-^3.4.0" = nodeEnv.buildNodePackage { name = "mattermost"; @@ -15746,7 +16402,7 @@ in }; dependencies = [ sources."async-1.5.2" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."component-emitter-1.2.1" sources."cookiejar-2.0.6" sources."core-util-is-1.0.2" @@ -15759,8 +16415,8 @@ in sources."isarray-0.0.1" sources."methods-1.1.2" sources."mime-1.3.4" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."ms-2.0.0" sources."qs-2.3.3" sources."readable-stream-1.0.27-1" @@ -15775,7 +16431,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "meta-marked-^0.4.2" = nodeEnv.buildNodePackage { name = "meta-marked"; @@ -15799,7 +16455,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "method-override-^2.3.7" = nodeEnv.buildNodePackage { name = "method-override"; @@ -15823,7 +16479,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "minimist-^1.2.0" = nodeEnv.buildNodePackage { name = "minimist"; @@ -15840,7 +16496,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "minio-^6.0.0" = nodeEnv.buildNodePackage { name = "minio"; @@ -15861,9 +16517,9 @@ in sources."inherits-2.0.3" sources."isarray-1.0.0" sources."json-stream-1.0.0" - sources."lodash-4.17.10" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."lodash-4.17.11" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."process-nextick-args-2.0.0" @@ -15896,15 +16552,15 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "moment-^2.17.1" = nodeEnv.buildNodePackage { name = "moment"; packageName = "moment"; - version = "2.22.2"; + version = "2.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz"; - sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66"; + url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; + sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; buildInputs = globalBuildInputs; meta = { @@ -15913,25 +16569,25 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "morgan-^1.7.0" = nodeEnv.buildNodePackage { name = "morgan"; packageName = "morgan"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz"; - sha1 = "d01fa6c65859b76fcf31b3cb53a3821a311d8051"; + url = "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz"; + sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA=="; }; dependencies = [ - sources."basic-auth-2.0.0" + sources."basic-auth-2.0.1" sources."debug-2.6.9" sources."depd-1.1.2" sources."ee-first-1.1.1" sources."ms-2.0.0" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" - sources."safe-buffer-5.1.1" + sources."on-headers-1.0.2" + sources."safe-buffer-5.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -15940,7 +16596,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "mysql-^2.12.0" = nodeEnv.buildNodePackage { name = "mysql"; @@ -15969,7 +16625,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "node-uuid-^1.4.7" = nodeEnv.buildNodePackage { name = "node-uuid"; @@ -15985,7 +16641,7 @@ in homepage = https://github.com/broofa/node-uuid; }; production = true; - bypassCache = false; + bypassCache = true; }; "octicons-~4.4.0" = nodeEnv.buildNodePackage { name = "octicons"; @@ -16002,7 +16658,7 @@ in license = "(OFL-1.1 OR MIT)"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-^0.4.0" = nodeEnv.buildNodePackage { name = "passport"; @@ -16023,7 +16679,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-dropbox-oauth2-^1.1.0" = nodeEnv.buildNodePackage { name = "passport-dropbox-oauth2"; @@ -16034,10 +16690,11 @@ in sha1 = "77c737636e4841944dfb82dfc42c3d8ab782c10e"; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" sources."passport-oauth-1.0.0" sources."passport-oauth1-1.1.0" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."pkginfo-0.2.3" sources."uid2-0.0.3" @@ -16049,7 +16706,7 @@ in homepage = "https://github.com/florianheinemann/passport-dropbox-oauth2#readme"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-facebook-^2.1.1" = nodeEnv.buildNodePackage { name = "passport-facebook"; @@ -16060,8 +16717,9 @@ in sha1 = "c39d0b52ae4d59163245a4e21a7b9b6321303311"; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" sources."utils-merge-1.0.1" @@ -16073,7 +16731,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-github-^1.1.0" = nodeEnv.buildNodePackage { name = "passport-github"; @@ -16084,8 +16742,9 @@ in sha1 = "8ce1e3fcd61ad7578eb1df595839e4aea12355d4"; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" sources."utils-merge-1.0.1" @@ -16097,7 +16756,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-gitlab2-^4.0.0" = nodeEnv.buildNodePackage { name = "passport-gitlab2"; @@ -16108,8 +16767,9 @@ in sha512 = "C/8/L8piHwv57J6fY/MzsEJc8yCkgsyBSzMWxfTfEHRvCaTkD08vJ5b/txydKrWrRPl4MHuZfisFnKlZHmq4yw=="; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" sources."utils-merge-1.0.1" @@ -16121,7 +16781,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-google-oauth20-^1.0.0" = nodeEnv.buildNodePackage { name = "passport-google-oauth20"; @@ -16132,8 +16792,9 @@ in sha1 = "3b960e8a1d70d1dbe794615c827c68c40392a5d0"; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" sources."utils-merge-1.0.1" @@ -16145,27 +16806,27 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-ldapauth-^2.0.0" = nodeEnv.buildNodePackage { name = "passport-ldapauth"; packageName = "passport-ldapauth"; - version = "2.0.0"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/passport-ldapauth/-/passport-ldapauth-2.0.0.tgz"; - sha1 = "42dff004417185d0a4d9f776a3eed8d4731fd689"; + url = "https://registry.npmjs.org/passport-ldapauth/-/passport-ldapauth-2.1.3.tgz"; + sha512 = "23n425UTasN6XhcXG0qQ0h0YrS/zfo8kNIEhSLfPsNpglhYhhQFfB1pmDc5RrH+Kiz5fKLkki5BpvkKHCwkixg=="; }; dependencies = [ sources."@types/body-parser-1.17.0" sources."@types/connect-3.4.32" - sources."@types/events-1.2.0" - sources."@types/express-4.16.0" - sources."@types/express-serve-static-core-4.16.0" + sources."@types/events-3.0.0" + sources."@types/express-4.16.1" + sources."@types/express-serve-static-core-4.16.2" sources."@types/ldapjs-1.0.3" - sources."@types/mime-2.0.0" - sources."@types/node-7.0.68" - sources."@types/passport-0.3.5" - sources."@types/range-parser-1.2.2" + sources."@types/mime-2.0.1" + sources."@types/node-10.14.4" + sources."@types/passport-1.0.0" + sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.2" sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -16187,21 +16848,20 @@ in sources."assert-plus-0.1.5" ]; }) - sources."ldapauth-fork-4.0.2" + sources."ldapauth-fork-4.2.0" sources."ldapjs-1.0.2" - sources."lru-cache-4.1.3" + sources."lru-cache-5.1.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.22.2" + sources."moment-2.24.0" sources."mv-2.1.1" - sources."nan-2.10.0" + sources."nan-2.13.2" sources."ncp-2.0.0" sources."once-1.4.0" sources."passport-strategy-1.0.0" sources."path-is-absolute-1.0.1" sources."precond-0.2.3" - sources."pseudomap-1.0.2" sources."rimraf-2.4.5" sources."safe-json-stringify-1.2.0" (sources."vasync-1.6.4" // { @@ -16211,7 +16871,7 @@ in }) sources."verror-1.10.0" sources."wrappy-1.0.2" - sources."yallist-2.1.2" + sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -16220,7 +16880,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-local-^1.0.0" = nodeEnv.buildNodePackage { name = "passport-local"; @@ -16238,17 +16898,18 @@ in description = "Local username and password authentication strategy for Passport."; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-oauth2-^1.4.0" = nodeEnv.buildNodePackage { name = "passport-oauth2"; packageName = "passport-oauth2"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz"; - sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad"; + url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.5.0.tgz"; + sha512 = "kqBt6vR/5VlCK8iCx1/KpY42kQ+NEHZwsSyt4Y6STiNjU+wWICG1i8ucc1FapXDGO15C5O5VZz7+7vRzrDPXXQ=="; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" @@ -16261,7 +16922,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-twitter-^1.0.4" = nodeEnv.buildNodePackage { name = "passport-twitter"; @@ -16286,7 +16947,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-saml-^0.31.0" = nodeEnv.buildNodePackage { name = "passport-saml"; @@ -16297,10 +16958,10 @@ in sha1 = "e4d654cab30f018bfd39056efe7bcfa770aab463"; }; dependencies = [ - sources."async-2.6.1" + sources."async-2.6.2" sources."ejs-2.6.1" - sources."lodash-4.17.10" - sources."node-forge-0.7.5" + sources."lodash-4.17.11" + sources."node-forge-0.7.6" sources."passport-strategy-1.0.0" sources."q-1.5.1" sources."sax-1.2.4" @@ -16323,7 +16984,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport.socketio-^3.7.0" = nodeEnv.buildNodePackage { name = "passport.socketio"; @@ -16343,15 +17004,15 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "pdfobject-^2.0.201604172" = nodeEnv.buildNodePackage { name = "pdfobject"; packageName = "pdfobject"; - version = "2.0.201604172"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pdfobject/-/pdfobject-2.0.201604172.tgz"; - sha1 = "112edf93b98be121a5e780b06e7f5f78ad31ab3f"; + url = "https://registry.npmjs.org/pdfobject/-/pdfobject-2.1.1.tgz"; + sha512 = "QFktTHyjs4q/WhGFfV2RdAbscPdNkyQb/JfFz18cwILvs9ocDiYVFAEh/jgkKGv6my+r4nlbLjwj7BHFKAupHQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -16360,7 +17021,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "pg-^6.1.2" = nodeEnv.buildNodePackage { name = "pg"; @@ -16381,10 +17042,10 @@ in sources."pg-pool-1.8.0" sources."pg-types-1.13.0" sources."pgpass-1.0.2" - sources."postgres-array-1.0.2" + sources."postgres-array-1.0.3" sources."postgres-bytea-1.0.0" - sources."postgres-date-1.0.3" - sources."postgres-interval-1.1.2" + sources."postgres-date-1.0.4" + sources."postgres-interval-1.2.0" sources."semver-4.3.2" sources."split-1.0.1" sources."through-2.3.8" @@ -16397,7 +17058,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "pg-hstore-^2.3.2" = nodeEnv.buildNodePackage { name = "pg-hstore"; @@ -16416,22 +17077,22 @@ in homepage = https://github.com/scarney81/pg-hstore; }; production = true; - bypassCache = false; + bypassCache = true; }; "prismjs-^1.6.0" = nodeEnv.buildNodePackage { name = "prismjs"; packageName = "prismjs"; - version = "1.15.0"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.15.0.tgz"; - sha512 = "Lf2JrFYx8FanHrjoV5oL8YHCclLQgbJcVZR+gikGGMqz6ub5QVWDTM6YIwm3BuPxM/LOV+rKns3LssXNLIf+DA=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.16.0.tgz"; + sha512 = "OA4MKxjFZHSvZcisLGe14THYsug/nF6O1f0pAJc0KN0wTyAcLqmsbE+lTGKSpyh+9pEW57+k6pg2AfYR+coyHA=="; }; dependencies = [ - sources."clipboard-2.0.1" + sources."clipboard-2.0.4" sources."delegate-3.2.0" sources."good-listener-1.2.2" sources."select-1.1.2" - sources."tiny-emitter-2.0.2" + sources."tiny-emitter-2.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -16440,33 +17101,33 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "randomcolor-^0.5.3" = nodeEnv.buildNodePackage { name = "randomcolor"; packageName = "randomcolor"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/randomcolor/-/randomcolor-0.5.3.tgz"; - sha1 = "7f90f2f2a7f6d5a52232161eeaeeaea9ac3b5815"; + url = "https://registry.npmjs.org/randomcolor/-/randomcolor-0.5.4.tgz"; + sha512 = "nYd4nmTuuwMFzHL6W+UWR5fNERGZeVauho8mrJDUSXdNDbao4rbrUwhuLgKC/j8VCS5+34Ria8CsTDuBjrIrQA=="; }; buildInputs = globalBuildInputs; meta = { description = "A tiny script for generating attractive random colors"; - homepage = https://randomcolor.llllll.li/; + homepage = https://randomcolor.lllllllllllllllll.com/; license = "CC0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "raphael-git+https://github.com/dmitrybaranovskiy/raphael" = nodeEnv.buildNodePackage { name = "raphael"; packageName = "raphael"; - version = "2.2.7"; + version = "2.2.8"; src = fetchgit { url = "https://github.com/dmitrybaranovskiy/raphael"; - rev = "527c51b7b12f846f9ab0d5ddf14767912b569c7d"; - sha256 = "a9c2dece0218d3c82ad624fd55d7f81b7696fd0415bc0f52429f2d09497b25d8"; + rev = "bf3dcd35317f76f915bcd04ed9db36a1b3775c4d"; + sha256 = "79245aeeab138e9a5137196d290536394bd376bbd0e92883c91d7cee9bea3274"; }; dependencies = [ sources."eve-raphael-0.5.0" @@ -16478,7 +17139,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "readline-sync-^1.4.7" = nodeEnv.buildNodePackage { name = "readline-sync"; @@ -16495,60 +17156,65 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "request-^2.79.0" = nodeEnv.buildNodePackage { name = "request"; packageName = "request"; - version = "2.87.0"; + version = "2.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; - sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" - sources."oauth-sign-0.8.2" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" sources."uuid-3.3.2" sources."verror-1.10.0" ]; @@ -16559,7 +17225,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "reveal.js-~3.6.0" = nodeEnv.buildNodePackage { name = "reveal.js"; @@ -16576,7 +17242,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "scrypt-^6.0.3" = nodeEnv.buildNodePackage { name = "scrypt"; @@ -16587,7 +17253,7 @@ in sha1 = "04e014a5682b53fa50c2d5cce167d719c06d870d"; }; dependencies = [ - sources."nan-2.10.0" + sources."nan-2.13.2" ]; buildInputs = globalBuildInputs; meta = { @@ -16596,7 +17262,7 @@ in license = "zlib"; }; production = true; - bypassCache = false; + bypassCache = true; }; "select2-^3.5.2-browserify" = nodeEnv.buildNodePackage { name = "select2"; @@ -16612,30 +17278,30 @@ in homepage = http://ivaynberg.github.io/select2; }; production = true; - bypassCache = false; + bypassCache = true; }; "sequelize-^3.28.0" = nodeEnv.buildNodePackage { name = "sequelize"; packageName = "sequelize"; - version = "3.33.0"; + version = "3.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/sequelize/-/sequelize-3.33.0.tgz"; - sha1 = "b0eb12b87223aded10e50a9d78506e0dd42f9208"; + url = "https://registry.npmjs.org/sequelize/-/sequelize-3.34.0.tgz"; + sha512 = "smJMYZ+JniYZ2Ja4GPaEC0/mkvCNnRl7mM958hZQP9dpXNbSS/wPFUNrn0mnfpWRk8Ob/3zo0H1qxQbXKgcIzw=="; }; dependencies = [ sources."@types/geojson-1.0.6" - sources."bluebird-3.5.1" + sources."bluebird-3.5.4" sources."debug-2.6.9" sources."depd-1.1.2" sources."dottie-1.1.1" sources."generic-pool-2.4.2" sources."inflection-1.12.0" - sources."lodash-4.17.10" - sources."moment-2.22.2" - sources."moment-timezone-0.5.21" + sources."lodash-4.17.11" + sources."moment-2.24.0" + sources."moment-timezone-0.5.23" sources."ms-2.0.0" sources."retry-as-promised-2.3.2" - sources."semver-5.5.0" + sources."semver-5.7.0" sources."shimmer-1.1.0" sources."terraformer-1.0.9" sources."terraformer-wkt-parser-1.2.0" @@ -16651,7 +17317,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "sequelize-cli-^2.5.1" = nodeEnv.buildNodePackage { name = "sequelize-cli"; @@ -16677,7 +17343,7 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.2.1" sources."assign-symbols-1.0.0" - sources."atob-2.1.1" + sources."atob-2.1.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -16686,10 +17352,9 @@ in ]; }) sources."beeper-1.1.1" - sources."bluebird-3.5.1" + sources."bluebird-3.5.4" sources."brace-expansion-1.1.11" sources."braces-1.8.5" - sources."builtin-modules-1.1.1" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -16726,15 +17391,15 @@ in sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-support-1.1.3" - sources."commander-2.16.0" + sources."commander-2.20.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."config-chain-1.1.11" + sources."config-chain-1.1.12" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" (sources."cross-spawn-5.1.0" // { dependencies = [ - sources."lru-cache-4.1.3" + sources."lru-cache-4.1.5" ]; }) sources."d-1.0.0" @@ -16751,15 +17416,15 @@ in sources."deprecated-0.0.1" sources."detect-file-0.1.0" sources."duplexer2-0.0.2" - (sources."editorconfig-0.13.3" // { + (sources."editorconfig-0.15.3" // { dependencies = [ - sources."lru-cache-3.2.0" - sources."semver-5.5.0" + sources."lru-cache-4.1.5" + sources."semver-5.7.0" ]; }) sources."end-of-stream-0.1.5" sources."error-ex-1.3.2" - sources."es5-ext-0.10.45" + sources."es5-ext-0.10.49" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -16776,24 +17441,25 @@ in ]; }) sources."extglob-0.3.2" - sources."fancy-log-1.3.2" + sources."fancy-log-1.3.3" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."find-index-0.1.1" sources."find-up-2.1.0" sources."findup-sync-1.0.0" - (sources."fined-1.1.0" // { + (sources."fined-1.1.1" // { dependencies = [ sources."expand-tilde-2.0.2" ]; }) sources."first-chunk-stream-1.0.0" - sources."flagged-respawn-1.0.0" + sources."flagged-respawn-1.0.1" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."fragment-cache-0.2.1" sources."fs-exists-sync-0.1.0" sources."fs-extra-4.0.3" + sources."fs.realpath-1.0.0" sources."gaze-0.5.2" sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" @@ -16821,8 +17487,8 @@ in sources."minimatch-0.2.14" ]; }) - sources."glogg-1.0.1" - sources."graceful-fs-4.1.11" + sources."glogg-1.0.2" + sources."graceful-fs-4.1.15" sources."gulp-3.9.1" sources."gulp-help-1.6.1" sources."gulp-util-3.0.8" @@ -16844,12 +17510,12 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."interpret-1.1.0" + sources."interpret-1.2.0" sources."invert-kv-1.0.0" (sources."is-absolute-1.0.0" // { dependencies = [ @@ -16863,7 +17529,6 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.2" @@ -16897,7 +17562,12 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - sources."js-beautify-1.7.5" + (sources."js-beautify-1.9.1" // { + dependencies = [ + sources."glob-7.1.3" + sources."minimatch-3.0.4" + ]; + }) sources."jsonfile-4.0.0" sources."kind-of-3.2.2" sources."lcid-1.0.0" @@ -16967,7 +17637,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lodash._basecopy-3.0.1" sources."lodash._basetostring-3.0.1" sources."lodash._basevalues-3.0.0" @@ -16993,9 +17663,9 @@ in }) sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."math-random-1.0.1" + sources."math-random-1.0.4" sources."mem-1.1.0" - sources."memoizee-0.4.12" + sources."memoizee-0.4.14" sources."micromatch-2.3.11" sources."mimic-fn-1.2.0" sources."minimatch-2.0.10" @@ -17010,7 +17680,7 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.22.2" + sources."moment-2.24.0" sources."ms-2.0.0" sources."multipipe-0.1.2" (sources."nanomatch-1.2.13" // { @@ -17021,10 +17691,10 @@ in sources."kind-of-6.0.2" ]; }) - sources."natives-1.1.4" + sources."natives-1.1.6" sources."next-tick-1.0.0" - sources."nopt-3.0.6" - sources."normalize-package-data-2.4.0" + sources."nopt-4.0.1" + sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -17068,6 +17738,8 @@ in sources."ordered-read-streams-0.1.0" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" sources."p-finally-1.0.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" @@ -17075,11 +17747,13 @@ in sources."parse-filepath-1.0.2" sources."parse-glob-3.0.4" sources."parse-json-2.2.0" + sources."parse-node-version-1.0.1" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" sources."path-type-2.0.0" @@ -17090,7 +17764,7 @@ in sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - (sources."randomatic-3.0.0" // { + (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" sources."kind-of-6.0.2" @@ -17108,12 +17782,12 @@ in sources."regex-cache-0.4.4" sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.2" + sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."replace-ext-0.0.1" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.8.1" + sources."resolve-1.10.0" sources."resolve-dir-0.1.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -17160,10 +17834,10 @@ in sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."sparkles-1.0.1" - sources."spdx-correct-3.0.0" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" + sources."spdx-license-ids-3.0.4" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -17195,7 +17869,7 @@ in sources."strip-bom-1.0.0" sources."strip-eof-1.0.0" sources."supports-color-2.0.0" - (sources."through2-2.0.3" // { + (sources."through2-2.0.5" // { dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" @@ -17203,7 +17877,7 @@ in }) sources."tildify-1.2.0" sources."time-stamp-1.1.0" - sources."timers-ext-0.1.5" + sources."timers-ext-0.1.7" sources."to-object-path-0.3.0" sources."to-regex-3.0.2" (sources."to-regex-range-2.1.1" // { @@ -17237,7 +17911,7 @@ in sources."user-home-1.1.1" sources."util-deprecate-1.0.2" sources."v8flags-2.1.1" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."vinyl-0.5.3" (sources."vinyl-fs-0.3.14" // { dependencies = [ @@ -17270,7 +17944,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "shortid-2.2.8" = nodeEnv.buildNodePackage { name = "shortid"; @@ -17287,7 +17961,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "socket.io-~2.0.4" = nodeEnv.buildNodePackage { name = "socket.io"; @@ -17306,7 +17980,7 @@ in sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" sources."better-assert-1.0.2" - sources."blob-0.0.4" + sources."blob-0.0.5" sources."callsite-1.0.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" @@ -17323,13 +17997,13 @@ in sources."debug-3.1.0" ]; }) - sources."engine.io-parser-2.1.2" + sources."engine.io-parser-2.1.3" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."indexof-0.0.1" sources."isarray-2.0.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."object-component-0.0.3" @@ -17357,7 +18031,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "socket.io-client-~2.0.4" = nodeEnv.buildNodePackage { name = "socket.io-client"; @@ -17374,7 +18048,7 @@ in sources."backo2-1.0.2" sources."base64-arraybuffer-0.1.5" sources."better-assert-1.0.2" - sources."blob-0.0.4" + sources."blob-0.0.5" sources."callsite-1.0.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" @@ -17385,7 +18059,7 @@ in sources."debug-3.1.0" ]; }) - sources."engine.io-parser-2.1.2" + sources."engine.io-parser-2.1.3" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."indexof-0.0.1" @@ -17413,7 +18087,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "spin.js-^2.3.2" = nodeEnv.buildNodePackage { name = "spin.js"; @@ -17430,19 +18104,19 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "sqlite3-^4.0.1" = nodeEnv.buildNodePackage { name = "sqlite3"; packageName = "sqlite3"; - version = "4.0.2"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.2.tgz"; - sha512 = "51ferIRwYOhzUEtogqOa/y9supADlAht98bF/gbIi6WkzRJX6Yioldxbzj1MV4yV+LgdKD/kkHwFTeFXOG4htA=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.6.tgz"; + sha512 = "EqBXxHdKiwvNMRCgml86VTL5TK1i0IKiumnfxykX0gh6H6jaKijAXvE9O1N7+omfNSawR2fOmIyJZcfe8HYWpw=="; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -17450,15 +18124,14 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" - sources."chownr-1.0.1" - sources."co-4.6.0" + sources."chownr-1.1.1" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -17471,20 +18144,20 @@ in sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."has-unicode-2.0.1" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.23" + sources."iconv-lite-0.4.24" sources."ignore-walk-3.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -17495,26 +18168,26 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.3.3" - sources."minizlib-1.1.0" + sources."minipass-2.3.5" + sources."minizlib-1.2.1" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."nan-2.10.0" - sources."needle-2.2.1" - sources."node-pre-gyp-0.10.3" + sources."needle-2.2.4" + sources."node-pre-gyp-0.11.0" sources."nopt-4.0.1" - sources."npm-bundled-1.0.3" - sources."npm-packlist-1.1.11" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.4.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" sources."os-homedir-1.0.2" @@ -17523,7 +18196,8 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" (sources."rc-1.2.8" // { dependencies = [ @@ -17531,29 +18205,34 @@ in ]; }) sources."readable-stream-2.3.6" - sources."request-2.87.0" - sources."rimraf-2.6.2" + sources."request-2.88.0" + sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.5.0" + sources."semver-5.7.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sshpk-1.14.2" + sources."sshpk-1.16.1" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.6" - sources."tough-cookie-2.3.4" + sources."tar-4.4.8" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" sources."wide-align-1.1.3" sources."wrappy-1.0.2" - sources."yallist-3.0.2" + sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -17562,7 +18241,7 @@ in license = "BSD-3-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; "store-^2.0.12" = nodeEnv.buildNodePackage { name = "store"; @@ -17579,7 +18258,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "string-^3.3.3" = nodeEnv.buildNodePackage { name = "string"; @@ -17596,7 +18275,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "tedious-^1.14.0" = nodeEnv.buildNodePackage { name = "tedious"; @@ -17610,10 +18289,10 @@ in sources."babel-runtime-6.26.0" sources."big-number-0.3.1" sources."bl-1.2.2" - sources."core-js-2.5.7" + sources."core-js-2.6.5" sources."core-util-is-1.0.2" sources."dns-lookup-all-1.0.2" - sources."iconv-lite-0.4.23" + sources."iconv-lite-0.4.24" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-2.0.0" @@ -17621,7 +18300,7 @@ in sources."regenerator-runtime-0.11.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.5.0" + sources."semver-5.7.0" sources."sprintf-0.1.5" sources."string_decoder-1.1.1" sources."util-deprecate-1.0.2" @@ -17633,7 +18312,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "to-markdown-^3.0.3" = nodeEnv.buildNodePackage { name = "to-markdown"; @@ -17647,85 +18326,86 @@ in sources."abab-1.0.4" sources."acorn-4.0.13" sources."acorn-globals-3.1.0" - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."array-equal-1.0.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."block-elements-1.2.0" sources."caseless-0.12.0" - sources."co-4.6.0" sources."collapse-whitespace-1.1.2" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."content-type-parser-1.0.2" sources."core-util-is-1.0.2" - sources."cssom-0.3.4" + sources."cssom-0.3.6" sources."cssstyle-0.2.37" sources."dashdash-1.14.1" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."escodegen-1.11.0" + sources."escodegen-1.11.1" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."html-encoding-sniffer-1.0.2" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.24" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."jsdom-9.12.0" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."levn-0.3.0" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."nwmatcher-1.4.4" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."optionator-0.8.2" sources."parse5-1.5.1" sources."performance-now-2.1.0" sources."prelude-ls-1.1.2" - sources."psl-1.1.29" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" - (sources."request-2.87.0" // { + (sources."request-2.88.0" // { dependencies = [ - sources."tough-cookie-2.3.4" + sources."punycode-1.4.1" + sources."tough-cookie-2.4.3" ]; }) sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."source-map-0.6.1" - sources."sshpk-1.14.2" + sources."sshpk-1.16.1" sources."symbol-tree-3.2.2" - sources."tough-cookie-2.4.3" + sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" + sources."uri-js-4.2.2" sources."uuid-3.3.2" sources."verror-1.10.0" sources."void-elements-2.0.1" sources."webidl-conversions-4.0.2" - sources."whatwg-encoding-1.0.3" + sources."whatwg-encoding-1.0.5" (sources."whatwg-url-4.8.0" // { dependencies = [ sources."webidl-conversions-3.0.1" @@ -17741,7 +18421,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "toobusy-js-^0.5.1" = nodeEnv.buildNodePackage { name = "toobusy-js"; @@ -17758,7 +18438,7 @@ in license = "WTFPL"; }; production = true; - bypassCache = false; + bypassCache = true; }; "uuid-^3.1.0" = nodeEnv.buildNodePackage { name = "uuid"; @@ -17775,7 +18455,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "uws-~0.14.1" = nodeEnv.buildNodePackage { name = "uws"; @@ -17792,24 +18472,24 @@ in license = "Zlib"; }; production = true; - bypassCache = false; + bypassCache = true; }; "validator-^10.4.0" = nodeEnv.buildNodePackage { name = "validator"; packageName = "validator"; - version = "10.5.0"; + version = "10.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-10.5.0.tgz"; - sha512 = "6OOi+eV2mOxCFLq0f2cJDrdB6lrtLXEUxabhNRGjgOLT/l3SSll9J49Cl+LIloUqkWWTPraK/mucEQ3dc2jStQ=="; + url = "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz"; + sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="; }; buildInputs = globalBuildInputs; meta = { description = "String validation and sanitization"; - homepage = http://github.com/chriso/validator.js; + homepage = https://github.com/chriso/validator.js; license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "velocity-animate-^1.4.0" = nodeEnv.buildNodePackage { name = "velocity-animate"; @@ -17826,7 +18506,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "visibilityjs-^1.2.4" = nodeEnv.buildNodePackage { name = "visibilityjs"; @@ -17843,7 +18523,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "viz.js-^1.7.0" = nodeEnv.buildNodePackage { name = "viz.js"; @@ -17860,15 +18540,15 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "winston-^2.3.0" = nodeEnv.buildNodePackage { name = "winston"; packageName = "winston"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz"; - sha512 = "GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw=="; + url = "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz"; + sha512 = "NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q=="; }; dependencies = [ sources."async-1.0.0" @@ -17885,18 +18565,18 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "xss-^1.0.3" = nodeEnv.buildNodePackage { name = "xss"; packageName = "xss"; - version = "1.0.3"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.3.tgz"; - sha512 = "LTpz3jXPLUphMMmyufoZRSKnqMj41OVypZ8uYGzvjkMV9C1EdACrhQl/EM8Qfh5htSAuMIQFOejmKAZGkJfaCg=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.6.tgz"; + sha512 = "6Q9TPBeNyoTRxgZFk5Ggaepk/4vUOYdOsIUYvLehcsIZTFjaavbVnsuAkLA5lIFuug5hw8zxcB9tm01gsjph2A=="; }; dependencies = [ - sources."commander-2.16.0" + sources."commander-2.20.0" sources."cssfilter-0.0.10" ]; buildInputs = globalBuildInputs; @@ -17906,6 +18586,6 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/pkgs/servers/web-apps/codimd/node.nix b/pkgs/servers/web-apps/codimd/node.nix index 8f3be4cc8c7f..abcf470ca088 100644 --- a/pkgs/servers/web-apps/codimd/node.nix +++ b/pkgs/servers/web-apps/codimd/node.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 89de25008113..17cb8be739f6 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -2,13 +2,11 @@ stdenv.mkDerivation rec { name = "matomo-${version}"; - version = "3.8.1"; + version = "3.9.1"; src = fetchurl { - # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again - # url = "https://builds.matomo.org/${name}.tar.gz"; - url = "https://builds.matomo.org/piwik-${version}.tar.gz"; - sha256 = "0ca4fkg2jpkfg0r9hxl45ad5xzz0gxhf404i96j059bn3c41kfi0"; + url = "https://builds.matomo.org/matomo-${version}.tar.gz"; + sha256 = "1y406dnwn4jyrjr2d5qfsg3b4v7nfbh09v74dm1vlcy3mkbhv2bp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 90ebe4fad44b..a103af9ee68a 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -32,11 +32,11 @@ lib.makeScope newScope (self: with self; { }) {}; bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "bitmap-1.0.8"; + name = "bitmap-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/bitmap-1.0.8.tar.gz; - sha256 = "1z06a1sn3iq72rmh73f11xgb7n46bdav1fvpgczxjp6al88bsbqs"; + url = mirror://xorg/individual/app/bitmap-1.0.9.tar.gz; + sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -729,11 +729,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libXau-1.0.8"; + name = "libXau-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2; - sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x"; + url = mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2; + sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1417,6 +1417,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xcalc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { + name = "xcalc-1.0.7"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2; + sha256 = "08bzaldi76vrj7350d7b04pq7qa1qhi81x8i806yv42zcp8p3lkh"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXaw xorgproto libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation { name = "xcb-proto-1.13"; builder = ./builder.sh; @@ -1574,11 +1587,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { - name = "xcursorgen-1.0.6"; + name = "xcursorgen-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2; - sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i"; + url = mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2; + sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1587,11 +1600,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation { - name = "xcursor-themes-1.0.5"; + name = "xcursor-themes-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2; - sha256 = "0whjiq6d5z4z75zh37pji6llfcyrg6q3mg9zx5zqyncnj39q30xf"; + url = mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2; + sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1599,16 +1612,16 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xdm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libXt }: stdenv.mkDerivation { - name = "xdm-1.1.11"; + xdm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + name = "xdm-1.1.12"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xdm-1.1.11.tar.bz2; - sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl"; + url = mirror://xorg/individual/app/xdm-1.1.12.tar.bz2; + sha256 = "1x17hdymf6rd8jmh4n1sd4g5a8ayr5w94nwjw84qs2fs5pvq7lhd"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; + buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1781,6 +1794,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xf86videoapm = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-apm-1.3.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2; + sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; @@ -1821,11 +1847,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-chips-1.3.0"; + name = "xf86-video-chips-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2; - sha256 = "00nsyz0z8mkzinr5czkkajbw1fm6437q7f3dx027017jdhh4qb4p"; + url = mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2; + sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2094,11 +2120,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-s3virge-1.10.7"; + name = "xf86-video-s3virge-1.11.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2; - sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx"; + url = mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2; + sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2198,11 +2224,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-tdfx-1.4.7"; + name = "xf86-video-tdfx-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2; - sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"; + url = mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2; + sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2627,11 +2653,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.3"; + name = "xorg-server-1.20.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.20.3.tar.bz2; - sha256 = "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v"; + url = mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2; + sha256 = "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index bd529c178f4f..e7e4c86e6a29 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -1,7 +1,6 @@ { abiCompat ? null, stdenv, makeWrapper, lib, fetchurl, fetchpatch, buildPackages, - - automake, autoconf, libiconv, libtool, intltool, mtdev, libevdev, libinput, + automake, autoconf, gettext, libiconv, libtool, intltool, mtdev, libevdev, libinput, freetype, tradcpp, fontconfig, meson, ninja, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, @@ -42,6 +41,10 @@ self: super: buildInputs = attrs.buildInputs ++ [ self.mkfontscale ]; }); + editres = super.editres.overrideAttrs (attrs: { + hardeningDisable = [ "format" ]; + }); + fontbhttf = super.fontbhttf.overrideAttrs (attrs: { meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; }; }); @@ -285,6 +288,10 @@ self: super: meta = attrs.meta // { platforms = stdenv.lib.platforms.linux; }; }); + oclock = super.oclock.overrideAttrs (attrs: { + buildInputs = attrs.buildInputs ++ [ self.libxkbfile ]; + }); + setxkbmap = super.setxkbmap.overrideAttrs (attrs: { postInstall = '' @@ -434,6 +441,10 @@ self: super: ''; }); + xload = super.xload.overrideAttrs (attrs: { + nativeBuildInputs = attrs.nativeBuildInputs ++ [ gettext ]; + }); + xlsfonts = super.xlsfonts.overrideAttrs (attrs: { meta = attrs.meta // { license = lib.licenses.mit; }; }); diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index ec1e6a413b4f..16a4a4d09497 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -11,7 +11,7 @@ https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 mirror://xorg/individual/app/appres-1.0.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 -mirror://xorg/individual/app/bitmap-1.0.8.tar.gz +mirror://xorg/individual/app/bitmap-1.0.9.tar.gz mirror://xorg/individual/app/editres-1.0.7.tar.bz2 mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 @@ -29,12 +29,13 @@ mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 +mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2 mirror://xorg/individual/app/xclock-1.0.7.tar.bz2 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2 mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 -mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2 -mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 +mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2 +mirror://xorg/individual/app/xdm-1.1.12.tar.bz2 mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2 mirror://xorg/individual/app/xev-1.2.2.tar.bz2 @@ -72,7 +73,7 @@ mirror://xorg/individual/app/xwd-1.0.7.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 -mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2 +mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 @@ -85,10 +86,11 @@ mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2 @@ -109,7 +111,7 @@ mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2 @@ -117,7 +119,7 @@ mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2 @@ -173,7 +175,7 @@ mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2 -mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 +mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 @@ -212,4 +214,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.3.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2 diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index 535fb061de9b..8df8499d11eb 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages } : +{ stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } : stdenv.mkDerivation rec { name = "pyIRCt-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -e '/configFiles/iimport os' -i config.py cp * $out/share/${name} cat > $out/bin/pyIRCt < $out/bin/pyMAILt < $out/bin/zooInspector.sh - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/zooinspector exec ${jre}/bin/java -cp $classpath org.apache.zookeeper.inspector.ZooInspector EOF diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 8e63eeeba159..32d87d7cc1bf 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -89,7 +89,7 @@ let fish = stdenv.mkDerivation rec { name = "fish-${version}"; - version = "3.0.1"; + version = "3.0.2"; etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; @@ -97,7 +97,7 @@ let # There are differences between the release tarball and the tarball github packages from the tag # Hence we cannot use fetchFromGithub url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${name}.tar.gz"; - sha256 = "1r55xgnacjxglban15ln3fw8p3q60k0pk0fgsax3h5zfambplrr1"; + sha256 = "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 5848c0a453cd..3d55dcc2f9b2 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,31 +2,36 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.8.3"; + version = "0.8.12"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "scopatz"; repo = "xonsh"; rev = "refs/tags/${version}"; - sha256 = "1qnghqswvqlwv9121r4maibmn2dvqmbr3fhsnngsj3q7plfp7yb2"; + sha256 = "1p8slx8nk15vyyzwc9ic50py0amk9p9nggp1973wfas0fxsg1r4f"; }; LC_ALL = "en_US.UTF-8"; postPatch = '' sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py - sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh + sed -ie "s|SHELL=xonsh|SHELL=$out/bin/xonsh|" tests/test_integrations.py + sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' tests/test_integrations.py + sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh + find -name "*.xsh" | xargs sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' patchShebangs . ''; + doCheck = !stdenv.isDarwin; + checkPhase = '' - HOME=$TMPDIR \ - pytest \ - -k 'not test_man_completion and not test_indir and not test_xonsh_party and not test_foreign_bash_data and not test_script and not test_single_command_no_windows and not test_redirect_out_to_file and not test_sourcefile and not test_printname and not test_printfile' + HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight' + HOME=$TMPDIR pytest -k 'test_builtins or test_main' --reruns 5 + HOME=$TMPDIR pytest -k 'test_ptk_highlight' ''; - checkInputs = [ python3Packages.pytest glibcLocales git ]; + checkInputs = [ python3Packages.pytest python3Packages.pytest-rerunfailures glibcLocales git ]; propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit pygments ]; diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index 29e79c0e5030..b68a25630a13 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "antibody-${version}"; - version = "4.0.2"; + pname = "antibody"; + version = "4.1.0"; goPackagePath = "github.com/getantibody/antibody"; src = fetchFromGitHub { - owner = "getantibody"; - repo = "antibody"; + owner = "getantibody"; + repo = "antibody"; rev = "v${version}"; - sha256 = "1lq0bd2l928bgwqiq3fa5ippjhnsfgwdqn6nd3hfis8bijrwc5jv"; + sha256 = "027qh535cpk5mbxav199vvzhwfkcs0lm7skgfhshpzps1yw4w4mb"; }; goDeps = ./deps.nix; diff --git a/pkgs/shells/zsh/antibody/deps.nix b/pkgs/shells/zsh/antibody/deps.nix index bdd53a9d142f..86263b43944e 100644 --- a/pkgs/shells/zsh/antibody/deps.nix +++ b/pkgs/shells/zsh/antibody/deps.nix @@ -1,73 +1,110 @@ -[{ - goPackagePath = "github.com/getantibody/folder"; - fetch = { - type = "git"; - url = "https://github.com/getantibody/folder"; - rev = "479aa91767d47bc27599e6ebc7fd07945dd38132"; - sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j"; - }; -}{ - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; -}{ - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; -}{ - goPackagePath = "github.com/caarlos0/gohome"; - fetch = { - type = "git"; - url = "https://github.com/caarlos0/gohome"; - rev = "75f08ebc60b144c5c3178115baedce176fdcfe99"; - sha256 = "04950r9lzhgkksgqbnlfx0m3n7zqfif3l8fixwb7f271a880i4gz"; - }; -}{ - goPackagePath = "github.com/alecthomas/kingpin"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "a39589180ebd6bbf43076e514b55f20a95d43086"; - sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3"; - }; -}{ - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; -}{ - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "1a580b3eff7814fc9b40602fd35256c63b50f491"; - sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7"; - }; -}{ - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b"; - sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3"; - }; -}{ - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "2491c5de3490fced2f6cff376127c667efeed857"; - sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3"; - }; -}] +[ + { + goPackagePath = "github.com/alecthomas/kingpin"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kingpin"; + rev = "a39589180ebd"; + sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/caarlos0/gohome"; + fetch = { + type = "git"; + url = "https://github.com/caarlos0/gohome"; + rev = "75f08ebc60b1"; + sha256 = "04950r9lzhgkksgqbnlfx0m3n7zqfif3l8fixwb7f271a880i4gz"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/getantibody/folder"; + fetch = { + type = "git"; + url = "https://github.com/getantibody/folder"; + rev = "v1.0.0"; + sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "1a580b3eff78"; + sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "2491c5de3490"; + sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "1d60e4601c6f"; + sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "7c87d13f8e83"; + sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3"; + }; + } +] diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 3e4b756044bc..c9a93db2d981 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -78,7 +78,7 @@ EOF ''; license = "MIT-like"; homepage = http://www.zsh.org/; - maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; + maintainers = with stdenv.lib.maintainers; [ pSub ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 8acdd8bb5161..764459958bf3 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "zsh-prezto-2017-12-03"; + name = "zsh-prezto-2019-03-18"; src = fetchgit { url = "https://github.com/sorin-ionescu/prezto"; - rev = "029414581e54f5b63156f81acd0d377e8eb78883"; - sha256 = "0crrj2nq0wcv5in8qimnkca2an760aqald13vq09s5kbwwc9rs1f"; + rev = "1f4601e44c989b90dc7314b151891fa60a101251"; + sha256 = "1dcd5r7pc4biiplm0lh7yca0h6hs0xpaq9dwaarmfsh9wrd68350"; fetchSubmodules = true; }; buildPhase = '' - sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zpreztorc|/etc/zpreztorc|g" init.zsh + sed -i '/\''${ZDOTDIR:\-\$HOME}\/.zpreztorc" ]]/i\ + if [[ -s "/etc/zpreztorc" ]]; then\ + source "/etc/zpreztorc"\ + fi' init.zsh sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" init.zsh for i in runcoms/*; do sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" $i done - sed -i -e "s|\''${0:h}/cache.zsh|\''${ZDOTDIR:\-\$HOME}/.zfasd_cache|g" modules/fasd/init.zsh ''; installPhase = '' mkdir -p $out diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 1c211f890b0c..08d1008abb41 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -53,7 +53,7 @@ in lib.init bootStages ++ [ cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt or false - then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".gcc + then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".clang else if targetPlatform.isGhcjs then null else buildPackages.gcc; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index fe0c8cfad919..76e1c351ff40 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -1,7 +1,7 @@ # Checks derivation meta and attrs for problems (like brokenness, # licenses, etc). -{ lib, config, hostPlatform, meta }: +{ lib, config, hostPlatform }: let # If we're in hydra, we can dispense with the more verbose error @@ -76,7 +76,7 @@ let showLicense = license: license.shortName or "unknown"; - pos_str = meta.position or "«unknown-file»"; + pos_str = meta: meta.position or "«unknown-file»"; remediation = { unfree = remediate_whitelist "Unfree"; @@ -143,12 +143,12 @@ let ${lib.concatStrings (builtins.map (output: " - ${output}\n") missingOutputs)} ''; - handleEvalIssue = attrs: { reason , errormsg ? "" }: + handleEvalIssue = { meta, attrs }: { reason , errormsg ? "" }: let msg = if inHydra then "Failed to evaluate ${attrs.name or "«name-missing»"}: «${reason}»: ${errormsg}" else '' - Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate. + Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str meta} ${errormsg}, refusing to evaluate. '' + (builtins.getAttr reason remediation) attrs; @@ -245,12 +245,12 @@ let { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; } else { valid = true; }; - assertValidity = attrs: let + assertValidity = { meta, attrs }: let validity = checkValidity attrs; in validity // { # Throw an error if trying to evaluate an non-valid derivation handled = if !validity.valid - then handleEvalIssue attrs (removeAttrs validity ["valid"]) + then handleEvalIssue { inherit meta attrs; } (removeAttrs validity ["valid"]) else true; }; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index cafd1031ab8b..b2ed6f6a80f5 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -1,6 +1,13 @@ { lib, config, stdenv }: -rec { +let + checkMeta = import ./check-meta.nix { + inherit lib config; + # Nix itself uses the `system` field of a derivation to decide where + # to build it. This is a bit confusing for cross compilation. + inherit (stdenv) hostPlatform; + }; +in rec { # `mkDerivation` wraps the builtin `derivation` function to # produce derivations that use this stdenv and its shell. # @@ -70,6 +77,7 @@ rec { else builtins.unsafeGetAttrPos "name" attrs) , separateDebugInfo ? false , outputs ? [ "out" ] + , __darwinAllowLocalNetworking ? false , __impureHostDeps ? [] , __propagatedImpureHostDeps ? [] , sandboxProfile ? "" @@ -175,6 +183,7 @@ rec { (removeAttrs attrs ["meta" "passthru" "pos" "checkInputs" "installCheckInputs" + "__darwinAllowLocalNetworking" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) // (lib.optionalAttrs (!(attrs ? name) && attrs ? pname && attrs ? version)) { @@ -245,6 +254,7 @@ rec { } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { NIX_HARDENING_ENABLE = enabledHardeningOptions; } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { + inherit __darwinAllowLocalNetworking; # TODO: remove lib.unique once nix has a list canonicalization primitive __sandboxProfile = let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; @@ -260,12 +270,7 @@ rec { __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; }; - validity = import ./check-meta.nix { - inherit lib config meta; - # Nix itself uses the `system` field of a derivation to decide where - # to build it. This is a bit confusing for cross compilation. - inherit (stdenv) hostPlatform; - } attrs; + validity = checkMeta { inherit meta attrs; }; # The meta attribute is passed in the resulting attribute set, # but it's not part of the actual derivation, i.e., it's not diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 9b434da7a84a..793229f8bbb0 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -7,6 +7,7 @@ with pkgs; cc-wrapper-gcc = callPackage ./cc-wrapper { stdenv = gccStdenv; }; cc-wrapper-gcc7 = callPackage ./cc-wrapper { stdenv = gcc7Stdenv; }; cc-wrapper-gcc8 = callPackage ./cc-wrapper { stdenv = gcc8Stdenv; }; + cc-wrapper-gcc9 = callPackage ./cc-wrapper { stdenv = gcc9Stdenv; }; cc-wrapper-clang = callPackage ./cc-wrapper { stdenv = llvmPackages.stdenv; }; cc-wrapper-libcxx = callPackage ./cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; cc-wrapper-clang-39 = callPackage ./cc-wrapper { stdenv = llvmPackages_39.stdenv; }; diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 73ec20a57a3a..41f21abd44d6 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "ckbcomp-${version}"; - version = "1.188"; + version = "1.190"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "1741mg2wc5wa63clkijmv04zd6jxhc7c6aq7mkhqw1r4dhfhih19"; + sha256 = "0qklm9ww1wap2bs7hp31xkfjyhdrirg2mk4hiv7h6fiqckzmdwvd"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index 669cb4b4844a..bf3ff7c65281 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -8,6 +8,7 @@ , lib , primusLib , writeScriptBin +, runtimeShell , primusLib_i686 ? null , useNvidia ? true }: @@ -25,7 +26,7 @@ let )); in writeScriptBin "primusrun" '' - #!${stdenv.shell} + #!${runtimeShell} export LD_LIBRARY_PATH=${ldPath}:$LD_LIBRARY_PATH exec "$@" '' diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index 54ab6a3c803d..4dfc06aa4366 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; - version = "0.6.1"; + version = "0.6.2"; doCheck = false; @@ -12,11 +12,11 @@ rustPlatform.buildRustPackage rec { repo = "xidlehook"; rev = version; - sha256 = "04h6j66wif202x4kssagb66nnrz9m9ccs1d0dfh92955yix1ln23"; + sha256 = "1ca29rw1w2ldahp9f1v9kfrjycbjwx3mab3m25lr82084kaa6lsh"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - cargoSha256 = "1pdhbqnkgwp2v5zyin8z8049aq8c3kfk04v9wsbz8qla34rgi99s"; + cargoSha256 = "1sy7q875gg6as98lp6m15x9b3lhdikm9326lmqcs5fv3hhzvdlvy"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig patchelf ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 1d6ea45c9c5e..efafbb3692ed 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk , wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which -, ffmpeg, x264, libvpx, libwebp +, ffmpeg_4, x264, libvpx, libwebp, x265 , libfakeXinerama , gst_all_1, pulseaudio, gobject-introspection , pam }: @@ -14,11 +14,11 @@ let xf86videodummy = callPackage ./xf86videodummy { }; in buildPythonApplication rec { pname = "xpra"; - version = "2.3.4"; + version = "2.5"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "0wa3kx54himy3i1b2801hlzfilh3cf4kjk40k1cjl0ds28m5hija"; + sha256 = "0q6c7ijgpp2wk6jlh0pzqki1w60i36wyl2zfwkg0gpdh40ypab3x"; }; patches = [ @@ -28,7 +28,11 @@ in buildPythonApplication rec { }) ]; - nativeBuildInputs = [ pkgconfig gobject-introspection wrapGAppsHook ]; + postPatch = '' + substituteInPlace setup.py --replace '/usr/include/security' '${pam}/include/security' + ''; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = with xorg; [ libX11 xorgproto libXrender libXi libXtst libXfixes libXcomposite libXdamage @@ -36,9 +40,9 @@ in buildPythonApplication rec { ] ++ [ cython - pango cairo gdk_pixbuf atk gtk3 glib + pango cairo gdk_pixbuf atk.out gtk3 glib - ffmpeg libvpx x264 libwebp + ffmpeg_4 libvpx x264 libwebp x265 gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -47,11 +51,13 @@ in buildPythonApplication rec { gst_all_1.gst-libav pam + gobject-introspection ]; - propagatedBuildInputs = with python3.pkgs; [ pillow rencode pycrypto cryptography pycups lz4 dbus-python - netifaces numpy websockify pygobject3 pycairo gst-python pam + netifaces numpy pygobject3 pycairo gst-python pam + pyopengl paramiko opencv python-uinput pyxdg + ipaddress idna ]; NIX_CFLAGS_COMPILE = [ @@ -64,6 +70,9 @@ in buildPythonApplication rec { "--without-strict" "--with-gtk3" "--without-gtk2" + # Override these, setup.py checks for headers in /usr/* paths + "--with-pam" + "--with-vsock" ]; preFixup = '' @@ -76,6 +85,8 @@ in buildPythonApplication rec { doCheck = false; + enableParallelBuilding = true; + passthru = { inherit xf86videodummy; }; meta = { @@ -85,8 +96,6 @@ in buildPythonApplication rec { description = "Persistent remote applications for X"; platforms = platforms.linux; license = licenses.gpl2; - # https://github.com/NixOS/nixpkgs/pull/48872#issuecomment-433559636 - broken = true; maintainers = with maintainers; [ tstrobel offline numinit ]; }; } diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch index c50ec28c35e2..ac8107235be5 100644 --- a/pkgs/tools/X11/xpra/fix-paths.patch +++ b/pkgs/tools/X11/xpra/fix-paths.patch @@ -9,25 +9,26 @@ cython_add(Extension("xpra.client.gtk3.cairo_workaround", ["xpra/client/gtk3/cairo_workaround.pyx"], **pkgconfig(pycairo) ---- a/xpra/client/gtk3/cairo_workaround.pyx -+++ b/xpra/client/gtk3/cairo_workaround.pyx -@@ -65,7 +65,7 @@ - void cairo_surface_flush (cairo_surface_t *surface) - void cairo_surface_mark_dirty (cairo_surface_t *surface) - --cdef extern from "pycairo/pycairo.h": -+cdef extern from "py3cairo.h": - ctypedef struct Pycairo_CAPI_t: - pass - ctypedef struct PycairoSurface: +@@ -2363,10 +2363,7 @@ + v4l2_pkgconfig = pkgconfig() + #fuly warning: cython makes this difficult, + #we have to figure out if "device_caps" exists in the headers: +- ENABLE_DEVICE_CAPS = False +- if os.path.exists("/usr/include/linux/videodev2.h"): +- hdata = open("/usr/include/linux/videodev2.h").read() +- ENABLE_DEVICE_CAPS = hdata.find("device_caps")>=0 ++ ENABLE_DEVICE_CAPS = True + kwargs = {"ENABLE_DEVICE_CAPS" : ENABLE_DEVICE_CAPS} + make_constants("xpra", "codecs", "v4l2", "constants", **kwargs) + cython_add(Extension("xpra.codecs.v4l2.pusher", --- a/xpra/x11/bindings/keyboard_bindings.pyx +++ b/xpra/x11/bindings/keyboard_bindings.pyx @@ -19,7 +19,7 @@ DEF PATH_MAX = 1024 - DEF DFLT_XKB_RULES_FILE = "base" --DEF DFLT_XKB_CONFIG_ROOT = "/usr/share/X11/xkb" -+DEF DFLT_XKB_CONFIG_ROOT = "@xkeyboardconfig@/share/X11/xkb" + DEF DFLT_XKB_RULES_FILE = b"base" +-DEF DFLT_XKB_CONFIG_ROOT = b"/usr/share/X11/xkb" ++DEF DFLT_XKB_CONFIG_ROOT = b"@xkeyboardconfig@/share/X11/xkb" ################################### # Headers, python magic diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 738b9d3dcea9..5cbf3cf3a8f0 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, libX11, libXcomposite, libXft, libXmu, pam, apacheHttpd, imagemagick -, pamtester, xscreensaver, xset }: +, libX11, libXcomposite, libXft, libXmu, libXrandr, libXext, libXScrnSaver +, pam, apacheHttpd, imagemagick, pamtester, xscreensaver, xset }: stdenv.mkDerivation rec { name = "xsecurelock-${version}"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { autoreconfHook pkgconfig ]; buildInputs = [ - libX11 libXcomposite libXft libXmu pam - apacheHttpd imagemagick pamtester + libX11 libXcomposite libXft libXmu libXrandr libXext libXScrnSaver + pam apacheHttpd imagemagick pamtester ]; configureFlags = [ diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index e3916b0f8a9e..58798a92b159 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -63,8 +63,8 @@ in rec { }; ansible_2_7 = generic { - version = "2.7.5"; - sha256 = "1fsif2jmkrrgiawsd8r6sxrqvh01fvrmdhas0p540a6i9fby3yda"; + version = "2.7.6"; + sha256 = "0f7b2ghm34ql8yv90wr0ngd6w7wyvnlcxpc3snkj86kcjsnmx1bd"; }; ansible2 = ansible_2_7; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 663dfa40e236..c36b6d2fbd65 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -14,16 +14,23 @@ let sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5"; }; }); + colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { + version = "0.3.9"; + src = oldAttrs.src.override { + inherit version; + sha256 = "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1"; + }; + }); }; }; in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.16.90"; # N.B: if you change this, change botocore to a matching version too + version = "1.16.106"; # N.B: if you change this, change botocore to a matching version too src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "1e2c776ca47ca18ee5ad3d481c0410800b8155342fe73099bc702b17625d7a2d"; + sha256 = "169810cb895ac8608747e81480aebd2712f654ad2e49e1f1315f34d6052d5e2d"; }; # No tests included diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index ba07f75bb36d..45530324e3ff 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxslt, docbook_xsl, libcap }: +{ stdenv, fetchurl, libxslt, docbook_xsl, libcap, fetchpatch }: stdenv.mkDerivation rec { name = "bubblewrap-${version}"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1y2bdlxnlr84xcbf31lzirc292c5ak9bd2wvcvh4ppsliih6pjny"; }; + patches = [ + (fetchpatch { + url = "https://github.com/projectatomic/bubblewrap/commit/efc89e3b939b4bde42c10f065f6b7b02958ed50e.patch"; + name = "CVE-2019-12439.patch"; + sha256 = "1p2w0ixrr3aca6i26ckmlq8ini4a6kgq53r9f98f7ghvbdlp4dkg"; + }) + ]; + nativeBuildInputs = [ libcap libxslt docbook_xsl ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index a4f4910a3344..aa22e10b95da 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -14,6 +14,8 @@ buildPythonApplication rec { sha256 = "0x5vzl4vvirqy03fnjwkamhzrqkknlajamwz1rmbnqh4bfmijh9m"; }; + patches = [ ./fix-tests.patch ]; + propagatedBuildInputs = [ pymysql configobj sqlparse prompt_toolkit pygments click pycrypto cli-helpers ]; diff --git a/pkgs/tools/admin/mycli/fix-tests.patch b/pkgs/tools/admin/mycli/fix-tests.patch new file mode 100644 index 000000000000..e67370bc824a --- /dev/null +++ b/pkgs/tools/admin/mycli/fix-tests.patch @@ -0,0 +1,446 @@ +diff --git a/mycli/sqlcompleter.py b/mycli/sqlcompleter.py +index 81ee128..2b22fa9 100644 +--- a/mycli/sqlcompleter.py ++++ b/mycli/sqlcompleter.py +@@ -16,27 +16,32 @@ _logger = logging.getLogger(__name__) + + class SQLCompleter(Completer): + keywords = ['ACCESS', 'ADD', 'ALL', 'ALTER TABLE', 'AND', 'ANY', 'AS', +- 'ASC', 'AUTO_INCREMENT', 'BEFORE', 'BEGIN', 'BETWEEN', 'BINARY', 'BY', +- 'CASE', 'CHAR', 'CHECK', 'COLUMN', 'COMMENT', 'COMMIT', 'CONSTRAINT', +- 'CHANGE MASTER TO', 'CHARACTER SET', 'COLLATE', 'CREATE', 'CURRENT', 'CURRENT_TIMESTAMP', 'DATABASE', 'DATE', +- 'DECIMAL', 'DEFAULT', 'DELETE FROM', 'DELIMITER', 'DESC', +- 'DESCRIBE', 'DROP', 'ELSE', 'END', 'ENGINE', 'ESCAPE', 'EXISTS', +- 'FILE', 'FLOAT', 'FOR', 'FOREIGN KEY', 'FORMAT', 'FROM', 'FULL', 'FUNCTION', 'GRANT', +- 'GROUP BY', 'HAVING', 'HOST', 'IDENTIFIED', 'IN', 'INCREMENT', 'INDEX', +- 'INSERT INTO', 'INTEGER', 'INTO', 'INTERVAL', 'IS', 'JOIN', 'KEY', 'LEFT', +- 'LEVEL', 'LIKE', 'LIMIT', 'LOCK', 'LOGS', 'LONG', 'MASTER', 'MODE', +- 'MODIFY', 'NOT', 'NULL', 'NUMBER', 'OFFSET', 'ON', 'OPTION', 'OR', +- 'ORDER BY', 'OUTER', 'OWNER', 'PASSWORD', 'PORT', 'PRIMARY', +- 'PRIVILEGES', 'PROCESSLIST', 'PURGE', 'REFERENCES', 'REGEXP', 'RENAME', 'REPAIR', 'RESET', +- 'REVOKE', 'RIGHT', 'ROLLBACK', 'ROW', 'ROWS', 'ROW_FORMAT', 'SELECT', 'SESSION', 'SET', +- 'SAVEPOINT', 'SHARE', 'SHOW', 'SLAVE', 'SMALLINT', 'START', 'STOP', 'TABLE', 'THEN', +- 'TO', 'TRANSACTION', 'TRIGGER', 'TRUNCATE', 'UNION', 'UNIQUE', 'UNSIGNED', 'UPDATE', +- 'USE', 'USER', 'USING', 'VALUES', 'VARCHAR', 'VIEW', 'WHEN', 'WHERE', +- 'WITH', 'TINYINT', 'SMALLINT', 'MEDIUMINT', 'INT', 'BIGINT'] +- +- functions = ['AVG', 'CONCAT', 'COUNT', 'DISTINCT', 'FIRST', 'FORMAT', 'LAST', +- 'LCASE', 'LEN', 'MAX', 'MIN', 'MID', 'NOW', 'ROUND', 'SUM', +- 'TOP', 'UCASE','FROM_UNIXTIME', 'UNIX_TIMESTAMP'] ++ 'ASC', 'AUTO_INCREMENT', 'BEFORE', 'BEGIN', 'BETWEEN', ++ 'BIGINT', 'BINARY', 'BY', 'CASE', 'CHANGE MASTER TO', 'CHAR', ++ 'CHARACTER SET', 'CHECK', 'COLLATE', 'COLUMN', 'COMMENT', ++ 'COMMIT', 'CONSTRAINT', 'CREATE', 'CURRENT', ++ 'CURRENT_TIMESTAMP', 'DATABASE', 'DATE', 'DECIMAL', 'DEFAULT', ++ 'DELETE FROM', 'DELIMITER', 'DESC', 'DESCRIBE', 'DROP', ++ 'ELSE', 'END', 'ENGINE', 'ESCAPE', 'EXISTS', 'FILE', 'FLOAT', ++ 'FOR', 'FOREIGN KEY', 'FORMAT', 'FROM', 'FULL', 'FUNCTION', ++ 'GRANT', 'GROUP BY', 'HAVING', 'HOST', 'IDENTIFIED', 'IN', ++ 'INCREMENT', 'INDEX', 'INSERT INTO', 'INT', 'INTEGER', ++ 'INTERVAL', 'INTO', 'IS', 'JOIN', 'KEY', 'LEFT', 'LEVEL', ++ 'LIKE', 'LIMIT', 'LOCK', 'LOGS', 'LONG', 'MASTER', ++ 'MEDIUMINT', 'MODE', 'MODIFY', 'NOT', 'NULL', 'NUMBER', ++ 'OFFSET', 'ON', 'OPTION', 'OR', 'ORDER BY', 'OUTER', 'OWNER', ++ 'PASSWORD', 'PORT', 'PRIMARY', 'PRIVILEGES', 'PROCESSLIST', ++ 'PURGE', 'REFERENCES', 'REGEXP', 'RENAME', 'REPAIR', 'RESET', ++ 'REVOKE', 'RIGHT', 'ROLLBACK', 'ROW', 'ROWS', 'ROW_FORMAT', ++ 'SAVEPOINT', 'SELECT', 'SESSION', 'SET', 'SHARE', 'SHOW', ++ 'SLAVE', 'SMALLINT', 'SMALLINT', 'START', 'STOP', 'TABLE', ++ 'THEN', 'TINYINT', 'TO', 'TRANSACTION', 'TRIGGER', 'TRUNCATE', ++ 'UNION', 'UNIQUE', 'UNSIGNED', 'UPDATE', 'USE', 'USER', ++ 'USING', 'VALUES', 'VARCHAR', 'VIEW', 'WHEN', 'WHERE', 'WITH'] ++ ++ functions = ['AVG', 'CONCAT', 'COUNT', 'DISTINCT', 'FIRST', 'FORMAT', ++ 'FROM_UNIXTIME', 'LAST', 'LCASE', 'LEN', 'MAX', 'MID', ++ 'MIN', 'NOW', 'ROUND', 'SUM', 'TOP', 'UCASE', 'UNIX_TIMESTAMP'] + + show_items = [] + +diff --git a/test/test_naive_completion.py b/test/test_naive_completion.py +index 3282c7e..01a432d 100644 +--- a/test/test_naive_completion.py ++++ b/test/test_naive_completion.py +@@ -19,36 +19,36 @@ def complete_event(): + def test_empty_string_completion(completer, complete_event): + text = '' + position = 0 +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert result == set(map(Completion, completer.all_completions)) ++ assert result == list(map(Completion, sorted(completer.all_completions))) + + + def test_select_keyword_completion(completer, complete_event): + text = 'SEL' + position = len('SEL') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert result == set([Completion(text='SELECT', start_position=-3)]) ++ assert result == list([Completion(text='SELECT', start_position=-3)]) + + + def test_function_name_completion(completer, complete_event): + text = 'SELECT MA' + position = len('SELECT MA') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert result == set([ +- Completion(text='MAX', start_position=-2), +- Completion(text='MASTER', start_position=-2)]) ++ assert result == list([ ++ Completion(text='MASTER', start_position=-2), ++ Completion(text='MAX', start_position=-2)]) + + + def test_column_name_completion(completer, complete_event): + text = 'SELECT FROM users' + position = len('SELECT ') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert result == set(map(Completion, completer.all_completions)) ++ assert result == list(map(Completion, sorted(completer.all_completions))) +diff --git a/test/test_smart_completion_public_schema_only.py b/test/test_smart_completion_public_schema_only.py +index 00059bb..3c29956 100644 +--- a/test/test_smart_completion_public_schema_only.py ++++ b/test/test_smart_completion_public_schema_only.py +@@ -42,11 +42,11 @@ def complete_event(): + def test_empty_string_completion(completer, complete_event): + text = '' + position = 0 +- result = set( ++ result = list( + completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert set(map(Completion, completer.keywords)) == result ++ assert list(map(Completion, completer.keywords)) == result + + + def test_select_keyword_completion(completer, complete_event): +@@ -55,7 +55,7 @@ def test_select_keyword_completion(completer, complete_event): + result = completer.get_completions( + Document(text=text, cursor_position=position), + complete_event) +- assert set(result) == set([Completion(text='SELECT', start_position=-3)]) ++ assert list(result) == list([Completion(text='SELECT', start_position=-3)]) + + + def test_table_completion(completer, complete_event): +@@ -63,10 +63,12 @@ def test_table_completion(completer, complete_event): + position = len(text) + result = completer.get_completions( + Document(text=text, cursor_position=position), complete_event) +- assert set(result) == set([Completion(text='users', start_position=0), +- Completion(text='`select`', start_position=0), +- Completion(text='`réveillé`', start_position=0), +- Completion(text='orders', start_position=0)]) ++ assert list(result) == list([ ++ Completion(text='`réveillé`', start_position=0), ++ Completion(text='`select`', start_position=0), ++ Completion(text='orders', start_position=0), ++ Completion(text='users', start_position=0), ++ ]) + + + def test_function_name_completion(completer, complete_event): +@@ -74,7 +76,7 @@ def test_function_name_completion(completer, complete_event): + position = len('SELECT MA') + result = completer.get_completions( + Document(text=text, cursor_position=position), complete_event) +- assert set(result) == set([Completion(text='MAX', start_position=-2), ++ assert list(result) == list([Completion(text='MAX', start_position=-2), + Completion(text='MASTER', start_position=-2), + ]) + +@@ -89,17 +91,18 @@ def test_suggested_column_names(completer, complete_event): + """ + text = 'SELECT from users' + position = len('SELECT ') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert set(result) == set([ +- Completion(text='users', start_position=0), ++ assert result == list([ + Completion(text='*', start_position=0), +- Completion(text='id', start_position=0), + Completion(text='email', start_position=0), + Completion(text='first_name', start_position=0), +- Completion(text='last_name', start_position=0)] + ++ Completion(text='id', start_position=0), ++ Completion(text='last_name', start_position=0), ++ ] + + list(map(Completion, completer.functions)) + ++ [Completion(text='users', start_position=0)] + + list(map(Completion, completer.keywords))) + + +@@ -117,11 +120,11 @@ def test_suggested_column_names_in_function(completer, complete_event): + result = completer.get_completions( + Document(text=text, cursor_position=position), + complete_event) +- assert set(result) == set([ ++ assert list(result) == list([ + Completion(text='*', start_position=0), +- Completion(text='id', start_position=0), + Completion(text='email', start_position=0), + Completion(text='first_name', start_position=0), ++ Completion(text='id', start_position=0), + Completion(text='last_name', start_position=0)]) + + +@@ -135,14 +138,14 @@ def test_suggested_column_names_with_table_dot(completer, complete_event): + """ + text = 'SELECT users. from users' + position = len('SELECT users.') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert set(result) == set([ ++ assert result == list([ + Completion(text='*', start_position=0), +- Completion(text='id', start_position=0), + Completion(text='email', start_position=0), + Completion(text='first_name', start_position=0), ++ Completion(text='id', start_position=0), + Completion(text='last_name', start_position=0)]) + + +@@ -156,14 +159,14 @@ def test_suggested_column_names_with_alias(completer, complete_event): + """ + text = 'SELECT u. from users u' + position = len('SELECT u.') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert set(result) == set([ ++ assert result == list([ + Completion(text='*', start_position=0), +- Completion(text='id', start_position=0), + Completion(text='email', start_position=0), + Completion(text='first_name', start_position=0), ++ Completion(text='id', start_position=0), + Completion(text='last_name', start_position=0)]) + + +@@ -178,17 +181,17 @@ def test_suggested_multiple_column_names(completer, complete_event): + """ + text = 'SELECT id, from users u' + position = len('SELECT id, ') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert set(result) == set([ +- Completion(text='u', start_position=0), ++ assert result == list([ + Completion(text='*', start_position=0), +- Completion(text='id', start_position=0), + Completion(text='email', start_position=0), + Completion(text='first_name', start_position=0), ++ Completion(text='id', start_position=0), + Completion(text='last_name', start_position=0)] + + list(map(Completion, completer.functions)) + ++ [Completion(text='u', start_position=0)] + + list(map(Completion, completer.keywords))) + + +@@ -203,14 +206,14 @@ def test_suggested_multiple_column_names_with_alias(completer, complete_event): + """ + text = 'SELECT u.id, u. from users u' + position = len('SELECT u.id, u.') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert set(result) == set([ ++ assert result == list([ + Completion(text='*', start_position=0), +- Completion(text='id', start_position=0), + Completion(text='email', start_position=0), + Completion(text='first_name', start_position=0), ++ Completion(text='id', start_position=0), + Completion(text='last_name', start_position=0)]) + + +@@ -225,106 +228,108 @@ def test_suggested_multiple_column_names_with_dot(completer, complete_event): + """ + text = 'SELECT users.id, users. from users u' + position = len('SELECT users.id, users.') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert set(result) == set([ ++ assert result == list([ + Completion(text='*', start_position=0), +- Completion(text='id', start_position=0), + Completion(text='email', start_position=0), + Completion(text='first_name', start_position=0), ++ Completion(text='id', start_position=0), + Completion(text='last_name', start_position=0)]) + + + def test_suggested_aliases_after_on(completer, complete_event): + text = 'SELECT u.name, o.id FROM users u JOIN orders o ON ' + position = len('SELECT u.name, o.id FROM users u JOIN orders o ON ') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert set(result) == set([ +- Completion(text='u', start_position=0), +- Completion(text='o', start_position=0)]) ++ assert result == list([ ++ Completion(text='o', start_position=0), ++ Completion(text='u', start_position=0)]) + + + def test_suggested_aliases_after_on_right_side(completer, complete_event): + text = 'SELECT u.name, o.id FROM users u JOIN orders o ON o.user_id = ' + position = len( + 'SELECT u.name, o.id FROM users u JOIN orders o ON o.user_id = ') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert set(result) == set([ +- Completion(text='u', start_position=0), +- Completion(text='o', start_position=0)]) ++ assert result == list([ ++ Completion(text='o', start_position=0), ++ Completion(text='u', start_position=0)]) + + + def test_suggested_tables_after_on(completer, complete_event): + text = 'SELECT users.name, orders.id FROM users JOIN orders ON ' + position = len('SELECT users.name, orders.id FROM users JOIN orders ON ') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert set(result) == set([ +- Completion(text='users', start_position=0), +- Completion(text='orders', start_position=0)]) ++ assert result == list([ ++ Completion(text='orders', start_position=0), ++ Completion(text='users', start_position=0)]) + + + def test_suggested_tables_after_on_right_side(completer, complete_event): + text = 'SELECT users.name, orders.id FROM users JOIN orders ON orders.user_id = ' + position = len( + 'SELECT users.name, orders.id FROM users JOIN orders ON orders.user_id = ') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert set(result) == set([ +- Completion(text='users', start_position=0), +- Completion(text='orders', start_position=0)]) ++ assert result == list([ ++ Completion(text='orders', start_position=0), ++ Completion(text='users', start_position=0)]) + + + def test_table_names_after_from(completer, complete_event): + text = 'SELECT * FROM ' + position = len('SELECT * FROM ') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert set(result) == set([ +- Completion(text='users', start_position=0), +- Completion(text='orders', start_position=0), ++ assert result == list([ + Completion(text='`réveillé`', start_position=0), + Completion(text='`select`', start_position=0), ++ Completion(text='orders', start_position=0), ++ Completion(text='users', start_position=0), + ]) + + + def test_auto_escaped_col_names(completer, complete_event): + text = 'SELECT from `select`' + position = len('SELECT ') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert set(result) == set([ +- Completion(text='`select`', start_position=0), ++ assert result == [ + Completion(text='*', start_position=0), +- Completion(text='id', start_position=0), ++ Completion(text='`ABC`', start_position=0), + Completion(text='`insert`', start_position=0), +- Completion(text='`ABC`', start_position=0), ] + +- list(map(Completion, completer.functions)) + +- list(map(Completion, completer.keywords))) ++ Completion(text='id', start_position=0), ++ ] + \ ++ list(map(Completion, completer.functions)) + \ ++ [Completion(text='`select`', start_position=0)] + \ ++ list(map(Completion, completer.keywords)) + + + def test_un_escaped_table_names(completer, complete_event): + text = 'SELECT from réveillé' + position = len('SELECT ') +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- assert set(result) == set([ +- Completion(text='réveillé', start_position=0), ++ assert result == list([ + Completion(text='*', start_position=0), +- Completion(text='id', start_position=0), ++ Completion(text='`ABC`', start_position=0), + Completion(text='`insert`', start_position=0), +- Completion(text='`ABC`', start_position=0), ] + ++ Completion(text='id', start_position=0), ++ ] + + list(map(Completion, completer.functions)) + ++ [Completion(text='réveillé', start_position=0)] + + list(map(Completion, completer.keywords))) + + +@@ -349,10 +354,10 @@ def dummy_list_path(dir_name): + + @patch('mycli.packages.filepaths.list_path', new=dummy_list_path) + @pytest.mark.parametrize('text,expected', [ +- ('source ', [('~', 0), +- ('/', 0), +- ('.', 0), +- ('..', 0)]), ++ # ('source ', [('~', 0), ++ # ('/', 0), ++ # ('.', 0), ++ # ('..', 0)]), + ('source /', [('dir1', 0), + ('file1.sql', 0), + ('file2.sql', 0)]), +@@ -363,8 +368,8 @@ def dummy_list_path(dir_name): + ]) + def test_file_name_completion(completer, complete_event, text, expected): + position = len(text) +- result = set(completer.get_completions( ++ result = list(completer.get_completions( + Document(text=text, cursor_position=position), + complete_event)) +- expected = set([Completion(txt, pos) for txt, pos in expected]) ++ expected = list((Completion(txt, pos) for txt, pos in expected)) + assert result == expected diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index 32d0e584f31a..716ffef0ce52 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,23 +1,25 @@ { stdenv, lib, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.4"; - versionMinor = "6_1"; + versionMajor = "6.7"; + versionMinor = "6"; + versionBuild_x86_64 = "11"; + versionBuild_i686 = "11"; in stdenv.mkDerivation rec { - name = "nomachine-client-${version}"; + pname = "nomachine-client"; version = "${versionMajor}.${versionMinor}"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_x86_64.tar.gz"; - sha256 = "141pv277kl5ij1pmc0iadc0hnslxri2qaqvsjkmmvls4432jh0yi"; + url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; + sha256 = "1mka0a7p03y53zsf0srrcj4f7sigda5vndrwqhr0vncc2qws03k0"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_i686.tar.gz"; - sha256 = "0a2vi4ygw34yw8rcjhw17mqx5qbjnym4jkap8paik8lisb5mhnyj"; + url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; + sha256 = "1g94s65bp99nfmzvwv1wasvjhgjbfg9jkc089qimi0lvr8ajabkx"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/tools/admin/sewer/default.nix index 5410d0c833df..59edaff5f94e 100644 --- a/pkgs/tools/admin/sewer/default.nix +++ b/pkgs/tools/admin/sewer/default.nix @@ -2,20 +2,15 @@ python3Packages.buildPythonApplication rec { pname = "sewer"; - version = "0.6.0"; + version = "0.7.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "180slmc2zk4mvjqp25ks0j8kd63ai4y77ds5icm7qd7av865rryp"; + sha256 = "16j4npqj3fdj3g2z7nqb0cvvxd85xk20g9c43f3q8a1k5psf1fmq"; }; propagatedBuildInputs = with python3Packages; [ pyopenssl requests tldextract ]; - postPatch = '' - # The README has non-ascii characters which makes setup.py crash. - sed -i 's/[\d128-\d255]//g' README.md - ''; - meta = with stdenv.lib; { homepage = https://github.com/komuw/sewer; description = "ACME client"; diff --git a/pkgs/tools/admin/virtscreen/default.nix b/pkgs/tools/admin/virtscreen/default.nix new file mode 100644 index 000000000000..73a81fcff875 --- /dev/null +++ b/pkgs/tools/admin/virtscreen/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, python3Packages, x11vnc, xrandr, libGL }: + +python3Packages.buildPythonApplication rec { + pname = "virtscreen"; + version = "0.3.1"; + + disabled = python3Packages.pythonOlder "3.6"; + + # No tests + doCheck = false; + + src = fetchFromGitHub { + owner = "kbumsik"; + repo = pname; + rev = version; + sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08"; + }; + + propagatedBuildInputs = with python3Packages; [ + netifaces + pyqt5 + quamash + x11vnc + xrandr + ]; + + postPatch = let + ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + substituteInPlace virtscreen/__main__.py \ + --replace "'GL'" "'${libGL}/lib/libGL${ext}'" \ + ''; + + meta = with stdenv.lib; { + description = "Make your iPad/tablet/computer as a secondary monitor on Linux"; + homepage = https://github.com/kbumsik/VirtScreen; + license = licenses.gpl3; + maintainers = with maintainers; [ borisbabic ]; + }; +} diff --git a/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch b/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch new file mode 100644 index 000000000000..d52995281347 --- /dev/null +++ b/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch @@ -0,0 +1,45 @@ +From 428c6e0eb604b63a67fda6af445c10c8ae3c1826 Mon Sep 17 00:00:00 2001 +From: Philipp Gesang +Date: Sun, 27 Jan 2019 21:37:13 +0100 +Subject: [PATCH] makefile: fix installation + +- comment hard-coded $(CC) +- avoid full paths during install +- set proper permissions +--- + Makefile | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 9268c6f..0797579 100644 +--- a/Makefile ++++ b/Makefile +@@ -76,7 +76,7 @@ MW=-Wformat -Werror=format-security -Wall + + CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer -Wno-unused-result $(LARGEFILEFLAGS) $(MW) + +-CC=gcc ++#CC=gcc + + # also using contents of usin CPPFLAGS, CFLAGS, LDFLAGS out of environment + # variables, if they exist +@@ -94,9 +94,14 @@ clean: + rm -f regtest/statsize regtest/statsize64 + cd regtest; /bin/sh regtest.clean + ++ifndef DESTDIR ++install: ++ $(error Please specify install prefix as $$DESTDIR) ++else + install: afio +- cp afio /usr/local/bin +- cp afio.1 /usr/share/man/man1 ++ install -Dm755 afio $(DESTDIR)/bin/afio ++ install -Dm644 afio.1 $(DESTDIR)/share/man/man1/afio.1 ++endif + + # generate default list of -E extensions from manpage + # note: on sun, I had to change awk command below to nawk or gawk +-- +2.18.1 + diff --git a/pkgs/tools/archivers/afio/afio-2.5.1-install.patch b/pkgs/tools/archivers/afio/afio-2.5.1-install.patch deleted file mode 100644 index 9fa7aacfa887..000000000000 --- a/pkgs/tools/archivers/afio/afio-2.5.1-install.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- p1/Makefile.orig 2017-02-14 21:40:20.404249126 +0100 -+++ p1/Makefile 2017-02-19 23:38:43.880414077 +0100 -@@ -66,37 +66,42 @@ - # systems the large file compile environment itself might be buggy or beta. - #LARGEFILEFLAGS= - LARGEFILEFLAGS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - - # even more warnings flags.. - MW= - #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations - - CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW} - --CC=gcc -+#CC=gcc - - CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I - LDFLAGS = - - afio : afio.o compfile.o exten.o match.o $M - ${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio - - clean: - rm -f *.o afio - rm -f regtest/cmpstat regtest/makesparse - rm -f regtest/statsize regtest/statsize64 - cd regtest; /bin/sh regtest.clean - -+ifndef DESTDIR -+install: -+ $(error Please specify install prefix as $$DESTDIR) -+else - install: afio -- cp afio /usr/local/bin -- cp afio.1 /usr/share/man/man1 -+ install -Dm755 afio $(DESTDIR)/bin/afio -+ install -Dm644 afio.1 $(DESTDIR)/share/man/man1/afio.1 -+endif - - # generate default list of -E extensions from manpage - # note: on sun, I had to change awk command below to nawk or gawk - # to get it to work. - exten_default.h : afio.1 - awk -f exten_make.awk afio.1 >exten_default.h - - - afio.o : afio.h patchlevel.h - compfile.o : afio.h diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index 551e38a7869d..0014febf40e4 100644 --- a/pkgs/tools/archivers/afio/default.nix +++ b/pkgs/tools/archivers/afio/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - version = "2.5.1"; + version = "2.5.2"; name = "afio-${version}"; src = fetchurl { url = "http://members.chello.nl/~k.holtman/${name}.tgz"; - sha256 = "363457a5d6ee422d9b704ef56d26369ca5ee671d7209cfe799cab6e30bf2b99a"; + sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66"; }; /* * A patch to simplify the installation and for removing the * hard coded dependency on GCC. */ - patches = [ ./afio-2.5.1-install.patch ]; + patches = [ ./0001-makefile-fix-installation.patch ]; installFlags = "DESTDIR=$(out)"; diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index a6f5052ad08a..8ec34ce6730b 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -62,5 +62,7 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.all; + + priority = 10; }; } diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index 6d5041c52d03..3c515b8c195d 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { script = substituteAll { src = ./rpmextract.sh; + isExecutable = true; inherit rpm cpio; inherit (stdenv) shell; }; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index ffea29691d69..7a6d4e6d3ab9 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2019.01.01"; + version = "2019.02.08"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "10kqxw4vrz7xa8fc9z5cdyrvks8fsr2s9nai9yg1z9p5w7xhagrg"; + sha256 = "14j2vgcck7c6x8bplhfng7mmqcmh7h98jggi30d5xa0anx1271sb"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 8d2bf5e634c3..21e748cc79de 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, writeScript, glibcLocales, diffPlugins , pythonPackages, imagemagick, gobject-introspection, gst_all_1 +, runtimeShell , fetchpatch # Attributes needed for tests of the external plugins @@ -140,19 +141,22 @@ in pythonPackages.buildPythonApplication rec { ++ optional enableAlternatives plugins.alternatives ++ optional enableCopyArtifacts plugins.copyartifacts; - buildInputs = with pythonPackages; [ - beautifulsoup4 + buildInputs = [ imagemagick - mock - nose - rarfile - responses ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly ]); + checkInputs = with pythonPackages; [ + beautifulsoup4 + mock + nose + rarfile + responses + ]; + patches = [ ./replaygain-default-bs1770gain.patch ./keyfinder-default-bin.patch @@ -212,9 +216,7 @@ in pythonPackages.buildPythonApplication rec { LOCALE_ARCHIVE=${assert stdenv.isLinux; glibcLocales}/lib/locale/locale-archive \ BEETS_TEST_SHELL="${testShell}" \ BASH_COMPLETION_SCRIPT="${completion}" \ - HOME="$(mktemp -d)" \ - # Exclude failing test https://github.com/beetbox/beets/issues/2652 - nosetests -v --exclude=test_single_month_nonmatch_ --exclude=test_asciify_variable --exclude=test_asciify_character_expanding_to_slash + HOME="$(mktemp -d)" nosetests -v runHook postCheck ''; @@ -227,7 +229,7 @@ in pythonPackages.buildPythonApplication rec { tmphome="$(mktemp -d)" EDITOR="${writeScript "beetconfig.sh" '' - #!${stdenv.shell} + #!${runtimeShell} cat > "$1" <=2.4,<3.0', + 'google-music-utils>=2.1,<3.0', + 'google-music>=3.0,<4.0', +- 'loguru>=0.2,<0.3', ++ 'loguru>=0.3,<0.4', + 'natsort>=5.0,<7.0', + 'pendulum>=2.0,<3.0', + 'tomlkit>=0.5,<0.6'] diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 8fed569f140f..f611055a4341 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.defaultIconTheme + makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.adwaita-icon-theme librsvg wrapGAppsHook ]; diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index 93e7afdce417..4b72ed3bfd30 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mpDris2"; name = "${pname}-${version}"; - version = "0.7"; + version = "0.8"; src = fetchurl { url = "https://github.com/eonpatapon/${pname}/archive/${version}.tar.gz"; - sha256 = "095swrjw59lh8qiwmjjjdbxl9587axilkj4mh2sx5m0kiq929z21"; + sha256 = "14a3va3929qaq1sp9hs9w4bs6lykdvshkbc58kbsc5nzvlgmrcdn"; }; preConfigure = '' diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 41b3b15738d6..cb6853c9a443 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; buildInputs = [ - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/tools/backup/automysqlbackup/default.nix b/pkgs/tools/backup/automysqlbackup/default.nix new file mode 100644 index 000000000000..44c14f2dc324 --- /dev/null +++ b/pkgs/tools/backup/automysqlbackup/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, makeWrapper, mysql, mailutils, pbzip2, pigz, bzip2, gzip }: + +stdenv.mkDerivation rec { + pname = "automysqlbackup"; + version = "3.0_rc6"; + + src = fetchurl { + url = "mirror://sourceforge/automysqlbackup/AutoMySQLBackup/AutoMySQLBackup%20VER%203.0/automysqlbackup-v${version}.tar.gz"; + sha256 = "1h1wq86q6my1a682nr8pjagjhai4lxz967m17lhpw1vb116hd7l8"; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin $out/etc + + cp automysqlbackup $out/bin/ + cp automysqlbackup.conf $out/etc/ + + wrapProgram $out/bin/automysqlbackup --prefix PATH : ${stdenv.lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]} + ''; + + meta = with stdenv.lib; { + description = "A script to run daily, weekly and monthly backups for your MySQL database"; + homepage = https://sourceforge.net/projects/automysqlbackup/; + platforms = platforms.linux; + maintainers = [ maintainers.aanderse ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index d30eaf12f911..1c0e08a2dbbd 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchpatch, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }: +{ stdenv, fetchpatch, python3, acl, libb2, lz4, zstd, openssl, openssh }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.9"; + version = "1.1.10"; - src = python3Packages.fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "7d0ff84e64c4be35c43ae2c047bb521a94f15b278c2fe63b43950c4836b42575"; + sha256 = "1pp70p4n5kamvcbl4d8021ggrxhyykmg9isjg4yd3wags8b19d7g"; }; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = with python3.pkgs; [ # For building documentation: sphinx guzzle_sphinx_theme ]; buildInputs = [ - libb2 lz4 zstd openssl python3Packages.setuptools_scm + libb2 lz4 zstd openssl python3.pkgs.setuptools_scm ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; - propagatedBuildInputs = with python3Packages; [ - cython msgpack-python + propagatedBuildInputs = with python3.pkgs; [ + cython ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ]; preConfigure = '' @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/ ''; - checkInputs = with python3Packages; [ + checkInputs = with python3.pkgs; [ pytest ]; diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 4133478dbf98..8aa2d015205e 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "burp-${version}"; - version = "2.1.32"; + version = "2.2.18"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; rev = version; - sha256 = "1izs5vavffvj6z478s5x1shg71p2v5bnnrsam1avs21ylxbfnxi5"; + sha256 = "1zhq240kz881vs2s620qp0kifmgr582caalm85ls789w9rmdkhjl"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix index 3855152880e2..de501659b083 100644 --- a/pkgs/tools/backup/ddar/default.nix +++ b/pkgs/tools/backup/ddar/default.nix @@ -23,6 +23,7 @@ python2.pkgs.buildPythonApplication rec { make -f Makefile.prep synctus/ddar_pb2.py ''; + nativeBuildInputs = with python2.pkgs; [ protobuf.protobuf ]; propagatedBuildInputs = with python2.pkgs; [ protobuf ]; checkInputs = [ roundup ]; diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/tools/backup/dirvish/default.nix new file mode 100644 index 000000000000..829dca52dfe5 --- /dev/null +++ b/pkgs/tools/backup/dirvish/default.nix @@ -0,0 +1,62 @@ +{ fetchurl, stdenv, makeWrapper, perl, rsync, perlPackages }: + +stdenv.mkDerivation rec { + name = "dirvish-1.2.1"; + src = fetchurl { + url = "http://dirvish.org/${name}.tgz"; + sha256 = "6b7f29c3541448db3d317607bda3eb9bac9fb3c51f970611ffe27e9d63507dcd"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ] ++ (with perlPackages; [ GetoptLong TimeParseDate TimePeriod ]); + + executables = [ "dirvish" "dirvish-runall" "dirvish-expire" "dirvish-locate" ]; + manpages = [ "dirvish.8" "dirvish-runall.8" "dirvish-expire.8" "dirvish-locate.8" "dirvish.conf.5" ]; + + buildPhase = '' + HEADER="#!${perl}/bin/perl + + \$CONFDIR = \"/etc/dirvish\"; + + " + + for executable in $executables; do + ( + echo "$HEADER" + cat $executable.pl loadconfig.pl + ) > $executable + chmod +x $executable + done + ''; + + installPhase = '' + mkdir -p $out/bin + cp --target-directory=$out/bin $executables + + for manpage in $manpages; do + if [[ $manpage =~ \.([[:digit:]]+)$ ]]; then + section=''${BASH_REMATCH[1]} + mkdir -p $out/man/man$section + cp --target-directory=$out/man/man$section $manpage + else + echo "Couldn't determine man page section by filename" + exit 1 + fi + done + ''; + + postFixup = '' + for executable in $executables; do + wrapProgram $out/bin/$executable \ + --set PERL5LIB "$PERL5LIB" + done + ''; + + meta = with stdenv.lib; { + description = "Dirvish is a fast, disk based, rotating network backup system"; + homepage = http://dirvish.org/; + license = stdenv.lib.licenses.osl2; + platforms = platforms.linux; + maintainers = [ maintainers.winpat ]; + }; +} diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix index d36ef7ea64fb..c774711b874c 100644 --- a/pkgs/tools/backup/duplicati/default.nix +++ b/pkgs/tools/backup/duplicati/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "duplicati-${version}"; - version = "2.0.3.3"; + version = "2.0.4.5"; channel = "beta"; - build_date = "2018-04-02"; + build_date = "2018-11-28"; src = fetchzip { url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip"; - sha256 = "0hwdpsgrvm3gq648mg9g0z0rk49g71dd8r5i1a8w83pwdqv0hn9c"; + sha256 = "118rhzm8vk1092214vq7kxnmrnz4jl32lk8j90965a8pg05m53gn"; stripRoot = false; }; diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix index e6284aa42d75..224b8b12906e 100644 --- a/pkgs/tools/backup/flockit/default.nix +++ b/pkgs/tools/backup/flockit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, runtimeShell }: stdenv.mkDerivation rec { name = "flockit-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp ./libflockit.so $out/lib (cat < $out/bin/flockit diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 7b039f93a039..da44e389bdd5 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.9.4"; + version = "0.9.5"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "15lx01w46bwn3hjwpmm8xy71m7ml9wdwddbbfvmk5in61gv1acr5"; + sha256 = "1bhn3xwlycpnjg2qbqblwxn3apj43lr5cakgkmrblk13yfwfv5xv"; }; buildPhase = '' diff --git a/pkgs/tools/compression/bzip2/cve-2019-12900.patch b/pkgs/tools/compression/bzip2/cve-2019-12900.patch new file mode 100644 index 000000000000..bf3d13a7a691 --- /dev/null +++ b/pkgs/tools/compression/bzip2/cve-2019-12900.patch @@ -0,0 +1,13 @@ +https://gitlab.com/federicomenaquintero/bzip2/commit/74de1e2e6ffc9d +diff --git a/decompress.c b/decompress.c +--- a/decompress.c ++++ b/decompress.c +@@ -287,7 +287,7 @@ + GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); + if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); + GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); +- if (nSelectors < 1) RETURN(BZ_DATA_ERROR); ++ if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); + for (i = 0; i < nSelectors; i++) { + j = 0; + while (True) { diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 4a2ba2fcb94c..f760e9b5672d 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./CVE-2016-3189.patch + ./cve-2019-12900.patch ]; diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index ce2aa9520d67..19c160c62f5a 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3 }: +{ stdenv, fetchurl, python3, runtimeShell }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" "$out/${python3.sitePackages}/" cp "${src}" "$out/${python3.sitePackages}/mozlz4a.py" - echo "#!${stdenv.shell}" >> "$out/bin/mozlz4a" + echo "#!${runtimeShell}" >> "$out/bin/mozlz4a" echo "export PYTHONPATH='$PYTHONPATH'" >> "$out/bin/mozlz4a" echo "'${python3}/bin/python' '$out/${python3.sitePackages}/mozlz4a.py' \"\$@\"" >> "$out/bin/mozlz4a" chmod a+x "$out/bin/mozlz4a" diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index 69d4284b795d..3421045fe4c6 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, fts }: +{ stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; - buildInputs = [ libxml2 openssl zlib bzip2 fts ]; + buildInputs = [ libxml2 lzma openssl zlib bzip2 fts ]; meta = { homepage = https://mackyle.github.io/xar/; diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index dfd522f5a094..4e2f8eaf5c9b 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "cryfs-${version}"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "cryfs"; repo = "cryfs"; rev = "${version}"; - sha256 = "07f2k2b595m3vkwwlmlc0m7px0nwrrzrph3z6sss9354m0b0lcri"; + sha256 = "04yqpad8x0hiiwpykcn3swi0py6sg9xid6g15ny2qs4j3llin5ry"; }; prePatch = '' diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 215f02ccdd4e..ccc5f1f2d4a8 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = { license = lib.licenses.asl20; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = []; homepage = https://cloud.google.com/storage/docs/gcs-fuse; description = diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix index f9021c5a3aa7..083bae24d601 100644 --- a/pkgs/tools/filesystems/ifuse/default.nix +++ b/pkgs/tools/filesystems/ifuse/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "ifuse"; - version = "1.1.3"; + version = "2018-10-08"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = version; - sha256 = "0p01rds3vc5864v48swgqw5dv0h937nqnxggryixg9pkvzhc6cx5"; + rev = "e75d32c34d0e8b80320f0a007d5ecbb3f55ef7f0"; + sha256 = "1b9w2i0sliswlkkb890l9i0rxrf631xywxf8ihygfmjdsfw47h1m"; }; nativeBuildInputs = [ autoreconfHook pkgconfig fuse usbmuxd libimobiledevice ]; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix index 697256982bbf..15bb390e3648 100644 --- a/pkgs/tools/filesystems/mhddfs/default.nix +++ b/pkgs/tools/filesystems/mhddfs/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { ./fix-format-security-error.patch ]; + postPatch = '' + substituteInPlace src/main.c --replace "attr/xattr.h" "sys/xattr.h" + substituteInPlace src/tools.c --replace "attr/xattr.h" "sys/xattr.h" + ''; + installPhase = '' mkdir -p $out/bin cp mhddfs $out/bin/ diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 797ce40a561f..42889714e924 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec{ - name = "netatalk-3.1.11"; + name = "netatalk-3.1.12"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2"; - sha256 = "3434472ba96d3bbe3b024274438daad83b784ced720f7662a4c1d0a1078799a6"; + sha256 = "1ld5mnz88ixic21m6f0xcgf8v6qm08j6xabh1dzfj6x47lxghq0m"; }; patches = [ diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 9fe4f90f258b..b5f3a2f3e1f6 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/cryptsetup/; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 7ee54a63fbb8..c919bfade3ac 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, utillinux, libuuid +{stdenv, fetchurl, utillinux, libuuid , crypto ? false, libgcrypt, gnutls, pkgconfig}: stdenv.mkDerivation rec { @@ -12,17 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = stdenv.lib.optional crypto pkgconfig; src = fetchurl { - url = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz"; + url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz"; sha256 = "1mb228p80hv97pgk3myyvgp975r9mxq56c6bdn1n24kngcfh4niy"; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.org/data/main/n/ntfs-3g/1:2016.2.22AR.1+dfsg-1/debian/patches/0003-CVE-2017-0358.patch"; - sha256 = "0hd05q9q06r18k8pmppvch1sslzqln5fvqj51d5r72g4mnpavpj3"; - }) - ]; - patchPhase = '' substituteInPlace src/Makefile.in --replace /sbin '@sbindir@' substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@' diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 8a9af4ba13c1..26cef4ac90f2 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ fuse samba glib attr libsecret ]; + postPatch = '' + substituteInPlace src/function.c --replace "attr/xattr.h" "sys/xattr.h" + ''; + meta = with stdenv.lib; { description = "A FUSE FS for mounting Samba shares"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 6acb034d75b6..3b9e4a021080 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -4,18 +4,18 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; - sha256 = "1skbzmrcjbw00a3jnbl2llqwz3ahsgvq74mjav68s2hw1wjidvk6"; + sha256 = "1hxsizk3hm1465wkxwdbbcffgi3r64y3r0zsfzsvhvnzx4y5dadm"; } else { arch = "i386"; gcclib = "${stdenv.cc.cc.lib}/lib"; - sha256 = "09h71i3k9d24ki81jdwhnav63fqbc44glbx228s9g3cr4ap41jcx"; + sha256 = "1s829q8gy9xgz0jm7w70aljqs2h49x402blqfr9zvn806aprmrm5"; }; in stdenv.mkDerivation rec { name = "yandex-disk-${version}"; - version = "0.1.5.978"; + version = "0.1.5.1010"; src = fetchurl { url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/pkgs/tools/graphics/blur-effect/default.nix new file mode 100644 index 000000000000..5bb209984396 --- /dev/null +++ b/pkgs/tools/graphics/blur-effect/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, gdk_pixbuf, libGL, mesa }: + +stdenv.mkDerivation rec { + pname = "blur-effect"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "sonald"; + repo = pname; + rev = version; + sha256 = "0cjw7iz0p7x1bi4vmwrivfidry5wlkgfgdl9wly88cm3z9ib98jj"; + }; + + nativeBuildInputs = [ + pkgconfig + cmake + ]; + + buildInputs = [ + gdk_pixbuf + libGL + mesa + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/sonald/blur-effect; + description = "Off-screen image blurring utility using OpenGL ES 3.0"; + license = licenses.gpl3; + platforms = platforms.unix; + broken = stdenv.hostPlatform.isDarwin; # packages 'libdrm' and 'gbm' not found + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index fb9b7cae488f..a6b3ba01bfa4 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -1,6 +1,6 @@ # The releases of this project are apparently precompiled to .jar files. -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, runtimeShell }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation { mkdir -p "$out/bin"; mkdir -p "$out/share"; install -D -m444 -t "$out/share" *.jar - echo "#!${stdenv.shell}" > "$out/bin/briss" + echo "#!${runtimeShell}" > "$out/bin/briss" echo "${jre}/bin/java -Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\"" >> "$out/bin/briss" chmod +x "$out/bin/briss" ''; diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 70821468992b..566d6f48e1cc 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu ]; - configureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"]; + wafConfigureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"]; meta = with stdenv.lib; { description = "OpenGL (ES) 2.0 benchmark"; diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix index c21fc02753ec..63d3e60e2069 100644 --- a/pkgs/tools/graphics/graph-easy/default.nix +++ b/pkgs/tools/graphics/graph-easy/default.nix @@ -11,7 +11,7 @@ perlPackages.buildPerlPackage rec { meta = with stdenv.lib; { description = "Render/convert graphs in/from various formats"; license = licenses.gpl1; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.jensbin ]; }; } diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 48d40ac49652..1d3a8b26aae8 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkgconfig , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp , libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu }: stdenv.mkDerivation rec { name = "gromit-mpx-${version}"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "bk138"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake autoreconfHook + cmake gtk glib pcre libappindicator libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus libdbusmenu diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 5a655b9ff162..883453379c4e 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, bash, curl, xsel }: stdenv.mkDerivation rec { - name = "imgurbash2-${version}"; - version = "2.1"; + pname = "imgurbash2"; + version = "3.1"; src = fetchFromGitHub { owner = "ram-on"; repo = "imgurbash2"; rev = version; - sha256 = "1vdkyy0gvjqwc2g7a1lqx6cbynfxbd4f66m8sg1xjvd0kdpgi9wk"; + sha256 = "1hqghlk8c6svfszhmp02bhkc791lqhqffgiypf05giqmr5d8b9a9"; }; installPhase = '' diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix new file mode 100644 index 000000000000..fec092db0c52 --- /dev/null +++ b/pkgs/tools/graphics/lepton/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, git, glibc }: + +stdenv.mkDerivation rec { + version = "1.2.1"; + name = "lepton-${version}"; + + src = fetchFromGitHub { + repo = "lepton"; + owner = "dropbox"; + rev = "c378cbfa2daaa99e8828be7395013f94cedb1bcc"; + sha256 = "1f2vyp0crj4yw27bs53vykf2fqk4w57gv3lh9dp89dh3y7wwh1ba"; + }; + + nativeBuildInputs = [ cmake git ]; + buildInputs = [ glibc.static ]; + + meta = with stdenv.lib; { + homepage = https://github.com/dropbox/lepton; + description = "A tool to losslessly compress JPEGs"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ artemist ]; + }; +} diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 85713a300ec6..3115b1b72439 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gnome3.gtk # needed for XDG_ICON_DIRS - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme makeWrapper (stdenv.lib.getLib gnome3.dconf) ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp]; @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/luxcoreui" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' \ + --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" ''; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index e9301731e856..666cdae131e2 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib, libwebp }: +{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib, libwebp, runtimeShell }: let version = "0.20"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { doCheck = true; preCheck = '' - sed -i -e "s|#!/bin/bash|#!${stdenv.shell}|" test/renderercheck.sh + sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" test/renderercheck.sh ''; meta = { diff --git a/pkgs/tools/graphics/xcur2png/default.nix b/pkgs/tools/graphics/xcur2png/default.nix new file mode 100644 index 000000000000..1e3da5dddecf --- /dev/null +++ b/pkgs/tools/graphics/xcur2png/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libpng, xorg }: + +stdenv.mkDerivation rec { + pname = "xcur2png"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "eworm-de"; + repo = pname; + rev = version; + sha256 = "0858wn2p14bxpv9lvaz2bz1rk6zk0g8zgxf8iy595m8fqv4q2fya"; + }; + + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + libpng + xorg.libX11 + xorg.libXcursor + xorg.xorgproto + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/eworm-de/xcur2png/releases; + description = "Convert X cursors to PNG images"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index b8bf73fda648..518b88e6d02a 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,53 +1,35 @@ -{ stdenv, fetchurl, imagemagickBig, pkgconfig, python2Packages, perl -, libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook +{ stdenv, fetchFromGitHub, imagemagickBig, pkgconfig, python2Packages, perl +, libX11, libv4l, qt5, lzma, gtk2, xmlto, docbook_xsl, autoreconfHook , enableVideo ? stdenv.isLinux }: let inherit (python2Packages) pygtk python; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "zbar"; - version = "0.10"; - src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${name}.tar.bz2"; - sha256 = "1imdvf5k34g1x2zr6975basczkz3zdxg6xnci50yyp5yvcwznki3"; + version = "0.22"; + + src = fetchFromGitHub { + owner = "mchehab"; + repo = "zbar"; + rev = version; + sha256 = "0pz0vq6a97vnc3lcjw9k12dk2awgmws46cjfh16zin0jiz18d1xq"; }; - patches = [ - (fetchpatch { - name = "0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch"; - url = "https://git.recluse.de/raw/debian/pkg-zbar.git/35182c3ac2430c986579b25f1826fe1b7dfd15de/debian!patches!0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch"; - sha256 = "1zy1wdyhmpw877pv6slfhjy0c6dm0gxli0i4zs1akpvh052j4a69"; - }) - (fetchpatch { - name = "python-zbar-import-fix-am.patch"; - url = "https://git.recluse.de/raw/debian/pkg-zbar.git/1f15f52e53ee0bf7b4761d673dc859c6b10e6be5/debian!patches!python-zbar-import-fix-am.patch"; - sha256 = "15xx9ms137hvwpynbgvbc6zgmmzfaf7331rfhls24rgbnywbgirx"; - }) - (fetchpatch { - name = "new_autotools_build_fix.patch"; - url = "https://git.recluse.de/raw/debian/pkg-zbar.git/2c641cc94d4f728421ed750d95d6d1c2d06a534d/debian!patches!new_autotools_build_fix.patch"; - sha256 = "0jhl5jnnjhfdv51xqimkbkdvj8d38z05fhd11yx1sgmw82f965s3"; - }) - (fetchpatch { - name = "threading-fix.patch"; - url = "https://git.recluse.de/raw/debian/pkg-zbar.git/d3eba6e2c3acb0758d19519015bf1a53ffb8e645/debian!patches!threading-fix.patch"; - sha256 = "1jjgrx9nc7788vfriai4z26mm106sg5ylm2w5rdyrwx7420x1wh7"; - }) + nativeBuildInputs = [ pkgconfig xmlto autoreconfHook docbook_xsl ]; + + buildInputs = [ + imagemagickBig python pygtk perl libX11 + ] ++ stdenv.lib.optionals enableVideo [ + libv4l gtk2 qt5.qtbase qt5.qtx11extras ]; - buildInputs = - [ imagemagickBig pkgconfig python pygtk perl libX11 - lzma autoreconfHook ] ++ - stdenv.lib.optionals enableVideo [ libv4l gtk2 qt4 ]; - - configureFlags = stdenv.lib.optionals (!enableVideo) [ + configureFlags = [ + "--with-dbusconfdir=$out/etc/dbus-1/system.d" + ] ++ stdenv.lib.optionals (!enableVideo) [ "--disable-video" "--without-gtk" "--without-qt" ]; - hardeningDisable = [ "fortify" ]; - meta = with stdenv.lib; { description = "Bar code reader"; longDescription = '' @@ -57,15 +39,9 @@ in stdenv.mkDerivation rec { EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. ''; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ delroth raskin ]; platforms = platforms.unix; license = licenses.lgpl21; - homepage = http://zbar.sourceforge.net/; - }; - - passthru = { - updateInfo = { - downloadPage = "http://zbar.sourceforge.net/"; - }; + homepage = https://github.com/mchehab/zbar; }; } diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index 7943903d6f7c..e10ffae4a51e 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper fcitx cmake isocodes gtk3 - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; preFixup = '' wrapProgram $out/bin/fcitx-config-gtk3 \ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index e1b01de11b25..aab7563cb020 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { name = "ibus-typing-booster-${version}"; - version = "2.5.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "1ghd9rqgs3xcv6crvc8x1nhrnr84rbp3b970mfg8f1yz6rsx9107"; + sha256 = "124a6yd7g6ws8s6p5146rhvyjswk001fqncc32jsfmjjgmgisqn2"; }; patches = [ ./hunspell-dirs.patch ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 16580aac9557..b561fb626e05 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -2,7 +2,7 @@ , vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null -, buildPackages }: +, buildPackages, runtimeShell }: assert withWayland -> wayland != null && libxkbcommon != null; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { substituteInPlace setup/ibus-setup.in --subst-var-by PYTHON ${python3Runtime.interpreter} substituteInPlace data/dconf/Makefile.am --replace "dconf update" true substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus - echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh + echo \#!${runtimeShell} > data/dconf/make-dconf-override-db.sh cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 168a3f887728..4571ee24fba7 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -2,14 +2,14 @@ let - version = "1.2.0"; + version = "1.3.0"; rev = "v${version}"; aptlySrc = fetchFromGitHub { inherit rev; - owner = "smira"; + owner = "aptly-dev"; repo = "aptly"; - sha256 = "1acnkmgarz9rp0skkh7zzwkhisjlmbl74jqjmqd3mn42y528c34b"; + sha256 = "032gw8qkxcgc0jyrvzqh7jkbmk4k0gf7j74hyhclfnjmd9548f5l"; }; aptlyCompletionSrc = fetchFromGitHub { @@ -26,7 +26,7 @@ buildGoPackage { src = aptlySrc; - goPackagePath = "github.com/smira/aptly"; + goPackagePath = "github.com/aptly-dev/aptly"; nativeBuildInputs = [ makeWrapper ]; @@ -41,7 +41,7 @@ buildGoPackage { homepage = https://www.aptly.info; description = "Debian repository management tool"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.montag451 ]; }; } diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/tools/misc/automirror/default.nix new file mode 100644 index 000000000000..3fd520513570 --- /dev/null +++ b/pkgs/tools/misc/automirror/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchFromGitHub, git, ronn}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "automirror"; + version = "49"; + + src = fetchFromGitHub { + owner = "schlomo"; + repo = "automirror"; + rev = "v${version}"; + sha256 = "1syyf7dcm8fbyw31cpgmacg80h7pg036dayaaf0svvdsk0hqlsch"; + }; + + patchPhase = "sed -i s#/usr##g Makefile"; + + buildInputs = [ git ronn ]; + + installFlags = "DESTDIR=$(out)"; + + meta = with stdenv.lib; { + homepage = https://github.com/schlomo/automirror; + description = "Automatic Display Mirror"; + license = licenses.gpl3; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 9a62f8c3fbf7..3ebf09bf139b 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -24,7 +24,7 @@ in runHook preInstall make install TARGETS='autorandr' PREFIX=$out - make install TARGETS='bash_completion' DESTDIR=$out + make install TARGETS='bash_completion' DESTDIR=$out/share/bash-completion/completions make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 1b179d328702..cc872ff53393 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.188"; + version = "1.189"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1g9i50a3x9p7kbyjg7z8xgxcknqxkxvzb0gg2jl2zgwjsyvjy5wn"; + sha256 = "0i4q4qdf5w96wkhc5lb2h7mdj0wfzqr3a265jp4wzyzgybayfz33"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index b8e5e3de6506..2bde876c68c1 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { --replace "data_files = *.rst, *.txt" "" ''; - buildInputs = [ httpretty pytest pytestcov ]; + buildInputs = [ httpretty pytest_3 pytestcov ]; propagatedBuildInputs = [ arrow click keyring parsedatetime requests six termcolor ]; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 84a2735dff8f..ce1d4dc0ba87 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -123,6 +123,8 @@ stdenv.mkDerivation rec { platforms = platforms.unix ++ platforms.windows; + priority = 10; + maintainers = [ maintainers.eelco ]; }; diff --git a/pkgs/tools/misc/dasht/default.nix b/pkgs/tools/misc/dasht/default.nix new file mode 100644 index 000000000000..e12868207970 --- /dev/null +++ b/pkgs/tools/misc/dasht/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, coreutils +, gnused +, gnugrep +, sqlite +, wget +, w3m +, socat +, gawk +}: + +stdenv.mkDerivation rec { + pname = "dasht"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "sunaku"; + repo = pname; + rev = "v${version}"; + sha256 = "0d0pcjalba58nvxdgn39m4b6n9ifajf3ygyjaqgvzwxzgpzw0a60"; + }; + + deps = lib.makeBinPath [ + coreutils + gnused + gnugrep + sqlite + wget + w3m + socat + gawk + (placeholder "out") + ]; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp bin/* $out/bin/ + + mkdir -p $out/share/man/man1 + cp man/man1/* $out/share/man/man1/ + + for i in $out/bin/*; do + echo "Wrapping $i" + wrapProgram $i --prefix PATH : ${deps}; + done; + + runHook postInstall + ''; + + meta = { + description = "Search API docs offline, in terminal or browser"; + homepage = "https://sunaku.github.io/dasht/man"; + license = stdenv.lib.licenses.isc; + platforms = stdenv.lib.platforms.unix; #cannot test other + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 25028a93e277..3a607b4ec751 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ddcutil-${version}"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "0ywrjp6r1z6jlwq1ycrr9qn3drjzbxvdf0v5f92rh68fwb06gn0y"; + sha256 = "1mqamwafm0rhw420i0pib6gq6hkdafnbg07b0z2ckrxii44sy0c2"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix index 0367ab53835f..c50e3adb6abb 100644 --- a/pkgs/tools/misc/dtach/default.nix +++ b/pkgs/tools/misc/dtach/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index f0dc3ab64604..770f4ae67f45 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages }: +{ stdenv, skawarePackages, makeWrapper }: with skawarePackages; @@ -11,6 +11,8 @@ buildPackage { outputs = [ "bin" "lib" "dev" "doc" "out" ]; + setupHooks = [ makeWrapper ]; + # TODO: nsss support configureFlags = [ "--libdir=\${lib}/lib" @@ -30,6 +32,11 @@ buildPackage { mv doc $doc/share/doc/execline/html mv examples $doc/share/doc/execline/examples + + # finally, add all tools to PATH so they are available + # from within execlineb scripts by default + wrapProgram $bin/bin/execlineb \ + --suffix PATH : $bin/bin ''; } diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index cefddbd65ef5..ed31d01f09d5 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "file-${version}"; - version = "5.35"; + version = "5.36"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${name}.tar.gz" "https://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "0ijm1fabm68ykr1zbx0bxnka5jr3n42sj8y5mbkrnxs0fj0mxi1h"; + sha256 = "0ya330cdkvfi2d28h8gvhghj4gnhysmifmryysl0a97xq2884q7v"; }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 21a126b04f3b..b45df3f57b56 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }: -let version = "1.0"; in stdenv.mkDerivation rec { name = "flashrom-${version}"; + version = "1.0.1"; src = fetchurl { - url = "https://download.flashrom.org/releases/${name}.tar.bz2"; - sha256 = "0i9wg1lyfg99bld7d00zqjm9f0lk6m0q3h3n9c195c9yysq5ccfb"; + url = "https://download.flashrom.org/releases/flashrom-v${version}.tar.bz2"; + sha256 = "0i6yrrl69hrqmwd7azj7x3j46m0qpvzmk3b5basym7mnlpfzhyfm"; }; # Newer versions of libusb deprecate some API flashrom uses. - postPatch = '' - substituteInPlace Makefile \ - --replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable=" - ''; + #postPatch = '' + # substituteInPlace Makefile \ + # --replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable=" + #''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libftdi pciutils ]; diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix new file mode 100644 index 000000000000..3d99a0e27e3e --- /dev/null +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + name = "fltrdr-${version}"; + version = "0.1.1"; + + src = fetchFromGitHub { + repo = "fltrdr"; + owner = "octobanana"; + rev = "${version}"; + sha256 = "1gglv7hwszk09ywjq6s169cdzr77sjklj89k5p24if24v93yffpf"; + }; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://octobanana.com/software/fltrdr; + description = "A TUI text reader for the terminal"; + + longDescription = '' + Fltrdr, or flat-reader, is an interactive text reader for the terminal. It + is flat in the sense that the reader is word-based. It creates a + horizontal stream of words, ignoring all newline characters and reducing + extra whitespace. Its purpose is to facilitate reading, scanning, and + searching text. The program has a play mode that moves the reader forward + one word at a time, along with a configurable words per minute (WPM), + setting. + ''; + + platforms = platforms.linux; # can only test linux + license = licenses.mit; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} + diff --git a/pkgs/tools/misc/fluentd/Gemfile b/pkgs/tools/misc/fluentd/Gemfile index 2c4fbc849631..952c419ad313 100644 --- a/pkgs/tools/misc/fluentd/Gemfile +++ b/pkgs/tools/misc/fluentd/Gemfile @@ -1,7 +1,6 @@ source "https://rubygems.org" gem 'fluentd' -gem 'fluent-plugin-elasticsearch' gem 'fluent-plugin-record-reformer' gem 'fluent-plugin-s3' gem 'fluent-plugin-kinesis' @@ -11,4 +10,3 @@ gem 'fluent-plugin-scribe' gem 'fluent-plugin-mongo' gem 'fluent-plugin-webhdfs' gem 'fluent-plugin-rewrite-tag-filter' - diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock index 2f9485d95777..3d852e367594 100644 --- a/pkgs/tools/misc/fluentd/Gemfile.lock +++ b/pkgs/tools/misc/fluentd/Gemfile.lock @@ -1,121 +1,117 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.0.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) - aws-sdk (2.7.0) - aws-sdk-resources (= 2.7.0) - aws-sdk-core (2.7.0) - aws-sigv4 (~> 1.0) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + aws-eventstream (1.0.2) + aws-partitions (1.149.0) + aws-sdk-core (3.48.3) + aws-eventstream (~> 1.0, >= 1.0.2) + aws-partitions (~> 1.0) + aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-resources (2.7.0) - aws-sdk-core (= 2.7.0) - aws-sigv4 (1.0.0) - bson (1.12.5) - bzip2-ffi (1.0.0) - ffi (~> 1.0) - concurrent-ruby (1.0.4) - cool.io (1.4.5) - elasticsearch (1.0.18) - elasticsearch-api (= 1.0.18) - elasticsearch-transport (= 1.0.18) - elasticsearch-api (1.0.18) + aws-sdk-firehose (1.14.0) + aws-sdk-core (~> 3, >= 3.48.2) + aws-sigv4 (~> 1.1) + aws-sdk-kinesis (1.13.1) + aws-sdk-core (~> 3, >= 3.48.2) + aws-sigv4 (~> 1.1) + aws-sdk-kms (1.16.0) + aws-sdk-core (~> 3, >= 3.48.2) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.36.0) + aws-sdk-core (~> 3, >= 3.48.2) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.0) + aws-sdk-sqs (1.13.0) + aws-sdk-core (~> 3, >= 3.48.2) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.1.0) + aws-eventstream (~> 1.0, >= 1.0.2) + bson (4.4.2) + cool.io (1.5.4) + dig_rb (1.0.1) + digest-crc (0.4.1) + elasticsearch (6.3.0) + elasticsearch-api (= 6.3.0) + elasticsearch-transport (= 6.3.0) + elasticsearch-api (6.3.0) multi_json - elasticsearch-transport (1.0.18) + elasticsearch-transport (6.3.0) faraday multi_json - excon (0.54.0) - faraday (0.11.0) + excon (0.62.0) + faraday (0.15.4) multipart-post (>= 1.2, < 3) - ffi (1.9.17) - fluent-mixin-config-placeholders (0.4.0) - fluentd - uuidtools (>= 2.1.5) - fluent-mixin-plaintextformatter (0.2.6) - fluentd - ltsv - fluent-plugin-elasticsearch (1.9.2) - elasticsearch (< 1.1) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) + fluent-plugin-elasticsearch (3.4.1) + elasticsearch excon - fluentd (>= 0.10.43) - fluent-plugin-kafka (0.5.0) + fluentd (>= 0.14.22) + fluent-plugin-kafka (0.9.2) fluentd (>= 0.10.58, < 2) ltsv - ruby-kafka (= 0.3.16.beta2) - fluent-plugin-kinesis (1.1.2) - aws-sdk (~> 2) - concurrent-ruby (~> 1) - fluentd (>= 0.10.58, < 2) - os (>= 0.9.6) - protobuf (>= 3.5.5) - fluent-plugin-mongo (0.7.16) - fluentd (>= 0.10.58, < 2) - mongo (~> 1.9) - fluent-plugin-record-reformer (0.8.2) + ruby-kafka (>= 0.7.1, < 0.8.0) + fluent-plugin-kinesis (3.0.0) + aws-sdk-firehose (~> 1, != 1.9, != 1.5) + aws-sdk-kinesis (~> 1, != 1.5, != 1.4) + fluentd (>= 0.14.10, < 2) + google-protobuf (~> 3) + fluent-plugin-mongo (1.2.2) + fluentd (>= 0.14.22, < 2) + mongo (~> 2.6.0) + fluent-plugin-record-reformer (0.9.1) fluentd - fluent-plugin-rewrite-tag-filter (1.5.5) - fluentd - fluent-plugin-s3 (0.8.0) - aws-sdk (>= 2.3.22, < 3) - fluentd (>= 0.10.58, < 2) - fluent-plugin-scribe (0.10.14) + fluent-plugin-rewrite-tag-filter (2.2.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) + fluent-plugin-s3 (1.1.9) + aws-sdk-s3 (~> 1.0) + aws-sdk-sqs (~> 1.0) + fluentd (>= 0.14.22, < 2) + fluent-plugin-scribe (1.0.0) fluentd thrift (~> 0.8.0) - fluent-plugin-webhdfs (0.5.2) - bzip2-ffi - fluent-mixin-config-placeholders (>= 0.3.0) - fluent-mixin-plaintextformatter (>= 0.2.1) - fluentd (>= 0.10.59) + fluent-plugin-webhdfs (1.2.3) + fluentd (>= 0.14.4) webhdfs (>= 0.6.0) - fluentd (0.14.11) - cool.io (~> 1.4.5) + fluentd (1.4.2) + cool.io (>= 1.4.5, < 2.0.0) + dig_rb (~> 1.0.0) http_parser.rb (>= 0.5.1, < 0.7.0) msgpack (>= 0.7.0, < 2.0.0) serverengine (>= 2.0.4, < 3.0.0) sigdump (~> 0.2.2) - strptime (~> 0.1.7) + strptime (>= 0.2.2, < 1.0.0) tzinfo (~> 1.0) tzinfo-data (~> 1.0) yajl-ruby (~> 1.0) + google-protobuf (3.7.1) http_parser.rb (0.6.0) - i18n (0.7.0) - jmespath (1.3.1) - ltsv (0.1.0) - middleware (0.1.0) - minitest (5.10.1) - mongo (1.12.5) - bson (= 1.12.5) - msgpack (1.0.2) - multi_json (1.12.1) + jmespath (1.4.0) + ltsv (0.1.2) + mongo (2.6.4) + bson (>= 4.3.0, < 5.0.0) + msgpack (1.2.9) + multi_json (1.13.1) multipart-post (2.0.0) - os (0.9.6) - protobuf (3.6.12) - activesupport (>= 3.2) - middleware - thor - thread_safe - public_suffix (2.0.5) - ruby-kafka (0.3.16.beta2) - serverengine (2.0.4) + public_suffix (3.0.3) + ruby-kafka (0.7.6) + digest-crc + serverengine (2.1.0) sigdump (~> 0.2.2) sigdump (0.2.4) - strptime (0.1.9) - thor (0.19.4) - thread_safe (0.3.5) + strptime (0.2.3) + thread_safe (0.3.6) thrift (0.8.0) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) - tzinfo-data (1.2016.10) + tzinfo-data (1.2019.1) tzinfo (>= 1.0.0) - uuidtools (2.1.5) webhdfs (0.8.0) addressable - yajl-ruby (1.3.0) + yajl-ruby (1.4.1) PLATFORMS ruby @@ -133,4 +129,4 @@ DEPENDENCIES fluentd BUNDLED WITH - 1.12.5 + 1.16.3 diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix index 1c508e7b58e2..022127238ecc 100644 --- a/pkgs/tools/misc/fluentd/gemset.nix +++ b/pkgs/tools/misc/fluentd/gemset.nix @@ -1,347 +1,443 @@ { - activesupport = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08bnl0nr9csjgkgz6xf8dyg7rccinmfrmn235z3bfaz8ihz15d1d"; - type = "gem"; - }; - version = "5.0.1"; - }; addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw"; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; - aws-sdk = { + aws-eventstream = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19s7ialas1yrc54g50yfa37z7m8dq4gqbf8dvlfg8qmpdijjxy3l"; + sha256 = "1i4djzrynzr4l8mqx946ad6zn7blz2r5jif58y9c0lws6bdc5h1l"; type = "gem"; }; - version = "2.7.0"; + version = "1.0.2"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08i5a52b42x1q26j4rzaxp4hhwl0wzw12jbbjxjifnwi2dm57biy"; + type = "gem"; + }; + version = "1.149.0"; }; aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a9sgff43s3zhpcmisk1bp6vvlpawa617svfhz84xwa6lmik9sp4"; + sha256 = "1sng9iagk96r8986gsacljnw357famz5x4xa1wk9xm4cx0bmpm5i"; type = "gem"; }; - version = "2.7.0"; + version = "3.48.3"; }; - aws-sdk-resources = { + aws-sdk-firehose = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b5z25n4bgzwkzmzx2q6ik2y74jinyphmrh38lnrn9im6pmmvy3w"; + sha256 = "0f7s1vqs1qga6jzvjgg4x4hcz1rdycwry5dcizidzffwn9sp9iy0"; type = "gem"; }; - version = "2.7.0"; + version = "1.14.0"; + }; + aws-sdk-kinesis = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "005dj7m3zi8gkda5g40a0wxlx48g0w5cz4k7783g2p6c0h5wwdsb"; + type = "gem"; + }; + version = "1.13.1"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1m64sb5nnpryjmjbgvr5lmlrd06wvafd0ss9i9zf3fsi39hqaicg"; + type = "gem"; + }; + version = "1.16.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bnihahz0va36jcw5wifw6ad0fdarl0lsils6h50wpvzcxzmlm2i"; + type = "gem"; + }; + version = "1.36.0"; + }; + aws-sdk-sqs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cpmimcnjfwrqv1nmaxp4yyxmh50wg83ccihj8hiafkazg75kfx0"; + type = "gem"; + }; + version = "1.13.0"; }; aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz"; + sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; bson = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12zcsfr72hr0w1qyxv1iz587nzganpclvimyx5y02gg1hij8hz6b"; + sha256 = "1kgim98b41cj0njlqv1bwvx2m6gw9n7ilwklfn9hivfg096bzl8l"; type = "gem"; }; - version = "1.12.5"; + version = "4.4.2"; }; - bzip2-ffi = { + "cool.io" = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y5jlcz1vb0v3rbmsbbrarfglcmzdhr5jhlfc5wjnhz2zpybsz3y"; + sha256 = "0l836z3qgrl5829q48qaz1zngqqxy2k0l61swqm0amhyfcgfbz1m"; + type = "gem"; + }; + version = "1.5.4"; + }; + dig_rb = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12dbb1pl2vr9z7yy2zsbsjaj4hw89y56wll6kd8422mylmcw7bx4"; + type = "gem"; + }; + version = "1.0.1"; + }; + digest-crc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08q8p0fk51aa6dwhy2xmjaj76arcq9nn22gyia162jmqpccfx50l"; + type = "gem"; + }; + version = "0.4.1"; + }; + elasticsearch = { + dependencies = ["elasticsearch-api" "elasticsearch-transport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kx13w90dnmrfgwgm86h8wsmjmpv19qxvd1f6xxrdjmw0ij0vyqn"; + type = "gem"; + }; + version = "6.3.0"; + }; + elasticsearch-api = { + dependencies = ["multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06dji10nahhqd04igfwcqb1d521lv7gy40g7nv0mx3nnb1c6ksbm"; + type = "gem"; + }; + version = "6.3.0"; + }; + elasticsearch-transport = { + dependencies = ["faraday" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "025c0plj3ydrykmwpwhn6vdxfgf4b7xr4gg5dzdd5ck9frvqb6mz"; + type = "gem"; + }; + version = "6.3.0"; + }; + excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; + type = "gem"; + }; + version = "0.62.0"; + }; + faraday = { + dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; + type = "gem"; + }; + version = "0.15.4"; + }; + fluent-config-regexp-type = { + dependencies = ["fluentd"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hk0vxcmlbid7n6piyv3x83j5gyiz7in397l9x3c6nh69wicy7gm"; type = "gem"; }; version = "1.0.0"; }; - concurrent-ruby = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0p7ji1h1l407kci9w4b4yspzd58ssmlx7p91npx55kw08836dlpb"; - type = "gem"; - }; - version = "1.0.4"; - }; - "cool.io" = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x5fkyjdjwk68sg7fwxhx2k3hzxkkm6frnd2yix7brxdh06fp0k1"; - type = "gem"; - }; - version = "1.4.5"; - }; - elasticsearch = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wdy17i56b4m7akp7yavnr8vhfhyz720waphmixq05dj21b11hl0"; - type = "gem"; - }; - version = "1.0.18"; - }; - elasticsearch-api = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1v6nb3ajz5rack3p4b4nz37hs0zb9x738h2ms8cc4plp6wqh1w5s"; - type = "gem"; - }; - version = "1.0.18"; - }; - elasticsearch-transport = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0smfrz8nq49hgf67y5ayxa9i4rmmi0q4m51l0h499ykq4cvcwv6i"; - type = "gem"; - }; - version = "1.0.18"; - }; - excon = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j4b6s90v84r4wrhbg4rzjfjg9sfisq50fjd3hh9p6yrkm86wbd3"; - type = "gem"; - }; - version = "0.54.0"; - }; - faraday = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18p1csdivgwmshfw3mb698a3bn0yrykg30khk5qxjf6n168g91jr"; - type = "gem"; - }; - version = "0.11.0"; - }; - ffi = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7"; - type = "gem"; - }; - version = "1.9.17"; - }; - fluent-mixin-config-placeholders = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14b4lqy91jgpky6g7h0vyfy2rr1qavmjzzgnmhwajfzxgw9y2jvi"; - type = "gem"; - }; - version = "0.4.0"; - }; - fluent-mixin-plaintextformatter = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gliangfr07060ya9sawkyfx2vz7vdygys65f83czawhckvvm75n"; - type = "gem"; - }; - version = "0.2.6"; - }; fluent-plugin-elasticsearch = { + dependencies = ["elasticsearch" "excon" "fluentd"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q0v8jxpwrkh1z5qh0chwrssz93nldka4jwfn32hlqhnmb99q8i1"; + sha256 = "115y11r7rd4hd9gc2lngm6cas1119fas87s75x6iaykqg8hlr99l"; type = "gem"; }; - version = "1.9.2"; + version = "3.4.1"; }; fluent-plugin-kafka = { + dependencies = ["fluentd" "ltsv" "ruby-kafka"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sd025xsl1cnjs11wasg0di2k02rx9ifaj49n28ak363df6vsqgf"; + sha256 = "079isjc1788fbhagrn2qfrp6mcfw0b6kl6dpnrwpwv9865h75hmm"; type = "gem"; }; - version = "0.5.0"; + version = "0.9.2"; }; fluent-plugin-kinesis = { + dependencies = ["aws-sdk-firehose" "aws-sdk-kinesis" "fluentd" "google-protobuf"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "119ngswi9q0p5hh5ldan9pzrgd1lfsbkr5f56hy1k4gfss4kmq27"; + sha256 = "14jqr13k50vs29akjpi0prcs1fdjy335prlqylvri7bc1cmfkhz3"; type = "gem"; }; - version = "1.1.2"; + version = "3.0.0"; }; fluent-plugin-mongo = { + dependencies = ["fluentd" "mongo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x7n8cknqh956yx3c9hv2g535x4kcixmnxw3fvcspjbqprrd1s91"; + sha256 = "1p5c7j3yx4cjrn4ljxwghrp8yh0rcdra1iafc67i92s1sl8b70dq"; type = "gem"; }; - version = "0.7.16"; + version = "1.2.2"; }; fluent-plugin-record-reformer = { + dependencies = ["fluentd"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q2pws1mqp6pkb00ix6wjkxklckqb4wcbp79lpyk0b644bk9hqzb"; + sha256 = "1gwfrfyi9is4l9q4ih3c4l3c9qvyh00jnd2qajdpdh5xjj2m7akn"; type = "gem"; }; - version = "0.8.2"; + version = "0.9.1"; }; fluent-plugin-rewrite-tag-filter = { + dependencies = ["fluent-config-regexp-type" "fluentd"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1avxvvmfm7bl7fpa2p73295kydh1nbsgdvsr7bsyrb77z1s1m86z"; + sha256 = "0kf8p1s02pwhkks82kmkkbfbf4qlhhqiczqah4w0dnp86wp6xyw5"; type = "gem"; }; - version = "1.5.5"; + version = "2.2.0"; }; fluent-plugin-s3 = { + dependencies = ["aws-sdk-s3" "aws-sdk-sqs" "fluentd"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxvk5n76pw4r37lv8vfl1cd0yjxnlj5wlwyk8f1lvp9ma5zlzmg"; + sha256 = "16zaxvf3rs5lmd933sgyrxkrws0qcd0z2ypbky45gyq8si1dpwcl"; type = "gem"; }; - version = "0.8.0"; + version = "1.1.9"; }; fluent-plugin-scribe = { + dependencies = ["fluentd" "thrift"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00m19w7p22adq0yx1h7h2h4ckw9kh5j458a8lawgmbazw2dz0zxi"; + sha256 = "19m37d0saknifjg8kva96pgsc7zsmdlwvwiy9gvhi2d6c7bq3q30"; type = "gem"; }; - version = "0.10.14"; + version = "1.0.0"; }; fluent-plugin-webhdfs = { + dependencies = ["fluentd" "webhdfs"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kb9cgrgvh61pqqzv2csnibmp2jwh4hyjyvrh2npkk59k3jp54ad"; + sha256 = "1yyv3f0g30x9dzhq74b5cq8z0wbyppw9bb6152v6yrwz25b16231"; type = "gem"; }; - version = "0.5.2"; + version = "1.2.3"; }; fluentd = { + dependencies = ["cool.io" "dig_rb" "http_parser.rb" "msgpack" "serverengine" "sigdump" "strptime" "tzinfo" "tzinfo-data" "yajl-ruby"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w1bg3nrn6gwhyp8xlpbs9rcajkddnvw6jhn7kvzydp70g2aydhz"; + sha256 = "1ppdfa03gzv97px7xhdx5nnzc15g8l7yp10jw87qyl5cp62kpx3c"; type = "gem"; }; - version = "0.14.11"; + version = "1.4.2"; + }; + google-protobuf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2"; + type = "gem"; + }; + version = "3.7.1"; }; "http_parser.rb" = { + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; type = "gem"; }; version = "0.6.0"; }; - i18n = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; - type = "gem"; - }; - version = "0.7.0"; - }; jmespath = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y"; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; ltsv = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alfq3g0mih4w86736ybnzqmknphm2z95c9q0wl765i4lrmxng11"; + sha256 = "0wrjvc5079zhpn62k1yflrf7js6vaysrg1qwggf7bj2zi0p5rhys"; type = "gem"; }; - version = "0.1.0"; - }; - middleware = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0703nkf2v371wqr41c04x5qid7ww45cxqv3hnlg07if3b3xrm9xl"; - type = "gem"; - }; - version = "0.1.0"; - }; - minitest = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yk2m8sp0p5m1niawa3ncg157a4i0594cg7z91rzjxv963rzrwab"; - type = "gem"; - }; - version = "5.10.1"; + version = "0.1.2"; }; mongo = { + dependencies = ["bson"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0658pn2hbyfvbnpp3wdh3irin0wpikm6y2qbhnx07w54jbkmgh5p"; + sha256 = "0k0f1826hixqfqgsc9g6rdqrzr5pzy46hszmk6869pmvm638jah1"; type = "gem"; }; - version = "1.12.5"; + version = "2.6.4"; }; msgpack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fb2my91j08plsbbry5kilsrh7slmzgbbf6f55zy6xk28p9036lg"; + sha256 = "0zs8v59d77wlx4yylyh0lglsj8sp9jrq11yqngdgn95avfhxjw0s"; type = "gem"; }; - version = "1.0.2"; + version = "1.2.9"; }; multi_json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.12.1"; + version = "1.13.1"; }; multipart-post = { + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; type = "gem"; }; version = "2.0.0"; }; - os = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz"; - type = "gem"; - }; - version = "0.9.6"; - }; - protobuf = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0cvkfp7574dr6wqpgafl3pg9niqfri3dh2fxb2f8qaapcgfgcaq6"; - type = "gem"; - }; - version = "3.6.12"; - }; public_suffix = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "2.0.5"; + version = "3.0.3"; }; ruby-kafka = { + dependencies = ["digest-crc"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "112avql9nf0hq07zvh47fyx7na721bj4zfpf43ip471l6k2ksrf5"; + sha256 = "0b5i6vazw9s26nwifwsbd95sl35l5krh3yp4z2zpp6lpp6al36db"; type = "gem"; }; - version = "0.3.16.beta2"; + version = "0.7.6"; }; serverengine = { + dependencies = ["sigdump"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f08kbiqg9yp5fxdw5blsrnq383a9g4n830g1ypppb7ddv61sbmi"; + sha256 = "01978684zvab2pbg7r8vm53n8m2h99pc9iqm1wy9gy67y1nxvz13"; type = "gem"; }; - version = "2.0.4"; + version = "2.1.0"; }; sigdump = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1mqf06iw7rymv54y7rgbmfi6ppddgjjmxzi3hrw658n1amp1gwhb"; @@ -350,29 +446,28 @@ version = "0.2.4"; }; strptime = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1avbl1fj4y5qx9ywkxpcjjxxpjj6h7r1dqlnddhk5wqg6ypq8lsb"; + sha256 = "1yj5wwa7wbhgi7w8d9ihpzpf99niw956fhyxddhayj09fgmdcxd8"; type = "gem"; }; - version = "0.1.9"; - }; - thor = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns"; - type = "gem"; - }; - version = "0.19.4"; + version = "0.2.3"; }; thread_safe = { + groups = ["default"]; + platforms = []; source = { - sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr"; + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; thrift = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0aj23ndh5n5yqcvp4c12y7vl5wvxpl66zncf6n6ax2zvb6ig44cv"; @@ -382,29 +477,30 @@ }; tzinfo = { dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; source = { - sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; + remotes = ["https://rubygems.org"]; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.5"; }; tzinfo-data = { + dependencies = ["tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01nr50alfm1fyzlcbzvfbpnsq37yb3h676f9n3z0iyp4s4766psf"; + sha256 = "1105fp27d527k7rrq1yx1ikbzf1sra046ndayxikkjvay9ql61jz"; type = "gem"; }; - version = "1.2016.10"; - }; - uuidtools = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g"; - type = "gem"; - }; - version = "2.1.5"; + version = "1.2019.1"; }; webhdfs = { + dependencies = ["addressable"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0gs6xb9dz9bp5xc38yplfy48jcgj7jrj0zg0vgi7ydkxnkzkhbf2"; @@ -413,11 +509,13 @@ version = "0.8.0"; }; yajl-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sah2lpvpsh555dcnhgcqylinjj5544md9dh1a0a13da0qv1p57i"; + sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.1"; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 32deb0c23067..e723db260eb5 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { homepage = https://github.com/kshvmdn/fsql; license = licenses.mit; maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + platforms = platforms.unix; inherit version; }; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 08efe3e6e18b..de211d1d1c4e 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText }: +{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText, runtimeShell }: buildGoPackage rec { name = "fzf-${version}"; @@ -47,7 +47,7 @@ buildGoPackage rec { cp -R $src/shell $bin/share/fzf cat <