From 4c1525c1f8985ffeb3b0310edeaa2e61b4977f9c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 21 Feb 2016 20:13:44 +0100 Subject: [PATCH 01/75] Documentation: rewrite Python - Rewrite current documentation - Add introduction/tutorial - Convert to markdown --- doc/default.nix | 4 + doc/languages-frameworks/python.md | 714 ++++++++++++++++++++++++++++ doc/languages-frameworks/python.xml | 447 ----------------- 3 files changed, 718 insertions(+), 447 deletions(-) create mode 100644 doc/languages-frameworks/python.md delete mode 100644 doc/languages-frameworks/python.xml diff --git a/doc/default.nix b/doc/default.nix index 196b9e445390..7583813c94f1 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation { + toDocbook { inputFile = ./introduction.md; outputFile = "introduction.xml"; + } + + toDocbook { + inputFile = ./languages-frameworks/python.md; + outputFile = "./languages-frameworks/python.xml"; useChapters = true; } + toDocbook { diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md new file mode 100644 index 000000000000..fc0a0ba987ae --- /dev/null +++ b/doc/languages-frameworks/python.md @@ -0,0 +1,714 @@ +# Python + +## User Guide + +Several versions of Python are available on Nix as well as a high amount of +packages. The default interpreter is CPython 2.7. + +### Using Python + +#### Installing Python and packages + +It is important to make a distinction between Python packages that are +used as libraries, and applications that are written in Python. + +Applications on Nix are installed typically into your user +profile imperatively using `nix-env -i`, and on NixOS declaratively by adding the +package name to `environment.systemPackages` in `/etc/nixos/configuration.nix`. +Dependencies such as libraries are automatically installed and should not be +installed explicitly. + +The same goes for Python applications and libraries. Python applications can be +installed in your profile, but Python libraries you would like to use to develop +cannot. If you do install libraries in your profile, then you will end up with +import errors. + +#### Python environments using `nix-shell` + +The recommended method for creating Python environments for development is with +`nix-shell`. Executing + +```sh +$ nix-shell -p python35Packages.numpy python35Packages.toolz +``` + +opens a Nix shell which has available the requested packages and dependencies. +Now you can launch the Python interpreter (which is itself a dependency) + +```sh +[nix-shell:~] python3 +``` + +If the packages were not available yet in the Nix store, Nix would download or +build them automatically. A convenient option with `nix-shell` is the `--run` +option, with which you can execute a command in the `nix-shell`. Let's say we +want the above environment and directly run the Python interpreter + +```sh +$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3" +``` + +This way you can use the `--run` option also to directly run a script + +```sh +$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py" +``` + +In fact, for this specific use case there is a more convenient method. You can +add a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script +specifying which dependencies Nix shell needs. With the following shebang, you +can use `nix-shell myscript.py` and it will make available all dependencies and +run the script in the `python3` shell. + +```py +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3Packages.numpy + +import numpy + +print(numpy.__version__) +``` + +Likely you do not want to type your dependencies each and every time. What you +can do is write a simple Nix expression which sets up an environment for you, +requiring you only to type `nix-shell`. Say we want to have Python 3.5, `numpy` +and `toolz`, like before, in an environment. With a `shell.nix` file +containing + +```nix +with import {}; + +(pkgs.python35.buildEnv.override { + extraLibs = with pkgs.python35Packages; [ numpy toolz ]; +}).env +``` +executing `nix-shell` gives you again a Nix shell from which you can run Python. + +What's happening here? + +1. We begin with importing the Nix Packages collections. `import ` import the `` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. Therefore we can now use `pkgs`. +2. Then we create a Python 3.5 environment with `pkgs.buildEnv`. Because we want to use it with a custom set of Python packages, we override it. +3. The `extraLibs` argument of the original `buildEnv` function can be used to specify which packages should be included. We want `numpy` and `toolz`. Again, we use the `with` statement to bring a set of attributes into the local scope. +4. And finally, for in interactive use we return the environment. + +### Developing with Python + + +Now that you know how to get a working Python environment on Nix, it is time to go forward and start actually developing with Python. +We will first have a look at how Python packages are packaged on Nix. Then, we will look how you can use development mode with your code. + +#### Python packaging on Nix + +On Nix all packages are built by functions. The main function in Nix for building Python packages is [`buildPythonPackage`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix). +Let's see how we would build the `toolz` package. According to [`python-packages.nix`](https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/top-level/python-packages.nix) `toolz` is build using + +```nix +toolz = buildPythonPackage rec{ + name = "toolz-${version}"; + version = "0.7.4"; + + src = pkgs.fetchurl{ + url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz"; + sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + }; + + meta = { + homepage = "http://github.com/pytoolz/toolz/"; + description = "List processing tools and functional utilities"; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; + }; +}; +``` + +What happens here? The function `buildPythonPackage` is called and as argument +it accepts a set. In this case the set is a recursive set ([`rec`](http://nixos.org/nix/manual/#sec-constructs)). +One of the arguments is the name of the package, which consists of a basename +(generally following the name on PyPi) and a version. Another argument, `src` +specifies the source, which in this case is fetched from an url. `fetchurl` not +only downloads the target file, but also validates its hash. Furthermore, we +specify some (optional) [meta information](http://nixos.org/nixpkgs/manual/#chap-meta). + +The output of the function is a derivation, which is an attribute with the name +`toolz` of the set `pythonPackages`. Actually, sets are created for all interpreter versions, +so `python27Packages`, `python34Packages`, `python35Packages` and `pypyPackages`. + +The above example works when you're directly working on +`pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though, +you will want to test a Nix expression outside of the Nixpkgs tree. If you +create a `shell.nix` file with the following contents + +```nix +with import {}; + +pkgs.python35Packages.buildPythonPackage rec { + name = "toolz-${version}"; + version = "0.7.4"; + + src = pkgs.fetchurl{ + url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz"; + sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + }; + + meta = { + homepage = "http://github.com/pytoolz/toolz/"; + description = "List processing tools and functional utilities"; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; + }; +} +``` + +and then execute `nix-shell` will result in an environment in which you can use +Python 3.5 and the `toolz` package. As you can see we had to explicitly mention +for which Python version we want to build a package. + +The above example considered only a single package. Generally you will want to use multiple packages. +If we create a `shell.nix` file with the following contents + +```nix +with import {}; + +( let + toolz = pkgs.python35Packages.buildPythonPackage rec { + name = "toolz-${version}"; + version = "0.7.4"; + + src = pkgs.fetchurl{ + url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz"; + sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + }; + + meta = { + homepage = "http://github.com/pytoolz/toolz/"; + description = "List processing tools and functional utilities"; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; + }; + }; + + in pkgs.python35.buildEnv.override rec { + + extraLibs = [ pkgs.python35Packages.numpy toolz ]; +} +).env +``` + +and again execute `nix-shell`, then we get a Python 3.5 environment with our +locally defined package as well as `numpy` which is build according to the +definition in Nixpkgs. What did we do here? Well, we took the Nix expression +that we used earlier to build a Python environment, and said that we wanted to +include our own version of `toolz`. To introduce our own package in the scope of +`buildEnv.override` we used a +[`let`](http://nixos.org/nix/manual/#sec-constructs) expression. + +### Handling dependencies + +Our example, `toolz`, doesn't have any dependencies on other Python +packages or system libraries. According to the manual, `buildPythonPackage` +uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is +exclusively a build-time dependency, then the dependency should be included as a +`buildInput`, but if it is (also) a runtime dependency, then it should be added +to `propagatedBuildInputs`. Test dependencies are considered build-time dependencies. + +The following example shows which arguments are given to `buildPythonPackage` in +order to build [`datashape`](https://github.com/blaze/datashape). + +```nix +datashape = buildPythonPackage rec { + name = "datashape-${version}"; + version = "0.4.7"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/D/DataShape/${name}.tar.gz"; + sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278"; + }; + + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ]; + + meta = { + 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 +test runner and is only used during the `checkPhase` and is therefore not added +to `propagatedBuildInputs`. + +In the previous case we had only dependencies on other Python packages to consider. +Occasionally you have also system libraries to consider. E.g., `lxml` provides +Python bindings to `libxml2` and `libxslt`. These libraries are only required +when building the bindings and are therefore added as `buildInputs`. + +```nix +lxml = buildPythonPackage rec { + name = "lxml-3.4.4"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/l/lxml/${name}.tar.gz"; + sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk"; + }; + + buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; + + meta = { + description = "Pythonic binding for the libxml2 and libxslt libraries"; + homepage = http://lxml.de; + license = licenses.bsd3; + maintainers = with maintainers; [ sjourdois ]; + }; +}; +``` + +In this example `lxml` and Nix are able to work out exactly where the relevant +files of the dependencies are. This is not always the case. + +The example below shows bindings to The Fastest Fourier Transform in the West, commonly known as +FFTW. On Nix we have separate packages of FFTW for the different types of floats +(`"single"`, `"double"`, `"long-double"`). The bindings need all three types, +and therefore we add all three as `buildInputs`. The bindings don't expect to +find each of them in a different folder, and therefore we have to set `LDFLAGS` +and `CFLAGS`. + +```nix +pyfftw = buildPythonPackage rec { + name = "pyfftw-${version}"; + version = "0.9.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyFFTW/pyFFTW-${version}.tar.gz"; + sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074"; + }; + + buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; + + propagatedBuildInputs = with self; [ numpy scipy ]; + + # Tests cannot import pyfftw. pyfftw works fine though. + doCheck = false; + + LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib" + CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include" + ''; + + meta = { + 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 ]; + maintainer = with maintainers; [ fridh ]; + }; +}; +``` +Note also the line `doCheck = false;`, we explicitly disabled running the test-suite. + + +#### Develop local package + +As a Python developer you're likely aware of [development mode](http://pythonhosted.org/setuptools/setuptools.html#development-mode) (`python setup.py develop`); +instead of installing the package this command creates a special link to the project code. +That way, you can run updated code without having to reinstall after each and every change you make. +Development mode is also available on Nix as [explained](http://nixos.org/nixpkgs/manual/#ssec-python-development) in the Nixpkgs manual. +Let's see how you can use it. + +In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using + +```nix +src = ./path/to/source/tree; +``` + +If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src` +is a local source, and if the local source has a `setup.py`, then development +mode is activated. + +In the following example we create a simple environment that +has a Python 3.5 version of our package in it, as well as its dependencies and +other packages we like to have in the environment, all specified with `propagatedBuildInputs`. +Indeed, we can just add any package we like to have in our environment to `propagatedBuildInputs`. + +```nix +with import ; +with pkgs.python35Packages; + +buildPythonPackage rec { + name = "mypackage"; + src = ./path/to/package/source; + propagatedBuildInputs = [ pytest numpy pkgs.libsndfile ]; +}; +``` + +It is important to note that due to how development mode is implemented on Nix it is not possible to have multiple packages simultaneously in development mode. + + +### Organising your packages + +So far we discussed how you can use Python on Nix, and how you can develop with +it. We've looked at how you write expressions to package Python packages, and we +looked at how you can create environments in which specified packages are +available. + +At some point you'll likely have multiple packages which you would +like to be able to use in different projects. In order to minimise unnecessary +duplication we now look at how you can maintain yourself a repository with your +own packages. The important functions here are `import` and `callPackage`. + +### Including a derivation using `callPackage` + +Earlier we created a Python environment using `buildEnv`, and included the +`toolz` package via a `let` expression. +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 +{ pkgs, buildPythonPackage }: + +buildPythonPackage rec { + name = "toolz-${version}"; + version = "0.7.4"; + + src = pkgs.fetchurl{ + url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz"; + sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + }; + + meta = { + homepage = "http://github.com/pytoolz/toolz/"; + description = "List processing tools and functional utilities"; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; + }; +}; +``` + +It takes two arguments, `pkgs` and `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; }; + in pkgs.python35.buildEnv.override rec { + extraLibs = [ pkgs.python35Packages.numpy toolz ]; +} +).env +``` + +Important to remember is that the Python version for which the package is made +depends on the `python` derivation that is passed to `buildPythonPackage`. Nix +tries to automatically pass arguments when possible, which is why generally you +don't explicitly define which `python` derivation should be used. In the above +example we use `buildPythonPackage` that is part of the set `python35Packages`, +and in this case the `python35` interpreter is automatically used. + + + +## Reference + +### Interpreters + +Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available on +Nix and are available as `python26`, `python27`, `python33`, `python34` and +`python35`. The PyPy interpreter is also available as `pypy`. Currently, the +aliases `python` and `python3` correspond to respectively `python27` and +`python35`. The Nix expressions for the interpreters can be found in +`pkgs/development/interpreters/python`. + + +#### Missing modules standard library + +The interpreters `python26` and `python27` do not include modules that +require external dependencies. This is done in order to reduce the closure size. +The following modules need to be added as `buildInput` explicitly: + +* `python.modules.bsddb` +* `python.modules.curses` +* `python.modules.curses_panel` +* `python.modules.crypt` +* `python.modules.gdbm` +* `python.modules.sqlite3` +* `python.modules.tkinter` +* `python.modules.readline` + +For convenience `python27Full` and `python26Full` are provided with all +modules included. + +All packages depending on any Python interpreter get appended +`out/{python.sitePackages}` to `$PYTHONPATH` if such directory +exists. + +#### Attributes on interpreters packages + +Each interpreter has the following attributes: + +- `libPrefix`. Name of the folder in `${python}/lib/` for corresponding interpreter. +- `interpreter`. Alias for `${python}/bin/${executable}`. +- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation. +- `sitePackages`. Alias for `lib/${libPrefix}/site-packages`. +- `executable`. Name of the interpreter executable, ie `python3.4`. + +### Building packages and applications + +Python packages (libraries) and applications that use `setuptools` or +`distutils` are typically built with respectively the `buildPythonPackage` and +`buildPythonApplication` functions. + +All Python packages reside in `pkgs/top-level/python-packages.nix` and all +applications elsewhere. Some packages are also defined in +`pkgs/development/python-modules`. It is important that these packages are +called in `pkgs/top-level/python-packages.nix` and not elsewhere, to guarantee +the right version of the package is built. + +Based on the packages defined in `pkgs/top-level/python-packages.nix` an +attribute set is created for each available Python interpreter. The available +sets are + +* `pkgs.python26Packages` +* `pkgs.python27Packages` +* `pkgs.python33Packages` +* `pkgs.python34Packages` +* `pkgs.python35Packages` +* `pkgs.pypyPackages` + +and the aliases + +* `pkgs.pythonPackages` pointing to `pkgs.python27Packages` +* `pkgs.python3Packages` pointing to `pkgs.python35Packages` + +#### `buildPythonPackage` function + +The `buildPythonPackage` function is implemented in +`pkgs/development/python-modules/generic/default.nix` + +and can be used as: + + twisted = buildPythonPackage { + name = "twisted-8.1.0"; + + src = pkgs.fetchurl { + url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2; + sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl"; + }; + + propagatedBuildInputs = [ self.ZopeInterface ]; + + meta = { + homepage = http://twistedmatrix.com/; + description = "Twisted, an event-driven networking engine written in Python"; + license = stdenv.lib.licenses.mit; }; + }; + +The `buildPythonPackage` mainly does four things: + +* In the `buildPhase`, it calls `${python.interpreter} setup.py bdist_wheel` to build a wheel binary zipfile. +* In the `installPhase`, it installs the wheel file using `pip install *.whl`. +* In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to wrap all programs in the `$out/bin/*` directory to include `$PYTHONPATH` and `$PATH` environment variables. +* 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’s (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 `buildInputs`. + +By default `meta.platforms` is set to the same value +as the interpreter unless overriden otherwise. + +##### `buildPythonPackage` parameters + +All parameters from `mkDerivation` function are still supported. + +* `namePrefix`: Prepended text to `${name}` parameter. Defaults to `"python3.3-"` for Python 3.3, etc. Set it to `""` if you're packaging an application or a command line tool. +* `disabled`: If `true`, package is not build for particular python interpreter version. Grep around `pkgs/top-level/python-packages.nix` for examples. +* `setupPyBuildFlags`: List of flags passed to `setup.py build_ext` command. +* `pythonPath`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). +* `preShellHook`: Hook to execute commands before `shellHook`. +* `postShellHook`: Hook to execute commands after `shellHook`. +* `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"]`. +* `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'"]. + +#### `buildPythonApplication` function + +The `buildPythonApplication` function is practically the same as `buildPythonPackage`. +The difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter. +Because with an application we're not interested in multiple version the prefix is dropped. + +#### python.buildEnv function + +Python environments can be created using the low-level `pkgs.buildEnv` function. +This example shows how to create an environment that has the Pyramid Web Framework. +Saving the following as `default.nix` + + with import {}; + + python.buildEnv.override { + extraLibs = [ pkgs.pythonPackages.pyramid ]; + ignoreCollisions = true; + } + +and running `nix-build` will create + + /nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env + +with wrapped binaries in `bin/`. + +You can also use the `env` attribute to create local environments with needed +packages installed. This is somewhat comparable to `virtualenv`. For example, +running `nix-shell` with the following `shell.nix` + + with import {}; + + (python3.buildEnv.override { + extraLibs = with python3Packages; [ numpy requests ]; + }).env + +will drop you into a shell where Python will have the +specified packages in its path. + + +##### `python.buildEnv` arguments + +* `extraLibs`: List of packages installed inside the environment. +* `postBuild`: Shell command executed after the build of environment. +* `ignoreCollisions`: Ignore file collisions inside the environment (default is `false`). + +### Development mode + +Development or editable mode is supported. To develop Python packages +`buildPythonPackage` has additional logic inside `shellPhase` to run `pip +install -e . --prefix $TMPDIR/`for the package. + +Warning: `shellPhase` is executed only if `setup.py` exists. + +Given a `default.nix`: + + with import {}; + + buildPythonPackage { name = "myproject"; + + buildInputs = with pkgs.pythonPackages; [ pyramid ]; + + src = ./.; } + +Running `nix-shell` with no arguments should give you +the environment in which the package would be build with +`nix-build`. + +Shortcut to setup environments with C headers/libraries and python packages: + + $ nix-shell -p pythonPackages.pyramid zlib libjpeg git + +Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked. + +### Tools + +Packages inside nixpkgs are written by hand. However many tools exist in +community to help save time. No tool is preferred at the moment. + +- [python2nix](https://github.com/proger/python2nix) by Vladimir Kirillov +- [pypi2nix](https://github.com/garbas/pypi2nix) by Rok Garbas +- [pypi2nix](https://github.com/offlinehacker/pypi2nix) by Jaka Hudoklin + +## FAQ + +### How to solve circular dependencies? + +Consider the packages `A` and `B` that depend on each other. When packaging `B`, +a solution is to override package `A` not to depend on `B` as an input. The same +should also be done when packaging `A`. + +### How to override a Python package? + +Recursively updating a package can be done with `pkgs.overridePackages` as explained in the Nixpkgs manual. +Python attribute sets are created for each interpreter version. We will therefore override the attribute set for the interpreter version we're interested. +In the following example we change the name of the package `pandas` to `foo`. +``` +newpkgs = pkgs.overridePackages(self: super: rec { + python35Packages = super.python35Packages.override { + self = python35Packages // { pandas = python35Packages.pandas.override{name="foo";};}; + }; +}); +``` +This can be tested with +``` +with import {}; + +(let + +newpkgs = pkgs.overridePackages(self: super: rec { + python35Packages = super.python35Packages.override { + self = python35Packages // { pandas = python35Packages.pandas.override{name="foo";};}; + }; +}); +in newpkgs.python35.buildEnv.override{ + extraLibs = [newpkgs.python35Packages.blaze ]; +}).env +``` +A typical use case is to switch to another version of a certain package. For example, in the Nixpkgs repository we have multiple versions of `django` and `scipy`. +In the following example we use a different version of `scipy`. All packages in `newpkgs` will now use the updated `scipy` version. +``` +with import {}; + +(let + +newpkgs = pkgs.overridePackages(self: super: rec { + python35Packages = super.python35Packages.override { + self = python35Packages // { scipy = python35Packages.scipy_0_16;}; + }; +}); +in pkgs.python35.buildEnv.override{ + extraLibs = [newpkgs.python35Packages.blaze ]; +}).env +``` +The requested package `blaze` depends upon `pandas` which itself depends on `scipy`. + + +### `install_data` / `data_files` problems + +If you get the following error: + + could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc': + Permission denied + +This is a [known bug](https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix) in setuptools. +Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`. +As workaround install it as an extra `preInstall` step: + + ${python.interpreter} setup.py install_data --install-dir=$out --root=$out + sed -i '/ = data\_files/d' setup.py + + +### Rationale of non-existent global site-packages + +On most operating systems a global `site-packages` is maintained. This however +becomes problematic if you want to run multiple Python versions or have multiple +versions of certain libraries for your projects. Generally, you would solve such +issues by creating virtual environments using `virtualenv`. + +On Nix each package has an isolated dependency tree which, in the case of +Python, guarantees the right versions of the interpreter and libraries or +packages are available. There is therefore no need to maintain a global `site-packages`. + +If you want to create a Python environment for development, then the recommended +method is to use `nix-shell`, either with or without the `python.buildEnv` +function. + + +## Contributing + +### Contributing guidelines + +Following rules are desired to be respected: + +* Make sure package builds for all python interpreters. Use `disabled` argument to `buildPythonPackage` to set unsupported interpreters. +* If tests need to be disabled for a package, make sure you leave a comment about reasoning. +* Packages in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts. +* Python libraries are supposed to be in `python-packages.nix` and packaged with `buildPythonPackage`. Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`. diff --git a/doc/languages-frameworks/python.xml b/doc/languages-frameworks/python.xml deleted file mode 100644 index 57aceeb48685..000000000000 --- a/doc/languages-frameworks/python.xml +++ /dev/null @@ -1,447 +0,0 @@ -
- -Python - - - Currently supported interpreters are python26, python27, - python33, python34, python35 - and pypy. - - - - python is an alias to python27 and python3 is an alias to python34. - - - - python26 and python27 do not include modules that require - external dependencies (to reduce dependency bloat). Following modules need to be added as - buildInput explicitly: - - - - python.modules.bsddb - python.modules.curses - python.modules.curses_panel - python.modules.crypt - python.modules.gdbm - python.modules.sqlite3 - python.modules.tkinter - python.modules.readline - - -For convenience python27Full and python26Full -are provided with all modules included. - - - Python packages that - use setuptools or distutils, - can be built using the buildPythonPackage function as documented below. - - - - All packages depending on any Python interpreter get appended $out/${python.sitePackages} - to $PYTHONPATH if such directory exists. - - - - - Useful attributes on interpreters packages: - - - - libPrefix - - Name of the folder in ${python}/lib/ for corresponding interpreter. - - - - - interpreter - - Alias for ${python}/bin/${executable}. - - - - - buildEnv - - Function to build python interpreter environments with extra packages bundled together. - See for usage and documentation. - - - - - sitePackages - - Alias for lib/${libPrefix}/site-packages. - - - - - executable - - Name of the interpreter executable, ie python3.4. - - - - -
<varname>buildPythonPackage</varname> function - - - The function is implemented in - pkgs/development/python-modules/generic/default.nix. - Example usage: - - -twisted = buildPythonPackage { - name = "twisted-8.1.0"; - - src = pkgs.fetchurl { - url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2; - sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl"; - }; - - propagatedBuildInputs = [ self.ZopeInterface ]; - - meta = { - homepage = http://twistedmatrix.com/; - description = "Twisted, an event-driven networking engine written in Python"; - license = stdenv.lib.licenses.mit; - }; -}; - - - Most of Python packages that use buildPythonPackage are defined - in pkgs/top-level/python-packages.nix - and generated for each python interpreter separately into attribute sets python26Packages, - python27Packages, python35Packages, python33Packages, - python34Packages and pypyPackages. - - - - buildPythonPackage mainly does four things: - - - - In the buildPhase, it calls - ${python.interpreter} setup.py bdist_wheel to build a wheel binary zipfile. - - - - In the installPhase, it installs the wheel file using - pip install *.whl. - - - - In the postFixup phase, wrapPythonPrograms - bash function is called to wrap all programs in $out/bin/* - directory to include $PYTHONPATH and $PATH - environment variables. - - - - In the installCheck phase, ${python.interpreter} setup.py test - is ran. - - - - - By default doCheck = true is set - - - 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’s (also) a runtime dependency, - use propagatedBuildInputs. - - - - By default meta.platforms is set to the same value - as the interpreter unless overriden otherwise. - - - - - <varname>buildPythonPackage</varname> parameters - (all parameters from <varname>mkDerivation</varname> function are still supported) - - - - namePrefix - - Prepended text to ${name} parameter. - Defaults to "python3.3-" for Python 3.3, etc. Set it to - "" - if you're packaging an application or a command line tool. - - - - - disabled - - If true, package is not build for - particular python interpreter version. Grep around - pkgs/top-level/python-packages.nix - for examples. - - - - - setupPyBuildFlags - - List of flags passed to setup.py build_ext command. - - - - - pythonPath - - List of packages to be added into $PYTHONPATH. - Packages in pythonPath are not propagated - (contrary to propagatedBuildInputs). - - - - - preShellHook - - Hook to execute commands before shellHook. - - - - - postShellHook - - Hook to execute commands after shellHook. - - - - - 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"]. - - - - - -
- -
<function>python.buildEnv</function> function - - Create Python environments using low-level pkgs.buildEnv function. Example default.nix: - - - {}; - -python.buildEnv.override { - extraLibs = [ pkgs.pythonPackages.pyramid ]; - ignoreCollisions = true; -}]]> - - - Running nix-build will create - /nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env - with wrapped binaries in bin/. - - - - You can also use env attribute to create local - environments with needed packages installed (somewhat comparable to - virtualenv). For example, with the following - shell.nix: - - - {}; - -(python3.buildEnv.override { - extraLibs = with python3Packages; - [ numpy - requests - ]; -}).env]]> - - - Running nix-shell will drop you into a shell where - python will have specified packages in its path. - - - - - <function>python.buildEnv</function> arguments - - - - extraLibs - - List of packages installed inside the environment. - - - - - postBuild - - Shell command executed after the build of environment. - - - - - ignoreCollisions - - Ignore file collisions inside the environment (default is false). - - - -
- -
Tools - -Packages inside nixpkgs are written by hand. However many tools -exist in community to help save time. No tool is preferred at the moment. - - - - - - python2nix - by Vladimir Kirillov - - - - pypi2nix - by Rok Garbas - - - - pypi2nix - by Jaka Hudoklin - - - - -
- -
Development - - - To develop Python packages buildPythonPackage has - additional logic inside shellPhase to run - pip install -e . --prefix $TMPDIR/ for the package. - - - shellPhase is executed only if setup.py - exists. - - - Given a default.nix: - - - {}; - -buildPythonPackage { - name = "myproject"; - - buildInputs = with pkgs.pythonPackages; [ pyramid ]; - - src = ./.; -}]]> - - - Running nix-shell with no arguments should give you - the environment in which the package would be build with - nix-build. - - - - Shortcut to setup environments with C headers/libraries and python packages: - - $ nix-shell -p pythonPackages.pyramid zlib libjpeg git - - - - There is a boolean value lib.inNixShell set to - true if nix-shell is invoked. - - -
- -
FAQ - - - - - How to solve circular dependencies? - - If you have packages A and B that - depend on each other, when packaging B override package - A not to depend on B as input - (and also the other way around). - - - - - install_data / data_files problems resulting into error: could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc': Permission denied - - - Known bug in setuptools install_data does not respect --prefix. Example of - such package using the feature is pkgs/tools/X11/xpra/default.nix. As workaround - install it as an extra preInstall step: - - ${python.interpreter} setup.py install_data --install-dir=$out --root=$out -sed -i '/ = data_files/d' setup.py - - - - - Rationale of non-existent global site-packages - - There is no need to have global site-packages in Nix. Each package has isolated - dependency tree and installing any python package will only populate $PATH - inside user environment. See to create self-contained - interpreter with a set of packages. - - - - - -
- - -
Contributing guidelines - - Following rules are desired to be respected: - - - - - - Make sure package builds for all python interpreters. Use disabled argument to - buildPythonPackage to set unsupported interpreters. - - - - If tests need to be disabled for a package, make sure you leave a comment about reasoning. - - - - Packages in pkgs/top-level/python-packages.nix - are sorted quasi-alphabetically to avoid merge conflicts. - - - - -
- -
- From 0ed331cf0978db7346817d8a230b865f19556f11 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Mar 2016 15:33:40 -0500 Subject: [PATCH 02/75] Documentation: fix usage of useChapters --- doc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/default.nix b/doc/default.nix index 7583813c94f1..5c97bc32a889 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation { + toDocbook { inputFile = ./introduction.md; outputFile = "introduction.xml"; + useChapters = true; } + toDocbook { inputFile = ./languages-frameworks/python.md; outputFile = "./languages-frameworks/python.xml"; - useChapters = true; } + toDocbook { inputFile = ./haskell-users-guide.md; From a4d741ef9deb66d84ad22ec4c33c15eaea9e9c39 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 24 Mar 2016 19:25:42 +0000 Subject: [PATCH 03/75] ppp: Include convenience scripts --- pkgs/tools/networking/ppp/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 43349178211f..dd07e53ee6f9 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -22,6 +22,16 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ]; + installPhase = '' + mkdir -p $out/bin + make install + install -D -m 755 scripts/{pon,poff,plog} $out/bin + ''; + + postFixup = '' + substituteInPlace $out/bin/{pon,poff,plog} --replace "/usr/sbin" "$out/bin" + ''; + meta = { homepage = https://ppp.samba.org/; description = "Point-to-point implementation for Linux and Solaris"; From 772ab40c525e15e46f35b192d036ef06872d0d59 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 26 Mar 2016 11:54:21 +0000 Subject: [PATCH 04/75] django packaging: remove remaining uses of makeOverridable for django-depending packages --- pkgs/top-level/python-packages.nix | 42 +++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88c238ef8b43..39e47be572bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8278,7 +8278,7 @@ in modules // { }; }; - django_redis = makeOverridable ({ django ? self.django }: buildPythonPackage rec { + django_redis = buildPythonPackage rec { name = "django-redis-${version}"; version = "4.2.0"; @@ -8289,18 +8289,18 @@ in modules // { buildInputs = [ self.mock ]; - propagatedBuildInputs = [ django ] ++ - (with self; [ - redis - msgpack - ]); + propagatedBuildInputs = with self; [ + django + redis + msgpack + ]; meta = { description = "Full featured redis cache backend for Django"; homepage = https://github.com/niwibe/django-redis; license = licenses.bsd3; }; - }) {}; + }; django_reversion = buildPythonPackage rec { name = "django-reversion-${version}"; @@ -8322,7 +8322,7 @@ in modules // { }; }; - django_silk = makeOverridable ({ django ? self.django }: buildPythonPackage rec { + django_silk = buildPythonPackage rec { name = "django-silk-${version}"; version = "0.5.6"; @@ -8333,25 +8333,25 @@ in modules // { buildInputs = [ self.mock ]; - propagatedBuildInputs = [ django ] ++ - (with self; [ - pygments - simplejson - dateutil - requests2 - sqlparse - jinja2 - autopep8 - pytz - pillow - ]); + propagatedBuildInputs = with self; [ + django + pygments + simplejson + dateutil + requests2 + sqlparse + jinja2 + autopep8 + pytz + pillow + ]; meta = { description = "Silky smooth profiling for the Django Framework"; homepage = https://github.com/mtford90/silk; license = licenses.mit; }; - }) {}; + }; django_taggit = buildPythonPackage rec { name = "django-taggit-${version}"; From 8b0076b887beeb6623121a6313d1a22eccf9a29b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 26 Mar 2016 11:44:26 +0300 Subject: [PATCH 05/75] avidemux: 2.5.6 -> 2.6.12 --- pkgs/applications/video/avidemux/default.nix | 127 ++++++++++++++---- .../video/avidemux/dynamic_install_dir.patch | 12 ++ pkgs/applications/video/avidemux/wrapper.nix | 29 ++++ pkgs/top-level/all-packages.nix | 6 +- 4 files changed, 144 insertions(+), 30 deletions(-) create mode 100644 pkgs/applications/video/avidemux/dynamic_install_dir.patch create mode 100644 pkgs/applications/video/avidemux/wrapper.nix diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 485d8c54eb36..3ffc18e3b181 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,46 +1,115 @@ -{stdenv, fetchurl, cmake, pkgconfig, libxml2, qt4, gtk, gettext, SDL, -libXv, pixman, libpthreadstubs, libXau, libXdmcp, libxslt, x264, -alsaLib, lame, faad2, libvorbis, yasm, libvpx, xvidcore, libva, -faac ? null, faacSupport ? false }: +{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir +, zlib, gettext, libvdpau, libva, libXv, sqlite, x265 +, yasm, fribidi, gtk3, qt4 +, withX264 ? true, x264 +, withLAME ? true, lame +, withFAAC ? true, faac +, withVorbis ? true, libvorbis +, withPulse ? true, libpulseaudio +, withFAAD ? true, faad2 +, withOpus ? true, libopus +, withVPX ? true, libvpx +}: -assert stdenv ? glibc; -assert faacSupport -> faac != null; - -stdenv.mkDerivation { - name = "avidemux-2.5.6"; +stdenv.mkDerivation rec { + name = "avidemux-${version}"; + version = "2.6.12"; src = fetchurl { - url = mirror://sourceforge/avidemux/avidemux_2.5.6.tar.gz; - sha256 = "12wvxz0n2g85f079d8mdkkp2zm279d34m9v7qgcqndh48cn7znnn"; + url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; + sha256 = "0nz52yih8sff53inndkh2dba759xjzsh4b8xjww419lcpk0qp6kn"; }; - buildInputs = [ cmake pkgconfig libxml2 qt4 gtk gettext SDL libXv - pixman libpthreadstubs libXau libXdmcp libxslt x264 alsaLib - lame faad2 libvorbis yasm libvpx xvidcore libva - ] ++ stdenv.lib.optional faacSupport faac; + nativeBuildInputs = [ cmake pkgconfig yasm lndir ]; + buildInputs = [ zlib gettext libvdpau libva libXv sqlite x265 fribidi gtk3 qt4 ] + ++ lib.optional withX264 x264 + ++ lib.optional withLAME lame + ++ lib.optional withFAAC faac + ++ lib.optional withVorbis libvorbis + ++ lib.optional withPulse libpulseaudio + ++ lib.optional withFAAD faad2 + ++ lib.optional withOpus libopus + ++ lib.optional withVPX libvpx + ; - cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" + - " -DGETTEXT_INCLUDE_DIR=${gettext}/include" + - " -DSDL_INCLUDE_DIR=${SDL}/include/SDL"; + enableParallelBuilding = false; - NIX_LDFLAGS="-lpthread"; + outputs = [ "out" "cli" "gtk" "qt4" ]; - postInstall = '' - cd $NIX_BUILD_TOP/$sourceRoot - mkdir build_plugins - cd build_plugins - cmake $cmakeFlags -DAVIDEMUX_INSTALL_PREFIX=$out \ - -DAVIDEMUX_SOURCE_DIR=$NIX_BUILD_TOP/$sourceRoot \ - -DAVIDEMUX_CORECONFIG_DIR=$NIX_BUILD_TOP/$sourceRoot/build/config ../plugins + patches = [ ./dynamic_install_dir.patch ]; - make - make install + buildCommand = '' + unpackPhase + cd "$sourceRoot" + patchPhase + + export cmakeFlags="$cmakeFlags -DAVIDEMUX_SOURCE_DIR=$(pwd)" + + function buildOutput() { + ( plugin_ui="$1" + output_dir="$2" + shift 2 + export cmakeFlags="$cmakeFlags -DPLUGIN_UI=$plugin_ui -DCMAKE_INSTALL_PREFIX=$output_dir" + for i in "$@" avidemux_plugins; do + ( cd "$i" + cmakeConfigurePhase + buildPhase + installPhase + ) + done + rm -rf avidemux_plugins/build + ) + } + + function buildUi() { + plugin_ui="$1" + output_dir="$2" + shift 2 + + # Hack to split builds properly + mkdir -p $output_dir + lndir $out $output_dir + buildOutput $plugin_ui $output_dir "$@" + } + + function fixupUi() { + output_dir="$1" + shift + + find $output_dir -lname $out\* -delete + find $output_dir -type f | while read -r f; do + rpath="$(patchelf --print-rpath $f 2>/dev/null)" || continue + new_rpath="" + IFS=':' read -ra old_rpath <<< "$rpath" + for p in "''${old_rpath[@]}"; do + new_rpath="$new_rpath:$p" + if [[ $p = $output_dir* ]]; then + new_rpath="$new_rpath:$out/''${p#$output_dir}" + fi + done + patchelf --set-rpath "$new_rpath" $f + patchelf --shrink-rpath $f + done + } + + buildOutput COMMON $out avidemux_core + buildOutput SETTINGS $out + buildUi CLI $cli avidemux/cli + buildUi GTK $gtk avidemux/gtk + buildUi QT4 $qt4 avidemux/qt4 + + fixupPhase + + fixupUi $cli + fixupUi $gtk + fixupUi $qt4 ''; meta = { homepage = http://fixounet.free.fr/avidemux/; description = "Free video editor designed for simple video editing tasks"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric abbradar ]; platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/avidemux/dynamic_install_dir.patch b/pkgs/applications/video/avidemux/dynamic_install_dir.patch new file mode 100644 index 000000000000..f2f963e51694 --- /dev/null +++ b/pkgs/applications/video/avidemux/dynamic_install_dir.patch @@ -0,0 +1,12 @@ +diff -ru3 avidemux_2.6.12.old/avidemux_core/ADM_core/src/ADM_fileio.cpp avidemux_2.6.12/avidemux_core/ADM_core/src/ADM_fileio.cpp +--- avidemux_2.6.12.old/avidemux_core/ADM_core/src/ADM_fileio.cpp 2016-03-25 15:26:00.368213627 +0300 ++++ avidemux_2.6.12/avidemux_core/ADM_core/src/ADM_fileio.cpp 2016-03-26 02:32:56.163550537 +0300 +@@ -393,7 +393,7 @@ + + return ADM_getRelativePath(buffer, base1, base2, base3); + #else +- return ADM_getRelativePath(ADM_INSTALL_DIR, base1, base2, base3); ++ return ADM_getRelativePath(getenv("ADM_ROOT_DIR"), base1, base2, base3); + #endif + } + diff --git a/pkgs/applications/video/avidemux/wrapper.nix b/pkgs/applications/video/avidemux/wrapper.nix new file mode 100644 index 000000000000..ad41f56d39d2 --- /dev/null +++ b/pkgs/applications/video/avidemux/wrapper.nix @@ -0,0 +1,29 @@ +{ buildEnv, avidemux, makeWrapper +# GTK version is broken upstream, see https://bugzilla.redhat.com/show_bug.cgi?id=1244340 +, withUi ? "qt4" +}: + +let + ui = builtins.getAttr withUi avidemux; + +in buildEnv { + name = "avidemux-${withUi}-" + avidemux.version; + + paths = [ avidemux ui ]; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${ui}/bin/*; do + ln -s $i $out/bin + done + fi + for i in $out/bin/*; do + wrapProgram $i --set ADM_ROOT_DIR $out + done + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f0ab25e92e9..3e5ef30d5ef4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11479,7 +11479,11 @@ in autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; - avidemux = callPackage ../applications/video/avidemux { }; + avidemux_unwrapped = callPackage ../applications/video/avidemux { }; + + avidemux = callPackage ../applications/video/avidemux/wrapper.nix { + avidemux = avidemux_unwrapped; + }; avogadro = callPackage ../applications/science/chemistry/avogadro { eigen = eigen2; From a314814c19fa9744ee3f3c333a1c00b27574b90e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 23 Mar 2016 15:33:28 +0800 Subject: [PATCH 06/75] tmux nixos module: add nixos program module for tmux This basic module allows you to specify the tmux configuration. As great as tmux is, some of the defaults are pretty awful, so having a way to specify the config really helps. --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/tmux.nix | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 nixos/modules/programs/tmux.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3dd60ad99dca..934fb56bc10d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -77,6 +77,7 @@ ./programs/shell.nix ./programs/ssh.nix ./programs/ssmtp.nix + ./programs/tmux.nix ./programs/venus.nix ./programs/wvdial.nix ./programs/xfs_quota.nix diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix new file mode 100644 index 000000000000..4220a2e17b3f --- /dev/null +++ b/nixos/modules/programs/tmux.nix @@ -0,0 +1,35 @@ +{ config, pkgs, lib, ... }: + +let + inherit (lib) mkOption mkEnableOption mkIf mkMerge types; + + cfg = config.programs.tmux; + +in +{ + ###### interface + + options = { + programs.tmux = { + + enable = mkEnableOption "tmux - a screen replacement."; + + tmuxconf = mkOption { + default = ""; + description = '' + The contents of /etc/tmux.conf + ''; + type = types.lines; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + environment = { + systemPackages = [ pkgs.tmux ]; + etc."tmux.conf".text = cfg.tmuxconf; + }; + }; +} From e5aaefd7b9fc1aeb770038d901c54acc7eabd3b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 27 Mar 2016 12:07:45 -0300 Subject: [PATCH 07/75] xmlto: 0.0.26 -> 0.0.28 --- pkgs/tools/typesetting/xmlto/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 49fe7dc681fe..9d050558f6dd 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, flex, libxml2, libxslt -, docbook_xml_dtd_42, docbook_xsl, w3m +, docbook_xml_dtd_45, docbook_xsl, w3m , bash, getopt, makeWrapper }: stdenv.mkDerivation rec { - name = "xmlto-0.0.26"; + name = "xmlto-0.0.28"; src = fetchurl { url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2"; - sha256 = "1v5mahfg5k9lh3anykl482xnrgxn36zlmqsgwahw29xwncprpd7g"; + sha256 = "0xhj8b2pwp4vhl9y16v3dpxpsakkflfamr191mprzsspg4xdyc0i"; }; patchPhase = '' @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { # `libxml2' provides `xmllint', needed at build-time and run-time. # `libxslt' provides `xsltproc', used by `xmlto' at run-time. - buildInputs = [ libxml2 libxslt docbook_xml_dtd_42 docbook_xsl getopt makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ libxml2 libxslt docbook_xml_dtd_45 docbook_xsl getopt ]; postInstall = '' wrapProgram "$out/bin/xmlto" \ From b9137334683315095cddcc63c9660917cc00023f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 27 Mar 2016 08:29:09 -0300 Subject: [PATCH 08/75] docbook-xsl: 1.78.1 -> 1.79.1 --- pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 863f60444025..5d395e383650 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -3,7 +3,7 @@ let common = { pname, sha256 }: stdenv.mkDerivation rec { - name = "${pname}-1.78.1"; + name = "${pname}-1.79.1"; src = fetchurl { url = "mirror://sourceforge/docbook/${name}.tar.bz2"; @@ -36,12 +36,12 @@ in { docbook_xsl = common { pname = "docbook-xsl"; - sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9"; + sha256 = "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj"; }; docbook_xsl_ns = common { pname = "docbook-xsl-ns"; - sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng"; + sha256 = "170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin"; }; } From 0b96e0daf3d3cd0a01056612c8bf33739d2082e5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 27 Mar 2016 20:28:45 +0000 Subject: [PATCH 09/75] osrm-backend: 4.5.0 -> 4.9.1 --- pkgs/servers/osrm-backend/4.5.0-openmp.patch | 18 ------------------ pkgs/servers/osrm-backend/default.nix | 8 ++++---- 2 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 pkgs/servers/osrm-backend/4.5.0-openmp.patch diff --git a/pkgs/servers/osrm-backend/4.5.0-openmp.patch b/pkgs/servers/osrm-backend/4.5.0-openmp.patch deleted file mode 100644 index f4010131f602..000000000000 --- a/pkgs/servers/osrm-backend/4.5.0-openmp.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b6a40f9..87ca301 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -261,9 +261,10 @@ target_link_libraries(OSRM ${STXXL_LIBRARY}) - target_link_libraries(osrm-extract ${STXXL_LIBRARY}) - target_link_libraries(osrm-prepare ${STXXL_LIBRARY}) - --if(MINGW) -- # STXXL needs OpenMP library -- target_link_libraries(osrm-extract gomp) -+find_package(OpenMP) -+if (OPENMP_FOUND) -+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") - endif() - - find_package( OSMPBF REQUIRED ) diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 9c1dd23b39f0..23c3b237c579 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -1,17 +1,17 @@ {stdenv, fetchFromGitHub, cmake, luabind, libosmpbf, stxxl, tbb, boost, expat, protobuf, bzip2, zlib, substituteAll}: stdenv.mkDerivation rec { - name = "osrm-backend-4.5.0"; + name = "osrm-backend-${version}"; + version = "4.9.1"; src = fetchFromGitHub { - rev = "v4.5.0"; + rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "19a8d1llvsrysyk1q48dpmh75qcbibfjlszndrysk11yh62hdvsz"; + sha256 = "1r4dwniwxgfppnb9asdh98w5qxqwkjhp9gc5fabmck0gk73cwkcc"; }; patches = [ - ./4.5.0-openmp.patch ./4.5.0-gcc-binutils.patch (substituteAll { src = ./4.5.0-default-profile-path.template.patch; From cc51d7c30e0ae36d3806b3e733ba9e979fb0d45b Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 28 Mar 2016 00:07:35 +0200 Subject: [PATCH 10/75] Revert "xmlto: 0.0.26 -> 0.0.28" This reverts commit e5aaefd7b9fc1aeb770038d901c54acc7eabd3b8. I jumped the gun on this, sorry --- pkgs/tools/typesetting/xmlto/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 9d050558f6dd..49fe7dc681fe 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, flex, libxml2, libxslt -, docbook_xml_dtd_45, docbook_xsl, w3m +, docbook_xml_dtd_42, docbook_xsl, w3m , bash, getopt, makeWrapper }: stdenv.mkDerivation rec { - name = "xmlto-0.0.28"; + name = "xmlto-0.0.26"; src = fetchurl { url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2"; - sha256 = "0xhj8b2pwp4vhl9y16v3dpxpsakkflfamr191mprzsspg4xdyc0i"; + sha256 = "1v5mahfg5k9lh3anykl482xnrgxn36zlmqsgwahw29xwncprpd7g"; }; patchPhase = '' @@ -20,8 +20,7 @@ stdenv.mkDerivation rec { # `libxml2' provides `xmllint', needed at build-time and run-time. # `libxslt' provides `xsltproc', used by `xmlto' at run-time. - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ libxml2 libxslt docbook_xml_dtd_45 docbook_xsl getopt ]; + buildInputs = [ libxml2 libxslt docbook_xml_dtd_42 docbook_xsl getopt makeWrapper ]; postInstall = '' wrapProgram "$out/bin/xmlto" \ From 0fc7b78de4c92e2b7bacc393e271c4eedf9f2579 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 28 Mar 2016 00:07:53 +0200 Subject: [PATCH 11/75] Revert "docbook-xsl: 1.78.1 -> 1.79.1" This reverts commit b9137334683315095cddcc63c9660917cc00023f. I jumped the gun on this, sorry --- pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 5d395e383650..863f60444025 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -3,7 +3,7 @@ let common = { pname, sha256 }: stdenv.mkDerivation rec { - name = "${pname}-1.79.1"; + name = "${pname}-1.78.1"; src = fetchurl { url = "mirror://sourceforge/docbook/${name}.tar.bz2"; @@ -36,12 +36,12 @@ in { docbook_xsl = common { pname = "docbook-xsl"; - sha256 = "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj"; + sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9"; }; docbook_xsl_ns = common { pname = "docbook-xsl-ns"; - sha256 = "170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin"; + sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng"; }; } From 5ca8c23b2ab96164bb8652d95c740ebc0e498d52 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 26 Mar 2016 14:21:23 +0000 Subject: [PATCH 12/75] nodePackages.bower: 1.4.1 -> 1.7.7 --- pkgs/top-level/node-packages-generated.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 12d0aff2616e..dbe500aea5e6 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -4477,7 +4477,24 @@ os = [ ]; cpu = [ ]; }; - "bower" = self.by-version."bower"."1.4.1"; + by-version."bower"."1.7.7" = self.buildNodePackage { + name = "bower-1.7.7"; + version = "1.7.7"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/bower/-/bower-1.7.7.tgz"; + name = "bower-1.7.7.tgz"; + sha1 = "2fd7ff3ebdcba5a8ffcd84c397c8fdfe9f825f92"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "bower" = self.by-version."bower"."1.7.7"; by-spec."bower".">=1.2.8 <2" = self.by-version."bower"."1.4.1"; by-spec."bower-config"."^0.6.1" = From 156b05ae48fb24ba270609f5908d5f6d09f3f5ba Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 26 Mar 2016 14:23:38 +0000 Subject: [PATCH 13/75] nodePackages.typescript: 1.5.0-alpha -> 1.8.9 --- pkgs/top-level/node-packages-generated.nix | 25 +++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index dbe500aea5e6..ae365e3bd796 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -42014,8 +42014,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."typescript"."*" = - self.by-version."typescript"."1.5.0-alpha"; by-version."typescript"."1.5.0-alpha" = self.buildNodePackage { name = "typescript-1.5.0-alpha"; version = "1.5.0-alpha"; @@ -42033,7 +42031,28 @@ os = [ ]; cpu = [ ]; }; - "typescript" = self.by-version."typescript"."1.5.0-alpha"; + by-version."typescript"."1.8.9" = self.buildNodePackage { + name = "typescript-1.8.9"; + version = "1.8.9"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/typescript/-/typescript-1.8.9.tgz"; + name = "typescript-1.8.9.tgz"; + sha1 = "b3b3a74059fd31cbd3ecad95d62465939e7ed5fa"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."typescript"."*" = + self.by-version."typescript"."1.8.9"; + by-spec."typescript"."~1.8.9" = + self.by-version."typescript"."1.8.9"; + "typescript" = self.by-version."typescript"."1.8.9"; by-spec."typewiselite"."~1.0.0" = self.by-version."typewiselite"."1.0.0"; by-version."typewiselite"."1.0.0" = self.buildNodePackage { From 457eddd18f180af2a2fd6285feeae7250b535281 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 26 Mar 2016 14:27:24 +0000 Subject: [PATCH 14/75] bower2nix: 2.1.0 -> 3.0.1 1. Update bower2nix version and add new/updated dependencies into node-packages-generated.nix. This was done manually, with npm2nix generating the initial set of derivations. In future, it would be nice to have an automatic process (see #10358, #9332). 2. Add an override to nodePackages.bower2nix wrapping the commands so that git is on the PATH. 3. Update fetchbower to support new command-line options of bower2nix, and to allow github URL tag versions. --- pkgs/build-support/fetchbower/default.nix | 37 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/node-packages-generated.nix | 3978 +++++++++++++++++++- pkgs/top-level/node-packages.json | 1 - pkgs/top-level/node-packages.nix | 6 + 5 files changed, 3963 insertions(+), 61 deletions(-) diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix index 057beb999b23..11d88ae10e9f 100644 --- a/pkgs/build-support/fetchbower/default.nix +++ b/pkgs/build-support/fetchbower/default.nix @@ -1,11 +1,26 @@ -{ stdenv, fetch-bower, git }: name: version: target: outputHash: stdenv.mkDerivation { - name = "${name}-${version}"; - buildCommand = '' - out=$PWD/out fetch-bower "${name}" "${version}" "${target}" - cp -R out $out - ''; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - inherit outputHash; - buildInputs = [git fetch-bower]; -} +{ stdenv, lib, bower2nix }: +let + bowerVersion = version: + let + components = lib.splitString "#" version; + hash = lib.last components; + ver = if builtins.length components == 1 then version else hash; + in ver; + + fetchbower = name: version: target: outputHash: stdenv.mkDerivation { + name = "${name}-${bowerVersion version}"; + buildCommand = '' + fetch-bower --quiet --out=$PWD/out "${name}" "${target}" "${version}" + # In some cases, the result of fetchBower is different depending + # on the output directory (e.g. if the bower package contains + # symlinks). So use a local output directory before copying to + # $out. + cp -R out $out + ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + inherit outputHash; + buildInputs = [ bower2nix ]; + }; + +in fetchbower diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c458eb9130c..1ec3fa9cd968 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -171,7 +171,7 @@ in }; fetchbower = callPackage ../build-support/fetchbower { - inherit (nodePackages) fetch-bower; + inherit (nodePackages) bower2nix; }; fetchbzr = callPackage ../build-support/fetchbzr { }; diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index ae365e3bd796..7cd7245edd8b 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -4650,35 +4650,30 @@ cpu = [ ]; }; by-spec."bower2nix"."*" = - self.by-version."bower2nix"."2.1.0"; - by-version."bower2nix"."2.1.0" = self.buildNodePackage { - name = "bower2nix-2.1.0"; - version = "2.1.0"; - bin = true; + self.by-version."bower2nix"."3.0.1"; + by-version."bower2nix"."3.0.1" = self.buildNodePackage { + name = "bower2nix-3.0.1"; + version = "3.0.1"; src = fetchurl { - url = "http://registry.npmjs.org/bower2nix/-/bower2nix-2.1.0.tgz"; - name = "bower2nix-2.1.0.tgz"; - sha1 = "213f507a729b20a1c3cb48f995a034f9c05f53e6"; + url = "http://registry.npmjs.org/bower2nix/-/bower2nix-3.0.1.tgz"; + name = "bower2nix-3.0.1.tgz"; + sha256 = "0jfrz2mvnx3fp2p76dcnw18c1vajladbqcrzapf93jh8h6715msi"; }; deps = { - "temp-0.6.0" = self.by-version."temp"."0.6.0"; - "fs.extra-1.3.2" = self.by-version."fs.extra"."1.3.2"; - "bower-json-0.4.0" = self.by-version."bower-json"."0.4.0"; + "argparse-1.0.4" = self.by-version."argparse"."1.0.4"; + "bower-1.7.7" = self.by-version."bower"."1.7.7"; "bower-endpoint-parser-0.2.1" = self.by-version."bower-endpoint-parser"."0.2.1"; + "bower-json-0.6.0" = self.by-version."bower-json"."0.6.0"; "bower-logger-0.2.1" = self.by-version."bower-logger"."0.2.1"; - "bower-1.4.1" = self.by-version."bower"."1.4.1"; - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; - "clone-0.1.11" = self.by-version."clone"."0.1.11"; - "semver-2.3.2" = self.by-version."semver"."2.3.2"; - "fetch-bower-2.0.0" = self.by-version."fetch-bower"."2.0.0"; + "fs-extra-0.26.7" = self.by-version."fs-extra"."0.26.7"; + "lodash-4.2.1" = self.by-version."lodash"."4.2.1"; + "promised-temp-0.1.0" = self.by-version."promised-temp"."0.1.0"; + "semver-5.1.0" = self.by-version."semver"."5.1.0"; + "temp-0.8.3" = self.by-version."temp"."0.8.3"; + "glob-6.0.4" = self.by-version."glob"."6.0.4"; }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; }; - "bower2nix" = self.by-version."bower2nix"."2.1.0"; + "bower2nix" = self.by-version."bower2nix"."3.0.1"; by-spec."bplist-parser"."0.0.6" = self.by-version."bplist-parser"."0.0.6"; by-version."bplist-parser"."0.0.6" = self.buildNodePackage { @@ -14812,32 +14807,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."fetch-bower"."*" = - self.by-version."fetch-bower"."2.0.0"; - by-version."fetch-bower"."2.0.0" = self.buildNodePackage { - name = "fetch-bower-2.0.0"; - version = "2.0.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/fetch-bower/-/fetch-bower-2.0.0.tgz"; - name = "fetch-bower-2.0.0.tgz"; - sha1 = "c027feb75a512001d1287bbfb3ffaafba67eb92f"; - }; - deps = { - "bower-endpoint-parser-0.2.1" = self.by-version."bower-endpoint-parser"."0.2.1"; - "bower-logger-0.2.1" = self.by-version."bower-logger"."0.2.1"; - "bower-1.4.1" = self.by-version."bower"."1.4.1"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "fetch-bower" = self.by-version."fetch-bower"."2.0.0"; - by-spec."fetch-bower".">=2 <3" = - self.by-version."fetch-bower"."2.0.0"; by-spec."fields"."~0.1.22" = self.by-version."fields"."0.1.23"; by-version."fields"."0.1.23" = self.buildNodePackage { @@ -45553,4 +45522,3917 @@ os = [ ]; cpu = [ ]; }; + by-spec."ansi-regex"."^2.0.0" = + self.by-version."ansi-regex"."2.0.0"; + by-version."ansi-regex"."2.0.0" = self.buildNodePackage { + name = "ansi-regex-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; + name = "ansi-regex-2.0.0.tgz"; + sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ansi-styles"."^2.1.0" = + self.by-version."ansi-styles"."2.2.0"; + by-version."ansi-styles"."2.2.0" = self.buildNodePackage { + name = "ansi-styles-2.2.0"; + version = "2.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.0.tgz"; + name = "ansi-styles-2.2.0.tgz"; + sha1 = "c59191936e6ed1c1315a4b6b6b97f3acfbfa68b0"; + }; + deps = { + "color-convert-1.0.0" = self.by-version."color-convert"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."argparse"."1.0.4" = + self.by-version."argparse"."1.0.4"; + by-version."argparse"."1.0.4" = self.buildNodePackage { + name = "argparse-1.0.4"; + version = "1.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/argparse/-/argparse-1.0.4.tgz"; + name = "argparse-1.0.4.tgz"; + sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; + }; + deps = { + "lodash-4.6.1" = self.by-version."lodash"."4.6.1"; + "sprintf-js-1.0.3" = self.by-version."sprintf-js"."1.0.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "argparse" = self.by-version."argparse"."1.0.4"; + by-spec."argparse"."^1.0.2" = + self.by-version."argparse"."1.0.7"; + by-version."argparse"."1.0.7" = self.buildNodePackage { + name = "argparse-1.0.7"; + version = "1.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/argparse/-/argparse-1.0.7.tgz"; + name = "argparse-1.0.7.tgz"; + sha1 = "c289506480557810f14a8bc62d7a06f63ed7f951"; + }; + deps = { + "sprintf-js-1.0.3" = self.by-version."sprintf-js"."1.0.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."array-find-index"."^1.0.0" = + self.by-version."array-find-index"."1.0.1"; + by-version."array-find-index"."1.0.1" = self.buildNodePackage { + name = "array-find-index-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz"; + name = "array-find-index-1.0.1.tgz"; + sha1 = "0bc25ddac941ec8a496ae258fd4ac188003ef3af"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."asn1".">=0.2.3 <0.3.0" = + self.by-version."asn1"."0.2.3"; + by-version."asn1"."0.2.3" = self.buildNodePackage { + name = "asn1-0.2.3"; + version = "0.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + name = "asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."assert-plus".">=0.2.0 <0.3.0" = + self.by-version."assert-plus"."0.2.0"; + by-version."assert-plus"."0.2.0" = self.buildNodePackage { + name = "assert-plus-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; + name = "assert-plus-0.2.0.tgz"; + sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."assert-plus"."^0.2.0" = + self.by-version."assert-plus"."0.2.0"; + by-spec."assert-plus"."^1.0.0" = + self.by-version."assert-plus"."1.0.0"; + by-version."assert-plus"."1.0.0" = self.buildNodePackage { + name = "assert-plus-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + name = "assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."assertion-error"."^1.0.0" = + self.by-version."assertion-error"."1.0.1"; + by-version."assertion-error"."1.0.1" = self.buildNodePackage { + name = "assertion-error-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.1.tgz"; + name = "assertion-error-1.0.1.tgz"; + sha1 = "35aaeec33097f11f42399ecadf33faccd27f5c4c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."^1.5.2" = + self.by-version."async"."1.5.2"; + by-version."async"."1.5.2" = self.buildNodePackage { + name = "async-1.5.2"; + version = "1.5.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-1.5.2.tgz"; + name = "async-1.5.2.tgz"; + sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."aws-sign2"."~0.6.0" = + self.by-version."aws-sign2"."0.6.0"; + by-version."aws-sign2"."0.6.0" = self.buildNodePackage { + name = "aws-sign2-0.6.0"; + version = "0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; + name = "aws-sign2-0.6.0.tgz"; + sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."aws4"."^1.2.1" = + self.by-version."aws4"."1.3.2"; + by-version."aws4"."1.3.2" = self.buildNodePackage { + name = "aws4-1.3.2"; + version = "1.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz"; + name = "aws4-1.3.2.tgz"; + sha1 = "d39e0bee412ced0e8ed94a23e314f313a95b9fd1"; + }; + deps = { + "lru-cache-4.0.1" = self.by-version."lru-cache"."4.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."balanced-match"."^0.3.0" = + self.by-version."balanced-match"."0.3.0"; + by-version."balanced-match"."0.3.0" = self.buildNodePackage { + name = "balanced-match-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"; + name = "balanced-match-0.3.0.tgz"; + sha1 = "a91cdd1ebef1a86659e70ff4def01625fc2d6756"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bl"."^0.9.3" = + self.by-version."bl"."0.9.5"; + by-version."bl"."0.9.5" = self.buildNodePackage { + name = "bl-0.9.5"; + version = "0.9.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; + name = "bl-0.9.5.tgz"; + sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; + }; + deps = { + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bl"."~1.0.0" = + self.by-version."bl"."1.0.3"; + by-version."bl"."1.0.3" = self.buildNodePackage { + name = "bl-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + name = "bl-1.0.3.tgz"; + sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + }; + deps = { + "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bluebird"."~1.2.4" = + self.by-version."bluebird"."1.2.4"; + by-version."bluebird"."1.2.4" = self.buildNodePackage { + name = "bluebird-1.2.4"; + version = "1.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bluebird/-/bluebird-1.2.4.tgz"; + name = "bluebird-1.2.4.tgz"; + sha1 = "5985ec23cb6ff1a5834cc6447b3c5ef010fd321a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."boom"."2.10.1" = self.buildNodePackage { + name = "boom-2.10.1"; + version = "2.10.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; + name = "boom-2.10.1.tgz"; + sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + }; + deps = { + "hoek-2.16.3" = self.by-version."hoek"."2.16.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "bower-endpoint-parser" = self.by-version."bower-endpoint-parser"."0.2.1"; + by-spec."bower-json"."0.6.0" = + self.by-version."bower-json"."0.6.0"; + by-version."bower-json"."0.6.0" = self.buildNodePackage { + name = "bower-json-0.6.0"; + version = "0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bower-json/-/bower-json-0.6.0.tgz"; + name = "bower-json-0.6.0.tgz"; + sha1 = "326579b23c33e4ea828e4763c55cd81fd7650329"; + }; + deps = { + "deep-extend-0.4.1" = self.by-version."deep-extend"."0.4.1"; + "ext-name-3.0.0" = self.by-version."ext-name"."3.0.0"; + "graceful-fs-3.0.8" = self.by-version."graceful-fs"."3.0.8"; + "intersect-1.0.1" = self.by-version."intersect"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "bower-json" = self.by-version."bower-json"."0.6.0"; + "bower-logger" = self.by-version."bower-logger"."0.2.1"; + by-version."brace-expansion"."1.1.3" = self.buildNodePackage { + name = "brace-expansion-1.1.3"; + version = "1.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz"; + name = "brace-expansion-1.1.3.tgz"; + sha1 = "46bff50115d47fc9ab89854abb87d98078a10991"; + }; + deps = { + "balanced-match-0.3.0" = self.by-version."balanced-match"."0.3.0"; + "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."builtin-modules"."^1.0.0" = + self.by-version."builtin-modules"."1.1.1"; + by-version."builtin-modules"."1.1.1" = self.buildNodePackage { + name = "builtin-modules-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; + name = "builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."camelcase"."^2.0.0" = + self.by-version."camelcase"."2.1.1"; + by-version."camelcase"."2.1.1" = self.buildNodePackage { + name = "camelcase-2.1.1"; + version = "2.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; + name = "camelcase-2.1.1.tgz"; + sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."camelcase-keys"."^2.0.0" = + self.by-version."camelcase-keys"."2.1.0"; + by-version."camelcase-keys"."2.1.0" = self.buildNodePackage { + name = "camelcase-keys-2.1.0"; + version = "2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; + name = "camelcase-keys-2.1.0.tgz"; + sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; + }; + deps = { + "camelcase-2.1.1" = self.by-version."camelcase"."2.1.1"; + "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."caseless"."~0.11.0" = + self.by-version."caseless"."0.11.0"; + by-version."caseless"."0.11.0" = self.buildNodePackage { + name = "caseless-0.11.0"; + version = "0.11.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; + name = "caseless-0.11.0.tgz"; + sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."chalk"."1.1.1" = self.buildNodePackage { + name = "chalk-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"; + name = "chalk-1.1.1.tgz"; + sha1 = "509afb67066e7499f7eb3535c77445772ae2d019"; + }; + deps = { + "ansi-styles-2.2.0" = self.by-version."ansi-styles"."2.2.0"; + "escape-string-regexp-1.0.5" = self.by-version."escape-string-regexp"."1.0.5"; + "has-ansi-2.0.0" = self.by-version."has-ansi"."2.0.0"; + "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1"; + "supports-color-2.0.0" = self.by-version."supports-color"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."chalk"."^1.1.1" = + self.by-version."chalk"."1.1.1"; + by-spec."color-convert"."^1.0.0" = + self.by-version."color-convert"."1.0.0"; + by-version."color-convert"."1.0.0" = self.buildNodePackage { + name = "color-convert-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/color-convert/-/color-convert-1.0.0.tgz"; + name = "color-convert-1.0.0.tgz"; + sha1 = "3c26fcd885d272d45beacf6e41baba75c89a8579"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."colors"."^1.1.0" = + self.by-version."colors"."1.1.2"; + by-version."colors"."1.1.2" = self.buildNodePackage { + name = "colors-1.1.2"; + version = "1.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; + name = "colors-1.1.2.tgz"; + sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."combined-stream"."^1.0.5" = + self.by-version."combined-stream"."1.0.5"; + by-version."combined-stream"."1.0.5" = self.buildNodePackage { + name = "combined-stream-1.0.5"; + version = "1.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; + name = "combined-stream-1.0.5.tgz"; + sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + }; + deps = { + "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."combined-stream"."~1.0.5" = + self.by-version."combined-stream"."1.0.5"; + by-spec."commander"."^2.9.0" = + self.by-version."commander"."2.9.0"; + by-version."commander"."2.9.0" = self.buildNodePackage { + name = "commander-2.9.0"; + version = "2.9.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + name = "commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + deps = { + "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."core-util-is"."1.0.2" = self.buildNodePackage { + name = "core-util-is-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + name = "core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."cryptiles"."2.0.5" = self.buildNodePackage { + name = "cryptiles-2.0.5"; + version = "2.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; + name = "cryptiles-2.0.5.tgz"; + sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + }; + deps = { + "boom-2.10.1" = self.by-version."boom"."2.10.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."dashdash".">=1.10.1 <2.0.0" = + self.by-version."dashdash"."1.13.0"; + by-version."dashdash"."1.13.0" = self.buildNodePackage { + name = "dashdash-1.13.0"; + version = "1.13.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz"; + name = "dashdash-1.13.0.tgz"; + sha1 = "a5aae6fd9d8e156624eb0dd9259eb12ba245385a"; + }; + deps = { + "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."debug"."2.2.0" = self.buildNodePackage { + name = "debug-2.2.0"; + version = "2.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + name = "debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + deps = { + "ms-0.7.1" = self.by-version."ms"."0.7.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."decamelize"."^1.1.2" = + self.by-version."decamelize"."1.2.0"; + by-version."decamelize"."1.2.0" = self.buildNodePackage { + name = "decamelize-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + name = "decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."deep-extend"."^0.4.0" = + self.by-version."deep-extend"."0.4.1"; + by-version."deep-extend"."0.4.1" = self.buildNodePackage { + name = "deep-extend-0.4.1"; + version = "0.4.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"; + name = "deep-extend-0.4.1.tgz"; + sha1 = "efe4113d08085f4e6f9687759810f807469e2253"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."deep-extend"."~0.4.0" = + self.by-version."deep-extend"."0.4.1"; + by-spec."deep-freeze"."0.0.1" = + self.by-version."deep-freeze"."0.0.1"; + by-version."deep-freeze"."0.0.1" = self.buildNodePackage { + name = "deep-freeze-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz"; + name = "deep-freeze-0.0.1.tgz"; + sha1 = "3a0b0005de18672819dfd38cd31f91179c893e84"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."definition-header"."~0.1.0" = + self.by-version."definition-header"."0.1.0"; + by-version."definition-header"."0.1.0" = self.buildNodePackage { + name = "definition-header-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/definition-header/-/definition-header-0.1.0.tgz"; + name = "definition-header-0.1.0.tgz"; + sha1 = "01445ff4ca663114cbf2c5a1131f13bb544eb5dd"; + }; + deps = { + "joi-4.9.0" = self.by-version."joi"."4.9.0"; + "joi-assert-0.0.3" = self.by-version."joi-assert"."0.0.3"; + "parsimmon-0.5.1" = self.by-version."parsimmon"."0.5.1"; + "xregexp-2.0.0" = self.by-version."xregexp"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."delayed-stream"."~1.0.0" = + self.by-version."delayed-stream"."1.0.0"; + by-version."delayed-stream"."1.0.0" = self.buildNodePackage { + name = "delayed-stream-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + name = "delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."detect-indent"."^0.2.0" = + self.by-version."detect-indent"."0.2.0"; + by-version."detect-indent"."0.2.0" = self.buildNodePackage { + name = "detect-indent-0.2.0"; + version = "0.2.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/detect-indent/-/detect-indent-0.2.0.tgz"; + name = "detect-indent-0.2.0.tgz"; + sha1 = "042914498979ac2d9f3c73e4ff3e6877d3bc92b6"; + }; + deps = { + "get-stdin-0.1.0" = self.by-version."get-stdin"."0.1.0"; + "minimist-0.1.0" = self.by-version."minimist"."0.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."diff"."^1.4.0" = + self.by-version."diff"."1.4.0"; + by-version."diff"."1.4.0" = self.buildNodePackage { + name = "diff-1.4.0"; + version = "1.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; + name = "diff-1.4.0.tgz"; + sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."duplexify"."3.4.3" = self.buildNodePackage { + name = "duplexify-3.4.3"; + version = "3.4.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/duplexify/-/duplexify-3.4.3.tgz"; + name = "duplexify-3.4.3.tgz"; + sha1 = "af6a7b10d928b095f8ad854d072bb90998db850d"; + }; + deps = { + "end-of-stream-1.0.0" = self.by-version."end-of-stream"."1.0.0"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ecc-jsbn".">=0.0.1 <1.0.0" = + self.by-version."ecc-jsbn"."0.1.1"; + by-version."ecc-jsbn"."0.1.1" = self.buildNodePackage { + name = "ecc-jsbn-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + name = "ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + }; + deps = { + "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ends-with"."^0.2.0" = + self.by-version."ends-with"."0.2.0"; + by-version."ends-with"."0.2.0" = self.buildNodePackage { + name = "ends-with-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ends-with/-/ends-with-0.2.0.tgz"; + name = "ends-with-0.2.0.tgz"; + sha1 = "2f9da98d57a50cfda4571ce4339000500f4e6b8a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."error-ex"."^1.2.0" = + self.by-version."error-ex"."1.3.0"; + by-version."error-ex"."1.3.0" = self.buildNodePackage { + name = "error-ex-1.3.0"; + version = "1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"; + name = "error-ex-1.3.0.tgz"; + sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9"; + }; + deps = { + "is-arrayish-0.2.1" = self.by-version."is-arrayish"."0.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."escape-string-regexp"."1.0.5" = self.buildNodePackage { + name = "escape-string-regexp-1.0.5"; + version = "1.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + name = "escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."esprima"."^2.6.0" = + self.by-version."esprima"."2.7.2"; + by-version."esprima"."2.7.2" = self.buildNodePackage { + name = "esprima-2.7.2"; + version = "2.7.2"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/esprima/-/esprima-2.7.2.tgz"; + name = "esprima-2.7.2.tgz"; + sha1 = "f43be543609984eae44c933ac63352a6af35f339"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."event-stream"."~3.1.5" = + self.by-version."event-stream"."3.1.7"; + by-version."event-stream"."3.1.7" = self.buildNodePackage { + name = "event-stream-3.1.7"; + version = "3.1.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.1.7.tgz"; + name = "event-stream-3.1.7.tgz"; + sha1 = "b4c540012d0fe1498420f3d8946008db6393c37a"; + }; + deps = { + "through-2.3.8" = self.by-version."through"."2.3.8"; + "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; + "from-0.1.3" = self.by-version."from"."0.1.3"; + "map-stream-0.1.0" = self.by-version."map-stream"."0.1.0"; + "pause-stream-0.0.11" = self.by-version."pause-stream"."0.0.11"; + "split-0.2.10" = self.by-version."split"."0.2.10"; + "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ext-list"."^2.0.0" = + self.by-version."ext-list"."2.2.0"; + by-version."ext-list"."2.2.0" = self.buildNodePackage { + name = "ext-list-2.2.0"; + version = "2.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ext-list/-/ext-list-2.2.0.tgz"; + name = "ext-list-2.2.0.tgz"; + sha1 = "a3e6fdeab978bca7a320c7e786f537083fc30055"; + }; + deps = { + "got-2.9.2" = self.by-version."got"."2.9.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ext-name"."^3.0.0" = + self.by-version."ext-name"."3.0.0"; + by-version."ext-name"."3.0.0" = self.buildNodePackage { + name = "ext-name-3.0.0"; + version = "3.0.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/ext-name/-/ext-name-3.0.0.tgz"; + name = "ext-name-3.0.0.tgz"; + sha1 = "07e4418737cb1f513c32c6ea48d8b8c8e0471abb"; + }; + deps = { + "ends-with-0.2.0" = self.by-version."ends-with"."0.2.0"; + "ext-list-2.2.0" = self.by-version."ext-list"."2.2.0"; + "meow-3.7.0" = self.by-version."meow"."3.7.0"; + "sort-keys-length-1.0.1" = self.by-version."sort-keys-length"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."extend"."~3.0.0" = + self.by-version."extend"."3.0.0"; + by-version."extend"."3.0.0" = self.buildNodePackage { + name = "extend-3.0.0"; + version = "3.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; + name = "extend-3.0.0.tgz"; + sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."extsprintf"."1.0.3" = + self.by-version."extsprintf"."1.0.3"; + by-version."extsprintf"."1.0.3" = self.buildNodePackage { + name = "extsprintf-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.3.tgz"; + name = "extsprintf-1.0.3.tgz"; + sha1 = "3310ca8ced5205e5234766b0b2744ea5b2788d67"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."find-up"."^1.0.0" = + self.by-version."find-up"."1.1.2"; + by-version."find-up"."1.1.2" = self.buildNodePackage { + name = "find-up-1.1.2"; + version = "1.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; + name = "find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + deps = { + "path-exists-2.1.0" = self.by-version."path-exists"."2.1.0"; + "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."foreach"."^2.0.4" = + self.by-version."foreach"."2.0.5"; + by-version."foreach"."2.0.5" = self.buildNodePackage { + name = "foreach-2.0.5"; + version = "2.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; + name = "foreach-2.0.5.tgz"; + sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."form-data"."~1.0.0-rc3" = + self.by-version."form-data"."1.0.0-rc4"; + by-version."form-data"."1.0.0-rc4" = self.buildNodePackage { + name = "form-data-1.0.0-rc4"; + version = "1.0.0-rc4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz"; + name = "form-data-1.0.0-rc4.tgz"; + sha1 = "05ac6bc22227b43e4461f488161554699d4f8b5e"; + }; + deps = { + "async-1.5.2" = self.by-version."async"."1.5.2"; + "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; + "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."from"."~0" = + self.by-version."from"."0.1.3"; + by-version."from"."0.1.3" = self.buildNodePackage { + name = "from-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/from/-/from-0.1.3.tgz"; + name = "from-0.1.3.tgz"; + sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."fs-extra"."~0.26.5" = + self.by-version."fs-extra"."0.26.7"; + by-version."fs-extra"."0.26.7" = self.buildNodePackage { + name = "fs-extra-0.26.7"; + version = "0.26.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz"; + name = "fs-extra-0.26.7.tgz"; + sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9"; + }; + deps = { + "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3"; + "jsonfile-2.2.3" = self.by-version."jsonfile"."2.2.3"; + "klaw-1.1.3" = self.by-version."klaw"."1.1.3"; + "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0"; + "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "fs-extra" = self.by-version."fs-extra"."0.26.7"; + by-version."generate-object-property"."1.2.0" = self.buildNodePackage { + name = "generate-object-property-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; + name = "generate-object-property-1.2.0.tgz"; + sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; + }; + deps = { + "is-property-1.0.2" = self.by-version."is-property"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."get-stdin"."^0.1.0" = + self.by-version."get-stdin"."0.1.0"; + by-version."get-stdin"."0.1.0" = self.buildNodePackage { + name = "get-stdin-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/get-stdin/-/get-stdin-0.1.0.tgz"; + name = "get-stdin-0.1.0.tgz"; + sha1 = "5998af24aafc802d15c82c685657eeb8b10d4a91"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."glob"."6.0.4" = + self.by-version."glob"."6.0.4"; + by-version."glob"."6.0.4" = self.buildNodePackage { + name = "glob-6.0.4"; + version = "6.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-6.0.4.tgz"; + name = "glob-6.0.4.tgz"; + sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; + }; + deps = { + "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0"; + "once-1.3.3" = self.by-version."once"."1.3.3"; + "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "glob" = self.by-version."glob"."6.0.4"; + by-spec."glob"."^4.0.6" = + self.by-version."glob"."4.5.3"; + by-spec."glob"."^7.0.0" = + self.by-version."glob"."7.0.3"; + by-version."glob"."7.0.3" = self.buildNodePackage { + name = "glob-7.0.3"; + version = "7.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-7.0.3.tgz"; + name = "glob-7.0.3.tgz"; + sha1 = "0aa235931a4a96ac13d60ffac2fb877bd6ed4f58"; + }; + deps = { + "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0"; + "once-1.3.3" = self.by-version."once"."1.3.3"; + "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."got"."^2.7.2" = + self.by-version."got"."2.9.2"; + by-version."got"."2.9.2" = self.buildNodePackage { + name = "got-2.9.2"; + version = "2.9.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/got/-/got-2.9.2.tgz"; + name = "got-2.9.2.tgz"; + sha1 = "2e1ee58ea1e8d201e25ae580b96e63c15fefd4ee"; + }; + deps = { + "duplexify-3.4.3" = self.by-version."duplexify"."3.4.3"; + "infinity-agent-2.0.3" = self.by-version."infinity-agent"."2.0.3"; + "is-stream-1.0.1" = self.by-version."is-stream"."1.0.1"; + "lowercase-keys-1.0.0" = self.by-version."lowercase-keys"."1.0.0"; + "nested-error-stacks-1.0.2" = self.by-version."nested-error-stacks"."1.0.2"; + "object-assign-2.1.1" = self.by-version."object-assign"."2.1.1"; + "prepend-http-1.0.3" = self.by-version."prepend-http"."1.0.3"; + "read-all-stream-2.2.0" = self.by-version."read-all-stream"."2.2.0"; + "statuses-1.2.1" = self.by-version."statuses"."1.2.1"; + "timed-out-2.0.0" = self.by-version."timed-out"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."got"."^3.2.0" = + self.by-version."got"."3.3.1"; + by-version."got"."3.3.1" = self.buildNodePackage { + name = "got-3.3.1"; + version = "3.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/got/-/got-3.3.1.tgz"; + name = "got-3.3.1.tgz"; + sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca"; + }; + deps = { + "duplexify-3.4.3" = self.by-version."duplexify"."3.4.3"; + "infinity-agent-2.0.3" = self.by-version."infinity-agent"."2.0.3"; + "is-redirect-1.0.0" = self.by-version."is-redirect"."1.0.0"; + "is-stream-1.0.1" = self.by-version."is-stream"."1.0.1"; + "lowercase-keys-1.0.0" = self.by-version."lowercase-keys"."1.0.0"; + "nested-error-stacks-1.0.2" = self.by-version."nested-error-stacks"."1.0.2"; + "object-assign-3.0.0" = self.by-version."object-assign"."3.0.0"; + "prepend-http-1.0.3" = self.by-version."prepend-http"."1.0.3"; + "read-all-stream-3.1.0" = self.by-version."read-all-stream"."3.1.0"; + "timed-out-2.0.0" = self.by-version."timed-out"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."graceful-fs"."3.0.8" = self.buildNodePackage { + name = "graceful-fs-3.0.8"; + version = "3.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"; + name = "graceful-fs-3.0.8.tgz"; + sha1 = "ce813e725fa82f7e6147d51c9a5ca68270551c22"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."graceful-fs"."^4.1.2" = + self.by-version."graceful-fs"."4.1.3"; + by-version."graceful-fs"."4.1.3" = self.buildNodePackage { + name = "graceful-fs-4.1.3"; + version = "4.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz"; + name = "graceful-fs-4.1.3.tgz"; + sha1 = "92033ce11113c41e2628d61fdfa40bc10dc0155c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."har-validator"."~2.0.6" = + self.by-version."har-validator"."2.0.6"; + by-version."har-validator"."2.0.6" = self.buildNodePackage { + name = "har-validator-2.0.6"; + version = "2.0.6"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; + name = "har-validator-2.0.6.tgz"; + sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; + }; + deps = { + "chalk-1.1.1" = self.by-version."chalk"."1.1.1"; + "commander-2.9.0" = self.by-version."commander"."2.9.0"; + "is-my-json-valid-2.13.1" = self.by-version."is-my-json-valid"."2.13.1"; + "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."has-ansi"."^2.0.0" = + self.by-version."has-ansi"."2.0.0"; + by-version."has-ansi"."2.0.0" = self.buildNodePackage { + name = "has-ansi-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + name = "has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + deps = { + "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hawk"."~3.1.0" = + self.by-version."hawk"."3.1.3"; + by-version."hawk"."3.1.3" = self.buildNodePackage { + name = "hawk-3.1.3"; + version = "3.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; + name = "hawk-3.1.3.tgz"; + sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + }; + deps = { + "hoek-2.16.3" = self.by-version."hoek"."2.16.3"; + "boom-2.10.1" = self.by-version."boom"."2.10.1"; + "cryptiles-2.0.5" = self.by-version."cryptiles"."2.0.5"; + "sntp-1.0.9" = self.by-version."sntp"."1.0.9"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."hoek"."2.16.3" = self.buildNodePackage { + name = "hoek-2.16.3"; + version = "2.16.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; + name = "hoek-2.16.3.tgz"; + sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hoek"."^2.2.x" = + self.by-version."hoek"."2.16.3"; + by-spec."hosted-git-info"."^2.1.4" = + self.by-version."hosted-git-info"."2.1.4"; + by-version."hosted-git-info"."2.1.4" = self.buildNodePackage { + name = "hosted-git-info-2.1.4"; + version = "2.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"; + name = "hosted-git-info-2.1.4.tgz"; + sha1 = "d9e953b26988be88096c46e926494d9604c300f8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."http-signature"."~1.1.0" = + self.by-version."http-signature"."1.1.1"; + by-version."http-signature"."1.1.1" = self.buildNodePackage { + name = "http-signature-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; + name = "http-signature-1.1.1.tgz"; + sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + }; + deps = { + "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0"; + "jsprim-1.2.2" = self.by-version."jsprim"."1.2.2"; + "sshpk-1.7.4" = self.by-version."sshpk"."1.7.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."indent-string"."^2.1.0" = + self.by-version."indent-string"."2.1.0"; + by-version."indent-string"."2.1.0" = self.buildNodePackage { + name = "indent-string-2.1.0"; + version = "2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; + name = "indent-string-2.1.0.tgz"; + sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; + }; + deps = { + "repeating-2.0.0" = self.by-version."repeating"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."infinity-agent"."^2.0.0" = + self.by-version."infinity-agent"."2.0.3"; + by-version."infinity-agent"."2.0.3" = self.buildNodePackage { + name = "infinity-agent-2.0.3"; + version = "2.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz"; + name = "infinity-agent-2.0.3.tgz"; + sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."ini"."1.3.4" = self.buildNodePackage { + name = "ini-1.3.4"; + version = "1.3.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; + name = "ini-1.3.4.tgz"; + sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."intersect"."^1.0.1" = + self.by-version."intersect"."1.0.1"; + by-version."intersect"."1.0.1" = self.buildNodePackage { + name = "intersect-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/intersect/-/intersect-1.0.1.tgz"; + name = "intersect-1.0.1.tgz"; + sha1 = "332650e10854d8c0ac58c192bdc27a8bf7e7a30c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-arrayish"."^0.2.1" = + self.by-version."is-arrayish"."0.2.1"; + by-version."is-arrayish"."0.2.1" = self.buildNodePackage { + name = "is-arrayish-0.2.1"; + version = "0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + name = "is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-builtin-module"."^1.0.0" = + self.by-version."is-builtin-module"."1.0.0"; + by-version."is-builtin-module"."1.0.0" = self.buildNodePackage { + name = "is-builtin-module-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; + name = "is-builtin-module-1.0.0.tgz"; + sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; + }; + deps = { + "builtin-modules-1.1.1" = self.by-version."builtin-modules"."1.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."is-finite"."1.0.1" = self.buildNodePackage { + name = "is-finite-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; + name = "is-finite-1.0.1.tgz"; + sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; + }; + deps = { + "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-my-json-valid"."^2.12.4" = + self.by-version."is-my-json-valid"."2.13.1"; + by-version."is-my-json-valid"."2.13.1" = self.buildNodePackage { + name = "is-my-json-valid-2.13.1"; + version = "2.13.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"; + name = "is-my-json-valid-2.13.1.tgz"; + sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707"; + }; + deps = { + "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0"; + "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0"; + "jsonpointer-2.0.0" = self.by-version."jsonpointer"."2.0.0"; + "xtend-4.0.1" = self.by-version."xtend"."4.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-plain-obj"."^1.0.0" = + self.by-version."is-plain-obj"."1.1.0"; + by-version."is-plain-obj"."1.1.0" = self.buildNodePackage { + name = "is-plain-obj-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + name = "is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-redirect"."^1.0.0" = + self.by-version."is-redirect"."1.0.0"; + by-version."is-redirect"."1.0.0" = self.buildNodePackage { + name = "is-redirect-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; + name = "is-redirect-1.0.0.tgz"; + sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-typedarray"."~1.0.0" = + self.by-version."is-typedarray"."1.0.0"; + by-version."is-typedarray"."1.0.0" = self.buildNodePackage { + name = "is-typedarray-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + name = "is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."is-utf8"."0.2.1" = self.buildNodePackage { + name = "is-utf8-0.2.1"; + version = "0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + name = "is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."isarray"."~1.0.0" = + self.by-version."isarray"."1.0.0"; + by-version."isarray"."1.0.0" = self.buildNodePackage { + name = "isarray-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + name = "isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."isemail"."1.x.x" = + self.by-version."isemail"."1.2.0"; + by-version."isemail"."1.2.0" = self.buildNodePackage { + name = "isemail-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz"; + name = "isemail-1.2.0.tgz"; + sha1 = "be03df8cc3e29de4d2c5df6501263f1fa4595e9a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."isstream"."~0.1.2" = + self.by-version."isstream"."0.1.2"; + by-spec."jodid25519".">=1.0.0 <2.0.0" = + self.by-version."jodid25519"."1.0.2"; + by-version."jodid25519"."1.0.2" = self.buildNodePackage { + name = "jodid25519-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; + name = "jodid25519-1.0.2.tgz"; + sha1 = "06d4912255093419477d425633606e0e90782967"; + }; + deps = { + "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."joi"."^4.0.0" = + self.by-version."joi"."4.9.0"; + by-version."joi"."4.9.0" = self.buildNodePackage { + name = "joi-4.9.0"; + version = "4.9.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/joi/-/joi-4.9.0.tgz"; + name = "joi-4.9.0.tgz"; + sha1 = "2355023363089ca01bc1fd079e72949f977baada"; + }; + deps = { + "hoek-2.16.3" = self.by-version."hoek"."2.16.3"; + "topo-1.1.0" = self.by-version."topo"."1.1.0"; + "isemail-1.2.0" = self.by-version."isemail"."1.2.0"; + "moment-2.12.0" = self.by-version."moment"."2.12.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."joi"."^4.7.0" = + self.by-version."joi"."4.9.0"; + by-spec."joi-assert"."0.0.3" = + self.by-version."joi-assert"."0.0.3"; + by-version."joi-assert"."0.0.3" = self.buildNodePackage { + name = "joi-assert-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/joi-assert/-/joi-assert-0.0.3.tgz"; + name = "joi-assert-0.0.3.tgz"; + sha1 = "77291376ac3f0b124f433f98db74b4f20f686fd6"; + }; + deps = { + "assertion-error-1.0.1" = self.by-version."assertion-error"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."js-yaml"."3.5.5" = self.buildNodePackage { + name = "js-yaml-3.5.5"; + version = "3.5.5"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz"; + name = "js-yaml-3.5.5.tgz"; + sha1 = "0377c38017cabc7322b0d1fbcd25a491641f2fbe"; + }; + deps = { + "argparse-1.0.7" = self.by-version."argparse"."1.0.7"; + "esprima-2.7.2" = self.by-version."esprima"."2.7.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."jsbn".">=0.1.0 <0.2.0" = + self.by-version."jsbn"."0.1.0"; + by-version."jsbn"."0.1.0" = self.buildNodePackage { + name = "jsbn-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; + name = "jsbn-0.1.0.tgz"; + sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."jsbn"."~0.1.0" = + self.by-version."jsbn"."0.1.0"; + by-spec."jsesc"."^0.5.0" = + self.by-version."jsesc"."0.5.0"; + by-version."jsesc"."0.5.0" = self.buildNodePackage { + name = "jsesc-0.5.0"; + version = "0.5.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; + name = "jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."json-pointer"."^0.2.2" = + self.by-version."json-pointer"."0.2.2"; + by-version."json-pointer"."0.2.2" = self.buildNodePackage { + name = "json-pointer-0.2.2"; + version = "0.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/json-pointer/-/json-pointer-0.2.2.tgz"; + name = "json-pointer-0.2.2.tgz"; + sha1 = "1a78285d4650c50b10475f7f59919a99db8a164b"; + }; + deps = { + "foreach-2.0.5" = self.by-version."foreach"."2.0.5"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."json-stringify-safe"."~5.0.1" = + self.by-version."json-stringify-safe"."5.0.1"; + by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage { + name = "json-stringify-safe-5.0.1"; + version = "5.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + name = "json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."jsonfile"."^2.1.0" = + self.by-version."jsonfile"."2.2.3"; + by-version."jsonfile"."2.2.3" = self.buildNodePackage { + name = "jsonfile-2.2.3"; + version = "2.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.2.3.tgz"; + name = "jsonfile-2.2.3.tgz"; + sha1 = "e252b99a6af901d3ec41f332589c90509a7bc605"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."jsonpointer"."2.0.0" = + self.by-version."jsonpointer"."2.0.0"; + by-version."jsonpointer"."2.0.0" = self.buildNodePackage { + name = "jsonpointer-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"; + name = "jsonpointer-2.0.0.tgz"; + sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."jsprim"."^1.2.2" = + self.by-version."jsprim"."1.2.2"; + by-version."jsprim"."1.2.2" = self.buildNodePackage { + name = "jsprim-1.2.2"; + version = "1.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz"; + name = "jsprim-1.2.2.tgz"; + sha1 = "f20c906ac92abd58e3b79ac8bc70a48832512da1"; + }; + deps = { + "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2"; + "json-schema-0.2.2" = self.by-version."json-schema"."0.2.2"; + "verror-1.3.6" = self.by-version."verror"."1.3.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."klaw"."^1.0.0" = + self.by-version."klaw"."1.1.3"; + by-version."klaw"."1.1.3" = self.buildNodePackage { + name = "klaw-1.1.3"; + version = "1.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/klaw/-/klaw-1.1.3.tgz"; + name = "klaw-1.1.3.tgz"; + sha1 = "7da33c6b42f9b3dc9cec00d17f13af017fcc2721"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."latest-version"."1.0.1" = self.buildNodePackage { + name = "latest-version-1.0.1"; + version = "1.0.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz"; + name = "latest-version-1.0.1.tgz"; + sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; + }; + deps = { + "package-json-1.2.0" = self.by-version."package-json"."1.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lazy.js"."~0.3.2" = + self.by-version."lazy.js"."0.3.2"; + by-version."lazy.js"."0.3.2" = self.buildNodePackage { + name = "lazy.js-0.3.2"; + version = "0.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lazy.js/-/lazy.js-0.3.2.tgz"; + name = "lazy.js-0.3.2.tgz"; + sha1 = "7cc1107e5f809ae70498f511dd180e1f80b4efa9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."load-json-file"."^1.0.0" = + self.by-version."load-json-file"."1.1.0"; + by-version."load-json-file"."1.1.0" = self.buildNodePackage { + name = "load-json-file-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + name = "load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + deps = { + "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3"; + "parse-json-2.2.0" = self.by-version."parse-json"."2.2.0"; + "pify-2.3.0" = self.by-version."pify"."2.3.0"; + "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; + "strip-bom-2.0.0" = self.by-version."strip-bom"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash".">= 4.0.0 < 5.0.0" = + self.by-version."lodash"."4.6.1"; + by-version."lodash"."4.6.1" = self.buildNodePackage { + name = "lodash-4.6.1"; + version = "4.6.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz"; + name = "lodash-4.6.1.tgz"; + sha1 = "df00c1164ad236b183cfc3887a5e8d38cc63cbbc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash"."~4.2.1" = + self.by-version."lodash"."4.2.1"; + by-version."lodash"."4.2.1" = self.buildNodePackage { + name = "lodash-4.2.1"; + version = "4.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz"; + name = "lodash-4.2.1.tgz"; + sha1 = "171fdcfbbc30d689c544cd18c0529f56de6c1aa9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "lodash" = self.by-version."lodash"."4.2.1"; + by-spec."loud-rejection"."^1.0.0" = + self.by-version."loud-rejection"."1.3.0"; + by-version."loud-rejection"."1.3.0" = self.buildNodePackage { + name = "loud-rejection-1.3.0"; + version = "1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/loud-rejection/-/loud-rejection-1.3.0.tgz"; + name = "loud-rejection-1.3.0.tgz"; + sha1 = "f289a392f17d2baacf194d0a673004394433b115"; + }; + deps = { + "array-find-index-1.0.1" = self.by-version."array-find-index"."1.0.1"; + "signal-exit-2.1.2" = self.by-version."signal-exit"."2.1.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."lru-cache"."2.7.3" = self.buildNodePackage { + name = "lru-cache-2.7.3"; + version = "2.7.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"; + name = "lru-cache-2.7.3.tgz"; + sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lru-cache"."^4.0.0" = + self.by-version."lru-cache"."4.0.1"; + by-version."lru-cache"."4.0.1" = self.buildNodePackage { + name = "lru-cache-4.0.1"; + version = "4.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz"; + name = "lru-cache-4.0.1.tgz"; + sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be"; + }; + deps = { + "pseudomap-1.0.2" = self.by-version."pseudomap"."1.0.2"; + "yallist-2.0.0" = self.by-version."yallist"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."map-obj"."1.0.1" = self.buildNodePackage { + name = "map-obj-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + name = "map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."map-obj"."^1.0.1" = + self.by-version."map-obj"."1.0.1"; + by-spec."map-stream"."~0.1.0" = + self.by-version."map-stream"."0.1.0"; + by-version."map-stream"."0.1.0" = self.buildNodePackage { + name = "map-stream-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; + name = "map-stream-0.1.0.tgz"; + sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."meow"."3.7.0" = self.buildNodePackage { + name = "meow-3.7.0"; + version = "3.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; + name = "meow-3.7.0.tgz"; + sha1 = "72cb668b425228290abbfa856892587308a801fb"; + }; + deps = { + "camelcase-keys-2.1.0" = self.by-version."camelcase-keys"."2.1.0"; + "decamelize-1.2.0" = self.by-version."decamelize"."1.2.0"; + "loud-rejection-1.3.0" = self.by-version."loud-rejection"."1.3.0"; + "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1"; + "minimist-1.2.0" = self.by-version."minimist"."1.2.0"; + "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5"; + "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1"; + "read-pkg-up-1.0.1" = self.by-version."read-pkg-up"."1.0.1"; + "redent-1.0.0" = self.by-version."redent"."1.0.0"; + "trim-newlines-1.0.0" = self.by-version."trim-newlines"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-db"."~1.22.0" = + self.by-version."mime-db"."1.22.0"; + by-version."mime-db"."1.22.0" = self.buildNodePackage { + name = "mime-db-1.22.0"; + version = "1.22.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"; + name = "mime-db-1.22.0.tgz"; + sha1 = "ab23a6372dc9d86d3dc9121bd0ebd38105a1904a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-types"."^2.1.10" = + self.by-version."mime-types"."2.1.10"; + by-version."mime-types"."2.1.10" = self.buildNodePackage { + name = "mime-types-2.1.10"; + version = "2.1.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz"; + name = "mime-types-2.1.10.tgz"; + sha1 = "b93c7cb4362e16d41072a7e54538fb4d43070837"; + }; + deps = { + "mime-db-1.22.0" = self.by-version."mime-db"."1.22.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-types"."~2.1.7" = + self.by-version."mime-types"."2.1.10"; + by-spec."minichain"."~0.0.1" = + self.by-version."minichain"."0.0.1"; + by-version."minichain"."0.0.1" = self.buildNodePackage { + name = "minichain-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minichain/-/minichain-0.0.1.tgz"; + name = "minichain-0.0.1.tgz"; + sha1 = "0bae49774170d8931401c271bb6ed6d3992a9f52"; + }; + deps = { + "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4"; + "miniwrite-0.1.4" = self.by-version."miniwrite"."0.1.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimatch"."2 || 3" = + self.by-version."minimatch"."3.0.0"; + by-version."minimatch"."3.0.0" = self.buildNodePackage { + name = "minimatch-3.0.0"; + version = "3.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"; + name = "minimatch-3.0.0.tgz"; + sha1 = "5236157a51e4f004c177fb3c527ff7dd78f0ef83"; + }; + deps = { + "brace-expansion-1.1.3" = self.by-version."brace-expansion"."1.1.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."minimatch"."2.0.10" = self.buildNodePackage { + name = "minimatch-2.0.10"; + version = "2.0.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; + name = "minimatch-2.0.10.tgz"; + sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; + }; + deps = { + "brace-expansion-1.1.3" = self.by-version."brace-expansion"."1.1.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimist"."^0.1.0" = + self.by-version."minimist"."0.1.0"; + by-version."minimist"."0.1.0" = self.buildNodePackage { + name = "minimist-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; + name = "minimist-0.1.0.tgz"; + sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."minimist"."1.2.0" = self.buildNodePackage { + name = "minimist-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + name = "minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimist"."^1.1.3" = + self.by-version."minimist"."1.2.0"; + by-spec."minimist"."^1.2.0" = + self.by-version."minimist"."1.2.0"; + by-spec."ministyle".">=0.1.2 >=0.1.3 <0.2.0" = + self.by-version."ministyle"."0.1.4"; + by-spec."ministyle"."~0.1.2" = + self.by-version."ministyle"."0.1.4"; + by-spec."minitable"."0.0.4" = + self.by-version."minitable"."0.0.4"; + by-version."minitable"."0.0.4" = self.buildNodePackage { + name = "minitable-0.0.4"; + version = "0.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minitable/-/minitable-0.0.4.tgz"; + name = "minitable-0.0.4.tgz"; + sha1 = "8d61cb78fae6f371d8051ce77e8a7831ce3d5396"; + }; + deps = { + "miniwrite-0.1.4" = self.by-version."miniwrite"."0.1.4"; + "minichain-0.0.1" = self.by-version."minichain"."0.0.1"; + "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."miniwrite"."~0.1.2" = + self.by-version."miniwrite"."0.1.4"; + by-version."mkdirp"."0.5.1" = self.buildNodePackage { + name = "mkdirp-0.5.1"; + version = "0.5.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + name = "mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + deps = { + "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."moment"."2.x.x" = + self.by-version."moment"."2.12.0"; + by-version."moment"."2.12.0" = self.buildNodePackage { + name = "moment-2.12.0"; + version = "2.12.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/moment/-/moment-2.12.0.tgz"; + name = "moment-2.12.0.tgz"; + sha1 = "dc2560d19838d6c0731b1a6afa04675264d360d6"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ms"."0.7.1" = + self.by-version."ms"."0.7.1"; + by-version."ms"."0.7.1" = self.buildNodePackage { + name = "ms-0.7.1"; + version = "0.7.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + name = "ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."nested-error-stacks"."1.0.2" = self.buildNodePackage { + name = "nested-error-stacks-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz"; + name = "nested-error-stacks-1.0.2.tgz"; + sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf"; + }; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."node-uuid"."1.x" = + self.by-version."node-uuid"."1.4.7"; + by-version."node-uuid"."1.4.7" = self.buildNodePackage { + name = "node-uuid-1.4.7"; + version = "1.4.7"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; + name = "node-uuid-1.4.7.tgz"; + sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."node-uuid"."~1.4.7" = + self.by-version."node-uuid"."1.4.7"; + by-spec."normalize-package-data"."^2.3.2" = + self.by-version."normalize-package-data"."2.3.5"; + by-version."normalize-package-data"."2.3.5" = self.buildNodePackage { + name = "normalize-package-data-2.3.5"; + version = "2.3.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"; + name = "normalize-package-data-2.3.5.tgz"; + sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; + }; + deps = { + "hosted-git-info-2.1.4" = self.by-version."hosted-git-info"."2.1.4"; + "is-builtin-module-1.0.0" = self.by-version."is-builtin-module"."1.0.0"; + "semver-5.1.0" = self.by-version."semver"."5.1.0"; + "validate-npm-package-license-3.0.1" = self.by-version."validate-npm-package-license"."3.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."normalize-package-data"."^2.3.4" = + self.by-version."normalize-package-data"."2.3.5"; + by-spec."number-is-nan"."^1.0.0" = + self.by-version."number-is-nan"."1.0.0"; + by-version."number-is-nan"."1.0.0" = self.buildNodePackage { + name = "number-is-nan-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; + name = "number-is-nan-1.0.0.tgz"; + sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."oauth-sign"."~0.8.0" = + self.by-version."oauth-sign"."0.8.1"; + by-version."oauth-sign"."0.8.1" = self.buildNodePackage { + name = "oauth-sign-0.8.1"; + version = "0.8.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz"; + name = "oauth-sign-0.8.1.tgz"; + sha1 = "182439bdb91378bf7460e75c64ea43e6448def06"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."object-assign"."2.1.1" = self.buildNodePackage { + name = "object-assign-2.1.1"; + version = "2.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"; + name = "object-assign-2.1.1.tgz"; + sha1 = "43c36e5d569ff8e4816c4efa8be02d26967c18aa"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."object-assign"."^3.0.0" = + self.by-version."object-assign"."3.0.0"; + by-version."object-assign"."3.0.0" = self.buildNodePackage { + name = "object-assign-3.0.0"; + version = "3.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"; + name = "object-assign-3.0.0.tgz"; + sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."object-assign"."^4.0.1" = + self.by-version."object-assign"."4.0.1"; + by-version."object-assign"."4.0.1" = self.buildNodePackage { + name = "object-assign-4.0.1"; + version = "4.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"; + name = "object-assign-4.0.1.tgz"; + sha1 = "99504456c3598b5cad4fc59c26e8a9bb107fe0bd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."once"."1.3.3" = self.buildNodePackage { + name = "once-1.3.3"; + version = "1.3.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/once/-/once-1.3.3.tgz"; + name = "once-1.3.3.tgz"; + sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + }; + deps = { + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."os-homedir"."^1.0.0" = + self.by-version."os-homedir"."1.0.1"; + by-version."os-homedir"."1.0.1" = self.buildNodePackage { + name = "os-homedir-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"; + name = "os-homedir-1.0.1.tgz"; + sha1 = "0d62bdf44b916fd3bbdcf2cab191948fb094f007"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."os-tmpdir"."^1.0.0" = + self.by-version."os-tmpdir"."1.0.1"; + by-version."os-tmpdir"."1.0.1" = self.buildNodePackage { + name = "os-tmpdir-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"; + name = "os-tmpdir-1.0.1.tgz"; + sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."osenv"."0.1.3" = self.buildNodePackage { + name = "osenv-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz"; + name = "osenv-0.1.3.tgz"; + sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217"; + }; + deps = { + "os-homedir-1.0.1" = self.by-version."os-homedir"."1.0.1"; + "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."package-json"."1.2.0" = self.buildNodePackage { + name = "package-json-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz"; + name = "package-json-1.2.0.tgz"; + sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0"; + }; + deps = { + "got-3.3.1" = self.by-version."got"."3.3.1"; + "registry-url-3.0.3" = self.by-version."registry-url"."3.0.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."parse-json"."^2.2.0" = + self.by-version."parse-json"."2.2.0"; + by-version."parse-json"."2.2.0" = self.buildNodePackage { + name = "parse-json-2.2.0"; + version = "2.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + name = "parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + deps = { + "error-ex-1.3.0" = self.by-version."error-ex"."1.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."parsimmon"."^0.5.0" = + self.by-version."parsimmon"."0.5.1"; + by-version."parsimmon"."0.5.1" = self.buildNodePackage { + name = "parsimmon-0.5.1"; + version = "0.5.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/parsimmon/-/parsimmon-0.5.1.tgz"; + name = "parsimmon-0.5.1.tgz"; + sha1 = "247c970d7d5e99a51115b16a106de96f0eb9303b"; + }; + deps = { + "pjs-5.1.1" = self.by-version."pjs"."5.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."path-exists"."^2.0.0" = + self.by-version."path-exists"."2.1.0"; + by-version."path-exists"."2.1.0" = self.buildNodePackage { + name = "path-exists-2.1.0"; + version = "2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + name = "path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + deps = { + "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."path-type"."^1.0.0" = + self.by-version."path-type"."1.1.0"; + by-version."path-type"."1.1.0" = self.buildNodePackage { + name = "path-type-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + name = "path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + deps = { + "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3"; + "pify-2.3.0" = self.by-version."pify"."2.3.0"; + "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pause-stream"."0.0.11" = + self.by-version."pause-stream"."0.0.11"; + by-version."pause-stream"."0.0.11" = self.buildNodePackage { + name = "pause-stream-0.0.11"; + version = "0.0.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + name = "pause-stream-0.0.11.tgz"; + sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + }; + deps = { + "through-2.3.8" = self.by-version."through"."2.3.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pify"."^2.0.0" = + self.by-version."pify"."2.3.0"; + by-version."pify"."2.3.0" = self.buildNodePackage { + name = "pify-2.3.0"; + version = "2.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + name = "pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pinkie"."^2.0.0" = + self.by-version."pinkie"."2.0.4"; + by-version."pinkie"."2.0.4" = self.buildNodePackage { + name = "pinkie-2.0.4"; + version = "2.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + name = "pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pinkie-promise"."^2.0.0" = + self.by-version."pinkie-promise"."2.0.0"; + by-version."pinkie-promise"."2.0.0" = self.buildNodePackage { + name = "pinkie-promise-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz"; + name = "pinkie-promise-2.0.0.tgz"; + sha1 = "4c83538de1f6e660c29e0a13446844f7a7e88259"; + }; + deps = { + "pinkie-2.0.4" = self.by-version."pinkie"."2.0.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pjs"."5.x" = + self.by-version."pjs"."5.1.1"; + by-version."pjs"."5.1.1" = self.buildNodePackage { + name = "pjs-5.1.1"; + version = "5.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pjs/-/pjs-5.1.1.tgz"; + name = "pjs-5.1.1.tgz"; + sha1 = "9dfc4673bb01deffd6915fb1dec75827aba42abf"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."prepend-http"."1.0.3" = self.buildNodePackage { + name = "prepend-http-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/prepend-http/-/prepend-http-1.0.3.tgz"; + name = "prepend-http-1.0.3.tgz"; + sha1 = "4d0d2b6f9efcf1190c23931325b4f3a9dba84869"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."process-nextick-args"."~1.0.6" = + self.by-version."process-nextick-args"."1.0.6"; + by-version."process-nextick-args"."1.0.6" = self.buildNodePackage { + name = "process-nextick-args-1.0.6"; + version = "1.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"; + name = "process-nextick-args-1.0.6.tgz"; + sha1 = "0f96b001cea90b12592ce566edb97ec11e69bd05"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."promised-temp"."^0.1.0" = + self.by-version."promised-temp"."0.1.0"; + by-version."promised-temp"."0.1.0" = self.buildNodePackage { + name = "promised-temp-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/promised-temp/-/promised-temp-0.1.0.tgz"; + name = "promised-temp-0.1.0.tgz"; + sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; + }; + deps = { + "temp-0.8.3" = self.by-version."temp"."0.8.3"; + "q-1.4.1" = self.by-version."q"."1.4.1"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "promised-temp" = self.by-version."promised-temp"."0.1.0"; + by-spec."pseudomap"."^1.0.1" = + self.by-version."pseudomap"."1.0.2"; + by-version."pseudomap"."1.0.2" = self.buildNodePackage { + name = "pseudomap-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + name = "pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."q"."1.4.1" = self.buildNodePackage { + name = "q-1.4.1"; + version = "1.4.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/q/-/q-1.4.1.tgz"; + name = "q-1.4.1.tgz"; + sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs"."~6.0.2" = + self.by-version."qs"."6.0.2"; + by-version."qs"."6.0.2" = self.buildNodePackage { + name = "qs-6.0.2"; + version = "6.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; + name = "qs-6.0.2.tgz"; + sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."rc"."1.1.6" = self.buildNodePackage { + name = "rc-1.1.6"; + version = "1.1.6"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/rc/-/rc-1.1.6.tgz"; + name = "rc-1.1.6.tgz"; + sha1 = "43651b76b6ae53b5c802f1151fa3fc3b059969c9"; + }; + deps = { + "deep-extend-0.4.1" = self.by-version."deep-extend"."0.4.1"; + "ini-1.3.4" = self.by-version."ini"."1.3.4"; + "minimist-1.2.0" = self.by-version."minimist"."1.2.0"; + "strip-json-comments-1.0.4" = self.by-version."strip-json-comments"."1.0.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."read-all-stream"."2.2.0" = self.buildNodePackage { + name = "read-all-stream-2.2.0"; + version = "2.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/read-all-stream/-/read-all-stream-2.2.0.tgz"; + name = "read-all-stream-2.2.0.tgz"; + sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0"; + }; + deps = { + "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."read-all-stream"."^3.0.0" = + self.by-version."read-all-stream"."3.1.0"; + by-version."read-all-stream"."3.1.0" = self.buildNodePackage { + name = "read-all-stream-3.1.0"; + version = "3.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; + name = "read-all-stream-3.1.0.tgz"; + sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; + }; + deps = { + "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; + "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."read-pkg"."^1.0.0" = + self.by-version."read-pkg"."1.1.0"; + by-version."read-pkg"."1.1.0" = self.buildNodePackage { + name = "read-pkg-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + name = "read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + deps = { + "load-json-file-1.1.0" = self.by-version."load-json-file"."1.1.0"; + "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5"; + "path-type-1.1.0" = self.by-version."path-type"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."read-pkg-up"."^1.0.1" = + self.by-version."read-pkg-up"."1.0.1"; + by-version."read-pkg-up"."1.0.1" = self.buildNodePackage { + name = "read-pkg-up-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + name = "read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + deps = { + "find-up-1.1.2" = self.by-version."find-up"."1.1.2"; + "read-pkg-1.1.0" = self.by-version."read-pkg"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."readable-stream"."^2.0.0" = + self.by-version."readable-stream"."2.0.6"; + by-version."readable-stream"."2.0.6" = self.buildNodePackage { + name = "readable-stream-2.0.6"; + version = "2.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; + name = "readable-stream-2.0.6.tgz"; + sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; + }; + deps = { + "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "isarray-1.0.0" = self.by-version."isarray"."1.0.0"; + "process-nextick-args-1.0.6" = self.by-version."process-nextick-args"."1.0.6"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "util-deprecate-1.0.2" = self.by-version."util-deprecate"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."readable-stream"."~2.0.5" = + self.by-version."readable-stream"."2.0.6"; + by-spec."redent"."^1.0.0" = + self.by-version."redent"."1.0.0"; + by-version."redent"."1.0.0" = self.buildNodePackage { + name = "redent-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; + name = "redent-1.0.0.tgz"; + sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + }; + deps = { + "indent-string-2.1.0" = self.by-version."indent-string"."2.1.0"; + "strip-indent-1.0.1" = self.by-version."strip-indent"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."repeating"."^2.0.0" = + self.by-version."repeating"."2.0.0"; + by-version."repeating"."2.0.0" = self.buildNodePackage { + name = "repeating-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz"; + name = "repeating-2.0.0.tgz"; + sha1 = "fd27d6d264d18fbebfaa56553dd7b82535a5034e"; + }; + deps = { + "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."request"."2.69.0" = self.buildNodePackage { + name = "request-2.69.0"; + version = "2.69.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.69.0.tgz"; + name = "request-2.69.0.tgz"; + sha1 = "cf91d2e000752b1217155c005241911991a2346a"; + }; + deps = { + "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0"; + "aws4-1.3.2" = self.by-version."aws4"."1.3.2"; + "bl-1.0.3" = self.by-version."bl"."1.0.3"; + "caseless-0.11.0" = self.by-version."caseless"."0.11.0"; + "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; + "extend-3.0.0" = self.by-version."extend"."3.0.0"; + "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1"; + "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4"; + "har-validator-2.0.6" = self.by-version."har-validator"."2.0.6"; + "hawk-3.1.3" = self.by-version."hawk"."3.1.3"; + "http-signature-1.1.1" = self.by-version."http-signature"."1.1.1"; + "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0"; + "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; + "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; + "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10"; + "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; + "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1"; + "qs-6.0.2" = self.by-version."qs"."6.0.2"; + "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5"; + "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2"; + "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."request"."^2.45.0" = + self.by-version."request"."2.69.0"; + by-version."rimraf"."2.5.2" = self.buildNodePackage { + name = "rimraf-2.5.2"; + version = "2.5.2"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz"; + name = "rimraf-2.5.2.tgz"; + sha1 = "62ba947fa4c0b4363839aefecd4f0fbad6059726"; + }; + deps = { + "glob-7.0.3" = self.by-version."glob"."7.0.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."semver"."2 || 3 || 4 || 5" = + self.by-version."semver"."5.1.0"; + by-version."semver"."5.1.0" = self.buildNodePackage { + name = "semver-5.1.0"; + version = "5.1.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; + name = "semver-5.1.0.tgz"; + sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."semver".">=5.1.0 <6" = + self.by-version."semver"."5.1.0"; + by-version."semver"."4.3.6" = self.buildNodePackage { + name = "semver-4.3.6"; + version = "4.3.6"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz"; + name = "semver-4.3.6.tgz"; + sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."semver"."^5.0.3" = + self.by-version."semver"."5.1.0"; + by-version."semver-diff"."2.1.0" = self.buildNodePackage { + name = "semver-diff-2.1.0"; + version = "2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; + name = "semver-diff-2.1.0.tgz"; + sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + }; + deps = { + "semver-5.1.0" = self.by-version."semver"."5.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."sigmund"."1.0.1" = self.buildNodePackage { + name = "sigmund-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; + name = "sigmund-1.0.1.tgz"; + sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."signal-exit"."^2.1.2" = + self.by-version."signal-exit"."2.1.2"; + by-version."signal-exit"."2.1.2" = self.buildNodePackage { + name = "signal-exit-2.1.2"; + version = "2.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"; + name = "signal-exit-2.1.2.tgz"; + sha1 = "375879b1f92ebc3b334480d038dc546a6d558564"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sort-keys"."^1.0.0" = + self.by-version."sort-keys"."1.1.1"; + by-version."sort-keys"."1.1.1" = self.buildNodePackage { + name = "sort-keys-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sort-keys/-/sort-keys-1.1.1.tgz"; + name = "sort-keys-1.1.1.tgz"; + sha1 = "a791c26071df66c356bf5dcad9cfb57a7b2f826e"; + }; + deps = { + "is-plain-obj-1.1.0" = self.by-version."is-plain-obj"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sort-keys-length"."^1.0.0" = + self.by-version."sort-keys-length"."1.0.1"; + by-version."sort-keys-length"."1.0.1" = self.buildNodePackage { + name = "sort-keys-length-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz"; + name = "sort-keys-length-1.0.1.tgz"; + sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188"; + }; + deps = { + "sort-keys-1.1.1" = self.by-version."sort-keys"."1.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."spdx-correct"."~1.0.0" = + self.by-version."spdx-correct"."1.0.2"; + by-version."spdx-correct"."1.0.2" = self.buildNodePackage { + name = "spdx-correct-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; + name = "spdx-correct-1.0.2.tgz"; + sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + }; + deps = { + "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."spdx-exceptions"."^1.0.4" = + self.by-version."spdx-exceptions"."1.0.4"; + by-version."spdx-exceptions"."1.0.4" = self.buildNodePackage { + name = "spdx-exceptions-1.0.4"; + version = "1.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"; + name = "spdx-exceptions-1.0.4.tgz"; + sha1 = "220b84239119ae9045a892db81a83f4ce16f80fd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."spdx-expression-parse"."~1.0.0" = + self.by-version."spdx-expression-parse"."1.0.2"; + by-version."spdx-expression-parse"."1.0.2" = self.buildNodePackage { + name = "spdx-expression-parse-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz"; + name = "spdx-expression-parse-1.0.2.tgz"; + sha1 = "d52b14b5e9670771440af225bcb563122ac452f6"; + }; + deps = { + "spdx-exceptions-1.0.4" = self.by-version."spdx-exceptions"."1.0.4"; + "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."spdx-license-ids"."^1.0.0" = + self.by-version."spdx-license-ids"."1.2.0"; + by-version."spdx-license-ids"."1.2.0" = self.buildNodePackage { + name = "spdx-license-ids-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.0.tgz"; + name = "spdx-license-ids-1.2.0.tgz"; + sha1 = "b549dd0f63dcb745a17e2ea3a07402e0e332d1e2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."spdx-license-ids"."^1.0.2" = + self.by-version."spdx-license-ids"."1.2.0"; + by-spec."split"."0.2" = + self.by-version."split"."0.2.10"; + by-version."split"."0.2.10" = self.buildNodePackage { + name = "split-0.2.10"; + version = "0.2.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/split/-/split-0.2.10.tgz"; + name = "split-0.2.10.tgz"; + sha1 = "67097c601d697ce1368f418f06cd201cf0521a57"; + }; + deps = { + "through-2.3.8" = self.by-version."through"."2.3.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."sprintf-js"."1.0.3" = self.buildNodePackage { + name = "sprintf-js-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + name = "sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sshpk"."^1.7.0" = + self.by-version."sshpk"."1.7.4"; + by-version."sshpk"."1.7.4" = self.buildNodePackage { + name = "sshpk-1.7.4"; + version = "1.7.4"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz"; + name = "sshpk-1.7.4.tgz"; + sha1 = "ad7b47defca61c8415d964243b62b0ce60fbca38"; + }; + deps = { + "asn1-0.2.3" = self.by-version."asn1"."0.2.3"; + "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0"; + "dashdash-1.13.0" = self.by-version."dashdash"."1.13.0"; + }; + optionalDependencies = { + "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0"; + "tweetnacl-0.14.1" = self.by-version."tweetnacl"."0.14.1"; + "jodid25519-1.0.2" = self.by-version."jodid25519"."1.0.2"; + "ecc-jsbn-0.1.1" = self.by-version."ecc-jsbn"."0.1.1"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."stringstream"."0.0.5" = self.buildNodePackage { + name = "stringstream-0.0.5"; + version = "0.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; + name = "stringstream-0.0.5.tgz"; + sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."strip-ansi"."^3.0.0" = + self.by-version."strip-ansi"."3.0.1"; + by-version."strip-ansi"."3.0.1" = self.buildNodePackage { + name = "strip-ansi-3.0.1"; + version = "3.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + name = "strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + deps = { + "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."strip-bom"."^2.0.0" = + self.by-version."strip-bom"."2.0.0"; + by-version."strip-bom"."2.0.0" = self.buildNodePackage { + name = "strip-bom-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + name = "strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + deps = { + "is-utf8-0.2.1" = self.by-version."is-utf8"."0.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."strip-indent"."^1.0.1" = + self.by-version."strip-indent"."1.0.1"; + by-version."strip-indent"."1.0.1" = self.buildNodePackage { + name = "strip-indent-1.0.1"; + version = "1.0.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; + name = "strip-indent-1.0.1.tgz"; + sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; + }; + deps = { + "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."strip-json-comments"."~1.0.4" = + self.by-version."strip-json-comments"."1.0.4"; + by-version."strip-json-comments"."1.0.4" = self.buildNodePackage { + name = "strip-json-comments-1.0.4"; + version = "1.0.4"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; + name = "strip-json-comments-1.0.4.tgz"; + sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."supports-color"."^2.0.0" = + self.by-version."supports-color"."2.0.0"; + by-version."supports-color"."2.0.0" = self.buildNodePackage { + name = "supports-color-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + name = "supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."temp"."0.8.3" = + self.by-version."temp"."0.8.3"; + by-version."temp"."0.8.3" = self.buildNodePackage { + name = "temp-0.8.3"; + version = "0.8.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/temp/-/temp-0.8.3.tgz"; + name = "temp-0.8.3.tgz"; + sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59"; + }; + deps = { + "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."temp"."^0.8.1" = + self.by-version."temp"."0.8.3"; + by-spec."through"."2" = + self.by-version."through"."2.3.8"; + by-version."through"."2.3.8" = self.buildNodePackage { + name = "through-2.3.8"; + version = "2.3.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz"; + name = "through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."through"."~2.3" = + self.by-version."through"."2.3.8"; + by-spec."through"."~2.3.1" = + self.by-version."through"."2.3.8"; + by-spec."topo"."1.x.x" = + self.by-version."topo"."1.1.0"; + by-version."topo"."1.1.0" = self.buildNodePackage { + name = "topo-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/topo/-/topo-1.1.0.tgz"; + name = "topo-1.1.0.tgz"; + sha1 = "e9d751615d1bb87dc865db182fa1ca0a5ef536d5"; + }; + deps = { + "hoek-2.16.3" = self.by-version."hoek"."2.16.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tough-cookie"."~2.2.0" = + self.by-version."tough-cookie"."2.2.2"; + by-version."tough-cookie"."2.2.2" = self.buildNodePackage { + name = "tough-cookie-2.2.2"; + version = "2.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; + name = "tough-cookie-2.2.2.tgz"; + sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."trim-newlines"."^1.0.0" = + self.by-version."trim-newlines"."1.0.0"; + by-version."trim-newlines"."1.0.0" = self.buildNodePackage { + name = "trim-newlines-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; + name = "trim-newlines-1.0.0.tgz"; + sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tsd"."~0.6.5" = + self.by-version."tsd"."0.6.5"; + by-version."tsd"."0.6.5" = self.buildNodePackage { + name = "tsd-0.6.5"; + version = "0.6.5"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/tsd/-/tsd-0.6.5.tgz"; + name = "tsd-0.6.5.tgz"; + sha1 = "34a0b64c1db6a70b3860fe4f5571d9d1357421ad"; + }; + deps = { + "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0"; + "bl-0.9.5" = self.by-version."bl"."0.9.5"; + "bluebird-1.2.4" = self.by-version."bluebird"."1.2.4"; + "chalk-1.1.1" = self.by-version."chalk"."1.1.1"; + "colors-1.1.2" = self.by-version."colors"."1.1.2"; + "deep-freeze-0.0.1" = self.by-version."deep-freeze"."0.0.1"; + "definition-header-0.1.0" = self.by-version."definition-header"."0.1.0"; + "detect-indent-0.2.0" = self.by-version."detect-indent"."0.2.0"; + "diff-1.4.0" = self.by-version."diff"."1.4.0"; + "event-stream-3.1.7" = self.by-version."event-stream"."3.1.7"; + "exit-0.1.2" = self.by-version."exit"."0.1.2"; + "glob-4.5.3" = self.by-version."glob"."4.5.3"; + "joi-4.9.0" = self.by-version."joi"."4.9.0"; + "joi-assert-0.0.3" = self.by-version."joi-assert"."0.0.3"; + "jsesc-0.5.0" = self.by-version."jsesc"."0.5.0"; + "json-pointer-0.2.2" = self.by-version."json-pointer"."0.2.2"; + "lazy.js-0.3.2" = self.by-version."lazy.js"."0.3.2"; + "lru-cache-2.5.2" = self.by-version."lru-cache"."2.5.2"; + "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "minimist-1.2.0" = self.by-version."minimist"."1.2.0"; + "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4"; + "minitable-0.0.4" = self.by-version."minitable"."0.0.4"; + "miniwrite-0.1.4" = self.by-version."miniwrite"."0.1.4"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + "open-0.0.5" = self.by-version."open"."0.0.5"; + "request-2.69.0" = self.by-version."request"."2.69.0"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "semver-4.3.6" = self.by-version."semver"."4.3.6"; + "type-detect-0.1.2" = self.by-version."type-detect"."0.1.2"; + "universal-analytics-0.3.11" = self.by-version."universal-analytics"."0.3.11"; + "update-notifier-0.2.2" = self.by-version."update-notifier"."0.2.2"; + "uri-templates-0.1.9" = self.by-version."uri-templates"."0.1.9"; + "uuid-2.0.1" = self.by-version."uuid"."2.0.1"; + "verror-1.4.0" = self.by-version."verror"."1.4.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "tsd" = self.by-version."tsd"."0.6.5"; + by-spec."tunnel-agent"."~0.4.1" = + self.by-version."tunnel-agent"."0.4.2"; + by-version."tunnel-agent"."0.4.2" = self.buildNodePackage { + name = "tunnel-agent-0.4.2"; + version = "0.4.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"; + name = "tunnel-agent-0.4.2.tgz"; + sha1 = "1104e3f36ac87125c287270067d582d18133bfee"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tweetnacl".">=0.13.0 <1.0.0" = + self.by-version."tweetnacl"."0.14.1"; + by-version."tweetnacl"."0.14.1" = self.buildNodePackage { + name = "tweetnacl-0.14.1"; + version = "0.14.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.1.tgz"; + name = "tweetnacl-0.14.1.tgz"; + sha1 = "37c6a1fb5cd4b63b7acee450d8419d9c0024cc03"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."type-detect"."~0.1.2" = + self.by-version."type-detect"."0.1.2"; + by-version."type-detect"."0.1.2" = self.buildNodePackage { + name = "type-detect-0.1.2"; + version = "0.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.2.tgz"; + name = "type-detect-0.1.2.tgz"; + sha1 = "c88e853e54e5abd88f1bf3194b477c853c94f854"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."universal-analytics"."~0.3.4" = + self.by-version."universal-analytics"."0.3.11"; + by-version."universal-analytics"."0.3.11" = self.buildNodePackage { + name = "universal-analytics-0.3.11"; + version = "0.3.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/universal-analytics/-/universal-analytics-0.3.11.tgz"; + name = "universal-analytics-0.3.11.tgz"; + sha1 = "512879193a12a66dcbd9185121389bab913cd4b6"; + }; + deps = { + "request-2.69.0" = self.by-version."request"."2.69.0"; + "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; + "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; + "async-0.2.10" = self.by-version."async"."0.2.10"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."update-notifier"."^0.2.2" = + self.by-version."update-notifier"."0.2.2"; + by-version."update-notifier"."0.2.2" = self.buildNodePackage { + name = "update-notifier-0.2.2"; + version = "0.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.2.2.tgz"; + name = "update-notifier-0.2.2.tgz"; + sha1 = "e69b3a784b4e686a2acd98f5e66944591996e187"; + }; + deps = { + "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; + "configstore-0.3.2" = self.by-version."configstore"."0.3.2"; + "is-npm-1.0.0" = self.by-version."is-npm"."1.0.0"; + "latest-version-1.0.1" = self.by-version."latest-version"."1.0.1"; + "semver-diff-2.1.0" = self.by-version."semver-diff"."2.1.0"; + "string-length-1.0.1" = self.by-version."string-length"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."uri-templates"."~0.1.5" = + self.by-version."uri-templates"."0.1.9"; + by-version."uri-templates"."0.1.9" = self.buildNodePackage { + name = "uri-templates-0.1.9"; + version = "0.1.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/uri-templates/-/uri-templates-0.1.9.tgz"; + name = "uri-templates-0.1.9.tgz"; + sha1 = "c56f7a5731b3a310226695f6e5639180fd1aa249"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."util-deprecate"."~1.0.1" = + self.by-version."util-deprecate"."1.0.2"; + by-version."util-deprecate"."1.0.2" = self.buildNodePackage { + name = "util-deprecate-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + name = "util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."validate-npm-package-license"."^3.0.1" = + self.by-version."validate-npm-package-license"."3.0.1"; + by-version."validate-npm-package-license"."3.0.1" = self.buildNodePackage { + name = "validate-npm-package-license-3.0.1"; + version = "3.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; + name = "validate-npm-package-license-3.0.1.tgz"; + sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; + }; + deps = { + "spdx-correct-1.0.2" = self.by-version."spdx-correct"."1.0.2"; + "spdx-expression-parse-1.0.2" = self.by-version."spdx-expression-parse"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."verror"."~1.4.0" = + self.by-version."verror"."1.4.0"; + by-version."verror"."1.4.0" = self.buildNodePackage { + name = "verror-1.4.0"; + version = "1.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/verror/-/verror-1.4.0.tgz"; + name = "verror-1.4.0.tgz"; + sha1 = "5d8fdf5875141c3183b7c6bc23a0aa3e3e6ca4e2"; + }; + deps = { + "extsprintf-1.0.3" = self.by-version."extsprintf"."1.0.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-version."xtend"."4.0.1" = self.buildNodePackage { + name = "xtend-4.0.1"; + version = "4.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; + name = "xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."yallist"."^2.0.0" = + self.by-version."yallist"."2.0.0"; + by-version."yallist"."2.0.0" = self.buildNodePackage { + name = "yallist-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"; + name = "yallist-2.0.0.tgz"; + sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; } diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index e67aecca6951..600ea00b93e6 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -122,7 +122,6 @@ , "git-run" , "bower" , "bower2nix" -, "fetch-bower" , "npm-check-updates" , "node-stringprep" , "ltx" diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index fca110d2a017..d8eb668107be 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -63,6 +63,12 @@ in rec { sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; }} ../webdrvr/chromedriver_linux64.zip ''; + bower2nix.buildInputs = [ pkgs.makeWrapper ]; + bower2nix.postInstall = '' + for prog in bower2nix fetch-bower; do + wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + done + ''; } // args.overrides or {}; # Apply overrides and back compatiblity transformations From b22e94c2008bca19b62d86d9e7264ea478daf91c Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 26 Mar 2016 15:33:30 +0000 Subject: [PATCH 15/75] Add pkgs.buildBowerComponents function --- .../bower-modules/generic/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/bower-modules/generic/default.nix diff --git a/pkgs/development/bower-modules/generic/default.nix b/pkgs/development/bower-modules/generic/default.nix new file mode 100644 index 000000000000..ba15b5881602 --- /dev/null +++ b/pkgs/development/bower-modules/generic/default.nix @@ -0,0 +1,49 @@ +{ pkgs }: + +{ buildInputs ? [], generated, ... } @ attrs: + +let + # Fetches the bower packages. `generated` should be the result of a + # `bower2nix` command. + bowerPackages = import generated { + inherit (pkgs) buildEnv fetchbower; + }; + +in pkgs.stdenv.mkDerivation ( + attrs + // + { + name = "bower_components-" + attrs.name; + + inherit bowerPackages; + + builder = builtins.toFile "builder.sh" '' + source $stdenv/setup + + # The project's bower.json is required + cp $src/bower.json . + + # Dereference symlinks -- bower doesn't like them + cp --recursive --reflink=auto \ + --dereference --no-preserve=mode \ + $bowerPackages bc + + # Bower install in offline mode -- links together the fetched + # bower packages. + HOME=$PWD bower \ + --config.storage.packages=bc/packages \ + --config.storage.registry=bc/registry \ + --offline install + + # Sets up a single bower_components directory within + # the output derivation. + mkdir -p $out + mv bower_components $out + ''; + + buildInputs = buildInputs ++ [ + pkgs.git + pkgs.nodePackages.bower + ]; + } +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ec3fa9cd968..bccceb12e04e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9150,6 +9150,10 @@ in yuicompressor = callPackage ../development/tools/yuicompressor { }; + ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT) + + buildBowerComponents = callPackage ../development/bower-modules/generic { }; + ### DEVELOPMENT / GO MODULES go14Packages = callPackage ./go-packages.nix { From 123da5c1c181e3a7b8136d932ec7d27fa7435ece Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 26 Mar 2016 16:50:45 +0000 Subject: [PATCH 16/75] nixpkgs manual: Add documentation for bower2nix Fixes #9459 Fixes #13214 --- doc/languages-frameworks/bower.xml | 244 +++++++++++++++++++++++++++++ doc/languages-frameworks/index.xml | 18 +++ 2 files changed, 262 insertions(+) create mode 100644 doc/languages-frameworks/bower.xml diff --git a/doc/languages-frameworks/bower.xml b/doc/languages-frameworks/bower.xml new file mode 100644 index 000000000000..742d3c2e9fe5 --- /dev/null +++ b/doc/languages-frameworks/bower.xml @@ -0,0 +1,244 @@ +
+ +Bower + + + Bower is a package manager + for web site front-end components. Bower packages (comprising of + build artefacts and sometimes sources) are stored in + git repositories, typically on Github. The + package registry is run by the Bower team with package metadata + coming from the bower.json file within each + package. + + + + The end result of running Bower is a + bower_components directory which can be included + in the web app's build process. + + + + Bower can be run interactively, by installing + nodePackages.bower. More interestingly, the Bower + components can be declared in a Nix derivation, with the help of + nodePackages.bower2nix. + + +
+ <command>bower2nix</command> usage + + + Suppose you have a bower.json with the following contents: + + +<filename>bower.json</filename> + + + + + + + + + Running bower2nix will produce something like the + following output: + + + + + + + + + Using the bower2nix command line arguments, the + output can be redirected to a file. A name like + bower-packages.nix would be fine. + + + + The resulting derivation is a union of all the downloaded Bower + packages (and their dependencies). To use it, they still need to be + linked together by Bower, which is where + buildBowerComponents is useful. + +
+ +
<varname>buildBowerComponents</varname> function + + + The function is implemented in + pkgs/development/bower-modules/generic/default.nix. + Example usage: + +buildBowerComponents + +bowerComponents = buildBowerComponents { + name = "my-web-app"; + generated = ./bower-packages.nix; + src = myWebApp; +}; + + + + + +In , the following arguments +are of special significance to the function: + + + + + generated specifies the file which was created by bower2nix. + + + + + + src is your project's sources. It needs to + contain a bower.json file. + + + + + + + buildBowerComponents will run Bower to link + together the output of bower2nix, resulting in a + bower_components directory which can be used. + + + + Here is an example of a web frontend build process using + gulp. You might use grunt, or + anything else. + + +Example build script (<filename>gulpfile.js</filename>) + + + + + + + Full example — <filename>default.nix</filename> + +{ myWebApp ? { outPath = ./.; name = "myWebApp"; } +, pkgs ? import <nixpkgs> {} +}: + +pkgs.stdenv.mkDerivation { + name = "my-web-app-frontend"; + src = myWebApp; + + buildInputs = [ pkgs.nodePackages.gulp ]; + + bowerComponents = pkgs.buildBowerComponents { + name = "my-web-app"; + generated = ./bower-packages.nix; + src = myWebApp; + }; + + buildPhase = '' + cp --reflink=auto --no-preserve=mode -R $bowerComponents/bower_components . + export HOME=$PWD + ${pkgs.nodePackages.gulp}/bin/gulp build + ''; + + installPhase = "mv gulpdist $out"; +} + + + + +A few notes about : + + + + + The result of buildBowerComponents is an + input to the frontend build. + + + + + + Whether to symlink or copy the + bower_components directory depends on the + build tool in use. In this case a copy is used to avoid + gulp silliness with permissions. + + + + + + gulp requires HOME to + refer to a writeable directory. + + + + + + The actual build command. Other tools could be used. + + + + +
+ +
+ Troubleshooting + + + + + + ENOCACHE errors from + buildBowerComponents + + + + This means that Bower was looking for a package version which + doesn't exist in the generated + bower-packages.nix. + + + If bower.json has been updated, then run + bower2nix again. + + + It could also be a bug in bower2nix or + fetchbower. If possible, try reformulating + the version specification in bower.json. + + + + + +
+ +
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index ab62afa40d61..63c4b7dec607 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -24,6 +24,24 @@ such as Perl or Haskell. These are described in this chapter. + + + + +>>>>>>> 05113a5... nixpkgs manual: Add documentation for bower2nix From 01f96aa572e5c1ff2cbd4bd2a8b49f23bf6f1eef Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 28 Mar 2016 10:41:47 +0000 Subject: [PATCH 17/75] osrm-backend: remove osrm-backend_luajit variant - it has been broken for a while --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c458eb9130c..b9383f1bdab4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9606,8 +9606,6 @@ in osrm-backend = callPackage ../servers/osrm-backend { }; - osrm-backend_luajit = callPackage ../servers/osrm-backend { luabind = luabind_luajit; }; - p910nd = callPackage ../servers/p910nd { }; petidomo = callPackage ../servers/mail/petidomo { }; From f4cb39c3d3153a8d01efa0949694766ba25fa444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 28 Mar 2016 14:02:36 +0200 Subject: [PATCH 18/75] mesa: maintenance update 11.1.1 -> 11.1.2 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 94eed4193c35..1c2257998e86 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -22,7 +22,7 @@ else */ let - version = "11.1.1"; + version = "11.1.2"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -38,7 +38,7 @@ stdenv.mkDerivation { + head (splitString "." version) + ''.x/${version}/mesa-${version}.tar.xz'') "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "087xlxl8dzmhzjilpsdiy19dn106spq120c9ndgnn4qlqm7hgnv4"; + sha256 = "8f72aead896b340ba0f7a4a474bfaf71681f5d675592aec1cb7ba698e319148b"; }; prePatch = "patchShebangs ."; From 86435a1b41a35daa09bb0ea15593cba16dcc27d9 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 28 Mar 2016 13:39:38 +0000 Subject: [PATCH 19/75] kombu: 3.0.33 -> 3.0.35, add redis to buildInputs to allow tests to pass --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 814a2c56dd1a..8b487ec0daf5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11019,16 +11019,16 @@ in modules // { kombu = buildPythonPackage rec { name = "kombu-${version}"; - version = "3.0.33"; + version = "3.0.35"; disabled = pythonOlder "2.6"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/k/kombu/${name}.tar.gz"; - sha256 = "16brjx2lgwbj2a37d0pjbfb84nvld6irghmqrs3qfncajp51hgc5"; + sha256 = "09xpxpjz9nk8d14dj361dqdwyjwda3jlf1a7v6jif9wn2xm37ar2"; }; - buildInputs = with self; optionals (!isPy3k) [ anyjson mock unittest2 nose ]; + buildInputs = with self; optionals (!isPy3k) [ anyjson mock unittest2 nose redis ]; propagatedBuildInputs = with self; [ amqp anyjson ] ++ (optionals (pythonOlder "2.7") [ importlib ordereddict ]); From b8cc1117645279fd310a7403411307ddd0d91f25 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 28 Mar 2016 23:14:33 +0900 Subject: [PATCH 20/75] oraclejdk: 8u73, 8u74 -> 8u77 --- pkgs/development/compilers/oraclejdk/jdk8-linux.nix | 6 +++--- pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index 48a586ffb0f2..554e3fc9838b 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "73"; + patchVersion = "77"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "1bi3yj2ds9w13p2lzvmxffk5gax8syi3bw52w8pam1jr3fmzgwgl"; - sha256_x86_64 = "1rp3nbnhkncyr48m0nn3pf5fr4bp3lzm0ki4gca7mn7rzag19a26"; + sha256_i686 = "14hyniai5l9qpg0pbnxa4rhyhk90qgihszfkn8h3vziqhmvrp27j"; + sha256_x86_64 = "0hyzvvj4bf0r4jda8fv3k06d9bf37nji37qbq067mcjp5abc0zd4"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 0f6c4ad668a6..554e3fc9838b 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "74"; + patchVersion = "77"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "1vc3g89fbrmznb10bhh5gs143hcjg4wsy4j4hwnr1djfj83y8188"; - sha256_x86_64 = "1pfx7il1h42w3kigscdvm9vfy616lmsp1d2cqvplim3nyxwmvz8b"; + sha256_i686 = "14hyniai5l9qpg0pbnxa4rhyhk90qgihszfkn8h3vziqhmvrp27j"; + sha256_x86_64 = "0hyzvvj4bf0r4jda8fv3k06d9bf37nji37qbq067mcjp5abc0zd4"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; From 364b3d2453ae33bb87b410bc3eae4de70a02364c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 28 Mar 2016 14:00:39 +0000 Subject: [PATCH 21/75] kombu: tidy up, removing py3k fussiness which is handled by the deps and adding to buildInputs to allow more of the test suite to run --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8b487ec0daf5..d0bbe1bb3704 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11028,14 +11028,14 @@ in modules // { sha256 = "09xpxpjz9nk8d14dj361dqdwyjwda3jlf1a7v6jif9wn2xm37ar2"; }; - buildInputs = with self; optionals (!isPy3k) [ anyjson mock unittest2 nose redis ]; + # most of these are simply to allow the test suite to do its job + buildInputs = with self; [ mock unittest2 nose redis qpid-python pymongo sqlalchemy pyyaml msgpack boto ]; propagatedBuildInputs = with self; [ amqp anyjson ] ++ (optionals (pythonOlder "2.7") [ importlib ordereddict ]); # tests broken on python 2.6? https://github.com/nose-devs/nose/issues/806 - # tests also appear to depend on anyjson, which has Py3k problems - doCheck = (pythonAtLeast "2.7") && !isPy3k ; + doCheck = (pythonAtLeast "2.7"); meta = { description = "Messaging library for Python"; From e6026003df5f252a9c8d701ad4adcc1c4b1e0c94 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 28 Mar 2016 14:17:53 +0000 Subject: [PATCH 22/75] billiard: 3.3.0.21 -> 3.3.0.23 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0bbe1bb3704..02512ebf7134 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2097,13 +2097,13 @@ in modules // { billiard = buildPythonPackage rec { name = "billiard-${version}"; - version = "3.3.0.21"; + version = "3.3.0.23"; disabled = isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/billiard/${name}.tar.gz"; - sha256 = "1sfsrkm5xv820wp2mz5zn2rnw6s0c9wal69v1fkr26wp1a7zf1cp"; + sha256 = "02wxsc6bhqvzh8j6w758kvgqbnj14l796mvmrcms8fgfamd2lak9"; }; buildInputs = with self; [ nose unittest2 mock ]; From a01b9f7c7436e830968af30a4b0511f02123f0b7 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 28 Mar 2016 14:23:36 +0000 Subject: [PATCH 23/75] celery: 3.1.19 -> 3.1.23 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 02512ebf7134..6bf888aae2b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2915,13 +2915,13 @@ in modules // { celery = buildPythonPackage rec { name = "celery-${version}"; - version = "3.1.19"; + version = "3.1.23"; disabled = pythonOlder "2.6"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/celery/${name}.tar.gz"; - sha256 = "0wbbsrg3vfq8v7y2nylal1gqmn3h4a5vqzbsjiwcybl21hlj2smx"; + sha256 = "0614ppp18vmiwdk0rxvz0wn62d7svanwdnx7jgqxpy9pb20rqd8s"; }; buildInputs = with self; [ mock nose unittest2 ]; From 46d26e82f48f930311ac2f25d00444fd12f3603c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 28 Mar 2016 14:55:22 +0000 Subject: [PATCH 24/75] django_reversion: 1.8.5 -> 1.10.1 --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 814a2c56dd1a..78fe4bbe56ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8301,14 +8301,14 @@ in modules // { django_reversion = buildPythonPackage rec { name = "django-reversion-${version}"; - version = "1.8.5"; + version = "1.10.1"; src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/d/django-reversion/${name}.tar.gz"; - sha256 = "0z8fxvxgbxfnalr5br74rsw6g42nry2q656rx7rsgmicd8n42v2r"; + url = "https://pypi.python.org/packages/source/d/django-reversion/${name}.tar.gz"; + sha256 = "01iv8w6lmmq98qjhxmnp8ddjxifmhxcmp612ijd91wc8nv8lk12w"; }; - propagatedBuildInputs = with self; [ django_1_7 ] ++ + propagatedBuildInputs = with self; [ django ] ++ (optionals (pythonOlder "2.7") [ importlib ordereddict ]); meta = { From 72b5bfda97dadf2ac2f01d8dd20bc19c6d9617bd Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 28 Mar 2016 17:07:37 +0200 Subject: [PATCH 25/75] v8: fix build(s) Ignore errors due to strict-overflow warnings; strip clang-only flag on non-clang builds. Concerning the latter "fix", it's not entirely clear to me why the -Wno-format-pedantic flag ends up being passed to gcc, the .gyp file appears to already condition the inclusion of this flag on whether cc=clang. --- pkgs/development/libraries/v8/generic.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/v8/generic.nix b/pkgs/development/libraries/v8/generic.nix index 51637fe6dbd0..349b35549b60 100644 --- a/pkgs/development/libraries/v8/generic.nix +++ b/pkgs/development/libraries/v8/generic.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; buildInputs = [ readline python icu ]; + NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; + buildFlags = [ "LINK=g++" "-C out" @@ -48,6 +50,10 @@ stdenv.mkDerivation rec { "BUILDTYPE=Release" ]; + postPatch = stdenv.lib.optionalString (!stdenv.cc.isClang) '' + sed -i build/standalone.gyp -e 's,-Wno-format-pedantic,,g' + ''; + enableParallelBuilding = true; installPhase = '' From 066042e3fa87b337a0fc1d9e77648c45f201b3a0 Mon Sep 17 00:00:00 2001 From: Brad Ediger Date: Mon, 28 Mar 2016 10:55:00 -0500 Subject: [PATCH 26/75] spotify: 1.0.25.127 -> 1.0.26.125 --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 498a4be7ff4d..243d1e49c7b7 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -5,7 +5,7 @@ assert stdenv.system == "x86_64-linux"; let - version = "1.0.25.127.g58007b4c-22"; + version = "1.0.26.125.g64dc8bc6-14"; deps = [ alsaLib @@ -50,7 +50,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "1fxps0ls0g4idw10la3qrpmp2jn85lkm3xj4nam4ycx0jj8g1v2p"; + sha256 = "09wanpml2a6k8asfc0pd56n7fia37amgsplsan1qdh6dwdzr3rv5"; }; buildInputs = [ dpkg makeWrapper ]; From 8bd72dfaa4f6987e5755ee6f31c636c466355023 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 28 Mar 2016 18:59:34 +0200 Subject: [PATCH 27/75] lsh: fix gcc5 build The build fails with c11 (also tested c99), but works with gnu90. --- pkgs/tools/networking/lsh/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index 77d268f3a47c..5d788af1682e 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { export lsh_cv_sys_unix98_ptys=yes ''; + NIX_CFLAGS_COMPILE = "-std=gnu90"; + buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam ]; meta = { From 9825a81cfc9eb368278383a0965a745f325b8038 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 28 Mar 2016 19:05:49 +0200 Subject: [PATCH 28/75] pythonPackages.numpy: 1.11 -> 1.10 Reverting default numpy to 1.11, since 1.10 breaks pandas and required patches couldn't be cherry-picked. 1.11 is still available as `pythonPackages.numpy_1_11`. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 519250788382..dd109462dd55 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13207,7 +13207,7 @@ in modules // { blas = pkgs.openblasCompat_2_14; }; - numpy = self.numpy_1_11; + numpy = self.numpy_1_10; numpy_1_10 = self.buildNumpyPackage rec { version = "1.10.4"; From 43161614951b261889d91607d9ecb538b3c2f694 Mon Sep 17 00:00:00 2001 From: Patrick Callahan Date: Sat, 26 Mar 2016 10:50:48 -0700 Subject: [PATCH 29/75] ogre: 1.9.0 -> 1.9-hg --- pkgs/development/libraries/ogre/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 51782449a252..89d694cc497c 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -8,11 +8,11 @@ , nvidia_cg_toolkit }: stdenv.mkDerivation { - name = "ogre-1.9.0"; + name = "ogre-1.9-hg-20160322"; src = fetchurl { - url = "https://bitbucket.org/sinbad/ogre/get/v1-9-0.tar.gz"; - sha256 = "0p8gyn293qn3iyiy1smfmjd9zpnjb8h2zgvff8778fwh0ylbmlpa"; + url = "https://bitbucket.org/sinbad/ogre/get/v1-9.tar.gz"; + sha256 = "0w3argjy1biaxwa3c80zxxgll67wjp8czd83p87awlcvwzdk5mz9"; }; cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ] From 008bcf51a4790fcfd1a5bc65fe5a3eef41b6866f Mon Sep 17 00:00:00 2001 From: Patrick Callahan Date: Sat, 26 Mar 2016 10:55:19 -0700 Subject: [PATCH 30/75] tinyxml-2: init at 3.0.0 --- pkgs/development/libraries/tinyxml-2/default.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/libraries/tinyxml-2/default.nix diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix new file mode 100644 index 000000000000..29fa2739f24d --- /dev/null +++ b/pkgs/development/libraries/tinyxml-2/default.nix @@ -0,0 +1,11 @@ +{ stdenv, fetchurl, cmake }: +let version = "3.0.0"; +in stdenv.mkDerivation rec { + name = "tinyxml-2-${version}"; + src = fetchurl { + url = "https://github.com/leethomason/tinyxml2/archive/${version}.tar.gz"; + sha256 = "0ispg7ngkry8vhzzawbq42y8gkj53xjipkycw0rkhh487ras32hj"; + }; + + nativeBuildInputs = [ cmake ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60ec2ba3564f..29d7a1f11614 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8788,6 +8788,8 @@ in tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { }; + tinyxml-2 = callPackage ../development/libraries/tinyxml-2 { }; + tk = tk-8_6; tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { }; From b682906b6a8ab52f947f7878819bbc72a03c19ba Mon Sep 17 00:00:00 2001 From: Patrick Callahan Date: Sat, 26 Mar 2016 11:01:54 -0700 Subject: [PATCH 31/75] ignition robotics libs: init; .math: init at 2.3.0 --- .../libraries/ignition-math/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/ignition-math/default.nix diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix new file mode 100644 index 000000000000..f71def555833 --- /dev/null +++ b/pkgs/development/libraries/ignition-math/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, cmake }: + +let + version = "2.3.0"; +in +stdenv.mkDerivation rec { + name = "ign-math2-${version}"; + + src = fetchurl { + url = "http://gazebosim.org/distributions/ign-math/releases/ignition-math2-${version}.tar.bz2"; + sha256 = "1a2jgq6allcxg62y0r61iv4hgxkfr1whpsxy75hg7k85s7da8dpl"; + }; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = http://ignitionrobotics.org/libraries/math; + description = "Math library by Ingition Robotics, created for the Gazebo project"; + license = licenses.asl20; + maintainers = with maintainers; [ pxc ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29d7a1f11614..f7386d8f3b03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1906,6 +1906,14 @@ in ifuse = callPackage ../tools/filesystems/ifuse/default.nix { }; + ignition = recurseIntoAttrs { + + math = callPackage ../development/libraries/ignition-math { }; + + math2 = ignition.math; + + }; + ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { inherit (haskellPackages) ihaskell ghcWithPackages; From 3c95d6d1ea52539c772aa869cd2bc5a919730fc3 Mon Sep 17 00:00:00 2001 From: Patrick Callahan Date: Sat, 26 Mar 2016 11:11:48 -0700 Subject: [PATCH 32/75] sdformat: init at 3.7.0 and 4.0.0 --- pkgs/development/libraries/sdformat/3.nix | 7 ++++++ .../libraries/sdformat/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++++++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/sdformat/3.nix create mode 100644 pkgs/development/libraries/sdformat/default.nix diff --git a/pkgs/development/libraries/sdformat/3.nix b/pkgs/development/libraries/sdformat/3.nix new file mode 100644 index 000000000000..116f248b3b4e --- /dev/null +++ b/pkgs/development/libraries/sdformat/3.nix @@ -0,0 +1,7 @@ +{ stdenv, fetchurl, callPackage, ... } @ args: + +callPackage ./default.nix (args // rec { + version = "3.7.0"; + srchash-sha256 = "07kn8bgvj9mwwinsp2cbmz11z7zw2lgnj61mi1gi1pjg7q9in98q"; +}) + diff --git a/pkgs/development/libraries/sdformat/default.nix b/pkgs/development/libraries/sdformat/default.nix new file mode 100644 index 000000000000..0245b47815e5 --- /dev/null +++ b/pkgs/development/libraries/sdformat/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, cmake, boost, ruby_1_9, ignition, tinyxml + , name ? "sdformat-${version}" + , version ? "4.0.0" # versions known to work with this expression include 3.7.0 + , srchash-sha256 ? "b0f94bb40b0d83e35ff250a7916fdfd6df5cdc1e60c47bc53dd2da5e2378163e" + , ... + }: + +let + ruby = ruby_1_9; +in +stdenv.mkDerivation rec { + src = fetchurl { + url = "http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${name}.tar.bz2"; + sha256 = srchash-sha256; + }; + + inherit name; + + enableParallelBuilding = true; + buildInputs = [ + cmake boost ruby ignition.math2 tinyxml + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7386d8f3b03..b4052536305e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1572,6 +1572,14 @@ in gawp = goPackages.gawp.bin // { outputs = [ "bin" ]; }; + gazeboSimulator = recurseIntoAttrs { + sdformat = gazeboSimulator.sdformat4; + + sdformat3 = callPackage ../development/libraries/sdformat/3.nix { }; + + sdformat4 = callPackage ../development/libraries/sdformat { }; + }; + gbdfed = callPackage ../tools/misc/gbdfed { gtk = gtk2; }; From 565b7b34edf8db03a4156afa86f1ed78447f36f8 Mon Sep 17 00:00:00 2001 From: Patrick Callahan Date: Sat, 26 Mar 2016 11:13:51 -0700 Subject: [PATCH 33/75] ignition.transport: init at 0.9.0 and 1.0.1 --- .../libraries/ignition-transport/0.9.0.nix | 9 +++++++ .../libraries/ignition-transport/1.0.1.nix | 9 +++++++ .../libraries/ignition-transport/generic.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++ 4 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/ignition-transport/0.9.0.nix create mode 100644 pkgs/development/libraries/ignition-transport/1.0.1.nix create mode 100644 pkgs/development/libraries/ignition-transport/generic.nix diff --git a/pkgs/development/libraries/ignition-transport/0.9.0.nix b/pkgs/development/libraries/ignition-transport/0.9.0.nix new file mode 100644 index 000000000000..3452c72839fd --- /dev/null +++ b/pkgs/development/libraries/ignition-transport/0.9.0.nix @@ -0,0 +1,9 @@ +{ stdenv, fetchurl, callPackage, ... } @ args : + +callPackage ./generic.nix (args // rec { + version = "0.9.0"; + src = fetchurl { + url = "http://gazebosim.org/distributions/ign-transport/releases/ignition-transport-${version}.tar.bz2"; + sha256 = "15a8lkxri8q2gc7h0pj1dg2kivhy46v8d3mlxpjy90l77788bw1z"; + }; +}) diff --git a/pkgs/development/libraries/ignition-transport/1.0.1.nix b/pkgs/development/libraries/ignition-transport/1.0.1.nix new file mode 100644 index 000000000000..2f9605a3a72f --- /dev/null +++ b/pkgs/development/libraries/ignition-transport/1.0.1.nix @@ -0,0 +1,9 @@ +{ stdenv, fetchurl, callPackage, ... } @ args : + +callPackage ./generic.nix (args // rec { + version = "1.0.1"; + src = fetchurl { + url = "http://gazebosim.org/distributions/ign-transport/releases/ignition-transport-${version}.tar.bz2"; + sha256 = "08qyd70vlymms1g4smblags9f057zsn62xxrx29rhd4wy8prnjsq"; + }; +}) diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix new file mode 100644 index 000000000000..0b10c2cdb52f --- /dev/null +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, cmake, pkgconfig, utillinux, + protobuf, zeromq, cppzmq, + version, src # parametrize version and src so we can easily have pkgs + # for different versions + , ... +}: + +stdenv.mkDerivation rec { + name = "ign-transport-${version}"; + inherit src; + + buildInputs = [ cmake protobuf zeromq pkgconfig + utillinux # we need utillinux/e2fsprogs uuid/uuid.h + ]; + + propagatedBuildInputs = [ cppzmq ]; + + meta = with stdenv.lib; { + homepage = http://ignitionrobotics.org/libraries/math; + description = "Math library by Ingition Robotics, created for the Gazebo project"; + license = licenses.asl20; + maintainers = with maintainers; [ pxc ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4052536305e..a45fd4d72b75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1920,8 +1920,14 @@ in math2 = ignition.math; + transport0 = callPackage ../development/libraries/ignition-transport/0.9.0.nix { }; + + transport1 = callPackage ../development/libraries/ignition-transport/1.0.1.nix { }; + + transport = ignition.transport0; }; + ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { inherit (haskellPackages) ihaskell ghcWithPackages; From 66b5055b955256f0131b225ad40e95671034daef Mon Sep 17 00:00:00 2001 From: Patrick Callahan Date: Sat, 26 Mar 2016 11:16:09 -0700 Subject: [PATCH 34/75] gazebo: init at 6.5.1 and 7.0.0 --- .../science/robotics/gazebo/6.nix | 8 ++ .../science/robotics/gazebo/default.nix | 81 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 14 ++++ 3 files changed, 103 insertions(+) create mode 100644 pkgs/applications/science/robotics/gazebo/6.nix create mode 100644 pkgs/applications/science/robotics/gazebo/default.nix diff --git a/pkgs/applications/science/robotics/gazebo/6.nix b/pkgs/applications/science/robotics/gazebo/6.nix new file mode 100644 index 000000000000..0d1aa4a9085f --- /dev/null +++ b/pkgs/applications/science/robotics/gazebo/6.nix @@ -0,0 +1,8 @@ +{ stdenv, fetchurl, callPackage, ignition, gazeboSimulator, ... } @ args: + +callPackage ./default.nix (args // rec { + version = "6.5.1"; + src-sha256 = "96260aa23f1a1f24bc116f8e359d31f3bc65011033977cb7fb2c64d574321908"; + sdformat = gazeboSimulator.sdformat3; +}) + diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix new file mode 100644 index 000000000000..1b71e45eb821 --- /dev/null +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -0,0 +1,81 @@ +{ stdenv, fetchurl, cmake, pkgconfig, boost, protobuf, freeimage + , boost-build, boost_process + , xorg_sys_opengl, tbb, ogre, tinyxml-2 + , libtar, glxinfo, libusb, libxslt, ruby, ignition + , pythonPackages, utillinux + + # these deps are hidden; cmake doesn't catch them + , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, kde4, x11 + , withIgnitionTransport ? true + , libav, withLibAvSupport ? true + , openal, withAudioSupport ? false + , withQuickBuild ? false, withHeadless ? false, withLowMemorySupport ? false + , doxygen, withDocs ? true + , bullet, withBulletEngineSupport ? false + , graphviz, withModelEditorSchematicView ? true # graphviz needed for this view + , gdal, withDigitalElevationTerrainsSupport ? true + , gts, withConstructiveSolidGeometrySupport ? true + , hdf5, withHdf5Support ? true + , version ? "7.0.0" + , src-sha256 ? "127q2g93kvmak2b6vhl13xzg56h09v14s4pki8wv7aqjv0c3whbl" + , ... +}: with stdenv.lib; + +stdenv.mkDerivation rec { + inherit version; + name = "gazebo-${version}"; + + src = fetchurl { + url = "http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${name}.tar.bz2"; + sha256 = src-sha256; + }; + + enableParallelBuilding = true; # gazebo needs this so bad + cmakeFlags = [] + ++ optional withQuickBuild [ "-DENABLE_TESTS_COMPILATION=False" ] + ++ optional withLowMemorySupport [ "-DUSE_LOW_MEMORY_TESTS=True" ] + ++ optional withHeadless [ "-DENABLE_SCREEN_TESTS=False" ]; + + buildInputs = [ + #cmake pkgconfig boost protobuf + freeimage + xorg_sys_opengl + tbb + ogre + tinyxml-2 + libtar + glxinfo + libusb + libxslt + ignition.math2 + sdformat + pythonPackages.pyopengl + + # TODO: add these hidden deps to cmake configuration & submit upstream + curl + tinyxml + x11 + kde4.qt4 + ] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h + ++ optional withDocs doxygen + ++ optional withLibAvSupport libav #TODO: package rubygem-ronn and put it here + ++ optional withAudioSupport openal + ++ optional withBulletEngineSupport bullet + ++ optional withIgnitionTransport ignition.transport + ++ optional withModelEditorSchematicView graphviz + ++ optional withDigitalElevationTerrainsSupport gdal + ++ optional withConstructiveSolidGeometrySupport gts + ++ optional withHdf5Support hdf5; + + nativeBuildInputs = [ cmake pkgconfig ]; + + propagatedNativeBuildInputs = [ boost boost-build boost_process protobuf ]; + + meta = with stdenv.lib; { + homepage = http://gazebosim.org/; + description = "Multi-robot simulator for outdoor environments"; + license = licenses.asl20; + maintainers = with maintainers; [ pxc ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a45fd4d72b75..e4dd0c5127fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1578,7 +1578,21 @@ in sdformat3 = callPackage ../development/libraries/sdformat/3.nix { }; sdformat4 = callPackage ../development/libraries/sdformat { }; + + gazebo6 = callPackage ../applications/science/robotics/gazebo/6.nix { }; + + gazebo6-headless = callPackage ../applications/science/robotics/gazebo/6.nix { withHeadless = true; }; + + gazebo7 = callPackage ../applications/science/robotics/gazebo { }; + + gazebo7-headless = callPackage ../applications/science/robotics/gazebo { withHeadless = true; }; + }; + + # at present, Gazebo 7.0.0 does not match Gazebo 6.5.1 for compatibility + gazebo = gazeboSimulator.gazebo6; + + gazebo-headless = gazeboSimulator.gazebo6-headless; gbdfed = callPackage ../tools/misc/gbdfed { gtk = gtk2; From c7a26ccf9dcc5a2ee7d7a1644887d778f17ed0ed Mon Sep 17 00:00:00 2001 From: = Date: Mon, 28 Mar 2016 20:50:47 +0200 Subject: [PATCH 35/75] meterbridge: fix gcc-5 build (thanks to: http://ports.ubuntu.com/pool/universe/m/meterbridge/) --- .../audio/meterbridge/default.nix | 2 +- .../meterbridge/fix_build_with_gcc-5.patch | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index e15febda2310..d6ba094f4584 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0jb6g3kbfyr5yf8mvblnciva2bmc01ijpr51m21r27rqmgi8gj5k"; }; - patches = [ ./buf_rect.patch ]; + patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch]; buildInputs = [ pkgconfig SDL SDL_image libjack2 diff --git a/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch b/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch new file mode 100644 index 000000000000..a738cd0b82a9 --- /dev/null +++ b/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch @@ -0,0 +1,31 @@ +Description: Fix build with gcc-5 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778003 +Author: Jaromír Mikeš +Forwarded: No + +Index: meterbridge/src/linedraw.h +=================================================================== +--- meterbridge.orig/src/linedraw.h ++++ meterbridge/src/linedraw.h +@@ -1,7 +1,7 @@ + #ifndef LINEDRAW_H + #define LINEDRAW_H + +-inline void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col); ++void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col); + + void draw_ptr(SDL_Surface *surface, int x1, int y1, int x2, int y2, Uint32 nedle_col, Uint32 aa_col); + +Index: meterbridge/src/linedraw.c +=================================================================== +--- meterbridge.orig/src/linedraw.c ++++ meterbridge/src/linedraw.c +@@ -4,7 +4,7 @@ + /* set a pixel on an SDL_Surface, assumes that the surface is 32bit RGBA, + * ordered ABGR (I think), probably wont work on bigendian systems */ + +-inline void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col) ++void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col) + { + Uint32 *bufp = (Uint32 *)surface->pixels + y*surface->pitch/4 + x; + *bufp = col; From 37617a2c4522176b5ebd07909f3c8a24a2aaa8ff Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 28 Mar 2016 14:00:00 -0500 Subject: [PATCH 36/75] nixos.tests.installer.swraid: mdadm verbosity These two steps seem to fail intermittently with exit code 1. It isn't clear to me why, or what the issue is. Adding the `--verbose` option, hoping to capture some debugging information which might aid stabilization. Also: I was unable to replicate the failure locally. --- nixos/tests/installer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 9e5a6ad04e1e..05c3f267eb93 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -366,8 +366,8 @@ in { "mkdir /mnt/boot", "mount LABEL=boot /mnt/boot", "udevadm settle", - "mdadm -W /dev/md0", # wait for sync to finish; booting off an unsynced device tends to fail - "mdadm -W /dev/md1", + "mdadm --verbose -W /dev/md0", # wait for sync to finish; booting off an unsynced device tends to fail + "mdadm --verbose -W /dev/md1", ); ''; }; From dcae10ebdac761005c6ce3fc33ea6d958faa3bb0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 2 Mar 2016 19:04:21 +0100 Subject: [PATCH 37/75] wpa_supplicant service: Depend on interfaces being present --- nixos/modules/services/networking/wpa_supplicant.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index a8f445a2c73c..53648aef1e04 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -125,10 +125,12 @@ in { # FIXME: start a separate wpa_supplicant instance per interface. systemd.services.wpa_supplicant = let ifaces = cfg.interfaces; + deviceUnit = interface: [ "sys-subsystem-net-devices-${interface}.device" ]; in { description = "WPA Supplicant"; after = [ "network-interfaces.target" ]; + requires = lib.concatMap deviceUnit ifaces; wantedBy = [ "network.target" ]; path = [ pkgs.wpa_supplicant ]; From d47e2fde696749e5d79871ca6e85c9e9af67ff25 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Tue, 29 Mar 2016 09:14:27 +1100 Subject: [PATCH 38/75] steam: enable hardware decoding (for In-Home Streaming) Previous to this patch I was getting software decoding when I used In-Home Streaming. I had a look around and according to: https://bbs.archlinux.org/viewtopic.php?id=187922 > It seems that the libva version Steam comes with, is not compatible anymore to > the newer libva 1.4.0. Substituting in our version of libva gives me hardware decoding! --- pkgs/games/steam/runtime-wrapped.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index c1c79f8ac43b..a8037be8f830 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -85,6 +85,7 @@ let libpulseaudio alsaLib openalSoft + libva ] ++ lib.optional newStdcpp gcc.cc; ourRuntime = if runtimeOnly then [] From 8db6998a0a744f6f94d68aa28bebdfe13ba00222 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Mon, 28 Mar 2016 18:19:41 -0400 Subject: [PATCH 39/75] doxygen: fix on darwin This avoids an issue where an old OS X SDK is assumed, leading to a linker error of the form: Undefined symbols: __Unwind_Resume --- pkgs/development/tools/documentation/doxygen/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index c843f0d2eefd..0b16723866bf 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { cmakeFlags = stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES"; + NIX_CFLAGS_COMPILE = + stdenv.lib.optional stdenv.isDarwin "-mmacosx-version-min=10.9"; + enableParallelBuilding = true; meta = { From cef2db7e76d17e0b5d370b57483482f7bfbdc0c1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 29 Mar 2016 02:21:30 +0300 Subject: [PATCH 40/75] haskellPackages.mueval: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b5b4db7e7297..20a338dd2cb8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -957,4 +957,9 @@ self: super: { # We get lots of strange compiler errors during the test suite run. jsaddle = dontCheck super.jsaddle; + # https://github.com/gwern/mueval/issues/14 + mueval = super.mueval.override { + hint = self.hint_0_4_3; + }; + } From dc73280d1950319583f24fbd1984074431834c1b Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 29 Mar 2016 09:19:34 +0900 Subject: [PATCH 41/75] thunderbird-bin: 38.6.0 -> 38.7.1 --- .../mailreaders/thunderbird-bin/sources.nix | 234 +++++++++--------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 19477d86a3c4..e3ffa283ad9e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -4,123 +4,123 @@ # ruby generate_sources.rb > sources.nix { - version = "38.6.0"; + version = "38.7.1"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha256 = "141b3e5a5a51b0ed8f11bc9233d19bccc3116e55d568eb4995bcd48c91ba3390"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "f2841d9da85e788d868eb56a43baa8e7d72d40c9c82ca60f4f958b9285be5bc3"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "aa52c0672bf8c2b28ae5efb26aa552592aad6c637b660f9cb4533cad72b9a4fc"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "1a083214fc2f31e52b0d03bffbef64e364b77457e447ddc134dc363004768b03"; } - { locale = "be"; arch = "linux-i686"; sha256 = "f3e7653a7f9957e9722cf29a7a97b751ffc2b19bd4982ff603f6460afb07445d"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "55d7082b20da1bbe23b8d1a2e1e07f6a02f9dd96b065cab1a8a2acd086790d21"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "132fb89107e653cb30e9f6fffbca6ced0451811080b89058a652dcb5187601f3"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "03868dab14f8bd671eed93a05c50c3836bb047e4195a2b8e92d04d3cf3244c67"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "ffa2c116e814da8f0a5995f382de0b4d614e72b55ecc905185c014abea763851"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "74631bb2d75687aefc6e8dfa9414176a92de7a22890704f6f84603703a3dd880"; } - { locale = "br"; arch = "linux-i686"; sha256 = "3942e35a9ea655ac365a4b00f70d8b97e7833e50d00d7d07e5ce851956f55f00"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "33dba57581571faac7cc11aeafda68fce323c9fc322a3c8e43cbce794489ab39"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "5001132684f89e6e4c4ab8d22f37739da4465577e850bed4748ad3079a0b592e"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "3cfad5f05320d179b575bc263ceecef0c9bfec08e7a3471dd779be8798f8f8e8"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "14879dadca5936473b42ccefc2485707330aa7062bd1c2094adafee0dde83a50"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "92f39de732f2264c5658e3282d0a4259b437f81277c926b3fe0a1c51bb18a27b"; } - { locale = "cy"; arch = "linux-i686"; sha256 = "e38d9c45558bbf1414efff8568b79ed58c0383329923944aca72bcd075c71967"; } - { locale = "cy"; arch = "linux-x86_64"; sha256 = "43f11c8ea150c1b58031fd765fc5d789e56df68ef36dd989a8a67135d9a1e501"; } - { locale = "da"; arch = "linux-i686"; sha256 = "9815c3fb3c95d4fb73faeb9db10591a39131edcb846fb72b6c2b01ac132602f5"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "6435f69ebb748f2f81dfcd1da4d66030792e73735d11c788c4478cdb750de89d"; } - { locale = "de"; arch = "linux-i686"; sha256 = "d8601890fe1021c61b48cb755a98358fffb0e5c3de106d0408baa748c6e4ff21"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "96626e10573940ce9a77277f8776066e1f33d852ff1a9be25c613ea54b2ad3d0"; } - { locale = "dsb"; arch = "linux-i686"; sha256 = "c0cf3e5db343c031171cca6507839e18bb4232a498eb0ff87864c0d3f54c31d3"; } - { locale = "dsb"; arch = "linux-x86_64"; sha256 = "5c94f8200bf7e5bccdb4f454232707c1354d4cb87713648847d742d1d127b5bc"; } - { locale = "el"; arch = "linux-i686"; sha256 = "43b61ae50412d5df24f903bd1890be52164689b53ec9bbfe134b7bbb36952377"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "163e041e125f84db5f9d55f6e8a2e8d15b7ac6335187a55f00f7019b3038249c"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "b34105daffdf9088fecd199e1525ebbc332ff6536487caa058d19daa4c7306c4"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "ac54bf8c804d17ecebab6a865471ce5adf712466612eb435e5871a4ffcc7238a"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "2e60a2a5764cdee16659b125f7ad2dde7ff6e993c69a738d86fb39530e469328"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "f0b4b0d5a7f4b21845e76411cd75d59b0e34a341747cafcb3e871a00b1b2535e"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "fa9de1698297336d3db8d7cc6c59ea1cad595c2d5caf8081f85fc217535d630d"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "62bf96299b20de2b6ea17db2113fd8220c60507314d9c3dfbd2ef06557746298"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "1e79df1375e29c6aaf2839584ee51e23a326587e02440c07f10969f82e29daa3"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "e5ef4e579c83b1f982b5d071966b3c1be39b94aa128e0ef14f4244e51b19c6c9"; } - { locale = "et"; arch = "linux-i686"; sha256 = "110dc75c81abcca2199c2f6bee542fe0909bfbe678e91376a1413a81bac88edf"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "71f7f7d5d9025423438138a62728d3494f2227c3b1daf8945cbd20d65e7629b3"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "ad2e6071fafe18f3db5d4af4d938450ec1a8f538e2a5efc7f8ce1d28f1f3dd66"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "32c8b0e825912b97a36cedf19ead4eba8427e08ac059b4bb9fda15c568ce6cff"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "203006ba5572a315f851e69e74779f92123df25d6a1964283bbf546c43ca0ecb"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "f87904779b68a60aef440a7eb5cf490fe224bc25517d9fa463575fd35c4fc895"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "4d92b6273006f6a20c6b405cfdd017930e7341230f0deefdbe8961a3ab2099d7"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "a7858e1fca3007710053cd6ffcd8d17fe111ec3727e98cfc410f426fb4dd04a1"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "d222ea0506db332ab7590fc85dce4102613489506d7680bac31c82b855ae238e"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "b466075727c3d3f709b9ddb1987f9fe69deb1efa34fecbd73aa1c5231ef844d8"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "d786389a7866d2be769c079ec65396fe3888968f80f3fbd8d54e355ac3098f91"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "8134a011c31cf63a5538fea89ef332a28ab510fb08e1251a9d460ba83946f656"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "a5b5cb6e9a2daf1587af84083cd680b14f49a0f998d4e6e80f09c37aebac0b0f"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "7b15ab841f95eda59256c7cb4c9c876b0bea34df9f0e1d3af3bd144230d7254a"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "7bee6ae14c9f43689ab2c7b9a7de60af9fe4d9d567efb94b26e3109af04d6c43"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "b9a6e5bd2c62745a82fd3685a694a6f34d3327b60a62af6e283caf3a67d77f22"; } - { locale = "he"; arch = "linux-i686"; sha256 = "17a322f92322de536ead76e292d877ab8e9deff9855b1c12fc20855d3935a548"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "e542cfdfd29f7d54520dc86c9b73252e57fd3346874f9d629fd31b25be463471"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "fe1fc94042eaeeedc1e7592cbedc5e4c922c5e05cd212feff8a654898d2c2a9e"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "de191f3cc421ed5b06ce981c0431decb933799252107b27103bc3c45ac6995be"; } - { locale = "hsb"; arch = "linux-i686"; sha256 = "f55ad886854541ea1d684d168f8fb3c858fc8a11324dc14fb64340cb47f6d7fe"; } - { locale = "hsb"; arch = "linux-x86_64"; sha256 = "ee03f60c834c141d3340dca9ecfce8f427ee50a3b6b963f4a565a843e895f614"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "8462e0a665d04b9273dbfc1095ef57831165438c21c34b5d04d22b51276fc047"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "6cc42919c6417860e19fcc851b8210b9d6e405c4b2ff0bf51cffb18af733b488"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "2c3f4f4358387dad669254da46e21b4da1f54cedbc7be62c38448862a88edf37"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "0556cb57c012554449d7044efaa5e8b4b938b15d55a19f91cb31ea5187b7ef76"; } - { locale = "id"; arch = "linux-i686"; sha256 = "26d31f04b836d3e5e3874c4e37d258effc8bd228223f6b963df3434d2276529c"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "55b2be7503278c0a41785796425fe35f5635e0c635d79a4246f7830a7cf6f075"; } - { locale = "is"; arch = "linux-i686"; sha256 = "29ce03e041c320aaa61c8ecefbe1a6cd2e9b96e916f3605f09a59cd271cfb741"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "44d7856e1779e86d715026a26fdc0db8beb8fac1bcba5c27ed652779f858c12e"; } - { locale = "it"; arch = "linux-i686"; sha256 = "47dd016eda154be31646105061570653ab61ab99d8bf873cf9e8e4b727847fc6"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "299941c56912734dd06c2f1dd89838d3a746dfde10df39f6caf198cf4fc6a332"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "ff809f8f752612d242d5787f511b4821294855dd42027d7493f789200747575a"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "babda834d5e6fa669691b974c4c4ea4b9207c3926796d0c1d76784b733d738a3"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "a04ca9cd1cd435d4ab5d832efaeb1a6fee5e9e6c933c5a3a9b0e21bbc5141f24"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "0390d47ca644679631b8bbb83cb45e404b4b7f1e4ad237d439318fd6464aeeb4"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "9e9d3ed60a3ba5ef761937e5b2b06a4eaac1c6f6c1d72a9b3fe0ab7818e3d18f"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "8d7cf2a173df6b7930a37244829934b2729341a8938288c988120010d1a52d2f"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "fde6089efa39e867f8c8b4b6d6e9d5c006f87c4ceaabb78517b34ea288cebe1e"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "9ff74ec5e87468f3912b1ec847eff2d215c35224b4ef82ba29efaba4a48f2bb0"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "349101916960741272549700a4050850730679826ef3f6c837b542628ac9b17b"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "0bc2cf52b46f15976cd5355960b81106279c4cea9b7d55ac0360a56dd934ce6a"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "6eff1f88b362d81d71833b50606afffdb7e0210160bc9933226c472daa692259"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "748726556948ebc59913a72965a54de67615217a93cf0351ece356524d8e3097"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "6606ee970387998235ed96fdbacc64a47fe2bc0d78061cf4205200517ab6f092"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "0a77fe35ddce1921252d2e2acbeb09d6e719d34b4d81af8d6ef9c5c846359780"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "b8d81eba8470a29768ded1c6882cdbf2f3306843754d29fa35e385b0a6efce25"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "2b10f69274860e7af35cbb795042d058c9480ad195cd435e457923da2341c99d"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "4391c285e1db0767f7242fad4fbf6441572ef930acabc63209f1d2ac64e6d08c"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "003060a341e1134870f96e1e032023884f3f22fa62261b07084e3cb8813423fb"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "d261cbc11bd9b176b656c3ae75f802aee4f1828e14f1a9f0e8c7822e9a24c090"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "81fb37b9591a159e9d5ceff18921683037b4c965765b47e736c9124ba6268ee2"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "a7d699ac74a568922a363eabaa38627564fbc715cdd3612a8f51e0c373594646"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "ab9c84765f54f02e385b360025d1c70937af91350cbf8eea666f97aec4e36276"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "00db7d515ee4abcba36713a7bac64a2afdfa1782bc3e4175ae2c69535c7b6cdf"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "03da97e6c832ce49ccf6736ddac4a14b92768442f6f462b0174324964693aaa7"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "d7d78792a83d76ce4c521674275b3b6443d0c12ad376b4ec3c34bc4edef64078"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "bc4c751c5079d3863df1b0dd5717d7f5c07c031fefe798642ff3ff91e8f7512c"; } - { locale = "si"; arch = "linux-i686"; sha256 = "9525a7a704f262efa1ad18ab154d7f0eeec8f923f641621a38cce3be5c090cd4"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "2e847ce3ee90d27b7e20602844cbc1c3a9e458a7d449386e5bc8067163b6559d"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "389e6dea7b61aced9ad491b57441963cf9c3f5f0c90a80778ccee71320a8bf53"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "c36e78ce9aecaa23cf183a453e6ae817a52b84e2129f4e41fd409a61e1705c6a"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "e8f1dd49850b2c359a66e8f79839a95d6e1a09de5cdd41a64c44315fdcea544c"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "3ae2a85dadbaf99109fa971bb0c7a825d4ad3d1357f4d51bc7bb20455564ea68"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "dd52238fbd564d49ae8f3dfcee7e608615d3e78bd99373b1bbcdf51b9e20c354"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "cbeadcb1de666c42c9e5b42b2a6c1fa14f80e4c6454ea8cfc34b0ad5dd472bb8"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "1318c997a56245b296b2f9ac004b07f87d6492448272c8978e78193fe484336b"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "0898d16c990669028fbea084755221c747db48392b30b7c498770fcb5df7b328"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "50c76b8904b51a84136a1c69939e49541205ce8b804c2ce90cff196e826c275c"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "bf3e5c83815458726317c8415963825975500452202f240200be0fab43b1e226"; } - { locale = "ta-LK"; arch = "linux-i686"; sha256 = "7d62ec98b8f01b12425e7692c4966faeeeb42ea66cd6105c37742698215bde5a"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "416cffbe25f2b00cd584fa455768b09c5f8d1bc7938263880903050f8c08fab4"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "581d6c8df1611d749d0dda9d1f248ebf354825f8a8097624fd08338ea5e01d38"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "24b1b9bfa251add2d7f3183b0c3aafdea6b4caa5bdbcea718462185d6dc63e5b"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "97175dba275e382b2436e9b7a948c46f137ed38612e90ea43466dd3fe20c878b"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "273b08710fbc57c30828736c38a158ff66ac788b2ca3726118367466cab09797"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "e0391fdecb11b5daac913f57894970208b51e1e7f1665ff56cb7a68dba0c442a"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "af51ee3bd2ac246a4b465aa65b13d1aa661dbce5e0988524532616fb9d2d651b"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "5e7d1543d41912ffa0a71137b90c40ab5569ffab65e8b99f0b62446561a78ca2"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "f85c8086b462474e40b0b090f9b566aa55b228ec49ec18fa1b5987ec3efa048b"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "6f161428af67a1635364660a8ec6d7c785350204d5bac602ebcd32861e9baf62"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "2088379539a9b4ece3012b603a5731c92567fa4b3e5c448ae54e2729c8df0658"; } + { locale = "ar"; arch = "linux-i686"; sha256 = "186ba5f03adc7cb94c69351f5edcf241abdba1a3602f9b140a46682cb94b053c"; } + { locale = "ar"; arch = "linux-x86_64"; sha256 = "7c6308024524c8ba458bb43cace95bdf92dfa7d797c7ff936598257c018e4807"; } + { locale = "ast"; arch = "linux-i686"; sha256 = "61de0fc548ff70367334c82bec580caa895f3db63c6b045c5a717bfa282e69db"; } + { locale = "ast"; arch = "linux-x86_64"; sha256 = "34c935a0b162e182a341699782143cad1e225ea63bf314c158d25f629889c5e1"; } + { locale = "be"; arch = "linux-i686"; sha256 = "4442d37c8bb411c5c151bd98d06a375dc8ffcf72fee4d03bed6ac8691ccd8e2c"; } + { locale = "be"; arch = "linux-x86_64"; sha256 = "e7226b6b42e7cfe4d36c430eca755f5deae8899fd64ea1877ad576f96fe29b8c"; } + { locale = "bg"; arch = "linux-i686"; sha256 = "eaf46e571b55800dfaf63a807236e8bf5fa8e8ba77bc996830ab0dfcdce23300"; } + { locale = "bg"; arch = "linux-x86_64"; sha256 = "62edb0cee78dd88a871355c996107901456f1fb70793d21209e75875c33d91a3"; } + { locale = "bn-BD"; arch = "linux-i686"; sha256 = "76e3222d9b7bc4f5948c56be6248deb23c1777550f497f115487e323c16b2f95"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "b7ad9dd397abb89b844f8a1adbd34d0dfdea6bb85b3f8ad5d5f297e7f8b1b081"; } + { locale = "br"; arch = "linux-i686"; sha256 = "b10c7e572ba88f79acb2d57988308c5af6fde268f64434956c4312f8a7c3ed42"; } + { locale = "br"; arch = "linux-x86_64"; sha256 = "174f671aa90307e4dd6756d60f37a0b628d7d1cee8c7bb623a1a32c55b26a967"; } + { locale = "ca"; arch = "linux-i686"; sha256 = "b966f3381a30567db88890dd3885c56f9cf367d9c92e192d0c6c79066e482c91"; } + { locale = "ca"; arch = "linux-x86_64"; sha256 = "e5d96ddd9ed6b685b872d90e95bded23124e21575e9e0bcb7aeaa77ef0226009"; } + { locale = "cs"; arch = "linux-i686"; sha256 = "fdbe97bc87656569b20d8154619cd7b3b5c3b03cbbcd7ff2f1e07a3af547bb41"; } + { locale = "cs"; arch = "linux-x86_64"; sha256 = "b24ea0ae2977d9380cadfd130f83971e798677ce956152d794523e90a54222e6"; } + { locale = "cy"; arch = "linux-i686"; sha256 = "ba39bd39698ad0486e22806ff468b9a763712f35e943b93e6021365dc061c2ce"; } + { locale = "cy"; arch = "linux-x86_64"; sha256 = "f51e4dcaeac1aeb53d858d029c34c366e948616f7ca3f35eb22b165fd2839376"; } + { locale = "da"; arch = "linux-i686"; sha256 = "511441bfe56749643f59e10c9219b8c3192d64c50008ee3d8a2dc342993c0133"; } + { locale = "da"; arch = "linux-x86_64"; sha256 = "9f60a1c06da4e61a415359eeaed831d61a8c8ad377952948c1475ee6a2bc0cd3"; } + { locale = "de"; arch = "linux-i686"; sha256 = "d48939ad0dab7c4829cd41cd6afe9239d12ab2a2337296203b660613cbba2698"; } + { locale = "de"; arch = "linux-x86_64"; sha256 = "6b1398161ab1271caa14b20c4ad0b3e4372fca743b4ae2e3d5bd1d77d8038c15"; } + { locale = "dsb"; arch = "linux-i686"; sha256 = "c30f3fea47cca28fcc928d813e8c631db43a665d8f347f174b23ef3c1fdd7550"; } + { locale = "dsb"; arch = "linux-x86_64"; sha256 = "592b18fa8ff3749c7a68b5f5406f5ae42f9f97e47cc8c2f9c18b242c8f192b8d"; } + { locale = "el"; arch = "linux-i686"; sha256 = "1ccdde8b11337e75feabbd1e40f1316c287862769d0b9c37934f22108c74bf1a"; } + { locale = "el"; arch = "linux-x86_64"; sha256 = "acb837b0120f00f6cb39e447e86cb140c0cabbe599bff70d85429126df377d85"; } + { locale = "en-GB"; arch = "linux-i686"; sha256 = "ba4c223c22fda306f4b66daa6ed0d157c5c24489ec7627e1124c9f79b5aca989"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "f4bb5a60493f3fbf519a55dc7ff2fa7bb455ad344d27b133addb2864f9d9d100"; } + { locale = "en-US"; arch = "linux-i686"; sha256 = "205729f0ce14666ef98b7e23dad0882d450a508b568fc1d2c99cdfffd2cc9547"; } + { locale = "en-US"; arch = "linux-x86_64"; sha256 = "7c7cb801ea902f93e57f944209e1358bcbe73f8ee312112e94ade2a2ef4b1194"; } + { locale = "es-AR"; arch = "linux-i686"; sha256 = "8bbb39afd31656bc7cdab60b179e0a5bb9d9d9fed62e1ad398dfc5c0f40a35ab"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "0d86ebebfd2ba294b0f27b5eb84b083a7c8cecc8fea944705525831cf3c161b8"; } + { locale = "es-ES"; arch = "linux-i686"; sha256 = "76673ffb93fb3b902366c5939619dfa11ecd724dc5ff37fe769d598dc937c353"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "6e7098cf9eb6f1b55d7504b341b709133fb5d4d20cb761984647422749b71615"; } + { locale = "et"; arch = "linux-i686"; sha256 = "3de2c84af3c7111a306e35f1f7304bf7a77a0e50c8d2c9bfbc896a11a6a23e5d"; } + { locale = "et"; arch = "linux-x86_64"; sha256 = "a2bb5c2b6e174a65cf825293f57cc1628930686f6a674d2cb7fcee6aaf755afc"; } + { locale = "eu"; arch = "linux-i686"; sha256 = "f0ec8c9613ee04c7f7c1b55cb81386036220a715b58edc302e2099882e2c642d"; } + { locale = "eu"; arch = "linux-x86_64"; sha256 = "3ed3c4431fc604fbc05b6f17c9c6e74057278e9ef85480d60ea638843eab1394"; } + { locale = "fi"; arch = "linux-i686"; sha256 = "e4dac93472bc5f41a75daf9ca18265de527b5fc621812bde2c634f1fa5a4692c"; } + { locale = "fi"; arch = "linux-x86_64"; sha256 = "8a30c0c7a586f598e6065f20b2a0dc1e105f59d3e4adac8167da462e8e0193d2"; } + { locale = "fr"; arch = "linux-i686"; sha256 = "adfe8aca07faf08ba780ca0f84d638d461f4a0f00b92d5a9cebe8102a94bce79"; } + { locale = "fr"; arch = "linux-x86_64"; sha256 = "19ccb4a2ec44b1c8edce204627af3d0e84f214591d3b7a4f6e67e297dd9db0f9"; } + { locale = "fy-NL"; arch = "linux-i686"; sha256 = "88f763080b2bbfb8957ed6b52189f2195b3317a1bfb851a6e686765e8a12181a"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "5955d594802281794ef25e9fda196206464ac0594ce12e957b5c40c589c89ad0"; } + { locale = "ga-IE"; arch = "linux-i686"; sha256 = "7fb849565e25b1bba853b434d7f0207bfc9b3f39251f08edf65a8a38ccd0dd96"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "b56cd8b5fc665ad24061fdf2ac3196aff9f953395e894007b133bc83f676be33"; } + { locale = "gd"; arch = "linux-i686"; sha256 = "860dca420cd8c6c18bc703ab4934948e038b4e7e91a1d80d3f632980f0799424"; } + { locale = "gd"; arch = "linux-x86_64"; sha256 = "4e8723dacd9a4961f02fece36066166c044880fbc0c7aab4e0f1289a36bd22c6"; } + { locale = "gl"; arch = "linux-i686"; sha256 = "fd071bf547ba0baaf13141e30f34c15108fb6e44432b02d55508cf3dfca91cdb"; } + { locale = "gl"; arch = "linux-x86_64"; sha256 = "b999261eb53e28c5b43fa5d3ffcb2f9c12cca45a38c6e8fc56a342b1a5dda78a"; } + { locale = "he"; arch = "linux-i686"; sha256 = "2c2e7d7a459dd85f88fb3839002e2eb602d47ce5df4d0572928d8a35a0df4773"; } + { locale = "he"; arch = "linux-x86_64"; sha256 = "0c540f0ffb1224c8d3b18423690f319d25ff5e0c004d18cc8bc6b7d69ecbc48a"; } + { locale = "hr"; arch = "linux-i686"; sha256 = "5d7e14f94f53c7623dc4fce69aa991a67792e0d2405a6c7044558d5023ea0cc0"; } + { locale = "hr"; arch = "linux-x86_64"; sha256 = "6355145ae642332d1798f8ce169cb85cc930af6add6c8cda142e8183666fdb71"; } + { locale = "hsb"; arch = "linux-i686"; sha256 = "897eca9ffdbf28f3d3f720dd44f68f67a289e4d2aff91005c180688b34358b08"; } + { locale = "hsb"; arch = "linux-x86_64"; sha256 = "43d2cf464be8be57a5d2bdba1683e6179641448e351d9a8bee9889febe1ebefd"; } + { locale = "hu"; arch = "linux-i686"; sha256 = "5e6b806364d7e97384bf3f30e4f398c8041cd8acc000b21edcf218ca24e1903a"; } + { locale = "hu"; arch = "linux-x86_64"; sha256 = "5b96ea401ec1af9473cc57e4f09f6f264598e52196dd9da38cebe3e802649fc9"; } + { locale = "hy-AM"; arch = "linux-i686"; sha256 = "3fbd40d914f9347f09848ffb3486d1cec9734f9ae3cc969bc71a8d9c61aea92b"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "9f60903ccb571eebdf7fab4c62e1f0675d4c7f5bcbca7589e669c931b355b55a"; } + { locale = "id"; arch = "linux-i686"; sha256 = "bd0e53bb5d792c9caf2aedc67cf1df2281d234905b96748766446e842448e39e"; } + { locale = "id"; arch = "linux-x86_64"; sha256 = "f7bc98632e15fb73c61c5fd54c3e349e93f3f07b61ee92d704b105b05386949d"; } + { locale = "is"; arch = "linux-i686"; sha256 = "6361b21f9a57468cb8e6273805437d4a40f90c0b461d447b17543f84f9cae8c2"; } + { locale = "is"; arch = "linux-x86_64"; sha256 = "df4d4ef5a25a8aa2f9cbbfef2425056c19b568030e2b217f9bb535fcd81cc017"; } + { locale = "it"; arch = "linux-i686"; sha256 = "def27fdc02da10e148b3312199826157b981165a98ea9a3f5135866092e07ad3"; } + { locale = "it"; arch = "linux-x86_64"; sha256 = "3c55c72d8b9936dc0b0ecf2e88024d4e128f4cbdb32ec5770d4caa930e12d696"; } + { locale = "ja"; arch = "linux-i686"; sha256 = "7f1e39da21362857afd57151b0bb606c7a8b52f0ea1362cbb5bf9c4eb9b18db8"; } + { locale = "ja"; arch = "linux-x86_64"; sha256 = "3b70e990616d999c572a9e95f92dc62b004f5449891778a6530ee81dc1f42703"; } + { locale = "ko"; arch = "linux-i686"; sha256 = "7023635ab8fde872b41b08f523128721863091d7bd7e76646ea2f2929a667719"; } + { locale = "ko"; arch = "linux-x86_64"; sha256 = "370075633a30d3f4afbe69c617ecc4df33e51aa95704ef9fff599a13e9cb3ab2"; } + { locale = "lt"; arch = "linux-i686"; sha256 = "f143791c658916ee2ddac2199293ded234cfd8201cd6399775ccb996cb784e18"; } + { locale = "lt"; arch = "linux-x86_64"; sha256 = "5d48abb53a5b71be190dc4c127c5718704fbc12590c2c5fbcf3b4046f9840415"; } + { locale = "nb-NO"; arch = "linux-i686"; sha256 = "319df90e458817537f7323e97c3d7fdeb2fd965a215b1173f87378b3c94e3ac7"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "2f93a35135f387c8cb2e4ca4b0c800f846596d0f93350f3be0983797a0571359"; } + { locale = "nl"; arch = "linux-i686"; sha256 = "8e3d9003a67a0d38821dae7a070eebe32698ae6a89272394d4f7faea91595360"; } + { locale = "nl"; arch = "linux-x86_64"; sha256 = "bf2bb1676c5966b6fdcf34c93eb3444ed0f3dd6ed03c8e2a39f6757811bf0e7f"; } + { locale = "nn-NO"; arch = "linux-i686"; sha256 = "e938fcf2e84bc19d766c89312f8ca8e055ffeaf7fe20ba8d616aeb0b862cd064"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "ab0b01922e883a34874de33f6eae08a8e4e40d23dd7ddcdf42254386218728e6"; } + { locale = "pa-IN"; arch = "linux-i686"; sha256 = "fd3fd9fe5280365a27ef4e81f7965da2e85ad149e4e026f6a8714a73d976eeb2"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "6a68c72828036a256a8d04b1678be58c786671ef97f106b23812ebcf149f1d15"; } + { locale = "pl"; arch = "linux-i686"; sha256 = "26bb8ca3617c70d1126ef4111787ab267bc6dcd28b2b995e07b7296bdf24723b"; } + { locale = "pl"; arch = "linux-x86_64"; sha256 = "de6ac16163aab662ba4fef2130dd822ec9cfecc0f4beec54f2017785fec8eb0a"; } + { locale = "pt-BR"; arch = "linux-i686"; sha256 = "82c459a487d2a7b156f92db36e85c815c714d59474ed9bd8cde46b08c69f1d57"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "1f4caae64ced0c69fe6ba6330921fce0d220b616a0eb8b1e696da85cdcf5ec01"; } + { locale = "pt-PT"; arch = "linux-i686"; sha256 = "830b649a394cd844bb1b159a76d265455f6ace76dec6697491367b2f6eff1588"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "e89e906cd896c8e04754a9658dc72617954e0a097e6e3b648e5ce827c8cec7d7"; } + { locale = "rm"; arch = "linux-i686"; sha256 = "260fc959ce74945d827c230124a451cec75b6347b78d7d8bbeb65a2bd91f5bd8"; } + { locale = "rm"; arch = "linux-x86_64"; sha256 = "aa416170d0d04d0e2e570d0b0874b6c585d706f8b670de3c24bc5a9ce9819d8d"; } + { locale = "ro"; arch = "linux-i686"; sha256 = "a24ec33c8812921ad0f15dd4306218a2443f7018be5141bcc8e87e0ce3f52929"; } + { locale = "ro"; arch = "linux-x86_64"; sha256 = "5c8bb4872206cacd17cfb77ed3cf58024cdc81be181908213f80659c4d36594b"; } + { locale = "ru"; arch = "linux-i686"; sha256 = "06bde08af3d4b73db3f0a8b87f4f5f3bbc95fd92d717a9ac83efddb7ebc0f12b"; } + { locale = "ru"; arch = "linux-x86_64"; sha256 = "6adf1e6992b05b6c93152bb19a79fe39f319b5a5a62d2491191544eaaabbcc1b"; } + { locale = "si"; arch = "linux-i686"; sha256 = "3f757064e857d8c4d025c0de8325b3bfd81648ac2b77ee11ca847e8ea85d35a5"; } + { locale = "si"; arch = "linux-x86_64"; sha256 = "01147194ad382e4cc61c22c6a2672a01740ced6fdb3d4c2a9394ca9d62503c24"; } + { locale = "sk"; arch = "linux-i686"; sha256 = "ffd8e8bbadb7be4672555f1ec8e4134af5c0898041cc197e1d0081b636d07642"; } + { locale = "sk"; arch = "linux-x86_64"; sha256 = "d1e9df7d081afa272e94534ee3d6310c3498629cd7bba0fd7ab86675ea885714"; } + { locale = "sl"; arch = "linux-i686"; sha256 = "2835ea496c48c171efa0d79924cd3183c12f6de49ce05af72214f6ad4a407c85"; } + { locale = "sl"; arch = "linux-x86_64"; sha256 = "e585b0839c2b31ef12f562c4303b46b392493c6619b7e1b0c92e21c3afdb7461"; } + { locale = "sq"; arch = "linux-i686"; sha256 = "592ece3de096b4135c24e9079f20b85b8c394d488caa6b7907b75d49f51fb30d"; } + { locale = "sq"; arch = "linux-x86_64"; sha256 = "048bcb92d0915b909e2174c990948dd5c50345452369e067bf8c5770bc7b40c4"; } + { locale = "sr"; arch = "linux-i686"; sha256 = "b24e02beeb02d44ba64884864cdfb6605e7b3454b6e953767ceeaf4817f41d95"; } + { locale = "sr"; arch = "linux-x86_64"; sha256 = "caad067689a49308c2e51385750f3d2319e3a06757cf56060ce3c5ecb74a9ed6"; } + { locale = "sv-SE"; arch = "linux-i686"; sha256 = "a2dc5de82a1736dd3aa157da305f5db478625508444df244a3492dfaff8278f3"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "d2c4ab30e6e5d17716d7981d0039f043a41107edb917a838be66659d60653074"; } + { locale = "ta-LK"; arch = "linux-i686"; sha256 = "58773ebf8d949541a2c19924935eb09f0d996aa4059ad3c17a71c664357c2bcc"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "bb5c4d1d81373c1d25c1df4d896fbd1ba52acfed4e890a81650e34e5b9bd2ef0"; } + { locale = "tr"; arch = "linux-i686"; sha256 = "c95f531aaa3d36788cf6511d51afa1242657890bdc10628218aef60d6d80b106"; } + { locale = "tr"; arch = "linux-x86_64"; sha256 = "bf04a4f7b629e20f8389aad530b89b592686bd1a8340090311882934f9bea391"; } + { locale = "uk"; arch = "linux-i686"; sha256 = "2c0c6d3a2d4228b7838864835665ff7d46cf8564d59db817ee1d8f9665828410"; } + { locale = "uk"; arch = "linux-x86_64"; sha256 = "c51477c9aaa96765205c163df83acb003c2db837243225d5d1e8753b1de5b71b"; } + { locale = "vi"; arch = "linux-i686"; sha256 = "3c92aef738962dab12fa0e118d64d29bb0d110f9ef2050630b3649d574036476"; } + { locale = "vi"; arch = "linux-x86_64"; sha256 = "4854536b65fb7afb8925315ff4192c369db53f55b3ccec698cb561af1bc03f68"; } + { locale = "zh-CN"; arch = "linux-i686"; sha256 = "3aa69342828a99d075e0b70938d1360dcb9016ad322638c57fba9288e37b9b3e"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "9d590c31e369d8e1287c915cb91061f14359329c89e5038e3491052ff3df894a"; } + { locale = "zh-TW"; arch = "linux-i686"; sha256 = "f133efa32b74f0203186abfeb5b191bf50711f04bf29762e2569b78e0feb66e3"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "15d71526ef072de2b9adacb300e0eb158170839be82a7def9efa6ac55adcda37"; } ]; } From ebf21fd29ee7df613b86f1c4f54873c4d592ba61 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 29 Mar 2016 04:53:53 +0200 Subject: [PATCH 42/75] libressl_2_3: 2.3.2 -> 2.3.3 --- pkgs/development/libraries/libressl/2.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix index a87e599cbc07..962bb5472636 100644 --- a/pkgs/development/libraries/libressl/2.3.nix +++ b/pkgs/development/libraries/libressl/2.3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0sm9cjjqvj581sfd4sh0i467sh8p89nq9b8ck2qn3war92p5zx40"; + sha256 = "1a8anm8nsfyxds03csk738m2cmzjbsb867my1rz5ij3w31k32wvn"; }; enableParallelBuilding = true; From 69c6f7e20ab34c0ee382a21c3a83112994c8af8d Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Tue, 29 Mar 2016 07:18:54 +0100 Subject: [PATCH 43/75] git: 2.7.4 -> 2.8.0 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 5083c73fb148..82a3dc79d7c5 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.7.4"; + version = "2.8.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0ys55v2xrhzj74jrrqx75xpr458klnyxshh8d8swfpp0zgg79rfy"; + sha256 = "0k77b5x41k80fqqmkmg59rdvs92xgp73iigh01l49h383r7rl2cs"; }; patches = [ From b40f0ac3c796eef57937e5f4634e54f47fdabb8d Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Tue, 29 Mar 2016 07:31:56 +0100 Subject: [PATCH 44/75] opencpn: init at 4.2.0 --- pkgs/applications/misc/opencpn/default.nix | 32 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/misc/opencpn/default.nix diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix new file mode 100644 index 000000000000..d6b9b943b6e4 --- /dev/null +++ b/pkgs/applications/misc/opencpn/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, gtk2, wxGTK30, libpulseaudio, curl, + gettext, glib, portaudio }: + +stdenv.mkDerivation rec { + name = "opencpn-${version}"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "OpenCPN"; + repo = "OpenCPN"; + rev = "v${version}"; + sha256 = "1m6fp9lf9ki9444h0dq6bj0vr7d0pcxkbjv3j2v76p0ksk2l8kw3"; + }; + + buildInputs = [ pkgconfig cmake gtk2 wxGTK30 libpulseaudio curl gettext + glib portaudio ]; + + cmakeFlags = [ + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" + ]; + + enableParallelBuilding = true; + + meta = { + description = "A concise ChartPlotter/Navigator"; + maintainers = [ stdenv.lib.maintainers.kragniz ]; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.gpl2; + homepage = "http://opencpn.org/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8bbccaf53cb..72a3094a12d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13001,6 +13001,8 @@ let openbrf = callPackage ../applications/misc/openbrf { }; + opencpn = callPackage ../applications/misc/opencpn { }; + openimageio = callPackage ../applications/graphics/openimageio { }; openjump = callPackage ../applications/misc/openjump { }; From b44b0ab27c26dea780aec7476b7d9486798b340a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Mar 2016 10:02:57 +0200 Subject: [PATCH 45/75] nixpkgs manual: remove cruft from a merge conflict It was clearly added unintentionally during #14243 merge. --- doc/languages-frameworks/index.xml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 63c4b7dec607..395d46880217 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -27,22 +27,5 @@ such as Perl or Haskell. These are described in this chapter. - ->>>>>>> 05113a5... nixpkgs manual: Add documentation for bower2nix - - From 62c29908da62fc2a11ae68830fea669cd2d4d618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Mar 2016 10:53:36 +0200 Subject: [PATCH 46/75] dvdisaster: disable parallel building http://hydra.nixos.org/build/33609373/nixlog/1/raw /cc @nkcx. I notified upstream. --- pkgs/tools/cd-dvd/dvdisaster/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 7cb1bf7506da..08da13b569ae 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (builtins.elem stdenv.system stdenv.lib.platforms.x86_64) "--with-sse2=yes"; - enableParallelBuilding = true; + # fatal error: inlined-icons.h: No such file or directory + enableParallelBuilding = false; doCheck = true; checkPhase = '' From 117183e27e273f6c8c121b8281d06d07e9b502c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Mar 2016 11:12:42 +0200 Subject: [PATCH 47/75] intltool: fix problems with perl-5.22 http://hydra.nixos.org/build/33608086/nixlog/1/raw --- pkgs/development/tools/misc/intltool/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index 761cd6edfc2c..4ab9fa284915 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, perl, perlXMLParser }: +{ stdenv, fetchurl, fetchpatch, gettext, perl, perlXMLParser }: stdenv.mkDerivation rec { name = "intltool-${version}"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; }; + # fix "unescaped left brace" errors when using intltool in some cases + patches = [(fetchpatch { + name = "perl-5.22.patch"; + url = "https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/intltool" + + "/debian/patches/perl5.22-regex-fixes?revision=47255&view=co"; + sha256 = "17clqczb9fky7hp8czxa0fy82b5478irvz4f3fnans3sqxl95hx3"; + })]; + propagatedBuildInputs = [ gettext perl perlXMLParser ]; meta = with stdenv.lib; { From 5147b9d30a1904ee324154192c81d2039abdeff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Mar 2016 11:55:44 +0200 Subject: [PATCH 48/75] pythonPackages.poppler-qt4: fix build by a hack /cc maintainer @sepi. --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd109462dd55..c8f6b65cba20 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6911,6 +6911,8 @@ in modules // { preBuild = "${python}/bin/${python.executable} setup.py build_ext" + " --include-dirs=${pkgs.poppler_qt4}/include/poppler/"; + NIX_CFLAGS_COMPILE = "-I${pkgs.poppler_qt4}/include/poppler/"; + meta = { description = "A Python binding to Poppler-Qt4"; longDescription = '' From e69306c46394f98e8ae53dd21dea3d0495a90780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Mar 2016 12:14:31 +0200 Subject: [PATCH 49/75] xmlsec: fix linkage, probably after #909 This fixes builds of (some) reverse dependencies, e.g. aqbanking. --- pkgs/development/libraries/xmlsec/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 3d92dcf3e12b..b4c0a51f6ddc 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; + # otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909 + NIX_LDFLAGS = [ "-lgcrypt" ]; + postFixup = '' wrapProgram "$out/bin/xmlsec1" --prefix LD_LIBRARY_PATH ":" "$out/lib" ''; From f6a44bea9e5cfb07dc283f2c7c222f9e0dbadf18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 29 Mar 2016 12:23:12 +0200 Subject: [PATCH 50/75] Updating wings and dependencies to match erlang I updated the erlang esdl lib, added the erlang cl lib, added opencl-headers and ocl-icd to make wings build and run. I have not tested its opencl part; I only added dependencies so it builds. --- pkgs/applications/graphics/wings/default.nix | 19 +++++++---- pkgs/development/libraries/cl/default.nix | 33 +++++++++++++++++++ pkgs/development/libraries/esdl/default.nix | 22 +++++++++---- .../development/libraries/ocl-icd/default.nix | 18 ++++++++++ .../libraries/opencl-headers/default.nix | 23 +++++++++++++ pkgs/top-level/all-packages.nix | 11 ++++--- 6 files changed, 108 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/libraries/cl/default.nix create mode 100644 pkgs/development/libraries/ocl-icd/default.nix create mode 100644 pkgs/development/libraries/opencl-headers/default.nix diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index 9e6d6fe492a3..9ecf94e21c01 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -1,29 +1,34 @@ -{ fetchurl, stdenv, erlang, esdl }: +{ fetchurl, stdenv, erlang, esdl, cl }: stdenv.mkDerivation rec { - name = "wings-1.4.1"; + name = "wings-1.5.4"; src = fetchurl { url = "mirror://sourceforge/wings/${name}.tar.bz2"; - sha256 = "16kqy92rapmbvkc58mc50cidp1pm8nlwlwx69riyadc9w4qs9bji"; + sha256 = "0qz6rmmkqgk3p0d3v2ikkf22n511bq0m7xp3kkradwrp28fcl15x"; }; - ERL_LIBS = "${esdl}/lib/erlang/addons"; + ERL_LIBS = "${esdl}/lib/erlang/lib:${cl}/lib/erlang/lib"; patchPhase = '' sed -i 's,include("sdl_keyboard.hrl"),include_lib("esdl/include/sdl_keyboard.hrl"),' \ src/wings_body.erl plugins_src/commands/wpc_constraints.erl + + # Fix reference + sed -i 's,wings/e3d/,,' plugins_src/import_export/wpc_lwo.erl ''; - buildInputs = [ erlang esdl ]; + buildInputs = [ erlang esdl cl ]; + # I did not test the *cl* part. I added the -pa just by imitation. installPhase = '' mkdir -p $out/bin $out/lib/${name}/ebin cp ebin/* $out/lib/${name}/ebin cp -R fonts textures shaders plugins $out/lib/$name cat << EOF > $out/bin/wings #!/bin/sh - export ROOTDIR=$out/lib/erlang/addons/${name} - ${erlang}/bin/erl -smp disable -pa ${esdl}/lib/erlang/addons/${esdl.name}/ebin \ + ${erlang}/bin/erl -smp disable \ + -pa ${esdl}/lib/erlang/lib/${cl.name}/ebin \ + -pa ${esdl}/lib/erlang/lib/${esdl.name}/ebin \ -pa $out/lib/${name}/ebin -run wings_start start_halt "$@" EOF chmod +x $out/bin/wings diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix new file mode 100644 index 000000000000..dfb54893b6ca --- /dev/null +++ b/pkgs/development/libraries/cl/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, SDL, mesa, rebar, erlang, opencl-headers, ocl-icd }: + +stdenv.mkDerivation rec { + version = "1.2.1"; + name = "cl-${version}"; + + src = fetchurl { + url = "https://github.com/tonyrog/cl/archive/${name}.tar.gz"; + sha256 = "03jv280h9gqqqkm0mmkjr53srd2mzhvyy1biss77wpjrzq2z12c8"; + }; + + buildInputs = [ erlang rebar opencl-headers ocl-icd ]; + #propagatedBuildInputs = [ SDL mesa ]; + + buildPhase = '' + sed 's/git/"${version}"/' -i src/cl.app.src + rebar compile + ''; + + # 'cp' line taken from Arch recipe + # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/erlang-sdl + installPhase = '' + DIR=$out/lib/erlang/lib/${name} + mkdir -p $DIR + cp -ruv c_src doc ebin include priv src $DIR + ''; + + meta = { + homepage = https://github.com/tonyrog/cl; + description = "OpenCL binding for Erlang"; + license = stdenv.lib.licences.mit; + }; +} diff --git a/pkgs/development/libraries/esdl/default.nix b/pkgs/development/libraries/esdl/default.nix index ccc3318ff6b9..63fc169355c6 100644 --- a/pkgs/development/libraries/esdl/default.nix +++ b/pkgs/development/libraries/esdl/default.nix @@ -1,18 +1,26 @@ -{stdenv, fetchurl, SDL, mesa, erlang}: +{stdenv, fetchurl, SDL, mesa, rebar, erlang}: stdenv.mkDerivation rec { - name = "esdl-1.0.1"; + name = "esdl-1.3.1"; src = fetchurl { - url = "mirror://sourceforge/esdl/${name}.src.tar.gz"; - sha256 = "0zc7cmr44v10sb593dismdm5qc2v7sm3z9yh22g4r9g6asbg5z0n"; + url = "mirror://sourceforge/esdl/${name}.src.tgz"; + sha256 = "0f5ad519600qarsa2anmnaxh6b7djzx1dnwxzi4l36pxsq896y01"; }; - buildInputs = [ erlang ]; + buildInputs = [ erlang rebar ]; propagatedBuildInputs = [ SDL mesa ]; - preBuild = '' - export makeFlags="INSTALLDIR=$out/lib/erlang/addons/${name}"; + buildPhase = '' + rebar compile + ''; + + # 'cp' line taken from Arch recipe + # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/erlang-sdl + installPhase = '' + DIR=$out/lib/erlang/lib/${name} + mkdir -p $DIR + cp -ruv c_src doc ebin include priv src $DIR ''; meta = { diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix new file mode 100644 index 000000000000..ac26ac7126fd --- /dev/null +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, ruby }: + +stdenv.mkDerivation rec { + name = "ocl-icd-2.2.9"; + + src = fetchurl { + url = "https://forge.imag.fr/frs/download.php/716/${name}.tar.gz"; + sha256 = "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc"; + }; + + buildInputs = [ ruby ]; + + meta = with stdenv.lib; { + description = "OpenCL ICD Loader"; + homepage = https://forge.imag.fr/projects/ocl-icd/; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix new file mode 100644 index 000000000000..9b931894f66f --- /dev/null +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "opencl-headers-2.1.0"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "OpenCL-Headers"; + rev = "c1770dcc6cf1daadec1905e7393f3691c1dde200"; + sha256 = "0m9fkblqja0686i2jjqiszvq3df95gp01a2674xknlmkd6525rck"; + }; + + installPhase = '' + mkdir -p $out/include/CL + cp * $out/include/CL + ''; + + meta = with stdenv.lib; { + description = "Khronos OpenCL headers"; + homepage = https://www.khronos.org/registry/cl/; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 752f23079954..8d15f689b0f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6432,6 +6432,8 @@ in stdenv = overrideInStdenv stdenv [gnumake380]; }; + cl = callPackage ../development/libraries/cl { }; + clanlib = callPackage ../development/libraries/clanlib { }; classads = callPackage ../development/libraries/classads { }; @@ -8217,6 +8219,8 @@ in nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; + ocl-icd = callPackage ../development/libraries/ocl-icd { }; + ode = callPackage ../development/libraries/ode { }; ogre = callPackage ../development/libraries/ogre {}; @@ -8244,6 +8248,8 @@ in opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; + opencl-headers = callPackage ../development/libraries/opencl-headers { }; + opencollada = callPackage ../development/libraries/opencollada { }; opencsg = callPackage ../development/libraries/opencsg { }; @@ -14133,10 +14139,7 @@ in winswitch = callPackage ../tools/X11/winswitch { }; - wings = callPackage ../applications/graphics/wings { - erlang = erlangR14; - esdl = esdl.override { erlang = erlangR14; }; - }; + wings = callPackage ../applications/graphics/wings { }; wmname = callPackage ../applications/misc/wmname { }; From d7e87db0c7f8d0ed759261cdfbdd2c71a7933bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Mar 2016 13:01:27 +0200 Subject: [PATCH 51/75] rustc: disable parallel building http://hydra.nixos.org/build/33119905/nixlog/1/raw --- pkgs/development/compilers/rustc/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index 8be2ec05f07e..c0f15fbd116c 100644 --- a/pkgs/development/compilers/rustc/generic.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -166,7 +166,7 @@ with stdenv.lib; stdenv.mkDerivation { buildInputs = [ ncurses ] ++ optional (!forceBundledLLVM) llvmShared; - enableParallelBuilding = true; + enableParallelBuilding = false; # missing files during linking, occasionally outputs = [ "out" "doc" ]; From 27eaa3775784fd520a61611e7cab1ef39345115a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 29 Mar 2016 07:12:47 -0300 Subject: [PATCH 52/75] weather: fix file locations, add python dependency --- pkgs/applications/misc/weather/default.nix | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index dec18aea961d..192e4406b6d8 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs }: +{ stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { version = "2.0"; @@ -9,15 +9,26 @@ stdenv.mkDerivation rec { sha256 = "0yil363y9iyr4mkd7xxq0p2260wh50f9i5p0map83k9i5l0gyyl0"; }; + nativeBuildInputs = [ pythonPackages.wrapPython ]; + + buildInputs = [ pythonPackages.python ]; + phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - mkdir $out/{share,man,bin} -p - cp weather{,.py} $out/bin/ - cp {airports,overrides.{conf,log},places,slist,stations,weatherrc,zctas,zlist,zones} $out/share/ + site_packages=$out/${pythonPackages.python.sitePackages} + mkdir -p $out/{share/{man,weather-util},bin,etc} $site_packages + cp weather $out/bin/ + cp weather.py $site_packages/ chmod +x $out/bin/weather - cp ./weather.1 $out/man/ - cp ./weatherrc.5 $out/man/ + cp airports overrides.{conf,log} places slist stations zctas zlist zones $out/share/weather-util/ + cp weatherrc $out/etc + cp weather.1 weatherrc.5 $out/share/man/ + sed -i \ + -e "s|/etc|$out/etc|g" \ + -e "s|else: default_setpath = \".:~/.weather|&:$out/share/weather-util|" \ + $site_packages/weather.py + wrapPythonPrograms ''; meta = { From 5ad9ed9291e304df3f07d3ae9de97feb7925cc45 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 29 Mar 2016 08:23:27 -0400 Subject: [PATCH 53/75] kotlin: 1.0.1 -> 1.0.1-2 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 5b9d57cfcac5..185dd278fba0 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: stdenv.mkDerivation rec { - version = "1.0.1"; + version = "1.0.1-2"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/${version}/kotlin-compiler-${version}.zip"; - sha256 = "1hwdisjgy4q5y25gqnxk8ycd04j7hxb7xd0y6ixi12qfj7259a41"; + sha256 = "0kdfvkb7qh3icchxswai24ifsiw25y3mq1xxcsp8nd3jn9krnj87"; }; propagatedBuildInputs = [ jre ] ; From 14fd473894b82194a1c2904c9b8642f5c8b2c03f Mon Sep 17 00:00:00 2001 From: obadz Date: Tue, 29 Mar 2016 14:09:34 +0100 Subject: [PATCH 54/75] gapi-ocaml: 0.2.6 -> 0.2.10 --- pkgs/development/ocaml-modules/gapi-ocaml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index ac85a03cc985..06a67e9cb8b6 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, ocaml, findlib, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: stdenv.mkDerivation rec { - name = "gapi-ocaml-0.2.6"; + name = "gapi-ocaml-0.2.10"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1468/${name}.tar.gz"; - sha256 = "1sqsir07xxk9xy723l206r7d10sp6rfid9dvi0g34vbkvshm50y2"; + url = "https://forge.ocamlcore.org/frs/download.php/1601/${name}.tar.gz"; + sha256 = "0kg4j7dhr7jynpy8x53bflqjf78jyl14j414l6px34xz7c9qx5fl"; }; buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; From b48a6fea80a4571e4e8d832087bb1da6d9cd4ff2 Mon Sep 17 00:00:00 2001 From: obadz Date: Tue, 29 Mar 2016 14:10:00 +0100 Subject: [PATCH 55/75] google-drive-ocamlfuse: 0.5.18 -> 0.5.22 --- .../networking/google-drive-ocamlfuse/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index e085adbdcda7..532ab3613138 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, zlib }: +{ stdenv, fetchurl, ocamlPackages, zlib }: stdenv.mkDerivation rec { name = "google-drive-ocamlfuse-${version}"; - version = "0.5.18"; + version = "0.5.22"; - src = fetchFromGitHub { - owner = "astrada"; - repo = "google-drive-ocamlfuse"; - rev = "v${version}"; - sha256 = "0a545zalsqw3jndrvkc0bsn4aab74cf8lwnsw09b5gjm8pm79b9r"; + src = fetchurl { + url = "https://forge.ocamlcore.org/frs/download.php/1587/${name}.tar.gz"; + sha256 = "1hjm6hyva9sl6lddb0372wsy7f76105iaxh976yyzfn3b4ran6ab"; }; buildInputs = [ zlib ] ++ (with ocamlPackages; [ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl]); From fc33e877c1fa2d6b5b533f8dd2f8298ef4598674 Mon Sep 17 00:00:00 2001 From: obadz Date: Tue, 29 Mar 2016 14:15:21 +0100 Subject: [PATCH 56/75] spacefm: 1.0.4 -> 1.0.5 --- pkgs/applications/misc/spacefm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 46500077a082..f0c244af05e7 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "spacefm-${version}"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "IgnorantGuru"; repo = "spacefm"; rev = "${version}"; - sha256 = "1jywsb5yjrq4w9m94m4mbww36npd1jk6s0b59liz6965hv3xp2sy"; + sha256 = "06askkrwls09d1x382zjrmnvcm0ghfgz4cms2qbhdkazfyy0ff65"; }; configureFlags = [ From 54eb061a12dd5f29ec52cad95b8e19b23b592eaf Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 29 Mar 2016 15:47:18 +0300 Subject: [PATCH 57/75] avidemux: don't depend on unfree FAAC by default --- pkgs/applications/video/avidemux/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 3ffc18e3b181..177f3d1b20c9 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -3,7 +3,7 @@ , yasm, fribidi, gtk3, qt4 , withX264 ? true, x264 , withLAME ? true, lame -, withFAAC ? true, faac +, withFAAC ? false, faac , withVorbis ? true, libvorbis , withPulse ? true, libpulseaudio , withFAAD ? true, faad2 From c56c3b65964b5d06ef1cf576aa609cd76c6edf78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 29 Mar 2016 14:16:01 +0100 Subject: [PATCH 58/75] nixos/lib/testing.nix: make 'config' a free variable cc @edolstra --- nixos/lib/build-vms.nix | 4 ++-- nixos/lib/testing.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index a97bae57d9bb..4e044deca217 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -1,6 +1,6 @@ -{ system, minimal ? false }: +{ system, minimal ? false, config ? {} }: -let pkgs = import ../.. { config = {}; inherit system; }; in +let pkgs = import ../.. { inherit system config; }; in with pkgs.lib; with import ../lib/qemu-flags.nix; diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index aa1cec1ea02d..f7159634e4f1 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -1,6 +1,6 @@ -{ system, minimal ? false }: +{ system, minimal ? false, config ? {} }: -with import ./build-vms.nix { inherit system minimal; }; +with import ./build-vms.nix { inherit system minimal config; }; with pkgs; rec { From d9b98b6b50261cd768bc595d68c91448d36b8692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Mar 2016 16:32:50 +0200 Subject: [PATCH 59/75] manual rl-16.03: document broadcom issue #12595 --- nixos/doc/manual/release-notes/rl-1603.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 350025da7b00..476540641639 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -274,6 +274,20 @@ services.syncthing = { + + + Systems with some broadcom cards used to result into a generated config + that is no longer accepted. If you get errors like + error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be created + you should either re-run nixos-generate-config or manually replace + "${config.boot.kernelPackages.broadcom_sta}" + by + config.boot.kernelPackages.broadcom_sta + in your /etc/nixos/hardware-configuration.nix. + More discussion is on + the github issue. + + From a5322efd958cf9fd063f67f4580cffbf70fdb750 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 29 Mar 2016 17:06:54 +0300 Subject: [PATCH 60/75] Revert "Remove PATH assumption from fhs-userenv." This reverts commit 2f26b82411ea93349d375ea3b5d833b04a455972. This breaks terminfo in Bash for some reason (i.e. TAB and other special keys). --- pkgs/build-support/build-fhs-userenv/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index 4177846c4336..a7e1bd11977a 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,9 +1,8 @@ -{ runCommand, lib, writeText, writeScriptBin, stdenv, bash, ruby } : -{ env, runScript ? "${bash}/bin/bash", extraBindMounts ? [], extraInstallCommands ? "", importMeta ? {} } : +{ runCommand, lib, writeText, writeScriptBin, stdenv, ruby } : +{ env, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "", importMeta ? {} } : let name = env.pname; - bash' = "${bash}/bin/bash"; # Sandboxing script chroot-user = writeScriptBin "chroot-user" '' @@ -33,7 +32,7 @@ in runCommand name { runCommand "${name}-shell-env" { shellHook = '' export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS" - exec ${chroot-user}/bin/chroot-user ${env} ${bash'} -l ${init bash'} "$(pwd)" + exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init "bash"} "$(pwd)" ''; } '' echo >&2 "" @@ -46,7 +45,7 @@ in runCommand name { cat <$out/bin/${name} #! ${stdenv.shell} export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:\$CHROOTENV_EXTRA_BINDS" - exec ${chroot-user}/bin/chroot-user ${env} ${bash'} ${init runScript} "\$(pwd)" "\$@" + exec ${chroot-user}/bin/chroot-user ${env} bash ${init runScript} "\$(pwd)" "\$@" EOF chmod +x $out/bin/${name} ${extraInstallCommands} From f38d620d596a45d6a7a4e20a1c7f4985cf4d3ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 29 Mar 2016 17:39:43 +0200 Subject: [PATCH 61/75] Updating giv to latest from git (>0.9.25). We were using a version years old. I picked the git version instead of the last release because the git version has fixes not released for almost one year. --- pkgs/applications/graphics/giv/build.patch | 27 ---------------------- pkgs/applications/graphics/giv/default.nix | 12 ++++++---- 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/graphics/giv/build.patch b/pkgs/applications/graphics/giv/build.patch index 639d881f4159..ec343c902386 100644 --- a/pkgs/applications/graphics/giv/build.patch +++ b/pkgs/applications/graphics/giv/build.patch @@ -15,30 +15,3 @@ index 16eccd9..603e931 100644 env['SBOX'] = False -diff --git a/giv/SConstruct b/giv/SConstruct -index 047839a..2c267aa 100644 ---- a/giv/SConstruct -+++ b/giv/SConstruct -@@ -3,8 +3,9 @@ - - import sys - import re -+import os - --env = Environment() -+env = Environment(ENV = os.environ) - - src = ["giv.c", - "giv-backstore.c", -diff --git a/src/plugins/dcmtk/SConstruct.standalone b/src/plugins/dcmtk/SConstruct.standalone -index ffce001..74246f8 100644 ---- a/src/plugins/dcmtk/SConstruct.standalone -+++ b/src/plugins/dcmtk/SConstruct.standalone -@@ -1,4 +1,6 @@ --env = Environment() -+import os -+ -+env = Environment(ENV = os.environ) - - variant = "Debug" - diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 2e9d55a3f3f2..f9ea3173b430 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, gdk_pixbuf, scons, pkgconfig, gtk, glib, +{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk, glib, pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }: stdenv.mkDerivation rec { - name = "giv-0.9.22"; + name = "giv-20150811-git"; - src = fetchurl { - url = "mirror://sourceforge/giv/${name}.tar.gz"; - sha256 = "1q0806b66ajppxbv1i71wx5d3ydc1h3hsz23m6g4g80dhiai7dly"; + src = fetchFromGitHub { + owner = "dov"; + repo = "giv"; + rev = "64648bfbbf10ec4a9adfbc939c96c7d1dbdce57a"; + sha256 = "1sz2n7jbmg3g97bs613xxjpzqbsl5rvpg6v7g3x3ycyd35r8vsfp"; }; # It built code to be put in a shared object without -fPIC From 0c98b52816bfa4f064bdadfcb026144fd5cece6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 29 Mar 2016 17:47:07 +0200 Subject: [PATCH 62/75] Fix evaluation. (licenses, not licences) Thanks Domen. --- pkgs/development/libraries/cl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index dfb54893b6ca..c166a6e4acf1 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/tonyrog/cl; description = "OpenCL binding for Erlang"; - license = stdenv.lib.licences.mit; + license = stdenv.lib.licenses.mit; }; } From 63f1eb6b00ca3bb792c36b4ce26685de90a62f5d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 29 Mar 2016 17:57:24 +0300 Subject: [PATCH 63/75] xserver service: add glamoregl for intel drivers Closes #14286 Credits to vcunat for the initial patch. --- nixos/modules/services/x11/xserver.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 0fcea6ce5e4f..76431f211243 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -13,9 +13,9 @@ let # Map video driver names to driver packages. FIXME: move into card-specific modules. knownVideoDrivers = { - virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; }; - ati = { modules = [ pkgs.xorg.xf86videoati pkgs.xorg.glamoregl ]; }; - intel-testing = { modules = with pkgs.xorg; [ xf86videointel-testing glamoregl ]; driverName = "intel"; }; + virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; }; + ati = { modules = with pkgs.xorg; [ xf86videoati glamoregl ]; }; + intel = { modules = with pkgs.xorg; [ xf86videointel glamoregl ]; }; }; fontsForXServer = From 9c8f810f834837131d113af0dd5f0c417542155b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 29 Mar 2016 20:58:44 +0300 Subject: [PATCH 64/75] noto-fonts: 2015-09-08 -> 2016-03-29 --- pkgs/data/fonts/noto-fonts/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index bb07596ab974..1ada615d5002 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -1,15 +1,18 @@ { stdenv, fetchurl, fetchFromGitHub, optipng, cairo, unzip, fontforge, pythonPackages, pkgconfig }: rec { # 18MB - noto-fonts = let version = "git-2015-09-08"; in stdenv.mkDerivation { + noto-fonts = let version = "git-2016-03-29"; in stdenv.mkDerivation { name = "noto-fonts-${version}"; + src = fetchFromGitHub { owner = "googlei18n"; repo = "noto-fonts"; - rev = "9d677e7e47a13f6e88052833277783fe4f27671f"; - sha256 = "1dw1142znlk19a4mzhfi9pg3jzmz8pl1ivix7sd2grg70vxscxqc"; + rev = "e8b0af48b15d64bd490edab4418b5e396cf29644"; + sha256 = "02yv12fbb4n1gp9g9m0qxnj6adpg9hfsr9377h2d4xsf6sxcgy6f"; }; - phases = "unpackPhase installPhase"; + + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' mkdir -p $out/share/fonts/noto cp hinted/*.ttf $out/share/fonts/noto @@ -19,6 +22,9 @@ rec { cp -n unhinted/*.ttf $out/share/fonts/noto cp -n alpha/*.ttf $out/share/fonts/noto ''; + + preferLocalBuild = true; + meta = with stdenv.lib; { inherit version; description = "Beautiful and free fonts for many languages"; From 08db1b19a29f03ca2f070eae7fc0b38e387c823c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 29 Mar 2016 21:00:00 +0300 Subject: [PATCH 65/75] noto-fonts-cjk: cleanup --- pkgs/data/fonts/noto-fonts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 1ada615d5002..d62b4758f756 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -57,9 +57,9 @@ rec { sha256 = "1vg3si6slvk8cklq6s5c76s84kqjc4wvwzr4ysljzjpgzra2rfn6"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; - phases = "unpackPhase installPhase"; + phases = [ "unpackPhase" "installPhase" ]; sourceRoot = "."; From f4fa3565b8051abae51e823852a47ae9068f9abc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 29 Mar 2016 21:00:18 +0300 Subject: [PATCH 66/75] noto-fonts-emoji: 2015-08-17 -> 2016-03-17 --- pkgs/data/fonts/noto-fonts/default.nix | 29 ++++++++++++-------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index d62b4758f756..5866d43b4e0b 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchFromGitHub, optipng, cairo, unzip, fontforge, pythonPackages, pkgconfig }: +{ stdenv, fetchurl, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }: + rec { # 18MB noto-fonts = let version = "git-2016-03-29"; in stdenv.mkDerivation { @@ -92,34 +93,30 @@ rec { }; }; # 12MB - noto-fonts-emoji = let version = "git-2015-08-17"; in stdenv.mkDerivation { + noto-fonts-emoji = let version = "git-2016-03-17"; in stdenv.mkDerivation { name = "noto-fonts-emoji-${version}"; src = fetchFromGitHub { owner = "googlei18n"; repo = "noto-emoji"; - rev = "ffd7cfd0c84b7bf37210d0908ac94adfe3259ff2"; - sha256 = "1pa94gw2y0b6p8r81zbjzcjgi5nrx4dqrqr6mk98wj6jbi465sh2"; + rev = "c6379827aaa9cb0baca1a08a9d44ae74ca505236"; + sha256 = "1zh1b617cjr5laha6lx0ys4k1c3az2zkgzjwc2nlb7dsdmfw1n0q"; }; - buildInputs = with pythonPackages; [ - optipng cairo fontforge python nototools fonttools pkgconfig - ]; + buildInputs = [ cairo ] + nativeBuildInputs = [ pngquant optipng which cairo pkgconfig imagemagick ] + ++ (with pythonPackages; [ python fonttools nototools ]); - #FIXME: perhaps use our pngquant instead - preConfigure = '' - for f in ./*.py ./third_party/pngquant/configure; do - patchShebangs "$f" - done + postPatch = '' + sed -i 's,^PNGQUANT :=.*,PNGQUANT := ${pngquant}/bin/pngquant,' Makefile + patchShebangs flag_glyph_name.py ''; - preBuild = '' - export PYTHONPATH=$PYTHONPATH:$PWD - ''; + enableParallelBuilding = true; installPhase = '' mkdir -p $out/share/fonts/noto - cp NotoColorEmoji.ttf NotoEmoji-Regular.ttf $out/share/fonts/noto + cp NotoColorEmoji.ttf fonts/NotoEmoji-Regular.ttf $out/share/fonts/noto ''; meta = with stdenv.lib; { From 8862c5db0c34d44bc97f40ed18cfefb93b85a26c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 29 Mar 2016 21:00:40 +0300 Subject: [PATCH 67/75] pythonPackages.nototools: 2015-09-16 -> 2016-03-25 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62b16f69e6b3..763e1aa15ff2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11834,11 +11834,17 @@ in modules // { }; nototools = buildPythonPackage rec { - version = "git-2015-09-16"; + version = "git-2016-03-25"; name = "nototools-${version}"; - disabled = isPy3k; - pythonPath = with self; [ fonttools numpy ]; + src = pkgs.fetchFromGitHub { + owner = "googlei18n"; + repo = "nototools"; + rev = "4f7b067d1b18f59288e5eaee34db5b0abd3a3f63"; + sha256 = "05brbkfg77ij4pmcrhq9302albzdalr9gv6jfdsbyyi2k8j85gbn"; + }; + + propagatedBuildInputs = with self; [ fonttools numpy ]; postPatch = '' sed -ie "s^join(_DATA_DIR_PATH,^join(\"$out/third_party/ucd\",^" nototools/unicode_data.py @@ -11848,11 +11854,12 @@ in modules // { cp -r third_party $out ''; - src = pkgs.fetchFromGitHub { - owner = "googlei18n"; - repo = "nototools"; - rev = "5a79bee819941849da7b414447929fc7ba6c2c08"; - sha256 = "0srrmyrjgksk4c6smgi1flyq325r4ma8r6bpkvbn731q3yykhmaa"; + disabled = isPy3k; + + meta = { + description = "Noto fonts support tools and scripts plus web site generation"; + license = licenses.asl20; + homepage = https://github.com/googlei18n/nototools; }; }; From e65b0b851bdd0cfb85bae4384574ce04891a1583 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 29 Mar 2016 21:05:32 +0300 Subject: [PATCH 68/75] noto-fonts-emoji: add uncommited fix --- pkgs/data/fonts/noto-fonts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 5866d43b4e0b..28fce3799683 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -103,7 +103,7 @@ rec { sha256 = "1zh1b617cjr5laha6lx0ys4k1c3az2zkgzjwc2nlb7dsdmfw1n0q"; }; - buildInputs = [ cairo ] + buildInputs = [ cairo ]; nativeBuildInputs = [ pngquant optipng which cairo pkgconfig imagemagick ] ++ (with pythonPackages; [ python fonttools nototools ]); From 51135d803a73218d5186b41bffd4298555de44ed Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 29 Mar 2016 21:16:56 +0200 Subject: [PATCH 69/75] bitlbee: 3.4.1 -> 3.4.2 --- .../networking/instant-messengers/bitlbee/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index d7c52ccfd6b8..89ee38a7380f 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -2,21 +2,16 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-3.4.1"; + name = "bitlbee-3.4.2"; src = fetchurl { url = "mirror://bitlbee/src/${name}.tar.gz"; - sha256 = "1qf0ypa9ba5jvsnpg9slmaran16hcc5fnfzbb1sdch1hjhchn2jh"; + sha256 = "0mza8lnfwibmklz8hdzg4f7p83hblf4h6fbf7d732kzpvra5bj39"; }; buildInputs = [ gnutls glib pkgconfig libotr python ] ++ optional doCheck check; - patches = [(fetchpatch { - url = "https://github.com/bitlbee/bitlbee/commit/34d16d5b4b5265990125894572a90493284358cd.patch"; - sha256 = "05in9kxabb6s2c1l4b9ry58ppfciwmwzrkaq33df2zv0pr3z7w33"; - })]; - configureFlags = [ "--gcov=1" "--otr=1" From 0ca288abc80752e2216afa2790d2bb92a5a38ef8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 29 Mar 2016 21:29:26 +0200 Subject: [PATCH 70/75] global: 6.5.3 -> 6.5.4 --- pkgs/development/tools/misc/global/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 298a99ef665d..5fdccc9acadd 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "global-6.5.3"; + name = "global-6.5.4"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "00h3p10rn312rnsipfvpyr61bsfdqyfpxp506yy6ji58skqr2vrk"; + sha256 = "19hxajpwld6qx0faz4rzyh1hfs25ycjmws6bas8pavx4hskf05mg"; }; nativeBuildInputs = [ libtool makeWrapper ]; From d52efcc9d3d007c6586e2cc815208c6a35b249bb Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Tue, 29 Mar 2016 15:38:48 -0400 Subject: [PATCH 71/75] assimp: add missing zlib dependency cmake searches for this package during the build phase. --- pkgs/development/libraries/assimp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index cfe86ce4e70e..38d7e50bdf8e 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cmake, boost }: +{ stdenv, fetchurl, unzip, cmake, boost, zlib }: let major = "3"; @@ -14,14 +14,14 @@ stdenv.mkDerivation { sha256 = "17nyzsqzqpafamhi779f1bkh5mfgj8rpas034x3v9a0hdy3jg66s"; }; - buildInputs = [ unzip cmake boost ]; + buildInputs = [ unzip cmake boost zlib ]; meta = with stdenv.lib; { description = "A library to import various 3D model formats"; homepage = http://assimp.sourceforge.net/; license = licenses.bsd3; maintainers = with maintainers; [ ehmry ]; - platfroms = platforms.linux; + platfroms = [ platforms.linux platforms.darwin ]; inherit version; }; -} \ No newline at end of file +} From 13e83a493e5e358a8a0a2677fc24b7e4b8436da8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 29 Mar 2016 09:48:19 -0500 Subject: [PATCH 72/75] kde5.applications: 15.12.1 -> 15.12.3 --- .../kde-5/applications-15.12/fetchsrcs.sh | 2 +- .../kde-5/applications-15.12/srcs.nix | 1928 ++++++++--------- 2 files changed, 965 insertions(+), 965 deletions(-) diff --git a/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh b/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh index 93da9d332f7c..ff118a53e3ab 100755 --- a/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh +++ b/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -WGET_ARGS='http://download.kde.org/stable/applications/15.12.1/ -A *.tar.xz' +WGET_ARGS='http://download.kde.org/stable/applications/15.12.3/ -A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/desktops/kde-5/applications-15.12/srcs.nix b/pkgs/desktops/kde-5/applications-15.12/srcs.nix index cd123f49f76b..7db99c26c3c8 100644 --- a/pkgs/desktops/kde-5/applications-15.12/srcs.nix +++ b/pkgs/desktops/kde-5/applications-15.12/srcs.nix @@ -3,1931 +3,1931 @@ { akonadi = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/akonadi-15.12.1.tar.xz"; - sha256 = "1v9l1i9yny1ckyvq95wvd0bn3ain3fdlba76gf4f2zjwd57kw4il"; - name = "akonadi-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/akonadi-15.12.3.tar.xz"; + sha256 = "17qzwsf8x95jm5swbxx5692i5yzwzqylnqrdbx2bflaaw7i2k3by"; + name = "akonadi-15.12.3.tar.xz"; }; }; akonadi-calendar = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/akonadi-calendar-15.12.1.tar.xz"; - sha256 = "120fzy2l7c3rl4jlvk021wsrkp0gihqxhihmk6jrlwj4v7nswp69"; - name = "akonadi-calendar-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/akonadi-calendar-15.12.3.tar.xz"; + sha256 = "15algxz73wi143b93yps7dlbac0dp9isaxlf0h9xv1cia8s98a17"; + name = "akonadi-calendar-15.12.3.tar.xz"; }; }; akonadi-search = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/akonadi-search-15.12.1.tar.xz"; - sha256 = "1kzjhqxa3n8216x1cs2xkyqyzjq7i8py5y5d303yr38m62z3f4qr"; - name = "akonadi-search-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/akonadi-search-15.12.3.tar.xz"; + sha256 = "0dxr8rppaf0vnfmcys5hp6h936lim3s8f1ykhrygrvjr3va0fw3f"; + name = "akonadi-search-15.12.3.tar.xz"; }; }; analitza = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/analitza-15.12.1.tar.xz"; - sha256 = "0lvjsrraffqfl53gkdsbzmrsznrz1sqnhpsbx015v21pgiwnx6ll"; - name = "analitza-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/analitza-15.12.3.tar.xz"; + sha256 = "0hz59vfzh4kysrchafiaa3l8lw2zv0nky1dyi9ybzqwi5ilxcs9b"; + name = "analitza-15.12.3.tar.xz"; }; }; ark = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ark-15.12.1.tar.xz"; - sha256 = "0x61k21rjydcjz4b2z52xa559kymsji52ik0hjdkljvwhggcw96a"; - name = "ark-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ark-15.12.3.tar.xz"; + sha256 = "13pl4phk7zg19gc16x1faaycgipdd85xg2s7rj6silmvyxr47kzf"; + name = "ark-15.12.3.tar.xz"; }; }; artikulate = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/artikulate-15.12.1.tar.xz"; - sha256 = "1nlpyslrsqs0zirkaryq4sk2cb53sh2b8mk3cdzpj9w9isx9565x"; - name = "artikulate-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/artikulate-15.12.3.tar.xz"; + sha256 = "00dhgpkzjdqjag6k2m2d8l8pp40grzhqhvvivxzy6lcz67yr68m1"; + name = "artikulate-15.12.3.tar.xz"; }; }; audiocd-kio = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/audiocd-kio-15.12.1.tar.xz"; - sha256 = "0x9x25x096grhm5lb3zibvrdy1x0hf2ryqkgp3l05580iirdjwss"; - name = "audiocd-kio-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/audiocd-kio-15.12.3.tar.xz"; + sha256 = "0ibasnpjqbfhxgkfar88pzmywcnnjpamkkd2arzwgdmrv311f4rj"; + name = "audiocd-kio-15.12.3.tar.xz"; }; }; baloo-widgets = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/baloo-widgets-15.12.1.tar.xz"; - sha256 = "01nrw2wrvzkvnh1xgzxqzy6zpx2p74iwrz44rrgr5dixciy5bqf5"; - name = "baloo-widgets-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/baloo-widgets-15.12.3.tar.xz"; + sha256 = "19yxc4njgnxyqd7izjkf93mml0wnnl23w58pv44w23a10jihydrg"; + name = "baloo-widgets-15.12.3.tar.xz"; }; }; blinken = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/blinken-15.12.1.tar.xz"; - sha256 = "1x9pdji26s0hwrni26wl8r0rqbykxdpl348671d0jwmnidq6rabv"; - name = "blinken-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/blinken-15.12.3.tar.xz"; + sha256 = "04jkf6gh676ghf6mhgn3pyv2vl6dypja3bxjc2np1j7j44575jx1"; + name = "blinken-15.12.3.tar.xz"; }; }; bomber = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/bomber-15.12.1.tar.xz"; - sha256 = "0666ghxjcpscnc4d0q1jh29kx6knabkglbvggpkk1zqq3zl0fw6y"; - name = "bomber-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/bomber-15.12.3.tar.xz"; + sha256 = "03ydvhdcbgvalkn3ch512s7z7hn2ykamjilbs7iv6p9q21va6iws"; + name = "bomber-15.12.3.tar.xz"; }; }; bovo = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/bovo-15.12.1.tar.xz"; - sha256 = "0cma6b1896nj2m7gra5g7jc9lwb7m70mhd593nib93w1i2mkamfr"; - name = "bovo-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/bovo-15.12.3.tar.xz"; + sha256 = "086nxgdl37jgmi5x759ln7ai4nxv6mahzhlkf3m8m3faa6hxm2af"; + name = "bovo-15.12.3.tar.xz"; }; }; cantor = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/cantor-15.12.1.tar.xz"; - sha256 = "15bdh85hrcx54ynq70jh42aw4m46g9sszg1rvymjpqi0za80srrj"; - name = "cantor-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/cantor-15.12.3.tar.xz"; + sha256 = "0fs2zsd8aq5q0l5d2p8343af6cbi4qvi603gvrcjyyyc728djrqc"; + name = "cantor-15.12.3.tar.xz"; }; }; cervisia = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/cervisia-15.12.1.tar.xz"; - sha256 = "1kgnvv3az7mdl6q29wxwaj8k3cnxzyizri7l6zjkp6n5jywxpq5h"; - name = "cervisia-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/cervisia-15.12.3.tar.xz"; + sha256 = "04gs4yjjdn0ndqfcpr7ww3qwn80929g4ylilznhpp6xp35gb5dsa"; + name = "cervisia-15.12.3.tar.xz"; }; }; dolphin = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/dolphin-15.12.1.tar.xz"; - sha256 = "0lpc21abdw242cans08jnswbsf9avckf6v12za029g6p4nnvmspx"; - name = "dolphin-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/dolphin-15.12.3.tar.xz"; + sha256 = "1pdxsf8n5kys7zwlhr71mwj4scwk8qglqml65cb3bijyysxlghr6"; + name = "dolphin-15.12.3.tar.xz"; }; }; dolphin-plugins = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/dolphin-plugins-15.12.1.tar.xz"; - sha256 = "0k438rhcscqin9735mjq8qrapc4ff4kimwp8bl6b77743b2bk59f"; - name = "dolphin-plugins-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/dolphin-plugins-15.12.3.tar.xz"; + sha256 = "179c1k6xd1f1mjrdgx23jfhgn3y72qqwmpnx8pyw83gc8rcjgrzz"; + name = "dolphin-plugins-15.12.3.tar.xz"; }; }; dragon = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/dragon-15.12.1.tar.xz"; - sha256 = "0kqd7m8vjpc4ywz3hpqa8cy3fdlznnhv291wrgvvgm7dv83wylq3"; - name = "dragon-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/dragon-15.12.3.tar.xz"; + sha256 = "0hkm0w85w5bc1pfmbaz64kxcplpm9459ggpv9gfabgg3ydy3k8l7"; + name = "dragon-15.12.3.tar.xz"; }; }; ffmpegthumbs = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ffmpegthumbs-15.12.1.tar.xz"; - sha256 = "1apcafjdjzhpqm72h2rvzxcy00fjdl8dah49ss7mj2ld0f36vl07"; - name = "ffmpegthumbs-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ffmpegthumbs-15.12.3.tar.xz"; + sha256 = "1wkxz3xhmfafq52ws9i8401s0nacdh896xfin86ypfqb6dk94119"; + name = "ffmpegthumbs-15.12.3.tar.xz"; }; }; filelight = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/filelight-15.12.1.tar.xz"; - sha256 = "0za42abixfhkxczcddy9n4b98ryf3wvq2gngnqwgrs0m4wv3y530"; - name = "filelight-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/filelight-15.12.3.tar.xz"; + sha256 = "1s31q8x2yywi2v8kql7zw5yz9r05v1509334kwlyyfz63zz54kgm"; + name = "filelight-15.12.3.tar.xz"; }; }; gpgmepp = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/gpgmepp-15.12.1.tar.xz"; - sha256 = "0ygmdmampd3yc0mkfbw7ihrdc6vmxb178kd5y3dxms4kiilxw6lv"; - name = "gpgmepp-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/gpgmepp-15.12.3.tar.xz"; + sha256 = "1vrr3i5d9nfyvn5v1hn6rxi3hkw4gi1bj7plnd4fhbl3s4nfhlsp"; + name = "gpgmepp-15.12.3.tar.xz"; }; }; granatier = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/granatier-15.12.1.tar.xz"; - sha256 = "09v0fwwkz7k8dx2rqc18qdrlmzkbmxna0ppxwq4cdhxixyppi0py"; - name = "granatier-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/granatier-15.12.3.tar.xz"; + sha256 = "1mjwgw4laxlkpy7zjd0jj7i2nq9mqpzzz048fw0swkndbh1ykrnc"; + name = "granatier-15.12.3.tar.xz"; }; }; gwenview = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/gwenview-15.12.1.tar.xz"; - sha256 = "1bqcq277h6421rwhqvy8b2dn95h0zqqiskw38xfzrablfmr4ba9h"; - name = "gwenview-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/gwenview-15.12.3.tar.xz"; + sha256 = "11wia3ljhwxfqbakiavi9b0h59fa2l5i1skgkbpnnglafj6j9dn9"; + name = "gwenview-15.12.3.tar.xz"; }; }; jovie = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/jovie-15.12.1.tar.xz"; - sha256 = "0z6lxvzv92z5hkbin6l7d75l6alnk94l3mhdkfa6p9mfimxvzixy"; - name = "jovie-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/jovie-15.12.3.tar.xz"; + sha256 = "07rmig3zfxhipf817gvphc68gm9zkliiwznw06z76zlpavcmmlgp"; + name = "jovie-15.12.3.tar.xz"; }; }; juk = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/juk-15.12.1.tar.xz"; - sha256 = "1k9js66kmbpc6wyxxgp3z2zx7zhyvdsawy8fra9j76zd2fjyja60"; - name = "juk-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/juk-15.12.3.tar.xz"; + sha256 = "1nbjv5vdxb3n5m213s7srfxh38y7bavvib9v4maabg84q84c4531"; + name = "juk-15.12.3.tar.xz"; }; }; kaccessible = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kaccessible-15.12.1.tar.xz"; - sha256 = "1vjla5wf63h88y738f0p8prqkmzdifl0l6akmjvkasjipy3bcdw6"; - name = "kaccessible-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kaccessible-15.12.3.tar.xz"; + sha256 = "0pg7jc7y6c8x246qyn0f9qdl38cg055bj4cfvnlp9bqkq69r4mw4"; + name = "kaccessible-15.12.3.tar.xz"; }; }; kaccounts-integration = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kaccounts-integration-15.12.1.tar.xz"; - sha256 = "1q7gjv4jr534q42am40x27kbk2sqs8im800xjw214y3dgw146g6d"; - name = "kaccounts-integration-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kaccounts-integration-15.12.3.tar.xz"; + sha256 = "0l3x3fgj7wvhlzx73qi0qb8yhk305yw71jrv8x4vvaagw0ffmkb9"; + name = "kaccounts-integration-15.12.3.tar.xz"; }; }; kaccounts-providers = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kaccounts-providers-15.12.1.tar.xz"; - sha256 = "1ir7cb3ma8j1jfnjk4m9xx5mj7yj769pblsjz1v6nh6s846ri1fh"; - name = "kaccounts-providers-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kaccounts-providers-15.12.3.tar.xz"; + sha256 = "0lmsv1296zgcrzlsidfwv4wlc6vdiaznbaw45xzfy6ki6yfldwc9"; + name = "kaccounts-providers-15.12.3.tar.xz"; }; }; kajongg = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kajongg-15.12.1.tar.xz"; - sha256 = "1dzw9dvh3an26i6w8zf319337x7d4iggfgz0v9c46kngh8b9lydx"; - name = "kajongg-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kajongg-15.12.3.tar.xz"; + sha256 = "13r7mgdmcv3ywn6ni7l1y9g021jrqga1lc9q4i4h4pi4ymc8vqn3"; + name = "kajongg-15.12.3.tar.xz"; }; }; kalarmcal = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kalarmcal-15.12.1.tar.xz"; - sha256 = "1kdbqy6hb19sip49nca05375rjwj2502mq1vmylrqfggbrh277wz"; - name = "kalarmcal-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kalarmcal-15.12.3.tar.xz"; + sha256 = "15cby2615r420zzfx7h2fpb0vsmnrbrr1l62arx2vswpb694d0hi"; + name = "kalarmcal-15.12.3.tar.xz"; }; }; kalgebra = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kalgebra-15.12.1.tar.xz"; - sha256 = "1f4kqjljw2rwzi82vzfbk7j9h4b9i127lnhklw47vyapllw2jjjc"; - name = "kalgebra-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kalgebra-15.12.3.tar.xz"; + sha256 = "0da88b30yi0f5h2alysmd1z94bzb9006zbh7939sx1v4fwg8nvha"; + name = "kalgebra-15.12.3.tar.xz"; }; }; kalzium = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kalzium-15.12.1.tar.xz"; - sha256 = "00fh91p4rrw7y6qdkg33dqf74c15q4j76b8xp1a6ydcvwjjcp4cv"; - name = "kalzium-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kalzium-15.12.3.tar.xz"; + sha256 = "0lrca50kczjynhn7c9b2sls6pjr7f86k69yq7b7krf3xk59a1hm1"; + name = "kalzium-15.12.3.tar.xz"; }; }; kamera = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kamera-15.12.1.tar.xz"; - sha256 = "01vd2zg2gyzbzcgdk6yd10vndn41wrf4cqg6vk65y0idk2gqjfbi"; - name = "kamera-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kamera-15.12.3.tar.xz"; + sha256 = "1azzvdj0gmafjkq7w19ns1mxjm240p0yx7cpq9dqhz0hhyl63666"; + name = "kamera-15.12.3.tar.xz"; }; }; kanagram = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kanagram-15.12.1.tar.xz"; - sha256 = "0pifl0qh33cm09m1fl8ma7p4nzd6bw2sisq3aj1x6r2yal48n5l7"; - name = "kanagram-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kanagram-15.12.3.tar.xz"; + sha256 = "1adhc1f4hdrgc780v1yadhjpb1dbydwh1xzvgwpd953df7pfxzzj"; + name = "kanagram-15.12.3.tar.xz"; }; }; kapman = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kapman-15.12.1.tar.xz"; - sha256 = "1fygp0v0s4dk6cb30samg63dbzdspx0fmd7shijhx4rdphq6jr5f"; - name = "kapman-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kapman-15.12.3.tar.xz"; + sha256 = "0iks3c18dqxds55fmf0fi93lbh14mfdhjh82xx4hc1fn9j8xhfw5"; + name = "kapman-15.12.3.tar.xz"; }; }; kapptemplate = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kapptemplate-15.12.1.tar.xz"; - sha256 = "045v0gb8gbhsnqk63zvwhmq7nncf6wd8zpbrp1s92sjkyjc7p8rn"; - name = "kapptemplate-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kapptemplate-15.12.3.tar.xz"; + sha256 = "1d1z6j5w80cjs8ls6c44sn0wwa1z4nly9gkk6qr47j8265a1rqnx"; + name = "kapptemplate-15.12.3.tar.xz"; }; }; kate = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kate-15.12.1.tar.xz"; - sha256 = "1nwg578z49pswj098awlqblxzj7a5isqg6j9fy28zdg29rzfwchx"; - name = "kate-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kate-15.12.3.tar.xz"; + sha256 = "1yxqs6j41cpx4zws5hfs7j01gqn47b6inddifbwglrp5w9j33wpv"; + name = "kate-15.12.3.tar.xz"; }; }; katomic = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/katomic-15.12.1.tar.xz"; - sha256 = "1xvqpazmak4xdzg0wlan5ysn0xnpjqfz8c0j5vhsbglhfw8a71d6"; - name = "katomic-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/katomic-15.12.3.tar.xz"; + sha256 = "0ydflzaxfxbk4yb26j4yziywr72dijva5g3xi9car3b0hckvqpf0"; + name = "katomic-15.12.3.tar.xz"; }; }; kblackbox = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kblackbox-15.12.1.tar.xz"; - sha256 = "1dgla3c0wd1vl3yx8civn60xv10kab7nkngmclp6kw4v6f4vqk7q"; - name = "kblackbox-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kblackbox-15.12.3.tar.xz"; + sha256 = "1yzw61b62plad78wchids243x4lb5bzla3zrlmi3lv5q3g7imz0f"; + name = "kblackbox-15.12.3.tar.xz"; }; }; kblocks = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kblocks-15.12.1.tar.xz"; - sha256 = "1zzdwg8bmf28r8yfjw4105j96xja30yq0aqg5cvpp0krmnr3254i"; - name = "kblocks-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kblocks-15.12.3.tar.xz"; + sha256 = "0hgmm4gyysn9k031im3xk7aiawavv4920y8xd44scxlcwxfid8cw"; + name = "kblocks-15.12.3.tar.xz"; }; }; kblog = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kblog-15.12.1.tar.xz"; - sha256 = "0yzi0q64szwgrda3x1w6vblfymgaqp3rq61z71fr327n8hngnpq8"; - name = "kblog-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kblog-15.12.3.tar.xz"; + sha256 = "01z3n0lzg9d6ygqn87yvi8wg6yyg5b8jhf96ywcmb5zzacamb2hq"; + name = "kblog-15.12.3.tar.xz"; }; }; kbounce = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kbounce-15.12.1.tar.xz"; - sha256 = "18z8q2ny5m3fik4q0zi0hkqy3w87qfhbpffp9nd6vrsi3wdj013p"; - name = "kbounce-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kbounce-15.12.3.tar.xz"; + sha256 = "1gbks7hyis7czvvvqb53qwfkbzmlwg85d51m5mg1m54qixq4blq9"; + name = "kbounce-15.12.3.tar.xz"; }; }; kbreakout = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kbreakout-15.12.1.tar.xz"; - sha256 = "02d964h3ay2sr5xk2g2kam80w9pi8ah98k6ld3vx5l5mjs5qffib"; - name = "kbreakout-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kbreakout-15.12.3.tar.xz"; + sha256 = "01d7i3ga4sdgvvyl4s77i9x15f80nbh3kcqmwmrj511icvynzkl8"; + name = "kbreakout-15.12.3.tar.xz"; }; }; kbruch = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kbruch-15.12.1.tar.xz"; - sha256 = "05s8ghmg562za2y7g9vqwdh4jbifz7kjd9fj45j9mjwb5rxdckpr"; - name = "kbruch-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kbruch-15.12.3.tar.xz"; + sha256 = "1y4dipifj3dz78y6h7852840msg80iwix427l6wxb8ybyzhapmz1"; + name = "kbruch-15.12.3.tar.xz"; }; }; kcachegrind = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kcachegrind-15.12.1.tar.xz"; - sha256 = "0v036sc9lmvc00gllyzzvlgbap3m7q2gx4m0c931iaw6sal473q0"; - name = "kcachegrind-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kcachegrind-15.12.3.tar.xz"; + sha256 = "0zprqhzqlhgvw3fyvqs4cdkmxgibw8l8i15ng6badnmdyi5dkz29"; + name = "kcachegrind-15.12.3.tar.xz"; }; }; kcalc = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kcalc-15.12.1.tar.xz"; - sha256 = "1dgpifj3w26d595gbv6m4r16729i92lkwl6p8hk0l5v5hxx82dkw"; - name = "kcalc-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kcalc-15.12.3.tar.xz"; + sha256 = "00138746j1j92dkc22c680wi9qqc891040d2b0i5fi1hp1a3z2r4"; + name = "kcalc-15.12.3.tar.xz"; }; }; kcalcore = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kcalcore-15.12.1.tar.xz"; - sha256 = "14w47ljak5v5nnbcgilsqc1hxf212vi8vycfxddflvmxzcy6b9c3"; - name = "kcalcore-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kcalcore-15.12.3.tar.xz"; + sha256 = "1zdkqxli6gr65947xgwsbyl84ar0px6flbky0zjy1i4h9jiysfan"; + name = "kcalcore-15.12.3.tar.xz"; }; }; kcalutils = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kcalutils-15.12.1.tar.xz"; - sha256 = "0p10vvbnn01qnaxgyinyil4dwqfbwgqk7ngkgblfbmfg9h8drwfp"; - name = "kcalutils-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kcalutils-15.12.3.tar.xz"; + sha256 = "0l65bc71i734j700akkr1ksjv5q09f7v2dfqcnciabqiphchr5cd"; + name = "kcalutils-15.12.3.tar.xz"; }; }; kcharselect = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kcharselect-15.12.1.tar.xz"; - sha256 = "1jagbaxs9nfih2wic0i9cgbmz76kwnrscrmcvd0w8jg4w5rnf59d"; - name = "kcharselect-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kcharselect-15.12.3.tar.xz"; + sha256 = "0ahk95k0vssk7kdsdddz1s1n3hzy4049s0dq4j5kiill3j5z47ba"; + name = "kcharselect-15.12.3.tar.xz"; }; }; kcolorchooser = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kcolorchooser-15.12.1.tar.xz"; - sha256 = "1djcknlp97zlwvrs9fswg4v188qs2acb7lzw8y9j2p982d0g1idc"; - name = "kcolorchooser-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kcolorchooser-15.12.3.tar.xz"; + sha256 = "0paki5clb420w8fhx9y9cyxrf86nz1bp5w6jgkyk5fqdw69d77wk"; + name = "kcolorchooser-15.12.3.tar.xz"; }; }; kcontacts = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kcontacts-15.12.1.tar.xz"; - sha256 = "0i6mx1ss19g86j55kj47qvrcvqwp6ax7wyg0ar436aa18digfa96"; - name = "kcontacts-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kcontacts-15.12.3.tar.xz"; + sha256 = "0xavlrf2zxvizv1w620w2wp46qx1267df7qilmws50qmyzdzd8pz"; + name = "kcontacts-15.12.3.tar.xz"; }; }; kcron = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kcron-15.12.1.tar.xz"; - sha256 = "04w3017y3955fj3z76ng28fksyzjbqlw09g6g6b9l8nyi5y1zgm0"; - name = "kcron-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kcron-15.12.3.tar.xz"; + sha256 = "1dwcqng0128n2d9lk059b94vzyn98xm0yx34wp5qibqg8c7a2z0z"; + name = "kcron-15.12.3.tar.xz"; }; }; kde-baseapps = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-baseapps-15.12.1.tar.xz"; - sha256 = "0n0g7jjb2kf8h9nr9sc0l5ia796nc2nzlfxnibyvvlp68sj4ffwd"; - name = "kde-baseapps-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-baseapps-15.12.3.tar.xz"; + sha256 = "1rqdbv5lhy7k8i4csp1lqvril7df12lz9vvjqnq7ccbbn67yjcfk"; + name = "kde-baseapps-15.12.3.tar.xz"; }; }; kdebugsettings = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdebugsettings-15.12.1.tar.xz"; - sha256 = "1b7w5rnbxg0m4xlrlisd1ipv4w0xl5125m5vxvrqdrcsl647xbk0"; - name = "kdebugsettings-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdebugsettings-15.12.3.tar.xz"; + sha256 = "1ik2j2i9k3rcfznwia9fxbivsva2ngb31wzrdciircl6i55k4sdd"; + name = "kdebugsettings-15.12.3.tar.xz"; }; }; kde-dev-scripts = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-dev-scripts-15.12.1.tar.xz"; - sha256 = "1d2d1r11xnk3wbxgmnkm8k6azbjxz8gm0mpp37lrx5aq181i8598"; - name = "kde-dev-scripts-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-dev-scripts-15.12.3.tar.xz"; + sha256 = "0cvcd2yv0xkk0q6zhpyqv0bjnpy6s09aw3kjjyyq5ddai5m5hp4q"; + name = "kde-dev-scripts-15.12.3.tar.xz"; }; }; kde-dev-utils = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-dev-utils-15.12.1.tar.xz"; - sha256 = "1igpf4qa502nsz7rxqmv3phrlj58fgjdbamlrz9fz4czlcd4j8fb"; - name = "kde-dev-utils-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-dev-utils-15.12.3.tar.xz"; + sha256 = "1k0d7z7rm6dgzy56dggxjwzzhz9ar2wfmvjs257l6lbjxxxry2gc"; + name = "kde-dev-utils-15.12.3.tar.xz"; }; }; kdeedu-data = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdeedu-data-15.12.1.tar.xz"; - sha256 = "0avpy6w5n554hxi2qhsfi8n9m1x9wf3faklqzfj650j1574n17yj"; - name = "kdeedu-data-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdeedu-data-15.12.3.tar.xz"; + sha256 = "18jssqnkjxxz98rmzd4gv0ix1zbb60qv22k150lqp32kckmgkn0y"; + name = "kdeedu-data-15.12.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdegraphics-mobipocket-15.12.1.tar.xz"; - sha256 = "0ya6cli7c0yh7myh00b818qydlm481cnszc39b3557iq43qrxd89"; - name = "kdegraphics-mobipocket-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdegraphics-mobipocket-15.12.3.tar.xz"; + sha256 = "05fhnh2qs1mgz1hfdvqb5dfd4h2vsz00hb2vl902qprnsjlpc6fb"; + name = "kdegraphics-mobipocket-15.12.3.tar.xz"; }; }; kdegraphics-strigi-analyzer = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdegraphics-strigi-analyzer-15.12.1.tar.xz"; - sha256 = "1i0sqdyl2fcg7v0q9c7pvk5v4klzsfphv82knapmkpvlddj7mwyz"; - name = "kdegraphics-strigi-analyzer-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdegraphics-strigi-analyzer-15.12.3.tar.xz"; + sha256 = "1bfxmv9pxxd5w2ppm673sdg459w04493p7lp8rwd3n7aa5dhw5fp"; + name = "kdegraphics-strigi-analyzer-15.12.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdegraphics-thumbnailers-15.12.1.tar.xz"; - sha256 = "03fvrlk6dgj6s6dr3vvhxn9877ay3798kf156hjn9pqx4iypqhz3"; - name = "kdegraphics-thumbnailers-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdegraphics-thumbnailers-15.12.3.tar.xz"; + sha256 = "1limkjpdd8n8hcj3ysr3zwa0fyydfjb1m5rl9lwb9mb08bl5qg70"; + name = "kdegraphics-thumbnailers-15.12.3.tar.xz"; }; }; kde-l10n-ar = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ar-15.12.1.tar.xz"; - sha256 = "1p417hkkikggy01awyazd1njyq2bs6y1jvspd7ijr3y4w1jia78q"; - name = "kde-l10n-ar-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ar-15.12.3.tar.xz"; + sha256 = "1s1xi98zk277rkfiip568712yammb30ld828rspxrl51ysqaj6gs"; + name = "kde-l10n-ar-15.12.3.tar.xz"; }; }; kde-l10n-bg = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-bg-15.12.1.tar.xz"; - sha256 = "1l2s8h2rpyp71xs8jkww6s5zi58xxizf38k5xh4jrvx9vias4cl8"; - name = "kde-l10n-bg-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-bg-15.12.3.tar.xz"; + sha256 = "19yz3x4f2mkqfpa37gzgkqmmka1xs5fnr54w7w0lz7scmi3pfqyp"; + name = "kde-l10n-bg-15.12.3.tar.xz"; }; }; kde-l10n-bs = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-bs-15.12.1.tar.xz"; - sha256 = "10a5680bl5w30ynndf019627l235bx2v5bi5yyx27l7ki3infs86"; - name = "kde-l10n-bs-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-bs-15.12.3.tar.xz"; + sha256 = "1k8kawr0psvlg6cgryqwwjb59g209bz08n8h7jg5h6vkb784v3bb"; + name = "kde-l10n-bs-15.12.3.tar.xz"; }; }; kde-l10n-ca = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ca-15.12.1.tar.xz"; - sha256 = "1841vmsf1iya41zwkcpgmcs2agc825l8mjbpmvpa5d5xyh9nsyp3"; - name = "kde-l10n-ca-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ca-15.12.3.tar.xz"; + sha256 = "0hf6cml2hw5mj5iwa5cbp56a6ns3qzy21c0c167p6yp2i6kshzcb"; + name = "kde-l10n-ca-15.12.3.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-15.12.1"; + version = "ca_valencia-15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ca@valencia-15.12.1.tar.xz"; - sha256 = "0yz30y1khvsng166wkq49kr17vv8y67n3cns5y6zrnq6wb7zplri"; - name = "kde-l10n-ca_valencia-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ca@valencia-15.12.3.tar.xz"; + sha256 = "0ibamck48cklkx6pjvcyw9bjfwnzib82822pagwrzgrr3g51djgf"; + name = "kde-l10n-ca_valencia-15.12.3.tar.xz"; }; }; kde-l10n-cs = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-cs-15.12.1.tar.xz"; - sha256 = "1vvi8mlj3sxwvpbz5fp2yhkzm1933nfmmhhfklpj264dynw6jxzm"; - name = "kde-l10n-cs-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-cs-15.12.3.tar.xz"; + sha256 = "1vp1aisfp0qw94w1kn66sxa79askj8yqn70adhf6q37rc8x3hz6z"; + name = "kde-l10n-cs-15.12.3.tar.xz"; }; }; kde-l10n-da = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-da-15.12.1.tar.xz"; - sha256 = "00vy9if529za7iybb8i7xxdazd8f4y9kiy1yjpgky39yhsjp65bw"; - name = "kde-l10n-da-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-da-15.12.3.tar.xz"; + sha256 = "0z7p992xinf0hw646mp5bgi93890kivs8kn407m1m4m0334m687c"; + name = "kde-l10n-da-15.12.3.tar.xz"; }; }; kde-l10n-de = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-de-15.12.1.tar.xz"; - sha256 = "0s9ibm1sjw1xa4gx36g0midy2wvc8baixaq7ldv23a56gr9ls37a"; - name = "kde-l10n-de-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-de-15.12.3.tar.xz"; + sha256 = "0f2z6qpv6qzajmh91skqbx6vn14ih74r3yzavj9xwzw940apiw34"; + name = "kde-l10n-de-15.12.3.tar.xz"; }; }; kde-l10n-el = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-el-15.12.1.tar.xz"; - sha256 = "16xfri6pv01vvxh47h0an2gy9hd38l0lvnmvq33kf60424p20iy9"; - name = "kde-l10n-el-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-el-15.12.3.tar.xz"; + sha256 = "0pdx8zlv2vv33iq2581yl67c3ly37s7hhg3m9lnnlm3wnybj658r"; + name = "kde-l10n-el-15.12.3.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-15.12.1"; + version = "en_GB-15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-en_GB-15.12.1.tar.xz"; - sha256 = "170hd2g8a7dafsjr35lkpc9wwiwj0gsg0bmrir3dmqjw78fkfrjw"; - name = "kde-l10n-en_GB-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-en_GB-15.12.3.tar.xz"; + sha256 = "041hwzh05ryqkzll6klva9cq7n0mcyqi8b7pgx0argkc68mn123y"; + name = "kde-l10n-en_GB-15.12.3.tar.xz"; }; }; kde-l10n-eo = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-eo-15.12.1.tar.xz"; - sha256 = "0jrhrr4rxz9qfapx2gvw8i7q17fc4zzp45q1scz0h7cvnmw087ac"; - name = "kde-l10n-eo-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-eo-15.12.3.tar.xz"; + sha256 = "1nrrk5a9m15xyj97shpxwnw4vjnafmwh25mq8906z150mr8fy4na"; + name = "kde-l10n-eo-15.12.3.tar.xz"; }; }; kde-l10n-es = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-es-15.12.1.tar.xz"; - sha256 = "1f54wg365mqbcgf93rs6lay78ac9zijff0kszylzjm1k2a2vl5wj"; - name = "kde-l10n-es-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-es-15.12.3.tar.xz"; + sha256 = "0bhws59jd9vbfdy7kv8d7gpsg5a39z4jkypd3pyqk98v0ahxlj5p"; + name = "kde-l10n-es-15.12.3.tar.xz"; }; }; kde-l10n-et = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-et-15.12.1.tar.xz"; - sha256 = "0arrgznymzv4vfc97g40b51z3szbg7y4k1nncl01w0758szrp6c0"; - name = "kde-l10n-et-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-et-15.12.3.tar.xz"; + sha256 = "0lafw4b9qdfy091w5dvhp9idn29p7in05p8jlvpa39v2cxmp271q"; + name = "kde-l10n-et-15.12.3.tar.xz"; }; }; kde-l10n-eu = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-eu-15.12.1.tar.xz"; - sha256 = "15dpm0isgh8645qwqw5mza295hb8ls6lp2pnil1iy2lpcmsr53cr"; - name = "kde-l10n-eu-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-eu-15.12.3.tar.xz"; + sha256 = "0p7lrd3k3mjxnhk4mr1p6znjp8j14xr93lg83s3v90w4vd34frsz"; + name = "kde-l10n-eu-15.12.3.tar.xz"; }; }; kde-l10n-fa = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-fa-15.12.1.tar.xz"; - sha256 = "1867bxi0bvy5dgig41z4gwghnkjgy43h4i5w65al8djf0haqyr52"; - name = "kde-l10n-fa-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fa-15.12.3.tar.xz"; + sha256 = "0gzx0bz9gv4kwd89ryny9qf4d7fjvicai54ryk3z3qibs3sy3g66"; + name = "kde-l10n-fa-15.12.3.tar.xz"; }; }; kde-l10n-fi = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-fi-15.12.1.tar.xz"; - sha256 = "1028psgc58wk5lp245jk905w54m654pmwkfj24g06jxas65pglrd"; - name = "kde-l10n-fi-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fi-15.12.3.tar.xz"; + sha256 = "1nh79mkcn5la6wnbpclcbcg6gia6srcv87462wax4sbhmz7b3gh8"; + name = "kde-l10n-fi-15.12.3.tar.xz"; }; }; kde-l10n-fr = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-fr-15.12.1.tar.xz"; - sha256 = "0hi3dzd07ns8hrm7rv6hxx1b6idwmgvr3jgdmzs2883gkjivv6g8"; - name = "kde-l10n-fr-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fr-15.12.3.tar.xz"; + sha256 = "1gwwc596p6mqjbjlhcz57hkc30slb5r3qgmnm5x68jlp4glhyyfm"; + name = "kde-l10n-fr-15.12.3.tar.xz"; }; }; kde-l10n-ga = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ga-15.12.1.tar.xz"; - sha256 = "1gq7j053c3lv30pmf0q2xlsazyl21jgpcr0kfmza6yrg5cxaivjb"; - name = "kde-l10n-ga-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ga-15.12.3.tar.xz"; + sha256 = "134r2i4f6j2db24rlc2y50da98spjwv5crd3yw27k4m2whw28g1q"; + name = "kde-l10n-ga-15.12.3.tar.xz"; }; }; kde-l10n-gl = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-gl-15.12.1.tar.xz"; - sha256 = "1pmizbmfqi95lcwbka5h87f015p3ml1vf59npkchfq6v7iv45zxf"; - name = "kde-l10n-gl-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-gl-15.12.3.tar.xz"; + sha256 = "1bpki1gk1gc5rqrrwkhil44mxmh76v5fygwvvlglk7rwyxkm0bfn"; + name = "kde-l10n-gl-15.12.3.tar.xz"; }; }; kde-l10n-he = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-he-15.12.1.tar.xz"; - sha256 = "1kyf48hpj42hzc75r1s1js730n0gw94ldcrap3ypd1vjzg67f6wn"; - name = "kde-l10n-he-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-he-15.12.3.tar.xz"; + sha256 = "12da700i3dbim64f5ybgfp5s8rky8s9828qklsnvrw6gj9i1qdh8"; + name = "kde-l10n-he-15.12.3.tar.xz"; }; }; kde-l10n-hi = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-hi-15.12.1.tar.xz"; - sha256 = "0rarsx7y0plr1l0vh5nx4dm9xdq69wr3szcdcvlxx1xdx0f2xyxk"; - name = "kde-l10n-hi-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hi-15.12.3.tar.xz"; + sha256 = "0r5z5652j52j16gdb08z1wnfa8vr871f7msip2xikmfm3kcgiwki"; + name = "kde-l10n-hi-15.12.3.tar.xz"; }; }; kde-l10n-hr = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-hr-15.12.1.tar.xz"; - sha256 = "15gxrrla5gwvwsx5ncf97naj9p09x3g03jbxkpzjf2vn4xgkq7wf"; - name = "kde-l10n-hr-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hr-15.12.3.tar.xz"; + sha256 = "1mz95pqd3pslg1f5cl1n8s35j19wijhhqpa64m6ahjm82p3dfqiz"; + name = "kde-l10n-hr-15.12.3.tar.xz"; }; }; kde-l10n-hu = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-hu-15.12.1.tar.xz"; - sha256 = "15cw97fjcbqn6n6h03mldf40vjsmzzjwgb63z0qlcg5s87yl8lik"; - name = "kde-l10n-hu-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hu-15.12.3.tar.xz"; + sha256 = "0gz3lvzpf58j0jdzmjg16nkz3078gjzlfwbanx5w6f4dfqp9ha4q"; + name = "kde-l10n-hu-15.12.3.tar.xz"; }; }; kde-l10n-ia = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ia-15.12.1.tar.xz"; - sha256 = "1ab7pivq4xbzvjwq18rnw1c7lyaz0yyhfqkkw0w31qdvh8zx91xg"; - name = "kde-l10n-ia-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ia-15.12.3.tar.xz"; + sha256 = "0flv662j20sqfd0cgy2p6wr2fk41sq47sxf2gkbmhr7n7n6an1fr"; + name = "kde-l10n-ia-15.12.3.tar.xz"; }; }; kde-l10n-id = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-id-15.12.1.tar.xz"; - sha256 = "1w7s7m7p4mia0q9x32rcmdszsz0x7zw210pssw1zk3vh9dc29f1j"; - name = "kde-l10n-id-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-id-15.12.3.tar.xz"; + sha256 = "07r4y1hnqz3xb649gvp818alwzyci8657fi4f3lpj8z54dngddx0"; + name = "kde-l10n-id-15.12.3.tar.xz"; }; }; kde-l10n-is = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-is-15.12.1.tar.xz"; - sha256 = "0w1b8fsw3q6ry63bs27s7rbv9q5cps3kd5rd4bhkja0v950p2lfg"; - name = "kde-l10n-is-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-is-15.12.3.tar.xz"; + sha256 = "14xs3n9468l4qgw5bpm57k4xmh37ixjr3sq370fbfmbrifrydrsb"; + name = "kde-l10n-is-15.12.3.tar.xz"; }; }; kde-l10n-it = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-it-15.12.1.tar.xz"; - sha256 = "03cal5i75540q6vk8ln32lfg93s1hy02qnnajggm96ncpmlw1fp4"; - name = "kde-l10n-it-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-it-15.12.3.tar.xz"; + sha256 = "0arvj4ms0qc283i1xqdmh6x8qjgjfsld57y341xk55b1birq87dp"; + name = "kde-l10n-it-15.12.3.tar.xz"; }; }; kde-l10n-ja = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ja-15.12.1.tar.xz"; - sha256 = "1d8p2pvz5h9mr0agbazggjd363h4ggmxs35lfkc41sw2ka8wc7zk"; - name = "kde-l10n-ja-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ja-15.12.3.tar.xz"; + sha256 = "1fby4r9aam0f31xlp00lmnhi156wfb3rbvwffvhm9qwam3gnypv2"; + name = "kde-l10n-ja-15.12.3.tar.xz"; }; }; kde-l10n-kk = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-kk-15.12.1.tar.xz"; - sha256 = "06pr04sq9szkgvgrj0saiwc5axqv09sz48alz97qvhprfi63k7gm"; - name = "kde-l10n-kk-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-kk-15.12.3.tar.xz"; + sha256 = "04yf8m84ywf6bzq3dfxxxcgz2syy4i72q5xjq3sba76p1w9wz8hf"; + name = "kde-l10n-kk-15.12.3.tar.xz"; }; }; kde-l10n-km = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-km-15.12.1.tar.xz"; - sha256 = "1j0jf01j12y1jsyx8n47nz5wjwk545z6wn3hp8shkf3gfrda6x8h"; - name = "kde-l10n-km-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-km-15.12.3.tar.xz"; + sha256 = "0q70agf08ln5xfg4hc0rw39qiq4mn0jq418d8f53qkdjvrj07hs2"; + name = "kde-l10n-km-15.12.3.tar.xz"; }; }; kde-l10n-ko = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ko-15.12.1.tar.xz"; - sha256 = "08hknapyy10205h71zapj3n5k46gqjjfd7acpqz85ff92l0iryxd"; - name = "kde-l10n-ko-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ko-15.12.3.tar.xz"; + sha256 = "0545nv721g2xlljv1jbq42j9b6g2l19yclv0lmy07dp0fx0ms2kc"; + name = "kde-l10n-ko-15.12.3.tar.xz"; }; }; kde-l10n-lt = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-lt-15.12.1.tar.xz"; - sha256 = "0l844nsr0najfhfbqzwhi4pvagir9fvq2gx2p1xkfk06m1ki1krw"; - name = "kde-l10n-lt-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-lt-15.12.3.tar.xz"; + sha256 = "0sc9g2iya3k4pzwmlcjlyvf25dag9z2ckbk2gz0fzzrwgvn61875"; + name = "kde-l10n-lt-15.12.3.tar.xz"; }; }; kde-l10n-lv = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-lv-15.12.1.tar.xz"; - sha256 = "09pnn4m70655pn9ycqpmxlich8pih5j0kgqa64r3ip2gsw4gx5js"; - name = "kde-l10n-lv-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-lv-15.12.3.tar.xz"; + sha256 = "0mllwxbcvfgvmxcv23azchkvirlamgh16hzi5575qd8mprxxayjx"; + name = "kde-l10n-lv-15.12.3.tar.xz"; }; }; kde-l10n-mr = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-mr-15.12.1.tar.xz"; - sha256 = "1nqvacfyar88zgq1h836r6amm56qk8whr4xh7q571969qmcbz8mc"; - name = "kde-l10n-mr-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-mr-15.12.3.tar.xz"; + sha256 = "1sg9s1d6yg6pjjqp986lixg5w8g3y9a0hi15iyv6iww2iwab821w"; + name = "kde-l10n-mr-15.12.3.tar.xz"; }; }; kde-l10n-nb = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-nb-15.12.1.tar.xz"; - sha256 = "0h9w9ya8ridprsav2ypn1rl92gdkx7cdnzjhjfyb028c6mrzx2xl"; - name = "kde-l10n-nb-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nb-15.12.3.tar.xz"; + sha256 = "0841zkw34afiq7kpl65mjxl66fvb7pbc2m5c7cbbpykb92hqy4gw"; + name = "kde-l10n-nb-15.12.3.tar.xz"; }; }; kde-l10n-nds = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-nds-15.12.1.tar.xz"; - sha256 = "0xj644sdicdqg4f5qvvmb3gzdw46rcma1bz2wr19prismswm61q4"; - name = "kde-l10n-nds-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nds-15.12.3.tar.xz"; + sha256 = "1y0svbp1fgr6azfqpicvfxz1bbfkkn27l91rl8mhpaqz79zmdsjz"; + name = "kde-l10n-nds-15.12.3.tar.xz"; }; }; kde-l10n-nl = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-nl-15.12.1.tar.xz"; - sha256 = "00wimacv53ggjrccm33mm406yd501c57pkvzdvzzx6ljdq0gz3j1"; - name = "kde-l10n-nl-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nl-15.12.3.tar.xz"; + sha256 = "0l2l0hypza8hrrz86pahvkn4qdwg1bzdsv4mk0w3f8anlfv5nlhy"; + name = "kde-l10n-nl-15.12.3.tar.xz"; }; }; kde-l10n-nn = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-nn-15.12.1.tar.xz"; - sha256 = "13cb7inz00i0cj9da3zhlbh6mb3rrya4c79ydy2gvwj5p54bdbxy"; - name = "kde-l10n-nn-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nn-15.12.3.tar.xz"; + sha256 = "1ryqkbjrc9fam4wlpfx3af5mppajcpf4qj6ghh16y2vjpxmy6226"; + name = "kde-l10n-nn-15.12.3.tar.xz"; }; }; kde-l10n-pa = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-pa-15.12.1.tar.xz"; - sha256 = "1f58fnmlzgsyfmn9f2lfsla1v0ynpmg4d5x6kk8b92a6ad2an9dc"; - name = "kde-l10n-pa-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pa-15.12.3.tar.xz"; + sha256 = "0dq0sv7yh8xkk5g005q8mh6c5drzp2alday28lz2i4a2wi6m1pbn"; + name = "kde-l10n-pa-15.12.3.tar.xz"; }; }; kde-l10n-pl = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-pl-15.12.1.tar.xz"; - sha256 = "0wfl6sgdbzwbg00c8rqj9i2avi46vdppdjk48w222j9cibf1ifwp"; - name = "kde-l10n-pl-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pl-15.12.3.tar.xz"; + sha256 = "186lb0ydgcgwmpjasdjnj1i6cn43m1l26lvh7c97kqmh0k7ixwbl"; + name = "kde-l10n-pl-15.12.3.tar.xz"; }; }; kde-l10n-pt = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-pt-15.12.1.tar.xz"; - sha256 = "0ljxz362ahz1r8hvvh8zliiki3jmsqzx656jn5f6g3c4xjxmmhd9"; - name = "kde-l10n-pt-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pt-15.12.3.tar.xz"; + sha256 = "1s71gn3xb98y5s6ly9qfjh51afk8w8ml3xqiri3vi1c7li3v6kas"; + name = "kde-l10n-pt-15.12.3.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-15.12.1"; + version = "pt_BR-15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-pt_BR-15.12.1.tar.xz"; - sha256 = "072jn9r4sfi62mb5yh6ayisana18da0xrvdf9r2c03rhl1hlqiiq"; - name = "kde-l10n-pt_BR-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pt_BR-15.12.3.tar.xz"; + sha256 = "1iq83ycsilracwa1cml7dliy6vsf7frk4k0rzawnprygnf89iavr"; + name = "kde-l10n-pt_BR-15.12.3.tar.xz"; }; }; kde-l10n-ro = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ro-15.12.1.tar.xz"; - sha256 = "0pp328zj5v50paf7xgajh2l4mk75hg3am6xyiw7p94fx3m6lnw9g"; - name = "kde-l10n-ro-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ro-15.12.3.tar.xz"; + sha256 = "1i4kmxjc9mr8ybg4gnbhdanp7s5illknaxh0av8v45an7j051vjd"; + name = "kde-l10n-ro-15.12.3.tar.xz"; }; }; kde-l10n-ru = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ru-15.12.1.tar.xz"; - sha256 = "1sg38y0778ld1cjvvm2zfn8gmav195dak52596lpzklh6ahnp9dc"; - name = "kde-l10n-ru-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ru-15.12.3.tar.xz"; + sha256 = "1xbd5nvyf6ckdry0c5d52s3qrnqbnmndbnbxz7ayqllz6b61vmp0"; + name = "kde-l10n-ru-15.12.3.tar.xz"; }; }; kde-l10n-sk = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-sk-15.12.1.tar.xz"; - sha256 = "16nxrz95x558n5kqvs8q0rdy8lqas0w7zlgr910v92497hsmxmsg"; - name = "kde-l10n-sk-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sk-15.12.3.tar.xz"; + sha256 = "03i2ngldf35ix4pgyv6pjjzfg4i330dmyml9rd9v6cspm0vpq7r2"; + name = "kde-l10n-sk-15.12.3.tar.xz"; }; }; kde-l10n-sl = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-sl-15.12.1.tar.xz"; - sha256 = "128jp5pis4np8734dn8j77xf2h8a8hq041gnjdlfd0yvq61pn9dk"; - name = "kde-l10n-sl-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sl-15.12.3.tar.xz"; + sha256 = "08cp9dzvii5afjck3wx05q7mjwsd10g1yg2bsxw4qldjzad31xhq"; + name = "kde-l10n-sl-15.12.3.tar.xz"; }; }; kde-l10n-sr = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-sr-15.12.1.tar.xz"; - sha256 = "0cmchn7niddx48lvjflzvqv0xlbp1fxwr492ldb8vs0l71ifsl6v"; - name = "kde-l10n-sr-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sr-15.12.3.tar.xz"; + sha256 = "0j8gfj1qx10yllj5vq85h4pw2l8hq1kimgm315v4wwyr4jyf4vi7"; + name = "kde-l10n-sr-15.12.3.tar.xz"; }; }; kde-l10n-sv = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-sv-15.12.1.tar.xz"; - sha256 = "02sh0z394bd03m0as4n6qdk9mm8yy8z80b2xk9d42f27v6snqr29"; - name = "kde-l10n-sv-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sv-15.12.3.tar.xz"; + sha256 = "0ijyxzm7akcpkf5vwppay063vkbn6rz8irc4yi9flc5mm1rpmb64"; + name = "kde-l10n-sv-15.12.3.tar.xz"; }; }; kde-l10n-tr = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-tr-15.12.1.tar.xz"; - sha256 = "18rlg2xdif54npfi2dhw2my494pbg089r3wvl6msc17nf0c72w10"; - name = "kde-l10n-tr-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-tr-15.12.3.tar.xz"; + sha256 = "1yyz8zf10jn8v5vz2h08m88l12gz95hsdvld4h8imbqc4b8ih9xh"; + name = "kde-l10n-tr-15.12.3.tar.xz"; }; }; kde-l10n-ug = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ug-15.12.1.tar.xz"; - sha256 = "1dkv3vqa66fvyksqxjdvrm6jmks07dp34934ccx9dm2kqq0nciz9"; - name = "kde-l10n-ug-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ug-15.12.3.tar.xz"; + sha256 = "0db4pf7j6m376irsby31qz42z4d0m45i1zhqmn5mplrq8hi3sy5n"; + name = "kde-l10n-ug-15.12.3.tar.xz"; }; }; kde-l10n-uk = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-uk-15.12.1.tar.xz"; - sha256 = "15vl45g85f9xncn2dxz527kxig151iddf1pbh57hngdhdirz98cd"; - name = "kde-l10n-uk-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-uk-15.12.3.tar.xz"; + sha256 = "0xsn75g7dw8p0gxfmk2xkr6cix5wvglj2hhbbcqdzixm0bnshiwj"; + name = "kde-l10n-uk-15.12.3.tar.xz"; }; }; kde-l10n-wa = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-wa-15.12.1.tar.xz"; - sha256 = "192rb9hrfw9b525czwc33x2djjg9klm5icdx4l7jp0qsrwzdgr0g"; - name = "kde-l10n-wa-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-wa-15.12.3.tar.xz"; + sha256 = "1zx5k0hnh17015c1jcf3hgbi3abnsrdr5zl9m06lvsccl32rcgla"; + name = "kde-l10n-wa-15.12.3.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-15.12.1"; + version = "zh_CN-15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-zh_CN-15.12.1.tar.xz"; - sha256 = "055prxx6dspsyp3j51a8chmg6fdzl0ncjkhhyr21hlfiwv91fac0"; - name = "kde-l10n-zh_CN-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-zh_CN-15.12.3.tar.xz"; + sha256 = "0lfm6q4xk5c5rywivhg6dbs5dczddixz4jjfdz5gb2xmnv5ns9z7"; + name = "kde-l10n-zh_CN-15.12.3.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-15.12.1"; + version = "zh_TW-15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-zh_TW-15.12.1.tar.xz"; - sha256 = "14kargm5s1vb6ylf7nrnv1s3pbjaplmbi8kr4qrggcyinda4wp74"; - name = "kde-l10n-zh_TW-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-zh_TW-15.12.3.tar.xz"; + sha256 = "1s0gp678sq6zxk9gkzhmkx1c0nxzx0n08pszv737a76lnnzg0fb0"; + name = "kde-l10n-zh_TW-15.12.3.tar.xz"; }; }; kdelibs = { - version = "4.14.16"; + version = "4.14.18"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdelibs-4.14.16.tar.xz"; - sha256 = "1amkwrwjm2v0jd1rl1n0pfi8ahvzaszj03093bmxqllrqhqbkxkv"; - name = "kdelibs-4.14.16.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdelibs-4.14.18.tar.xz"; + sha256 = "0qyfsci3z4vm79c5xkdk45qlh63as1iyfdgk3iny6q9c5wwqd3kp"; + name = "kdelibs-4.14.18.tar.xz"; }; }; kdenetwork-filesharing = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdenetwork-filesharing-15.12.1.tar.xz"; - sha256 = "15fj3kk76gg6vk43yiz508cks1l9yazlhmqf7s4q0b9xwmvdahsj"; - name = "kdenetwork-filesharing-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdenetwork-filesharing-15.12.3.tar.xz"; + sha256 = "0psln12gnyf7pp6r01p7bi5lygqpg5frfkc8hh1wn982i1vbkn8s"; + name = "kdenetwork-filesharing-15.12.3.tar.xz"; }; }; kdenetwork-strigi-analyzers = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdenetwork-strigi-analyzers-15.12.1.tar.xz"; - sha256 = "1nwckiggwrmvsdhyfmhqv1w79zcvzh4s2jyivyprvk418c1qy69b"; - name = "kdenetwork-strigi-analyzers-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdenetwork-strigi-analyzers-15.12.3.tar.xz"; + sha256 = "0yisyhic3nmbj7a0csjafhl3mjcg3hqa8pwfrkwwm848b67n9qls"; + name = "kdenetwork-strigi-analyzers-15.12.3.tar.xz"; }; }; kdenlive = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdenlive-15.12.1.tar.xz"; - sha256 = "1j7mpjwis9n99dsyax7swqmx45g9mw46lcn063m0rsdzsh905yrk"; - name = "kdenlive-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdenlive-15.12.3.tar.xz"; + sha256 = "0svw8dms0qha4mbnyldm0cwvy52ikly3x26b9q8psayjd0pbbb5p"; + name = "kdenlive-15.12.3.tar.xz"; }; }; kdepim = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdepim-15.12.1.tar.xz"; - sha256 = "0r1l3za5jbdvr4x6hv0d94d8lwa1a5qcg3q83wn1jrb6mlfc1f03"; - name = "kdepim-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdepim-15.12.3.tar.xz"; + sha256 = "0niy2wfrarnrphwwi6jp2g0xj5dbvvcmdjgprdrw3zn7ni7kxa9q"; + name = "kdepim-15.12.3.tar.xz"; }; }; kdepimlibs = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdepimlibs-15.12.1.tar.xz"; - sha256 = "1f5j4alzmpm4scvn6k4mg9ykdsi0b6r28h2bisq39apn0k6fzadl"; - name = "kdepimlibs-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdepimlibs-15.12.3.tar.xz"; + sha256 = "17dn4yals62657dnx5adm9622z5bmwzl2nqgidcvflamvnvjj2b1"; + name = "kdepimlibs-15.12.3.tar.xz"; }; }; kdepim-runtime = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdepim-runtime-15.12.1.tar.xz"; - sha256 = "0l6la5jds6byg9ibphlbf8yywgfjyin4w02ik16h3mm01rl5d1mn"; - name = "kdepim-runtime-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdepim-runtime-15.12.3.tar.xz"; + sha256 = "1ljsn2b5ylzsr8mm48l4k84bgc9d6h9ilv46zgiciisgqs0xd4y3"; + name = "kdepim-runtime-15.12.3.tar.xz"; }; }; kde-runtime = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kde-runtime-15.12.1.tar.xz"; - sha256 = "19arkcj95dysxhanbh0armwimxph3s7ljhvgbzdi7r4glm9aq0kn"; - name = "kde-runtime-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kde-runtime-15.12.3.tar.xz"; + sha256 = "097h9kjqikr4qxj6swkh2r90havaw6zxs12kkic0qkmvbxxa6qdj"; + name = "kde-runtime-15.12.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdesdk-kioslaves-15.12.1.tar.xz"; - sha256 = "198i8cfz194smlhj8rafmkjbgzk1wmiw1gki4mb9vvk1gddgxc65"; - name = "kdesdk-kioslaves-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdesdk-kioslaves-15.12.3.tar.xz"; + sha256 = "0605aldqng33cd44qap2bargsf99jlrclsw84pv2hh4m33qlxkhi"; + name = "kdesdk-kioslaves-15.12.3.tar.xz"; }; }; kdesdk-strigi-analyzers = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdesdk-strigi-analyzers-15.12.1.tar.xz"; - sha256 = "0lcn0b58574kwsg7j5qyf46vjkbvsl7w8y9wi983rd06dhfgql5l"; - name = "kdesdk-strigi-analyzers-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdesdk-strigi-analyzers-15.12.3.tar.xz"; + sha256 = "0jc2dvnpmr6hw58nfmnw7lmys74zgl0m5vbmp27vkain95wab17c"; + name = "kdesdk-strigi-analyzers-15.12.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdesdk-thumbnailers-15.12.1.tar.xz"; - sha256 = "18fbgwb8bil90arbylw4605xk240g21saaw39zlx203q8bmnm7cm"; - name = "kdesdk-thumbnailers-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdesdk-thumbnailers-15.12.3.tar.xz"; + sha256 = "0k67zx5c2qsrk3nnnrs5ir0z8c42lp4ig9l82brv35iw3frgfyr9"; + name = "kdesdk-thumbnailers-15.12.3.tar.xz"; }; }; kdewebdev = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdewebdev-15.12.1.tar.xz"; - sha256 = "1zmbagi1fqlr2y74hghlbs8y7kbaxx739vjhxxvd8qn4akhgij92"; - name = "kdewebdev-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdewebdev-15.12.3.tar.xz"; + sha256 = "1hn0s72695mm7b3lqx45d2rbm639p3la1v95274il8nd6qnxfd1h"; + name = "kdewebdev-15.12.3.tar.xz"; }; }; kdf = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdf-15.12.1.tar.xz"; - sha256 = "0g0b2hqsls8nrwrqj78v6m38h4szsr0hs9bwfbrv63ppjm6a8272"; - name = "kdf-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdf-15.12.3.tar.xz"; + sha256 = "0h37405qiz5478fdm8k7h5hmpmznzrrb6a55grcc9jnp4qxqhdk7"; + name = "kdf-15.12.3.tar.xz"; }; }; kdiamond = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kdiamond-15.12.1.tar.xz"; - sha256 = "12xl2h3hcb4c7sm1v9p9cqcflqi30cfqhjj6vjwwb474pjffxfdw"; - name = "kdiamond-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kdiamond-15.12.3.tar.xz"; + sha256 = "1p5a26dw4sasfk0bmf79zwcp60s4wqk65169vn73nn51dkyplr0z"; + name = "kdiamond-15.12.3.tar.xz"; }; }; kfloppy = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kfloppy-15.12.1.tar.xz"; - sha256 = "1hrr4rfk63q4r7lbqq6nn96camcm5jq41qnvx6cm4pqqd4a8z6hp"; - name = "kfloppy-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kfloppy-15.12.3.tar.xz"; + sha256 = "1dsnv89n48aj1pcx6r64ds9pkafb0d8gpmw8ps0mhiwyhzjik0af"; + name = "kfloppy-15.12.3.tar.xz"; }; }; kfourinline = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kfourinline-15.12.1.tar.xz"; - sha256 = "1xj3krs20j3df3mkbav1nmwjaw524kif6g5qp36jipv9f58zw73g"; - name = "kfourinline-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kfourinline-15.12.3.tar.xz"; + sha256 = "1j0yhwwsr6kxynhyj8m9bwckz49rp33y8b7br8s4i186byjviw6f"; + name = "kfourinline-15.12.3.tar.xz"; }; }; kgeography = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kgeography-15.12.1.tar.xz"; - sha256 = "0rvq9a4l4yjyk2bmlwppjmik3pfkhbxrp9105136n4vskizhrm8h"; - name = "kgeography-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kgeography-15.12.3.tar.xz"; + sha256 = "19sqrgj08ilf43za4l1apz5whpnxhy9aafygxnklyl6xwkldfa56"; + name = "kgeography-15.12.3.tar.xz"; }; }; kget = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kget-15.12.1.tar.xz"; - sha256 = "1nqiw64yaz7kw58cldjjwdmlilrg9hxrlqwd2r7d0ip3mid5clkj"; - name = "kget-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kget-15.12.3.tar.xz"; + sha256 = "0ks210pxs4phrc0k05zaf0ip91yzg5xycfdac1rz4snn3wd5x8x5"; + name = "kget-15.12.3.tar.xz"; }; }; kgoldrunner = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kgoldrunner-15.12.1.tar.xz"; - sha256 = "0rlhqvksyi0b79z955d3anagk5p5k4b9nikr8fsb64xzq7pjwn42"; - name = "kgoldrunner-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kgoldrunner-15.12.3.tar.xz"; + sha256 = "19pvabs8fbzq6j9l8v2bdvz8rbzhmav14hymxf0fndg3b5qi1v46"; + name = "kgoldrunner-15.12.3.tar.xz"; }; }; kgpg = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kgpg-15.12.1.tar.xz"; - sha256 = "1ylns50237qr3af9i66n3v31qm6n1dd64j09smbjy6ij010ja4l3"; - name = "kgpg-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kgpg-15.12.3.tar.xz"; + sha256 = "1fw74kpd8f2hm82l2sn8nvi4dzrw1i2xgd5dkfhj1c8frnp4akrn"; + name = "kgpg-15.12.3.tar.xz"; }; }; khangman = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/khangman-15.12.1.tar.xz"; - sha256 = "12xkqa8i53km3nwi9kzlclr29hg185pcjmsd6grzkyh3brqz40y2"; - name = "khangman-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/khangman-15.12.3.tar.xz"; + sha256 = "1a0jbg0xfnjji1y946d8c1dmm8awdf6j4r3w226fmci2q764ap4l"; + name = "khangman-15.12.3.tar.xz"; }; }; kholidays = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kholidays-15.12.1.tar.xz"; - sha256 = "01ycl8j4nsc454wkk7ir5q38j4xlqcq05bgapks04s9lws1582dz"; - name = "kholidays-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kholidays-15.12.3.tar.xz"; + sha256 = "1hr253vc5r3fq2vkrl175zql8z146h5zpikq6wlxabh86isri07b"; + name = "kholidays-15.12.3.tar.xz"; }; }; kidentitymanagement = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kidentitymanagement-15.12.1.tar.xz"; - sha256 = "12adkn01h5392fqixiap62cql20sijjm23c666kabwdmji98183p"; - name = "kidentitymanagement-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kidentitymanagement-15.12.3.tar.xz"; + sha256 = "16v4ykbgiw06xdrd74gnjhwlvdjs926zdfmnn1gzhf2isyz0c4jp"; + name = "kidentitymanagement-15.12.3.tar.xz"; }; }; kig = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kig-15.12.1.tar.xz"; - sha256 = "0x3g1ipxrqvd7pxpc2kccv0r4m2qnasarjcxz6ljz3227xzcc5zf"; - name = "kig-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kig-15.12.3.tar.xz"; + sha256 = "12wf10d9579jhygrch4avacnxkhrmiyp2ci3kccyvva09cjdahpb"; + name = "kig-15.12.3.tar.xz"; }; }; kigo = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kigo-15.12.1.tar.xz"; - sha256 = "0b3ngl9ndgfbbihp1dikii40r8kbpi8yz9s0f4jadp6gqna6xjl5"; - name = "kigo-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kigo-15.12.3.tar.xz"; + sha256 = "15n6chq4mjynh5b4g2mbk1qjmgxlfzln5fl19i6qi11xd5yanz50"; + name = "kigo-15.12.3.tar.xz"; }; }; killbots = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/killbots-15.12.1.tar.xz"; - sha256 = "1qvy6y4rbapp2y7vd2ammbiqxxqp3dbpyy16fyd7h08639wbrl7f"; - name = "killbots-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/killbots-15.12.3.tar.xz"; + sha256 = "14mlmi958sz3nf5l1v2mq5ahfiqnb3m9a32hqfz2d5vzczrvarxv"; + name = "killbots-15.12.3.tar.xz"; }; }; kimap = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kimap-15.12.1.tar.xz"; - sha256 = "0q1n8p4h7n5zad0lwaawh5kb5k6z4wzdr8kbpvhlw0dkp8a504ds"; - name = "kimap-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kimap-15.12.3.tar.xz"; + sha256 = "1qk68zjw31hfxr577idn2rirmb8pwxxqcwz56jg9kc6mxff6k2sw"; + name = "kimap-15.12.3.tar.xz"; }; }; kio-extras = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kio-extras-15.12.1.tar.xz"; - sha256 = "0crl21kq8ya49hhcgfcch4x9xxjakwgs90yv0qp8zj19k12kl8fn"; - name = "kio-extras-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kio-extras-15.12.3.tar.xz"; + sha256 = "1lhg5g9fmfsg7yl0kzi779wilgcfdcx0zhzryqz307dhmvbffs87"; + name = "kio-extras-15.12.3.tar.xz"; }; }; kiriki = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kiriki-15.12.1.tar.xz"; - sha256 = "04zyq7nmdlnskzlw0hn78hpcf8rwjq53d7imnai7gvbxgcv2qf7a"; - name = "kiriki-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kiriki-15.12.3.tar.xz"; + sha256 = "0bff99yxlaqa46d5mgv6qnscyhidbi6kg0zb10b7jl4wr60d1gkm"; + name = "kiriki-15.12.3.tar.xz"; }; }; kiten = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kiten-15.12.1.tar.xz"; - sha256 = "0wr3zr26y07m911fy6ar4n53fp8b9jvms49i9cf7qwx4dc4a0wvr"; - name = "kiten-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kiten-15.12.3.tar.xz"; + sha256 = "067lcpgp3kc4rl2zz4a8rrm0pdgwsm8fwvrzay4dpghwznkmr7s5"; + name = "kiten-15.12.3.tar.xz"; }; }; kjumpingcube = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kjumpingcube-15.12.1.tar.xz"; - sha256 = "1xsza01v0c6d1p6ydng1pkqq8g9397x1xbzfzq3fal8l8bf1nnl7"; - name = "kjumpingcube-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kjumpingcube-15.12.3.tar.xz"; + sha256 = "1b6bsp7vmnik1119yx7vgsgn55pz250mqd5fmqxi9khllz1alsh1"; + name = "kjumpingcube-15.12.3.tar.xz"; }; }; kldap = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kldap-15.12.1.tar.xz"; - sha256 = "1dr8pavgr3hrlk0xxvfnsk9p05bzg9rgwzgqw4xci9cx22jmyaxi"; - name = "kldap-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kldap-15.12.3.tar.xz"; + sha256 = "18rdad71x5h4710bq9b0207rsfnlb7jqriv5zp8qmiz3zf04jwvc"; + name = "kldap-15.12.3.tar.xz"; }; }; klettres = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/klettres-15.12.1.tar.xz"; - sha256 = "0b1sw7x3miqivryc6bq1qn5gnfm8x8ns5v8qpvq5a2j76ifwkj54"; - name = "klettres-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/klettres-15.12.3.tar.xz"; + sha256 = "1a89w5r1in86k101qjg40q32c5rcgp4fbcydysa40knawnryfd1c"; + name = "klettres-15.12.3.tar.xz"; }; }; klickety = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/klickety-15.12.1.tar.xz"; - sha256 = "1cfrn7fvrrvn9s22d8ry1nck6h0hg0l8ccdy6405wjiks9wb5jra"; - name = "klickety-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/klickety-15.12.3.tar.xz"; + sha256 = "1sa3ilz14y1hd7m2czdqsrc5ih2a9gq8a26xh7wy1g4w32c59qp2"; + name = "klickety-15.12.3.tar.xz"; }; }; klines = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/klines-15.12.1.tar.xz"; - sha256 = "1b0plhc79cpxag02ij5zj3ix1hg4rpsnbc272gdy6kzl2862brdd"; - name = "klines-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/klines-15.12.3.tar.xz"; + sha256 = "1w8vni5m1j2ac6c72z5g6jdd6qml4jqn140a6i8sb5jkr6b8ccwb"; + name = "klines-15.12.3.tar.xz"; }; }; kmag = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kmag-15.12.1.tar.xz"; - sha256 = "1j7vgzpl61b2bm4csh6y9m58451nj0d7sxvjhxbimz0vzv9hh90x"; - name = "kmag-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kmag-15.12.3.tar.xz"; + sha256 = "0ng6rz93hxpzyk9gj91hjlpf7phpcg88wvn00d8f7ddfy0fydnaa"; + name = "kmag-15.12.3.tar.xz"; }; }; kmahjongg = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kmahjongg-15.12.1.tar.xz"; - sha256 = "1ng2495vrk7czfd1zlmij1qch6ir3vm2dfm63y8vnyf1dj39g1z3"; - name = "kmahjongg-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kmahjongg-15.12.3.tar.xz"; + sha256 = "0d6zcyf7l98albi7ikpb16wglvbvh4c2x0y4rpzwy6pbskkmvapd"; + name = "kmahjongg-15.12.3.tar.xz"; }; }; kmailtransport = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kmailtransport-15.12.1.tar.xz"; - sha256 = "04c9pq16aaf1fmyy25jlnq2wcsninbr19j7ygaaiqm2scj2mikk3"; - name = "kmailtransport-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kmailtransport-15.12.3.tar.xz"; + sha256 = "1p5qkk8qz6072yr6f9gzhzpk05qny8zxaiyaghc9vgh0dq2zpsyq"; + name = "kmailtransport-15.12.3.tar.xz"; }; }; kmbox = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kmbox-15.12.1.tar.xz"; - sha256 = "17ri9ay28v7f8yar8a33gx2wm99shby8bi9pj0sflxnzvawnlrwq"; - name = "kmbox-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kmbox-15.12.3.tar.xz"; + sha256 = "0p2zbxd2my1z48i5xr2nb9fnzqjnvgpfc8m7klp2b443lgmnwg3v"; + name = "kmbox-15.12.3.tar.xz"; }; }; kmime = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kmime-15.12.1.tar.xz"; - sha256 = "0r5scbsq21zhxs6c2lj0ay6sizrkyfczzjrnyv15izxh18jm7h7d"; - name = "kmime-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kmime-15.12.3.tar.xz"; + sha256 = "1as3pql5gxqf9m36qxl78cfzcjxwf41l57b7w9wy4p5wi1izdmba"; + name = "kmime-15.12.3.tar.xz"; }; }; kmines = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kmines-15.12.1.tar.xz"; - sha256 = "0za53gh6v74c2rwmm2f084z80w9gqrdx5g6zqdlxwiml8m9ybzq1"; - name = "kmines-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kmines-15.12.3.tar.xz"; + sha256 = "01090mwigxx5lwrzywnq8qwxqflylrf807rfjqa0s4na9qx2v682"; + name = "kmines-15.12.3.tar.xz"; }; }; kmix = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kmix-15.12.1.tar.xz"; - sha256 = "10vbb5x9hbd124avs68x39zlp7jrqww0gp2avsgvgv8hr7caxwlv"; - name = "kmix-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kmix-15.12.3.tar.xz"; + sha256 = "16yrfgg3cvjbypmz6p8zqsvp2qdihlq4d68w46f0m9gnm4dmywf1"; + name = "kmix-15.12.3.tar.xz"; }; }; kmousetool = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kmousetool-15.12.1.tar.xz"; - sha256 = "16lr93v2jmj0851afiz63p317fbnfdjavi2f2j49dxd51dayxydl"; - name = "kmousetool-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kmousetool-15.12.3.tar.xz"; + sha256 = "171lcfwrkbfwhvdfi7y2xprv6fb6xn5yd6zi3ifyka1jgl0z3nr8"; + name = "kmousetool-15.12.3.tar.xz"; }; }; kmouth = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kmouth-15.12.1.tar.xz"; - sha256 = "0hfkmj3gd71fjp3fvqyv2ds42rlrgyzd1g0scrjpaql9d28g5q7f"; - name = "kmouth-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kmouth-15.12.3.tar.xz"; + sha256 = "1fdgrpv7nqpfcrq5p2d22ysanj3fmwxy1lb2hxy75k1f051jyzvr"; + name = "kmouth-15.12.3.tar.xz"; }; }; kmplot = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kmplot-15.12.1.tar.xz"; - sha256 = "1bniv6aahgmdh4kqkcvhi34jpd5i6g4q9s1gyjsfi4b65lhvb908"; - name = "kmplot-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kmplot-15.12.3.tar.xz"; + sha256 = "1wxw65chz8ibf0ad6262qpr1761kx8k7mdin5wmiczakwkkpn7r1"; + name = "kmplot-15.12.3.tar.xz"; }; }; knavalbattle = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/knavalbattle-15.12.1.tar.xz"; - sha256 = "1ky6wx26l1dk244py2j59rh1yyyhdv00kv698i44w71g21g0zg2h"; - name = "knavalbattle-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/knavalbattle-15.12.3.tar.xz"; + sha256 = "1ma4dvrprlb0rdfq2iy56cvgfv6skm32yv6lk5vbqnp3mw7amyjz"; + name = "knavalbattle-15.12.3.tar.xz"; }; }; knetwalk = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/knetwalk-15.12.1.tar.xz"; - sha256 = "0zxq3rcs62q2q393b5nrf9496h0ahja7rwydgqmim0gywfnq1xk6"; - name = "knetwalk-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/knetwalk-15.12.3.tar.xz"; + sha256 = "1iqvp9pmiav0w03p0xfri7l0dx0h97283pyz6xhfmffvi5vsr1zn"; + name = "knetwalk-15.12.3.tar.xz"; }; }; kolf = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kolf-15.12.1.tar.xz"; - sha256 = "182196bjz721vxll4d1j6kflrpqnzrx2ws369p2wm7sy72md5d9s"; - name = "kolf-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kolf-15.12.3.tar.xz"; + sha256 = "0ky9bn8kgirm2shg1vc98q91ab8rx14fm2i4ammx3hjh6qp043hb"; + name = "kolf-15.12.3.tar.xz"; }; }; kollision = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kollision-15.12.1.tar.xz"; - sha256 = "09cf6dkq499wlafdlzvgkvs4vbkz4pws1q2x1w8ayl0qg4d85a5g"; - name = "kollision-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kollision-15.12.3.tar.xz"; + sha256 = "0y2bmw2h2big65arfhg8vhppglvw8xf5acmgbx37mnds3pxwqaw1"; + name = "kollision-15.12.3.tar.xz"; }; }; kolourpaint = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kolourpaint-15.12.1.tar.xz"; - sha256 = "1dnzgyd61n09ia4nvzdc94z2w82akv386kqvla85yrjyr11jcr2j"; - name = "kolourpaint-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kolourpaint-15.12.3.tar.xz"; + sha256 = "15ws4hyyq2shygblyp9dvq7dln61dpi3g0frxbxwkk8p3iznwsbw"; + name = "kolourpaint-15.12.3.tar.xz"; }; }; kompare = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kompare-15.12.1.tar.xz"; - sha256 = "00mibqn1ca09z3i12ic7vkpdr48sh6ry302jmlcbbmx9pfwlnvdv"; - name = "kompare-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kompare-15.12.3.tar.xz"; + sha256 = "0lvrhkmdhb74akby2js1hd6avmc5a5w7h2cbb7yw658zmg2xq0lq"; + name = "kompare-15.12.3.tar.xz"; }; }; konquest = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/konquest-15.12.1.tar.xz"; - sha256 = "1lhfv8l2yn49bdbkh41pjdjin7g1xgy6qh5hcixvh5sizhnax3yd"; - name = "konquest-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/konquest-15.12.3.tar.xz"; + sha256 = "1vgcqmw84ybly4hv8r33jdj0x8dpnfzdl2n7rqxvmb9ma12lc2wy"; + name = "konquest-15.12.3.tar.xz"; }; }; konsole = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/konsole-15.12.1.tar.xz"; - sha256 = "0vpaq3081y8x0sybnnkhq6sz6gdpsl73yvzpgnbmshxr34xnn26z"; - name = "konsole-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/konsole-15.12.3.tar.xz"; + sha256 = "1n2zv07hj53yq7msgh2r824c6r9gbvki57njn4c7vpx5fzyiwmjk"; + name = "konsole-15.12.3.tar.xz"; }; }; kontactinterface = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kontactinterface-15.12.1.tar.xz"; - sha256 = "1j95qcfiwbij7l2fwls4wmpsad2mzsrzg82cdfy6wddgl86v1i1n"; - name = "kontactinterface-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kontactinterface-15.12.3.tar.xz"; + sha256 = "0cgb79nmifajs3088pp5qvcbc970grx2irpfdy2nvh451g53jagf"; + name = "kontactinterface-15.12.3.tar.xz"; }; }; kopete = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kopete-15.12.1.tar.xz"; - sha256 = "0cv22hx0xk2yfwbqh7dqhpdsifb63gyjng2k4zbjjgiixhyg82z8"; - name = "kopete-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kopete-15.12.3.tar.xz"; + sha256 = "1r8v6l83avyygpw3yjni7bx01jhsnhq41c89c9g800qzl1zy67f8"; + name = "kopete-15.12.3.tar.xz"; }; }; kpat = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kpat-15.12.1.tar.xz"; - sha256 = "1qjrs2sblwkhb9avrjsximfshabpc0gqznhq6lwwm41i8kql261m"; - name = "kpat-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kpat-15.12.3.tar.xz"; + sha256 = "028vx550fkzqnk4dmkkrmicpr8k8yx9alj6da04p2y8ans70v7q4"; + name = "kpat-15.12.3.tar.xz"; }; }; kpimtextedit = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kpimtextedit-15.12.1.tar.xz"; - sha256 = "1qgr5bcqmlqngi1g2ylxik80pixa5nijj2ii8qvjh7wkbd7m549y"; - name = "kpimtextedit-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kpimtextedit-15.12.3.tar.xz"; + sha256 = "0jyiwjwz62dk746707z9fs3q0bw6xbz6kg2h92m85060db18vkl5"; + name = "kpimtextedit-15.12.3.tar.xz"; }; }; kppp = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kppp-15.12.1.tar.xz"; - sha256 = "0v03mp295h184dhx0kps7r1aygmbdyxr7yz2ab8m259pzb6mfv5l"; - name = "kppp-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kppp-15.12.3.tar.xz"; + sha256 = "17609g9npn8y3wr6zfq00raifw61qmc6qqn0j6mvn47d4942c1zp"; + name = "kppp-15.12.3.tar.xz"; }; }; kqtquickcharts = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kqtquickcharts-15.12.1.tar.xz"; - sha256 = "1vwx3qb8hrwn4r89a9kb8ycvgv43d94zhfi46l0a5msl94k2kigr"; - name = "kqtquickcharts-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kqtquickcharts-15.12.3.tar.xz"; + sha256 = "1lyx8m02xqjc8l65plwm12wdyqbspg5qr9hr1wlj6x711amjp7m4"; + name = "kqtquickcharts-15.12.3.tar.xz"; }; }; krdc = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/krdc-15.12.1.tar.xz"; - sha256 = "1vhxl6h4xjqvckl2zxhfcb633wllj1xx5dv4lwpvpqk2zpihkrli"; - name = "krdc-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/krdc-15.12.3.tar.xz"; + sha256 = "0j05p5j99bbldcnzwd0dqshry7pgb5v2jp2jqg390vfmqmx438sd"; + name = "krdc-15.12.3.tar.xz"; }; }; kremotecontrol = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kremotecontrol-15.12.1.tar.xz"; - sha256 = "0v59y8ilgyyjl327qf25d21z0gr7ii2p9wd985xj9lcdx2gax811"; - name = "kremotecontrol-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kremotecontrol-15.12.3.tar.xz"; + sha256 = "1yjjb6agh1i3axj82g4zsaygm2x39x1bnq90aiplxn84gh98cnfd"; + name = "kremotecontrol-15.12.3.tar.xz"; }; }; kreversi = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kreversi-15.12.1.tar.xz"; - sha256 = "1hlh2ddxg1kcg9pmd0pmw8kwnnvv7jy45sq8dhw1wnfmqxyni5m9"; - name = "kreversi-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kreversi-15.12.3.tar.xz"; + sha256 = "09h1pi4kccy0k0m0zifdlys89j2ybsa9xwp8aqzyifbqi7s874cs"; + name = "kreversi-15.12.3.tar.xz"; }; }; krfb = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/krfb-15.12.1.tar.xz"; - sha256 = "1dw7jwny6qqffykdkv1ic0xb4qbn5kymxv3rpy9g0gzwgyphgg3c"; - name = "krfb-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/krfb-15.12.3.tar.xz"; + sha256 = "1a6ddsjr26lwk7d7isna8shnzciyqghad9nhzn5jgqc56v13hg1m"; + name = "krfb-15.12.3.tar.xz"; }; }; kross-interpreters = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kross-interpreters-15.12.1.tar.xz"; - sha256 = "1lwxk5p5mb4760bwi5b10yqdrbr7vw1g4xq9g8krd9k3nz5gkkqg"; - name = "kross-interpreters-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kross-interpreters-15.12.3.tar.xz"; + sha256 = "14g1mp0izqqllr75vlbi9yn6awn77zasb42zppqxq1rl11bwp2li"; + name = "kross-interpreters-15.12.3.tar.xz"; }; }; kruler = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kruler-15.12.1.tar.xz"; - sha256 = "0y7cli4k0hhdrsw1c0mldlrw9nh7smsayik108na5wyd10ps2yyl"; - name = "kruler-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kruler-15.12.3.tar.xz"; + sha256 = "0i9f2ck55p87npk7xsqgi5zy0a9yiiv4razjdfj7fh8g78xj51yk"; + name = "kruler-15.12.3.tar.xz"; }; }; ksaneplugin = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ksaneplugin-15.12.1.tar.xz"; - sha256 = "1fs19rs6kkh2vq5kg1i2n1650349qanw03v6wziqnar4ay243grp"; - name = "ksaneplugin-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ksaneplugin-15.12.3.tar.xz"; + sha256 = "0834p0lfbf7l8lknxr0rz1w8j688dld36nyrz6pfk00h06an59h5"; + name = "ksaneplugin-15.12.3.tar.xz"; }; }; kscd = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kscd-15.12.1.tar.xz"; - sha256 = "16hzmxgc73p0n154clnyqz5hc3xliqcra37hrsbx2g0mkbm15p8g"; - name = "kscd-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kscd-15.12.3.tar.xz"; + sha256 = "0d82di7sg9mypxk7s24yldjjgwymi2yxwjhai67337wn6ivvw338"; + name = "kscd-15.12.3.tar.xz"; }; }; kshisen = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kshisen-15.12.1.tar.xz"; - sha256 = "1kkzpf4dvlfaqs6f5rxabjn0n95nqxadfw1rp6aqxj0v2qb60pcp"; - name = "kshisen-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kshisen-15.12.3.tar.xz"; + sha256 = "0aqz8w1rps0g8kvccqpkpmy8g2m5k4bpydz9gdh1nhia5h9558fq"; + name = "kshisen-15.12.3.tar.xz"; }; }; ksirk = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ksirk-15.12.1.tar.xz"; - sha256 = "1hfq7c77y9wia4534j4cwai3xj4xn4nny9mxx6jwj9hfw6yh3lj6"; - name = "ksirk-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ksirk-15.12.3.tar.xz"; + sha256 = "1z43v25gfv6gzpsm87s84v34389fjvvgq41maa1yzv0p3lj14v86"; + name = "ksirk-15.12.3.tar.xz"; }; }; ksnakeduel = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ksnakeduel-15.12.1.tar.xz"; - sha256 = "0mdfv4slh2nj50jc27p2hslqxzghyv0mvx270wk2b1n53zg079q9"; - name = "ksnakeduel-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ksnakeduel-15.12.3.tar.xz"; + sha256 = "1bkbbfvbpihq19z0jvk3ix535y60b7fb943crcflbqyknpnnh038"; + name = "ksnakeduel-15.12.3.tar.xz"; }; }; kspaceduel = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kspaceduel-15.12.1.tar.xz"; - sha256 = "0wi6zcmgihw42w4hxrcwc5bq3cksgc71m4a53hqs9j3pq1lz1ykr"; - name = "kspaceduel-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kspaceduel-15.12.3.tar.xz"; + sha256 = "0snjlvc56299frj89h41rs6ij85idyzcp8yv6rkc8kqjbdqm8hjj"; + name = "kspaceduel-15.12.3.tar.xz"; }; }; ksquares = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ksquares-15.12.1.tar.xz"; - sha256 = "0cmls8lpm271m55wflg1cbj88nvqzfawqn27nxfrg313j7n3a04b"; - name = "ksquares-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ksquares-15.12.3.tar.xz"; + sha256 = "06ij62n2kbjbgijcw3ddkc3fyl27rgyrkbz3cl5f3ydfyrmsnmzv"; + name = "ksquares-15.12.3.tar.xz"; }; }; kstars = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kstars-15.12.1.tar.xz"; - sha256 = "1jfha7s54rcs76kzw2v445k4s0qnkfdfipbylhkd0jd50a5j7wvl"; - name = "kstars-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kstars-15.12.3.tar.xz"; + sha256 = "1ka31vbzwdxv16p4nh40g6c6yijczv73y3js1scrc195k6byni5r"; + name = "kstars-15.12.3.tar.xz"; }; }; ksudoku = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ksudoku-15.12.1.tar.xz"; - sha256 = "0pm0a3b59wv30pkl50mcaqn37pmq4yjyviy2l62gbvb229sw9cl2"; - name = "ksudoku-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ksudoku-15.12.3.tar.xz"; + sha256 = "1132551s0hdabm42jxnbd9q9yiwh40lgfnzm4ccznv02l1g0fp8k"; + name = "ksudoku-15.12.3.tar.xz"; }; }; ksystemlog = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ksystemlog-15.12.1.tar.xz"; - sha256 = "0k3bwjmxs0xzxdvmq6s5sm1x84bfglf347f5bxdcfjmv95vp9bq6"; - name = "ksystemlog-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ksystemlog-15.12.3.tar.xz"; + sha256 = "0yiq0kajqjbb3s8ljp11kb83xha4n20v17fk8rnjn9dymvlkmw1j"; + name = "ksystemlog-15.12.3.tar.xz"; }; }; kteatime = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kteatime-15.12.1.tar.xz"; - sha256 = "12fjqq5n6305203b05q1lkwq7a56jynlkwykjai0yfjg2phxwa1c"; - name = "kteatime-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kteatime-15.12.3.tar.xz"; + sha256 = "0chf0cbghmf0aj0l0zxinhfpwpr40af3b4r7axkj77lrkkyl1acq"; + name = "kteatime-15.12.3.tar.xz"; }; }; ktimer = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktimer-15.12.1.tar.xz"; - sha256 = "0nwjyd7z6gz45291w50qa356nlbva6mc4qa53z8jl8nqn6c74iwn"; - name = "ktimer-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktimer-15.12.3.tar.xz"; + sha256 = "1sghh5983bzn3qlfm7fs74v6f5djmbixppfw09j8nn9rsmsah30a"; + name = "ktimer-15.12.3.tar.xz"; }; }; ktnef = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktnef-15.12.1.tar.xz"; - sha256 = "178r4ql1jyfk40l6s3jwabqvx5i25fzq3kv83csvd7p3y2299xbh"; - name = "ktnef-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktnef-15.12.3.tar.xz"; + sha256 = "043im3rcw210w90spyxap3pjqfk5dmgk57p2pqkxir6mcsfz9hm8"; + name = "ktnef-15.12.3.tar.xz"; }; }; ktouch = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktouch-15.12.1.tar.xz"; - sha256 = "1d7nkq060h5wvjxrgsqdjhmilgaaakk48a6qnx4yv5bc0gpd47rl"; - name = "ktouch-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktouch-15.12.3.tar.xz"; + sha256 = "1zmzm52pxi3hs7r12qsfmmqf8x7q1aapss2drlmx3r4lfi3hwzsp"; + name = "ktouch-15.12.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktp-accounts-kcm-15.12.1.tar.xz"; - sha256 = "1nfk33cxl278p4a3f3hiwxn25crvc0bvggfsmmkqd5m1iq1y2vid"; - name = "ktp-accounts-kcm-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktp-accounts-kcm-15.12.3.tar.xz"; + sha256 = "1zyprpzwbpvj22wsl6bc75r38bm7rshhl7llyk47rl0v02p8gd7s"; + name = "ktp-accounts-kcm-15.12.3.tar.xz"; }; }; ktp-approver = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktp-approver-15.12.1.tar.xz"; - sha256 = "10h40f8hhxv5a50yby728znfsl8w3jhy4cpp3a15bl21y0javb8p"; - name = "ktp-approver-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktp-approver-15.12.3.tar.xz"; + sha256 = "01ppnmi7fah8yq4yvhsrz6kask9f1fxhzcvjmjr5igv2d9hfsppw"; + name = "ktp-approver-15.12.3.tar.xz"; }; }; ktp-auth-handler = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktp-auth-handler-15.12.1.tar.xz"; - sha256 = "00r0r46vqd4y89djmkdibb566i23nkd0viz7rfp46s35mlwlfylf"; - name = "ktp-auth-handler-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktp-auth-handler-15.12.3.tar.xz"; + sha256 = "1hkc7gkh38vw7l3b8ygywifv60g1chm3xcgklj94dsm3x9j8xbwa"; + name = "ktp-auth-handler-15.12.3.tar.xz"; }; }; ktp-common-internals = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktp-common-internals-15.12.1.tar.xz"; - sha256 = "0bswmvzr78amwpcrmsvpr49854rcq6c9d1g475bgwwi9h2qjajqg"; - name = "ktp-common-internals-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktp-common-internals-15.12.3.tar.xz"; + sha256 = "13wp73k52nrqml17x9papdi9jymbymrkszag6rmmzmw5rq5kikb6"; + name = "ktp-common-internals-15.12.3.tar.xz"; }; }; ktp-contact-list = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktp-contact-list-15.12.1.tar.xz"; - sha256 = "1awidixqp12i29bm15vr1c6lf6m5mwqs9yvfczdvhxmq1vkniwxr"; - name = "ktp-contact-list-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktp-contact-list-15.12.3.tar.xz"; + sha256 = "1b9ql2435wq410gfxw5ybvlm68pilx8rp8dxbxrs1cw4wrc88mf3"; + name = "ktp-contact-list-15.12.3.tar.xz"; }; }; ktp-contact-runner = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktp-contact-runner-15.12.1.tar.xz"; - sha256 = "0b7gj3vandgqyd27rc7cdr61l7f7ph0whq9pggfxcbly7xmhyhh1"; - name = "ktp-contact-runner-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktp-contact-runner-15.12.3.tar.xz"; + sha256 = "0hnkrnq2kr3jan0pmy82hndji5jvjxpr9sn90s8swwksdv8f2gc9"; + name = "ktp-contact-runner-15.12.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktp-desktop-applets-15.12.1.tar.xz"; - sha256 = "0h6zw79canpwlnngkn9w7qnz4jch0ksqvn2vw4vfqgy3w91dxxkj"; - name = "ktp-desktop-applets-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktp-desktop-applets-15.12.3.tar.xz"; + sha256 = "0pcync77gh55wn9701mviwmnm2ahxqs1rfzw7cxsjvgk4324arzq"; + name = "ktp-desktop-applets-15.12.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktp-filetransfer-handler-15.12.1.tar.xz"; - sha256 = "13mzc2brzfxfpsqya35iyf76mllp7bhs6yjfcy4rhvazdf79p3dm"; - name = "ktp-filetransfer-handler-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktp-filetransfer-handler-15.12.3.tar.xz"; + sha256 = "0ykvly1giqn5nn4vwa7xcdz0q6mrni6raay9krvajk97qcdc5af8"; + name = "ktp-filetransfer-handler-15.12.3.tar.xz"; }; }; ktp-kded-module = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktp-kded-module-15.12.1.tar.xz"; - sha256 = "1bn22k1ai2bsncim1k55nm0k0k34xkxs2cvvf4f8y4za5s0hsyix"; - name = "ktp-kded-module-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktp-kded-module-15.12.3.tar.xz"; + sha256 = "0x42cgjiwy4yawial483ilb0sxncnip40ilma0kxzli0nzlbjfq8"; + name = "ktp-kded-module-15.12.3.tar.xz"; }; }; ktp-send-file = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktp-send-file-15.12.1.tar.xz"; - sha256 = "18l6il6b70bqs9ggjah2yrmbw229k8cjr8gf1kvkckwh1rv3z343"; - name = "ktp-send-file-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktp-send-file-15.12.3.tar.xz"; + sha256 = "0bx30sbwbxjgnylx9xzhq5vkisn34xxzqryalvg1lzhqnh338iri"; + name = "ktp-send-file-15.12.3.tar.xz"; }; }; ktp-text-ui = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktp-text-ui-15.12.1.tar.xz"; - sha256 = "0ydk503b8gn84jk5l1v061g9zdi79mb5xjpa7lffgqzjippsb5y1"; - name = "ktp-text-ui-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktp-text-ui-15.12.3.tar.xz"; + sha256 = "044pfam4i3qs43xgp2q0lsvrfjvbvbywclw4wx22m0i02580llga"; + name = "ktp-text-ui-15.12.3.tar.xz"; }; }; ktuberling = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/ktuberling-15.12.1.tar.xz"; - sha256 = "1rxn6ih2jy36jisaxf8gxs6rnsdbgmbhv0xmczn74vlzfi35izja"; - name = "ktuberling-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/ktuberling-15.12.3.tar.xz"; + sha256 = "0x73hppzchi5k4y9xd520qllkhn5mhrrmaapnacybb2pbpv58d17"; + name = "ktuberling-15.12.3.tar.xz"; }; }; kturtle = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kturtle-15.12.1.tar.xz"; - sha256 = "1d3vmkjww7zc0blc0i62jbay3mqgcccnkr6wxfabmcsz8cp062f4"; - name = "kturtle-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kturtle-15.12.3.tar.xz"; + sha256 = "12x86v658d7by5x1axwchn53fd23yrfavfxn5yy700vbqa6jd8qn"; + name = "kturtle-15.12.3.tar.xz"; }; }; kubrick = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kubrick-15.12.1.tar.xz"; - sha256 = "1r2pwrj8hd5vb18m3ad72cfka6kjz9rab0nsk33sp2yg23zwrg2y"; - name = "kubrick-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kubrick-15.12.3.tar.xz"; + sha256 = "0az5vcg5a565cmzmavzww5sl7wiz6gi2p0h61xl3di1pc8gk8wkp"; + name = "kubrick-15.12.3.tar.xz"; }; }; kuser = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kuser-15.12.1.tar.xz"; - sha256 = "1qg67d6r2ng217r5f36qgqyyvy16bv1pv0xy3i35d1qpq6y7indy"; - name = "kuser-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kuser-15.12.3.tar.xz"; + sha256 = "0aggk24z6fmsqimj7c3zi0vaq508m3g1956v0kfxd2k5wipb9cfz"; + name = "kuser-15.12.3.tar.xz"; }; }; kwalletmanager = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kwalletmanager-15.12.1.tar.xz"; - sha256 = "09801vnq6c2cq10ywg68fddwbmvly6lyaybdffw27h8cl4qkxy9f"; - name = "kwalletmanager-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kwalletmanager-15.12.3.tar.xz"; + sha256 = "1qyms04w0xmhxxd4kb9zsdkr50gxbjhs3hjq5vhvbagb05ya8g4m"; + name = "kwalletmanager-15.12.3.tar.xz"; }; }; kwordquiz = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/kwordquiz-15.12.1.tar.xz"; - sha256 = "1brihl4a488nmi5s1yk4jy8bb1a5l5576j9vldh2ad9y5mqdq68d"; - name = "kwordquiz-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/kwordquiz-15.12.3.tar.xz"; + sha256 = "1vhxdng5i9hzx57mj9jfsdc63wbk9xyjhr6f1hq035z0cz4j59r6"; + name = "kwordquiz-15.12.3.tar.xz"; }; }; libkcddb = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/libkcddb-15.12.1.tar.xz"; - sha256 = "0y5jsimz71a8dilb3gwa8xa2r6bgfh3giwqbg0vl5xsnmq5q282k"; - name = "libkcddb-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/libkcddb-15.12.3.tar.xz"; + sha256 = "1m3r5d4jy4n8l29ncm3wnmmnfilr64qn987brm4y16bcbxidigcz"; + name = "libkcddb-15.12.3.tar.xz"; }; }; libkcompactdisc = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/libkcompactdisc-15.12.1.tar.xz"; - sha256 = "1cmabgzv1lliqlc0yc3y365g5rdvqpjfs8am4179h2mr1vibvx6b"; - name = "libkcompactdisc-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/libkcompactdisc-15.12.3.tar.xz"; + sha256 = "0cb50346c4jv35125kaz65m8n1bw0rn8wynig6iygp8b2xam9303"; + name = "libkcompactdisc-15.12.3.tar.xz"; }; }; libkdcraw = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/libkdcraw-15.12.1.tar.xz"; - sha256 = "0gl1a5dk63jmdh7ip8b1z8179daz1hx0w0p2pqgyklaxg883r88v"; - name = "libkdcraw-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/libkdcraw-15.12.3.tar.xz"; + sha256 = "1d2l6nk25vj0h0a7slnz6dnlpfr4wyc6rh188vsdm24nz8q89hqf"; + name = "libkdcraw-15.12.3.tar.xz"; }; }; libkdeedu = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/libkdeedu-15.12.1.tar.xz"; - sha256 = "1fp41cx2gsdax8iqx2kw790i8j718q46ss4c5zhxagshnkd3czmz"; - name = "libkdeedu-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/libkdeedu-15.12.3.tar.xz"; + sha256 = "1imk40ygm9jndj95hkz1grjrsh9r0adjz41sarkjyfglxw3xwm0c"; + name = "libkdeedu-15.12.3.tar.xz"; }; }; libkdegames = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/libkdegames-15.12.1.tar.xz"; - sha256 = "003ypjiqi3mk00a6iv9d8nf6d4kq7l6nflgwf0d3sq0y4cbkix0m"; - name = "libkdegames-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/libkdegames-15.12.3.tar.xz"; + sha256 = "1v3zmg8zb9cnfw3inba68c4v6iv1mqinskvsa61rkzzdhjf1cjj4"; + name = "libkdegames-15.12.3.tar.xz"; }; }; libkeduvocdocument = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/libkeduvocdocument-15.12.1.tar.xz"; - sha256 = "0v1ssh4m59kb7b82r06fwgb0cmj9xm5yy9vcrmhs1167l1s8vr6w"; - name = "libkeduvocdocument-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/libkeduvocdocument-15.12.3.tar.xz"; + sha256 = "1i4s3v9pdn0jrgbdidq1rg9zka9m06h1c1yxrs0j0zscwmnalzlc"; + name = "libkeduvocdocument-15.12.3.tar.xz"; }; }; libkexiv2 = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/libkexiv2-15.12.1.tar.xz"; - sha256 = "1z4z77psaiqwh62spsvqpkd21agsfjjrpaiiqdaxinsimw5pagb0"; - name = "libkexiv2-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/libkexiv2-15.12.3.tar.xz"; + sha256 = "196sxzhirc1l33jj1zjl6h57w9fyqa0kik0mmwj9w3jbjbsdmazv"; + name = "libkexiv2-15.12.3.tar.xz"; }; }; libkface = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/libkface-15.12.1.tar.xz"; - sha256 = "0x6pz72vxmrsncc0kkwdaci9i9nxkdqkdklwlg7q4wbn8kxxa8n6"; - name = "libkface-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/libkface-15.12.3.tar.xz"; + sha256 = "0rsy3xqfj7mbnhwb8gknv0cz20m2nv1zzs9jl39dna381gjh7sw0"; + name = "libkface-15.12.3.tar.xz"; }; }; libkgeomap = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/libkgeomap-15.12.1.tar.xz"; - sha256 = "127flkwgkmcdkd40ccrvxmyq2nzb1jshpj79pjyhwirh9iqbw773"; - name = "libkgeomap-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/libkgeomap-15.12.3.tar.xz"; + sha256 = "0mm46if7jrf31s9sxn2vpaq6bk4bansbkgjb166anbfb6ywfs30d"; + name = "libkgeomap-15.12.3.tar.xz"; }; }; libkipi = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/libkipi-15.12.1.tar.xz"; - sha256 = "0x14adzkla7cpiwbs75n87x5gb8ifcby1zkw2f2i69g6w9x8nnps"; - name = "libkipi-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/libkipi-15.12.3.tar.xz"; + sha256 = "0lz8b792gpdgy6nlw50n62jn7fj2bj8znqsln2s2vmibgjscvl55"; + name = "libkipi-15.12.3.tar.xz"; }; }; libkmahjongg = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/libkmahjongg-15.12.1.tar.xz"; - sha256 = "1q04c91j78hzk5x7iiwxkn2is3c5cy7wca1wmxlbqbw3q3zc5jlh"; - name = "libkmahjongg-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/libkmahjongg-15.12.3.tar.xz"; + sha256 = "0vjzdicqwgz49vykb698b2vgj1vmsxhn2ad8fjw863dqds9979v7"; + name = "libkmahjongg-15.12.3.tar.xz"; }; }; libkomparediff2 = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/libkomparediff2-15.12.1.tar.xz"; - sha256 = "0vkndb5l5lv50id8fik6zbg0ph5mv0kmcxz6ywh2i6mh3nf5h0m2"; - name = "libkomparediff2-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/libkomparediff2-15.12.3.tar.xz"; + sha256 = "1iw60r4rnijsh22mslrcsgrhqndqndvqsin20g0gx8zl6qs680kn"; + name = "libkomparediff2-15.12.3.tar.xz"; }; }; libksane = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/libksane-15.12.1.tar.xz"; - sha256 = "112w0hpnq4rzp40rq68wjdkx0w2p06z1chxribgh032wh09j21by"; - name = "libksane-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/libksane-15.12.3.tar.xz"; + sha256 = "0r4v20l6bpv5j0gk0vcm90ag4cd410mllfw03f4v683wsda1phcj"; + name = "libksane-15.12.3.tar.xz"; }; }; lokalize = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/lokalize-15.12.1.tar.xz"; - sha256 = "0ldmw4rgli64dq4xllxbrgvc8wz52a5xhmbcb7m31yr7vpsav533"; - name = "lokalize-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/lokalize-15.12.3.tar.xz"; + sha256 = "1qnhhvgpigss0ngca7yqwqlwixm2221cynp94nw0csfx72mkbpyl"; + name = "lokalize-15.12.3.tar.xz"; }; }; lskat = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/lskat-15.12.1.tar.xz"; - sha256 = "116vfahyh65bhfp8z5ay2xj8gb7s935d3cbd4f9ppidva493lpvp"; - name = "lskat-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/lskat-15.12.3.tar.xz"; + sha256 = "05d40mc8bs4f45jy1sh64chp0ffb0631660wwd4p60d7x0j5as98"; + name = "lskat-15.12.3.tar.xz"; }; }; marble = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/marble-15.12.1.tar.xz"; - sha256 = "15zybdm28a0q3nanv43y5g3xbl2gpi19fdx1smslypkz33srfwlm"; - name = "marble-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/marble-15.12.3.tar.xz"; + sha256 = "1gz7nj0jaqg7pbird2rv3cngfifpm9g1dnmx9rykdripv9m4g9am"; + name = "marble-15.12.3.tar.xz"; }; }; mplayerthumbs = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/mplayerthumbs-15.12.1.tar.xz"; - sha256 = "16wgsg3s0a0mcn1p3ixy8xw8qci082qq415hcy4vr1ycbxzypcd0"; - name = "mplayerthumbs-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/mplayerthumbs-15.12.3.tar.xz"; + sha256 = "0r2v4b1kxrc1rpk771xry1swirf66z9lbrg7qs0an5vgp9wmghzw"; + name = "mplayerthumbs-15.12.3.tar.xz"; }; }; okteta = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/okteta-15.12.1.tar.xz"; - sha256 = "1fzk1qlsxw5mkvk5sbzaxs902waagf9i8rggis00c6cpgd2il75q"; - name = "okteta-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/okteta-15.12.3.tar.xz"; + sha256 = "1qhrddir85z5c91xrqzndnd3n30vsfw6rafsk55zxwyhkws2jks0"; + name = "okteta-15.12.3.tar.xz"; }; }; okular = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/okular-15.12.1.tar.xz"; - sha256 = "17d2xhwdlqf2jcx34hh0l7gj3n3lpidv9wha8xp2vww8hibmdmn3"; - name = "okular-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/okular-15.12.3.tar.xz"; + sha256 = "1xrw0rvzw2i7289fv2maff3zb7f3vqv50fb88dbx67n9mzib794v"; + name = "okular-15.12.3.tar.xz"; }; }; palapeli = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/palapeli-15.12.1.tar.xz"; - sha256 = "1kq06xi6d6f47chzzcknr1v1jd3pajzg7s45zc78sfwvq1lkcwpj"; - name = "palapeli-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/palapeli-15.12.3.tar.xz"; + sha256 = "08sj1zjd3smfcdgnmj57q9yz3bsd7k654zyh3sqar29yd4ja1b8l"; + name = "palapeli-15.12.3.tar.xz"; }; }; parley = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/parley-15.12.1.tar.xz"; - sha256 = "1imkxanm5nzjkvgyskj3bcnn7rz7hwggspg3iyq75vmrqvmnd17y"; - name = "parley-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/parley-15.12.3.tar.xz"; + sha256 = "00h83mpkz52ybav8d3c3gv6y53xcz3d5abq11daa6hc171bm35qy"; + name = "parley-15.12.3.tar.xz"; }; }; picmi = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/picmi-15.12.1.tar.xz"; - sha256 = "0ka8ksq2v7j313i0iki07d2rn6d0ga7qi5zmwvz0c7c0yk1ndpd0"; - name = "picmi-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/picmi-15.12.3.tar.xz"; + sha256 = "0x952gpdz415pr691bv8x98pnvs1xajgsgk6rm6kx9crm1qm0qfa"; + name = "picmi-15.12.3.tar.xz"; }; }; poxml = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/poxml-15.12.1.tar.xz"; - sha256 = "08qyhw1x4lf5lgbi55cdvvlizbfjjrg2xncgnnvcc2xvs0vbsdrx"; - name = "poxml-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/poxml-15.12.3.tar.xz"; + sha256 = "1w3mgz5ayryra844pn5jrhnxnhbz8d8kjg74a9xnw98j81qqjz1y"; + name = "poxml-15.12.3.tar.xz"; }; }; print-manager = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/print-manager-15.12.1.tar.xz"; - sha256 = "0n11ras6zk68zb901jwg5dkay04cl4qwplh57yvcvkaqzp7dx29h"; - name = "print-manager-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/print-manager-15.12.3.tar.xz"; + sha256 = "1xranm7l9bgg9dnpj91d9nmzmbgj52zgzsvvsnp9ygxgcs5bzlhc"; + name = "print-manager-15.12.3.tar.xz"; }; }; rocs = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/rocs-15.12.1.tar.xz"; - sha256 = "1car9wdw3jrnczcws8hp15nky6fm04asqh6z64v1x46xpgqq15s8"; - name = "rocs-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/rocs-15.12.3.tar.xz"; + sha256 = "0pl3ildg2rgnq7ax28ba5ninv8lw7mm5c4zwj63fwz3ds1d4rysq"; + name = "rocs-15.12.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/signon-kwallet-extension-15.12.1.tar.xz"; - sha256 = "1s96924sahamdiw6gs42c7f6fmxacccy0x7a7vcm25jrdw2y8rny"; - name = "signon-kwallet-extension-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/signon-kwallet-extension-15.12.3.tar.xz"; + sha256 = "05y6c4pd833zwxx6fndidxr39w3qxga6nkcjds8ywxrr0968mfi7"; + name = "signon-kwallet-extension-15.12.3.tar.xz"; }; }; spectacle = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/spectacle-15.12.1.tar.xz"; - sha256 = "0ikv29g85fzk4k84a3p56krsabg92na1kc3r1dvg6vmhprr5ar0y"; - name = "spectacle-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/spectacle-15.12.3.tar.xz"; + sha256 = "0qyyc30pgybx205a45vj0yqv03csi0dihx012iz3hlnhgr2g586n"; + name = "spectacle-15.12.3.tar.xz"; }; }; step = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/step-15.12.1.tar.xz"; - sha256 = "0g85cwr4ixh254i75af0pvqs6rp9zmzifnn8757dmqb0z0l31l9r"; - name = "step-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/step-15.12.3.tar.xz"; + sha256 = "0473n43wqiwsrajy06mr024qnfr2nhhjxwsv1arg2gv7xvzhbgq1"; + name = "step-15.12.3.tar.xz"; }; }; svgpart = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/svgpart-15.12.1.tar.xz"; - sha256 = "1l86kvgrjbhyqaldw3cdm483lc1j9lrf8rif059qnq20r35llfp0"; - name = "svgpart-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/svgpart-15.12.3.tar.xz"; + sha256 = "1lhhjmf2ay9v6p64693kf5rk3jywyyyd18xq9lgqlng0b27acsac"; + name = "svgpart-15.12.3.tar.xz"; }; }; sweeper = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/sweeper-15.12.1.tar.xz"; - sha256 = "1ykk3msicf71p3p9y6135hdrv3szjfv9khb0bl2nzqg2i28psdad"; - name = "sweeper-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/sweeper-15.12.3.tar.xz"; + sha256 = "0wnk6zmf24mpnacsp6wi8c617jl4znk1pbm9jl38ckmg5z56ghz0"; + name = "sweeper-15.12.3.tar.xz"; }; }; syndication = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/syndication-15.12.1.tar.xz"; - sha256 = "1kq97rid82dv70ii4imh6aq1bwc2i0x7yzw95g855khxbd485a1m"; - name = "syndication-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/syndication-15.12.3.tar.xz"; + sha256 = "07xnjxjdf11k0fkpf9xdfvfh176pimx3v4h5y6f7bswsgnld7h38"; + name = "syndication-15.12.3.tar.xz"; }; }; umbrello = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/umbrello-15.12.1.tar.xz"; - sha256 = "1qxqkqvkp19vj8zkl39cwn077sncl3wqkgv0a1a16cdxhhvfbf23"; - name = "umbrello-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/umbrello-15.12.3.tar.xz"; + sha256 = "072nqqjq2cfxwi098kh7m24cvs6f6nss62wxdskvzdkbcd7gfh26"; + name = "umbrello-15.12.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "15.12.1"; + version = "15.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/15.12.1/src/zeroconf-ioslave-15.12.1.tar.xz"; - sha256 = "0q9q1vj62h3lw0451csg4sa2cgm9h5r9jxbgn8yg4xa31vx1cw03"; - name = "zeroconf-ioslave-15.12.1.tar.xz"; + url = "${mirror}/stable/applications/15.12.3/src/zeroconf-ioslave-15.12.3.tar.xz"; + sha256 = "1iv4l58v7wg4kjmp7723za84rpns4dm6av6b6cybmj8dzw3jixxf"; + name = "zeroconf-ioslave-15.12.3.tar.xz"; }; }; } From e498a645c1087cd85b3f4168e0b56233c729959c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 26 Jan 2016 02:58:17 +0100 Subject: [PATCH 73/75] ncat: Remove old package, available in nmap --- pkgs/tools/networking/ncat/default.nix | 25 ------------ pkgs/tools/networking/ncat/ncat-0.10rc3.patch | 38 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 -- pkgs/top-level/release-small.nix | 1 - pkgs/top-level/release.nix | 1 - 6 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 pkgs/tools/networking/ncat/default.nix delete mode 100644 pkgs/tools/networking/ncat/ncat-0.10rc3.patch diff --git a/pkgs/tools/networking/ncat/default.nix b/pkgs/tools/networking/ncat/default.nix deleted file mode 100644 index 8f81e9284b60..000000000000 --- a/pkgs/tools/networking/ncat/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, fetchurl, openssl}: - -stdenv.mkDerivation { - name = "ncat-0.10rc3"; - - src = fetchurl { - url = mirror://sourceforge/nmap-ncat/ncat-0.10rc3.tar.gz; - sha256 = "1yb26ipxwhqkfannji90jxi38k35fal4ffx0jm5clr1a1rndjjzb"; - }; - - patches = [./ncat-0.10rc3.patch]; - - buildInputs = [openssl]; - - CFLAGS = "-g"; - - postInstall = '' - install -D ncat $out/bin/ncat - install -D docs/man/ncat.1 $out/man/ncat.1 - ''; - - meta = { - description = "A netcat implementation with IPv6 support"; - }; -} diff --git a/pkgs/tools/networking/ncat/ncat-0.10rc3.patch b/pkgs/tools/networking/ncat/ncat-0.10rc3.patch deleted file mode 100644 index ed4c93673aa6..000000000000 --- a/pkgs/tools/networking/ncat/ncat-0.10rc3.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -urN ncat-0.10rc3/ncat_main.c ncat-0.10rc3-fixed/ncat_main.c ---- ncat-0.10rc3/ncat_main.c 2006-01-10 03:29:08.000000000 +0300 -+++ ncat-0.10rc3-fixed/ncat_main.c 2007-07-09 09:58:58.000000000 +0400 -@@ -23,6 +23,7 @@ - { - struct sockaddr_in ss; - struct sockaddr_in6 ss6; -+ struct sockaddr_storage sst; - - struct conn_state cs; - -@@ -271,7 +272,7 @@ - } - - /* resolve hostname */ -- if (!resolve(argv[optind], (struct sockaddr_storage *) &ss)) { -+ if (!resolve(argv[optind], (struct sockaddr_storage *) &sst)) { - /* host failed to resolve :( */ - fprintf(stderr, - "%s: Could not resolve target hostname %s. QUITTING.\n", -@@ -297,6 +298,8 @@ - - /* IPv6 connect() */ - if (oipv == 6) { -+ memcpy(&ss6,&sst,sizeof(ss6)); -+ - ss6.sin6_family = AF_INET6; - ss_len = sizeof(struct sockaddr_in6); - -@@ -329,6 +332,8 @@ - } - /* IPv4 connect() - default. */ - else { -+ memcpy(&ss,&sst,sizeof(ss)); -+ - ss.sin_family = AF_INET; - ss_len = sizeof(struct sockaddr_in); - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9d278b19342c..23e05eb6c9e4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -62,6 +62,7 @@ doNotDisplayTwice rec { mssys = ms-sys; # added 2015-12-13 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 + ncat = nmap; # added 2016-01-26 nfsUtils = nfs-utils; # added 2014-12-06 phonon_qt5 = qt5.phonon; # added 2015-12-19 phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d15f689b0f6..edc2abe1f4d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2434,8 +2434,6 @@ in nc6 = callPackage ../tools/networking/nc6 { }; - ncat = callPackage ../tools/networking/ncat { }; - ncftp = callPackage ../tools/networking/ncftp { }; ncompress = callPackage ../tools/compression/ncompress { }; @@ -16407,4 +16405,3 @@ in togglesg-download = callPackage ../tools/misc/togglesg-download { }; } - diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 9a10fad4e9fe..bd2223b4b04b 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -111,7 +111,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; mpg321 = linux; mutt = linux; mysql = linux; - ncat = linux; netcat = all; nfs-utils = linux; nix = all; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index cc1e9b791f77..24ea9bdc470b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -167,7 +167,6 @@ let mupen64plus = linux; mutt = linux; nano = allBut cygwin; - ncat = linux; netcat = all; nss_ldap = linux; nssmdns = linux; From 8605dab96431d5a790e99a3f5f86ab2625747c10 Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Tue, 29 Mar 2016 12:04:46 -0400 Subject: [PATCH 74/75] webkitgtk: add darwin support --- pkgs/development/libraries/cairo/default.nix | 24 +++++++--- .../gobject-introspection/darwin-fixups.patch | 26 +++++++++++ .../gobject-introspection/default.nix | 4 ++ .../separate-rpath-arg.patch | 21 +++++++++ pkgs/development/libraries/gtk+/3.x.nix | 12 +++++ pkgs/development/libraries/pango/default.nix | 4 ++ pkgs/development/libraries/webkitgtk/2.4.nix | 40 ++++++++++++++--- .../libraries/webkitgtk/adding-libintl.patch | 10 +++++ .../libraries/webkitgtk/default.nix | 45 +++++++++++++++---- .../libraries/webkitgtk/impure-icucore.patch | 12 +++++ .../libraries/webkitgtk/libc++.patch | 20 +++++++++ .../libraries/webkitgtk/plugin-none.patch | 38 ++++++++++++++++ .../libraries/webkitgtk/quartz-webcore.patch | 22 +++++++++ 13 files changed, 259 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/libraries/gobject-introspection/darwin-fixups.patch create mode 100644 pkgs/development/libraries/gobject-introspection/separate-rpath-arg.patch create mode 100644 pkgs/development/libraries/webkitgtk/adding-libintl.patch create mode 100644 pkgs/development/libraries/webkitgtk/impure-icucore.patch create mode 100644 pkgs/development/libraries/webkitgtk/libc++.patch create mode 100644 pkgs/development/libraries/webkitgtk/plugin-none.patch create mode 100644 pkgs/development/libraries/webkitgtk/quartz-webcore.patch diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 5add4e451297..537107f3f6a8 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -4,6 +4,7 @@ , xcbSupport ? true # no longer experimental since 1.12 , glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency , pdfSupport ? true +, darwin }: assert glSupport -> mesa_noglu != null; @@ -11,14 +12,21 @@ assert glSupport -> mesa_noglu != null; with { inherit (stdenv.lib) optional optionals; }; stdenv.mkDerivation rec { - name = "cairo-1.14.4"; + name = "cairo-1.14.6"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.xz"; - sha256 = "05p75r914d809711yg9rapgmmi4hymzbarhd3w0yrfadhiy9rv7n"; + sha256 = "0lmjlzmghmr27y615px9hkm552x7ap6pmq9mfbzr6smp8y2b6g31"; }; - nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; + nativeBuildInputs = [ + pkgconfig + libiconv + ] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreGraphics + ApplicationServices + Carbon + ]); propagatedBuildInputs = with xorg; [ xorg.xlibsWrapper fontconfig expat freetype pixman zlib libpng ] @@ -28,11 +36,17 @@ stdenv.mkDerivation rec { ++ optionals glSupport [ mesa_noglu ] ; - configureFlags = [ "--enable-tee" ] + configureFlags = if stdenv.isDarwin then [ + "--disable-dependency-tracking" + "--enable-quartz" + "--enable-quartz-font" + "--enable-quartz-image" + "--enable-ft" + ] else ([ "--enable-tee" ] ++ optional xcbSupport "--enable-xcb" ++ optional glSupport "--enable-gl" ++ optional pdfSupport "--enable-pdf" - ; + ); preConfigure = # On FreeBSD, `-ldl' doesn't exist. diff --git a/pkgs/development/libraries/gobject-introspection/darwin-fixups.patch b/pkgs/development/libraries/gobject-introspection/darwin-fixups.patch new file mode 100644 index 000000000000..02443d56afab --- /dev/null +++ b/pkgs/development/libraries/gobject-introspection/darwin-fixups.patch @@ -0,0 +1,26 @@ +diff -ur gobject-introspection-1.46.0-orig/giscanner/ccompiler.py gobject-introspection-1.46.0/giscanner/ccompiler.py +--- gobject-introspection-1.46.0-orig/giscanner/ccompiler.py 2016-02-01 12:25:41.000000000 -0500 ++++ gobject-introspection-1.46.0/giscanner/ccompiler.py 2016-02-01 15:50:36.000000000 -0500 +@@ -128,11 +128,7 @@ + self.compiler.add_runtime_library_dir('.') + + # https://bugzilla.gnome.org/show_bug.cgi?id=625195 +- args.append('-Wl,-rpath=.') +- +- # Ensure libraries are always linked as we are going to use ldd to work +- # out their names later +- args.append('-Wl,--no-as-needed') ++ args.append('-Wl,-rpath,.') + + for library in libraries: + self.compiler.add_library(library) +@@ -140,7 +136,7 @@ + for library_path in libpaths: + args.append('-L' + library_path) + if os.path.isabs(library_path): +- args.append('-Wl,-rpath=' + library_path) ++ args.append('-Wl,-rpath,' + library_path) + + else: + # libtool case: assemble linker command arguments, like we did before +Only in gobject-introspection-1.46.0/giscanner: ccompiler.py~ diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 959abc44d248..e13ce337f388 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -10,6 +10,7 @@ let ver_maj = "1.46"; ver_min = "0"; in +with stdenv.lib; stdenv.mkDerivation rec { name = "gobject-introspection-${ver_maj}.${ver_min}"; @@ -38,6 +39,9 @@ stdenv.mkDerivation rec { patches = stdenv.lib.singleton (substituteAll { src = ./absolute_shlib_path.patch; inherit nixStoreDir; + }) ++ optional stdenv.isDarwin (substituteAll { + src = ./darwin-fixups.patch; + inherit nixStoreDir; }); meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gobject-introspection/separate-rpath-arg.patch b/pkgs/development/libraries/gobject-introspection/separate-rpath-arg.patch new file mode 100644 index 000000000000..1f25aa1f8987 --- /dev/null +++ b/pkgs/development/libraries/gobject-introspection/separate-rpath-arg.patch @@ -0,0 +1,21 @@ +diff -ur gobject-introspection-1.46.0-orig/giscanner/ccompiler.py gobject-introspection-1.46.0/giscanner/ccompiler.py +--- gobject-introspection-1.46.0-orig/giscanner/ccompiler.py 2016-02-01 12:25:41.000000000 -0500 ++++ gobject-introspection-1.46.0/giscanner/ccompiler.py 2016-02-01 12:26:52.000000000 -0500 +@@ -128,7 +128,7 @@ + self.compiler.add_runtime_library_dir('.') + + # https://bugzilla.gnome.org/show_bug.cgi?id=625195 +- args.append('-Wl,-rpath=.') ++ args.append('-Wl,-rpath,.') + + # Ensure libraries are always linked as we are going to use ldd to work + # out their names later +@@ -140,7 +140,7 @@ + for library_path in libpaths: + args.append('-L' + library_path) + if os.path.isabs(library_path): +- args.append('-Wl,-rpath=' + library_path) ++ args.append('-Wl,-rpath,' + library_path) + + else: + # libtool case: assemble linker command arguments, like we did before diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 248c4fa385e1..f738f76ca029 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -3,11 +3,14 @@ , xlibs, x11, wayland, libxkbcommon, epoxy , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null +, darwin }: assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; +with stdenv.lib; + let ver_maj = "3.18"; ver_min = "5"; @@ -27,6 +30,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with xlibs; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] ++ optionals stdenv.isLinux [ wayland ] + ++ optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; @@ -37,6 +41,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + configureFlags = optional stdenv.isDarwin [ + "--disable-debug" + "--disable-dependency-tracking" + "--disable-glibtest" + "--with-gdktarget=quartz" + "--enable-quartz-backend" + ]; + postInstall = "rm -rf $out/share/gtk-doc"; passthru = { diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 07a987c8ff66..bb619c7fda5f 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -2,6 +2,8 @@ , fontconfig, freetype, libintlOrEmpty, gobjectIntrospection }: +with stdenv.lib; + let ver_maj = "1.38"; ver_min = "1"; @@ -29,6 +31,8 @@ stdenv.mkDerivation rec { # .../bin/sh: line 5: 14823 Abort trap: 6 srcdir=. PANGO_RC_FILE=./pangorc ${dir}$tst # FAIL: testiter + configureFlags = optional stdenv.isDarwin "--without-x"; + postInstall = "rm -rf $out/share/gtk-doc"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index b1f47b80d782..e8f0a3d4da7e 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -4,9 +4,15 @@ , libxml2, libsoup, libsecret, libxslt, harfbuzz , gst-plugins-base , withGtk2 ? false -, enableIntrospection ? true +, enableIntrospection ? !stdenv.isDarwin +, enableCredentialStorage ? !stdenv.isDarwin +, readline, libedit }: +assert stdenv.isDarwin -> !enableIntrospection; +assert stdenv.isDarwin -> !enableCredentialStorage; + +with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; version = "2.4.9"; @@ -29,16 +35,32 @@ stdenv.mkDerivation rec { prePatch = '' patchShebangs Tools/gtk ''; - patches = [ ./webcore-svg-libxml-cflags.patch ]; + patches = [ + ./webcore-svg-libxml-cflags.patch + ] ++ optionals stdenv.isDarwin [ + ./impure-icucore.patch + ./quartz-webcore.patch + ./libc++.patch + ./plugin-none.patch + ]; configureFlags = with stdenv.lib; [ "--disable-geolocation" (optionalString enableIntrospection "--enable-introspection") - ] ++ stdenv.lib.optional withGtk2 [ + ] ++ optional withGtk2 [ "--with-gtk=2.0" + ] ++ optionals (withGtk2 || stdenv.isDarwin) [ "--disable-webkit2" + ] ++ optionals stdenv.isDarwin [ + "--disable-x11-target" + "--enable-quartz-target" + "--disable-web-audio" + ] ++ optionals (!enableCredentialStorage) [ + "--disable-credential-storage" ]; + NIX_CFLAGS_COMPILE = "-DU_NOEXCEPT="; + dontAddDisableDepTrack = true; nativeBuildInputs = [ @@ -47,10 +69,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 wayland libwebp enchant - libxml2 libsecret libxslt + gtk2 libwebp enchant + libxml2 libxslt gst-plugins-base sqlite - ]; + ] ++ optionals enableCredentialStorage [ + libsecret + ] ++ (if stdenv.isDarwin then [ + readline libedit + ] else [ + wayland + ]); propagatedBuildInputs = [ libsoup harfbuzz/*icu in *.la*/ diff --git a/pkgs/development/libraries/webkitgtk/adding-libintl.patch b/pkgs/development/libraries/webkitgtk/adding-libintl.patch new file mode 100644 index 000000000000..b6e8b073c9d4 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/adding-libintl.patch @@ -0,0 +1,10 @@ +--- webkitgtk-2.10.4-orig/Source/WebKit2/CMakeLists.txt 2015-11-11 02:42:51.000000000 -0500 ++++ webkitgtk-2.10.4/Source/WebKit2/CMakeLists.txt 2016-01-31 18:27:49.000000000 -0500 +@@ -738,6 +738,7 @@ + set(WebKit2_LIBRARIES + JavaScriptCore + WebCore ++ intl + ) + + set(PluginProcess_LIBRARIES diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 5fd108161680..1abfcbb6c860 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -2,11 +2,13 @@ , pkgconfig, gettext, gobjectIntrospection, libnotify , gtk2, gtk3, wayland, libwebp, enchant , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs -, enableGeoLocation ? true, geoclue2, sqlite -, gst-plugins-base +, enableGeoLocation ? false, geoclue2, sqlite +, enableCredentialStorage ? !stdenv.isDarwin +, gst-plugins-base, readline, libedit }: assert enableGeoLocation -> geoclue2 != null; +assert stdenv.isDarwin -> !enableCredentialStorage; with stdenv.lib; stdenv.mkDerivation rec { @@ -29,16 +31,37 @@ stdenv.mkDerivation rec { sha256 = "0mghsbfnmmf6nsf7cb3ah76s77aigkzf3k6kw96wgh6all6jdy6v"; }; - patches = [ ./finding-harfbuzz-icu.patch + patches = [ + ./finding-harfbuzz-icu.patch (fetchpatch { name = "glibc-isnan.patch"; url = "http://trac.webkit.org/changeset/194518/trunk/Source/JavaScriptCore" + "/runtime/Options.cpp?format=diff&new=194518"; sha256 = "0pzdv1zmlym751n9d310cx3yp752yzsc49cysbvgnrib4dh68nbm"; }) - ]; + ] ++ optional stdenv.isDarwin ./adding-libintl.patch; - cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ]; + cmakeFlags = [ + "-DPORT=GTK" + "-DUSE_LIBHYPHEN=OFF" + ] ++ optionals (!enableCredentialStorage) [ + "-DENABLE_CREDENTIAL_STORAGE=OFF" + ] ++ optionals (!enableGeoLocation) [ + "-DENABLE_GEOLOCATION=OFF" + ] ++ optionals stdenv.isDarwin [ + "-DENABLE_WEBKIT=ON" + "-DENABLE_X11_TARGET=OFF" + "-DENABLE_QUARTZ_TARGET=ON" + "-DENABLE_TOOLS=ON" + "-DENABLE_MINIBROWSER=ON" + "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" + "-DENABLE_VIDEO=OFF" + "-DENABLE_WEB_AUDIO=OFF" + "-DENABLE_OPENGL=OFF" + "-DENABLE_INTROSPECTION=OFF" + "-DUSE_LIBNOTIFY=OFF" + "-DCMAKE_SHARED_LINKER_FLAGS=-L/path/to/nonexistent/folder" + ]; # XXX: WebKit2 missing include path for gst-plugins-base. # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 @@ -50,10 +73,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 wayland libwebp enchant libnotify - libxml2 libsecret libxslt harfbuzz libpthreadstubs + gtk2 libwebp enchant libnotify + libxml2 libxslt harfbuzz libpthreadstubs gst-plugins-base - ] ++ optional enableGeoLocation geoclue2; + ] ++ optionals enableCredentialStorage [ + libsecret + ] ++ (if stdenv.isDarwin then [ + readline libedit + ] else [ + wayland + ]) ++ optional enableGeoLocation geoclue2; propagatedBuildInputs = [ libsoup gtk3 diff --git a/pkgs/development/libraries/webkitgtk/impure-icucore.patch b/pkgs/development/libraries/webkitgtk/impure-icucore.patch new file mode 100644 index 000000000000..24bf690d8b8f --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/impure-icucore.patch @@ -0,0 +1,12 @@ +diff -ru webkitgtk-2.4.9-orig/configure webkitgtk-2.4.9/configure +--- webkitgtk-2.4.9-orig/configure 2016-02-02 13:23:22.000000000 -0500 ++++ webkitgtk-2.4.9/configure 2016-02-02 13:24:13.000000000 -0500 +@@ -17715,7 +17715,7 @@ + case "$host" in + *-*-darwin*) + UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu" +- UNICODE_LIBS="-licucore" ++ UNICODE_LIBS="/usr/lib/libicucore.dylib" + ;; + *-*-mingw*) + diff --git a/pkgs/development/libraries/webkitgtk/libc++.patch b/pkgs/development/libraries/webkitgtk/libc++.patch new file mode 100644 index 000000000000..5a9df0ddae98 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/libc++.patch @@ -0,0 +1,20 @@ +--- webkitgtk-2.4.9-orig/GNUmakefile.in 2016-02-02 13:23:23.000000000 -0500 ++++ webkitgtk-2.4.9/GNUmakefile.in 2016-02-02 22:10:23.000000000 -0500 +@@ -23321,7 +23321,7 @@ + $(WINMM_LIBS) \ + -lm \ + -lpthread \ +- -lstdc++ ++ -lc++ + + Programs_minidom_LDFLAGS = \ + -no-install +@@ -23344,7 +23344,7 @@ + $(WINMM_LIBS) \ + -lm \ + -lpthread \ +- -lstdc++ ++ -lc++ + + Programs_LLIntOffsetsExtractor_LDFLAGS = \ + -no-install diff --git a/pkgs/development/libraries/webkitgtk/plugin-none.patch b/pkgs/development/libraries/webkitgtk/plugin-none.patch new file mode 100644 index 000000000000..5e2b36bf62dd --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/plugin-none.patch @@ -0,0 +1,38 @@ +--- webkitgtk-2.4.9-orig/GNUmakefile.in 2016-02-02 13:23:23.000000000 -0500 ++++ webkitgtk-2.4.9/GNUmakefile.in 2016-02-08 00:27:10.000000000 -0500 +@@ -4799,6 +4799,8 @@ + Source/WebCore/plugins/PluginViewBase.h \ + Source/WebCore/plugins/PluginView.cpp \ + Source/WebCore/plugins/PluginView.h \ ++ Source/WebCore/plugins/PluginViewNone.cpp \ ++ Source/WebCore/plugins/PluginPackageNone.cpp \ + Source/WebCore/plugins/npapi.h \ + Source/WebCore/plugins/npfunctions.h \ + Source/WebCore/plugins/npruntime.h \ +@@ -6375,6 +6377,8 @@ + Source/WebCore/plugins/libWebCore_la-PluginPackage.lo \ + Source/WebCore/plugins/libWebCore_la-PluginStream.lo \ + Source/WebCore/plugins/libWebCore_la-PluginView.lo \ ++ Source/WebCore/plugins/libWebCore_la-PluginViewNone.lo \ ++ Source/WebCore/plugins/libWebCore_la-PluginPackageNone.lo \ + Source/WebCore/rendering/libWebCore_la-AutoTableLayout.lo \ + Source/WebCore/rendering/libWebCore_la-BidiRun.lo \ + Source/WebCore/rendering/libWebCore_la-break_lines.lo \ +@@ -10796,6 +10800,8 @@ + Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginProcessConnectionManager.lo \ + Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginProxy.lo \ + Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginView.lo \ ++ Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginViewNone.lo \ ++ Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginPackageNone.lo \ + Source/WebKit2/WebProcess/ResourceCache/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-WebResourceCacheManager.lo \ + Source/WebKit2/WebProcess/Storage/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-StorageAreaImpl.lo \ + Source/WebKit2/WebProcess/Storage/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-StorageAreaMap.lo \ +@@ -19503,6 +19509,8 @@ + Source/WebCore/plugins/PluginViewBase.h \ + Source/WebCore/plugins/PluginView.cpp \ + Source/WebCore/plugins/PluginView.h \ ++ Source/WebCore/plugins/PluginViewNone.cpp \ ++ Source/WebCore/plugins/PluginPackageNone.cpp \ + Source/WebCore/plugins/npapi.h \ + Source/WebCore/plugins/npfunctions.h \ + Source/WebCore/plugins/npruntime.h \ diff --git a/pkgs/development/libraries/webkitgtk/quartz-webcore.patch b/pkgs/development/libraries/webkitgtk/quartz-webcore.patch new file mode 100644 index 000000000000..a7bf859d6c62 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/quartz-webcore.patch @@ -0,0 +1,22 @@ +--- webkitgtk-2.4.9-orig/Source/WebCore/plugins/PluginView.cpp 2016-02-02 13:23:23.000000000 -0500 ++++ webkitgtk-2.4.9/Source/WebCore/plugins/PluginView.cpp 2016-02-02 18:28:07.000000000 -0500 +@@ -839,7 +839,7 @@ + #if defined(XP_MACOSX) + , m_contextRef(0) + #endif +-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API) ++#if defined(X11) && ENABLE(NETSCAPE_PLUGIN_API) + , m_hasPendingGeometryChange(true) + , m_drawable(0) + , m_visual(0) +--- webkitgtk-2.4.9-orig/Source/WebCore/plugins/PluginView.h 2016-02-02 13:23:23.000000000 -0500 ++++ webkitgtk-2.4.9/Source/WebCore/plugins/PluginView.h 2016-02-02 18:26:37.000000000 -0500 +@@ -378,7 +378,7 @@ + void setNPWindowIfNeeded(); + #endif + +-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API) ++#if PLATFORM(X11) && ENABLE(NETSCAPE_PLUGIN_API) + bool m_hasPendingGeometryChange; + Pixmap m_drawable; + Visual* m_visual; From 070b123d4b0b15801861e2e37c554190bc61d48b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Mar 2016 10:57:22 +0200 Subject: [PATCH 75/75] ghc: version 6.12.3 is broken after updating to gcc 5.x http://hydra.nixos.org/build/33627548 --- pkgs/development/compilers/ghc/6.12.3.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index f6beaf3a0067..e480a6f837c3 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. inherit (ghc.meta) license; + broken = true; # broken by gcc 5.x: http://hydra.nixos.org/build/33627548 }; }