From 9a67d1dcab481108f8ee3e24836639661a32d255 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 11 Mar 2016 21:51:06 +0100 Subject: [PATCH 001/165] python-xcaplib: 1.1.0 -> 1.2.0 --- pkgs/top-level/python-packages.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e7484287ce..101fd5ff98f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22213,12 +22213,15 @@ in modules // { }; xcaplib = buildPythonPackage rec { - name = "python-xcaplib-${version}"; - version = "1.1.0"; + pname = "python-xcaplib"; + name = "${pname}-${version}"; + version = "1.2.0"; + disabled = isPy3k; - src = pkgs.fetchurl { - url = "http://download.ag-projects.com/XCAP/${name}.tar.gz"; - sha256 = "2f8ea6fe7d005104ef1d854aa87bd8ee85ca242a70cde42f409f8e5557f864b3"; + src = pkgs.fetchdarcs { + url = "http://devel.ag-projects.com/repositories/${pname}"; + rev = "release-${version}"; + sha256 = "0vna5r4ihv7z1yx6r93954jqskcxky77znzy1m9dg9vna1dgwfdn"; }; propagatedBuildInputs = with self; [ eventlib application ]; From c8f9f9d9ed23c2cbaca6303e83c58dca487a2cdb Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 11 Mar 2016 22:05:29 +0100 Subject: [PATCH 002/165] python-application: 1.5.0 -> 2.0.2 --- pkgs/top-level/python-packages.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 101fd5ff98f..e78806f5ff2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -773,13 +773,18 @@ in modules // { }; application = buildPythonPackage rec { - name = "python-application-${version}"; - version = "1.5.0"; + pname = "python-application"; + name = "${pname}-${version}"; + version = "2.0.2"; + disabled = isPy3k; + + src = pkgs.fetchdarcs { + url = "http://devel.ag-projects.com/repositories/${pname}"; + rev = "release-${version}"; + sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn"; + }; + buildInputs = with self; [ zope_interface ]; - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/p/python-application/${name}.tar.gz"; - sha256 = "9bc00c2c639bf633e2c5e08d4bf1bb5d7edaad6ccdd473692f0362df08f8aafc"; - }; }; appnope = buildPythonPackage rec { From a8c8dc9e270ab321061b916b73f41cce5da67828 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 11 Mar 2016 22:11:34 +0100 Subject: [PATCH 003/165] python-msrplib: 0.18 -> 0.19 --- pkgs/top-level/python-packages.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e78806f5ff2..43b63cfb260 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11959,14 +11959,16 @@ in modules // { }; msrplib = buildPythonPackage rec { - name = "python-msrplib-${version}"; - version = "0.18.0"; - - src = pkgs.fetchurl { - url = "http://download.ag-projects.com/MSRP/${name}.tar.gz"; - sha256 = "0vp9g5p015g3f67rl4vz0qnn6x7hciry6nmvwf82h9h5rx11r43j"; - }; + pname = "python-msrplib"; + name = "${pname}-${version}"; + version = "0.19"; + src = pkgs.fetchdarcs { + url = "http://devel.ag-projects.com/repositories/${pname}"; + rev = "release-${version}"; + sha256 = "0jqvvssbwzq7bwqn3wrjfnpj8zb558mynn2visnlrcma6b57yhwd"; + }; + propagatedBuildInputs = with self; [ eventlib application gnutls ]; }; From dc6c4f909b127a6261a8815cc5e119a61a6d9005 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 11 Mar 2016 22:15:41 +0100 Subject: [PATCH 004/165] python-eventlib: 0.2.1 -> 0.2.2 --- pkgs/top-level/python-packages.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43b63cfb260..8b9d86cbff1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5252,16 +5252,18 @@ in modules // { eventlib = buildPythonPackage rec { - name = "python-eventlib-${version}"; - version = "0.2.1"; + pname = "python-eventlib"; + name = "${pname}-${version}"; + version = "0.2.2"; # Judging from SyntaxError disabled = isPy3k; - src = pkgs.fetchurl { - url = "http://download.ag-projects.com/SipClient/${name}.tar.gz"; - sha256 = "25224794420f430946fe46932718b521a6264903fe8c0ed3563dfdb844c623e7"; - }; + src = pkgs.fetchdarcs { + url = "http://devel.ag-projects.com/repositories/${pname}"; + rev = "release-${version}"; + sha256 = "1zxhpq8i4jwsk7wmfncqfm211hqikj3hp38cfv509924bi76wak8"; + }; propagatedBuildInputs = with self; [ greenlet ]; From b4fc87b06291f8943d9dd3c8b47e3337329baf00 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sat, 12 Mar 2016 12:10:38 +0100 Subject: [PATCH 005/165] python-sipsimple: 2.6.0 -> 3.0.0 --- 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 8b9d86cbff1..3746f860b66 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19942,12 +19942,12 @@ in modules // { sipsimple = buildPythonPackage rec { name = "sipsimple-${version}"; - version = "2.6.0"; + version = "3.0.0"; disabled = isPy3k; src = pkgs.fetchurl { url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz"; - sha256 = "0xcyasas28q1ad1hgw4vd62b72mf1sng7xwfcls6dc05k9p3q8v3"; + sha256 = "1q35kgz151rr99240jq55rs39y741m8shh9yihl3x95rkjxchji4"; }; propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ]; From 4c1525c1f8985ffeb3b0310edeaa2e61b4977f9c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 21 Feb 2016 20:13:44 +0100 Subject: [PATCH 006/165] 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 196b9e44539..7583813c94f 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 00000000000..fc0a0ba987a --- /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 57aceeb4868..00000000000 --- 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 007/165] 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 7583813c94f..5c97bc32a88 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 2f24bef7828736466b5cb5a553be447ad75cb4d5 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sat, 12 Mar 2016 22:31:29 +0100 Subject: [PATCH 008/165] python-gnutls: 2.0.1 -> 3.0.0 --- pkgs/top-level/python-packages.nix | 31 +++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3746f860b66..5287d9a47e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5695,8 +5695,8 @@ in modules // { gnutls = buildPythonPackage rec { name = "python-gnutls"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-2.0.1.tar.gz"; - sha256 = "d8fb368c6a4dd58bc6cd5e61d4a12d119c4506fd344a371b3429b3ac2623b9ac"; + url = "https://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-3.0.0.tar.gz"; + sha256 = "1yrdxcj5rzvz8iglircz6icvyggz5fmdcd010n6w3j60yp4p84kc"; }; propagatedBuildInputs = with self; [ pkgs.gnutls ]; @@ -13288,6 +13288,31 @@ in modules // { }; }; + python-otr = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "python-otr"; + version = "1.2.0"; + + disabled = isPy3k; + + src = pkgs.fetchFromGitHub { + owner = "AGProjects"; + repo = pname; + rev = "release-" + version; + sha256 = "0p3b1n8jlxwd65gbk2k5007fkhdyjwcvr4982s42hncivxvabzzy"; + }; + + propagatedBuildInputs = with self; [ zope_interface cryptography application gmpy2 ]; + + meta = { + description = "A pure python implementation of OTR"; + homepage = https://github.com/AGProjects/otr; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ edwtjo ]; + }; + }; + ply = buildPythonPackage (rec { name = "ply-3.8"; @@ -19950,7 +19975,7 @@ in modules // { sha256 = "1q35kgz151rr99240jq55rs39y741m8shh9yihl3x95rkjxchji4"; }; - propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ]; + propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml python-otr ]; buildInputs = with pkgs; [ alsaLib ffmpeg libv4l pkgconfig sqlite libvpx ]; }; From 6db4b907b8df946eb668aa01c997ecac4509a03e Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sat, 12 Mar 2016 22:33:00 +0100 Subject: [PATCH 009/165] blinkqt: 1.4.1 -> 2.0.0 --- .../instant-messengers/blink/default.nix | 4 +- .../instant-messengers/blink/pythonpath.patch | 45 +++++++++++++++---- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 7b0e4d70fd9..0a6d04aef64 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication rec { name = "blink-${version}"; - version = "1.4.2"; + version = "2.0.0"; src = fetchurl { url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz"; - sha256 = "0ia5hgwyg6cm393ik4ggzhcmc957ncswycs07ilwj6vrrzraxfk7"; + sha256 = "07hvy45pavgkvdlh4wbz3shsxh4fapg96qlqmfymdi1nfhwghb05"; }; patches = [ ./pythonpath.patch ]; diff --git a/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch b/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch index 723e097ea82..0df8bc84ff3 100644 --- a/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch +++ b/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch @@ -1,14 +1,44 @@ -diff -rupN a/blink/resources.py b/blink/resources.py ---- a/blink/resources.py 2015-03-17 03:24:06.000000000 -0600 -+++ b/blink/resources.py 2015-04-07 22:52:06.101096413 -0600 -@@ -60,14 +60,7 @@ class Resources(object): +--- blink-2.0.0/blink/resources.py 2016-03-09 14:39:07.000000000 +0100 ++++ blink-2.0.0/blink/resources-patched.py 2016-03-12 21:34:14.965476623 +0100 +@@ -1,7 +1,10 @@ ++# Copyright (C) 2010-2013 AG Projects. See LICENSE for details. ++# + + """Provide access to Blink's resources""" + +-import __main__ ++__all__ = ['ApplicationData', 'Resources', 'IconManager'] ++ + import imghdr + import os + import platform +@@ -19,14 +22,10 @@ + from blink.util import run_in_gui_thread + + +-__all__ = ['ApplicationData', 'Resources', 'IconManager'] +- +- + class DirectoryContextManager(unicode): + def __enter__(self): + self.directory = os.getcwdu() + os.chdir(self) +- + def __exit__(self, type, value, traceback): + os.chdir(self.directory) + +@@ -61,18 +60,7 @@ @classproperty def directory(cls): if cls._cached_directory is None: -- if sys.path[0] == '': -- application_directory = os.path.realpath('') # executed in interactive interpreter +- try: +- binary_directory = os.path.dirname(os.path.realpath(__main__.__file__)) +- except AttributeError: +- if hasattr(sys, 'frozen'): +- application_directory = os.path.dirname(os.path.realpath(sys.executable)) +- else: +- application_directory = os.path.realpath('') # executed in interactive interpreter - else: -- binary_directory = os.path.dirname(os.path.realpath(sys.argv[0])) - if os.path.basename(binary_directory) == 'bin': - application_directory = os.path.dirname(binary_directory) - else: @@ -17,4 +47,3 @@ diff -rupN a/blink/resources.py b/blink/resources.py if os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')): cls._cached_directory = os.path.join(application_directory, 'resources').decode(sys.getfilesystemencoding()) else: -Binary files a/blink/.resources.py.swp and b/blink/.resources.py.swp differ From 7f3b08361044e41fa74c7b583d019f9f82c16def Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Mon, 14 Mar 2016 12:32:48 +0300 Subject: [PATCH 010/165] torch: init at torch-git-2016-03-08 Torch is a machine-learning framework written in Lua --- .../machine-learning/torch/default.nix | 10 + .../machine-learning/torch/torch-distro.nix | 355 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 367 insertions(+) create mode 100644 pkgs/applications/science/machine-learning/torch/default.nix create mode 100644 pkgs/applications/science/machine-learning/torch/torch-distro.nix diff --git a/pkgs/applications/science/machine-learning/torch/default.nix b/pkgs/applications/science/machine-learning/torch/default.nix new file mode 100644 index 00000000000..0444e664502 --- /dev/null +++ b/pkgs/applications/science/machine-learning/torch/default.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchgit } : +let + src = fetchgit { + url = "https://github.com/grwlf/torch-distro"; + rev = "f972c4253b14b95b53aefe7b24efa496223e73f2"; + sha256 = "1lhjhivhyypaic33vj1nsghshsajf7vi6gwsclaf3nqdl27d1h1s"; + }; + +in + callPackage (import ./torch-distro.nix) { inherit src; } diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix new file mode 100644 index 00000000000..66e7b15a568 --- /dev/null +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -0,0 +1,355 @@ +{ luarocks, lib , stdenv, writeText , readline, makeWrapper, + less, ncurses, cmake, openblas, coreutils, fetchgit, libuuid, czmq, openssl, + gnuplot, fetchurl, + + src ? ./. +} : + +let + + common_meta = { + homepage = http://torch.ch; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ smironov ]; + platforms = stdenv.lib.platforms.gnu; + }; + + distro_src = src; + + default_luarocks = luarocks; + + pkgs_gnuplot = gnuplot; + + luapkgs = rec { + + + luajit = + stdenv.mkDerivation rec { + name = "luajit-${version}"; + version = "2.1.0-beta1"; + luaversion = "5.1"; + + src = fetchurl { + url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; + sha256 = "06170d38387c59d1292001a166e7f5524f5c5deafa8705a49a46fa42905668dd"; + }; + + enableParallelBuilding = true; + + patchPhase = '' + substituteInPlace Makefile \ + --replace /usr/local $out + + substituteInPlace src/Makefile --replace gcc cc + '' + stdenv.lib.optionalString (stdenv.cc.libc != null) + '' + substituteInPlace Makefile \ + --replace ldconfig ${stdenv.cc.libc}/sbin/ldconfig + ''; + + configurePhase = false; + buildFlags = [ "amalg" ]; # Build highly optimized version + installPhase = '' + make install INSTALL_INC=$out/include PREFIX=$out + ln -s $out/bin/luajit* $out/bin/luajit + ''; + + meta = with stdenv.lib; { + description = "high-performance JIT compiler for Lua 5.1"; + homepage = http://luajit.org; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = [ maintainers.thoughtpolice ]; + }; + }; + + luarocks = default_luarocks.override { + lua = luajit; + }; + + buildLuaRocks = { rockspec ? "", luadeps ? [] , buildInputs ? [] + , preBuild ? "" , postInstall ? "" + , runtimeDeps ? [] , ... }@args : + let + + luadeps_ = + luadeps ++ + (lib.concatMap (d : if d ? luadeps then d.luadeps else []) luadeps); + + runtimeDeps_ = + runtimeDeps ++ + (lib.concatMap (d : if d ? runtimeDeps then d.runtimeDeps else []) luadeps) ++ + [ luajit coreutils ]; + + mkcfg = '' + export LUAROCKS_CONFIG=config.lua + cat >config.lua <= 1.0"' ' ' + export LUA_PATH="$src/?.lua;$LUA_PATH" + ''; + meta = common_meta // { + description = "Torch is a machine-learning library"; + longDescription = '' + Torch is the main package in [Torch7](http://torch.ch) where data + structures for multi-dimensional tensors and mathematical operations + over these are defined. Additionally, it provides many utilities for + accessing files, serializing objects of arbitrary types and other + useful utilities. + ''; + }; + }; + + dok = buildLuaRocks rec { + name = "dok"; + src = "${distro_src}/pkg/dok"; + luadeps = [sundown]; + rockspec = "rocks/${name}-scm-1.rockspec"; + }; + + sys = buildLuaRocks rec { + name = "sys"; + luadeps = [torch]; + buildInputs = [readline cmake]; + src = "${distro_src}/pkg/sys"; + rockspec = "sys-1.1-0.rockspec"; + preBuild = '' + export Torch_DIR=${torch}/share/cmake/torch + ''; + }; + + xlua = buildLuaRocks rec { + name = "xlua"; + luadeps = [torch sys]; + src = "${distro_src}/pkg/xlua"; + rockspec = "xlua-1.0-0.rockspec"; + }; + + nn = buildLuaRocks rec { + name = "nn"; + luadeps = [torch luaffifb]; + buildInputs = [cmake]; + src = "${distro_src}/extra/nn"; + rockspec = "rocks/nn-scm-1.rockspec"; + preBuild = '' + export Torch_DIR=${torch}/share/cmake/torch + ''; + }; + + graph = buildLuaRocks rec { + name = "graph"; + luadeps = [ torch ]; + buildInputs = [cmake]; + src = "${distro_src}/extra/graph"; + rockspec = "rocks/graph-scm-1.rockspec"; + preBuild = '' + export Torch_DIR=${torch}/share/cmake/torch + ''; + }; + + nngraph = buildLuaRocks rec { + name = "nngraph"; + luadeps = [ torch nn graph ]; + buildInputs = [cmake]; + src = "${distro_src}/extra/nngraph"; + preBuild = '' + export Torch_DIR=${torch}/share/cmake/torch + ''; + }; + + image = buildLuaRocks rec { + name = "image"; + luadeps = [ torch dok sys xlua ]; + buildInputs = [cmake]; + src = "${distro_src}/pkg/image"; + rockspec = "image-1.1.alpha-0.rockspec"; + preBuild = '' + export Torch_DIR=${torch}/share/cmake/torch + ''; + }; + + optim = buildLuaRocks rec { + name = "optim"; + luadeps = [ torch ]; + buildInputs = [cmake]; + src = "${distro_src}/pkg/optim"; + rockspec = "optim-1.0.5-0.rockspec"; + preBuild = '' + export Torch_DIR=${torch}/share/cmake/torch + ''; + }; + + gnuplot = buildLuaRocks rec { + name = "gnuplot"; + luadeps = [ torch paths ]; + runtimeDeps = [ pkgs_gnuplot less ]; + src = "${distro_src}/pkg/gnuplot"; + rockspec = "rocks/gnuplot-scm-1.rockspec"; + }; + + trepl = buildLuaRocks rec { + name = "trepl"; + luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot optim sys dok]; + runtimeDeps = [ ncurses readline ]; + src = "${distro_src}/exe/trepl"; + meta = common_meta // { + description = "A pure Lua REPL for LuaJIT, with heavy support for Torch types."; + }; + }; + + lbase64 = buildLuaRocks rec { + name = "lbase64"; + src = fetchgit { + url = "https://github.com/LuaDist2/lbase64"; + rev = "1e9e4f1e0bf589a0ed39f58acc185ec5e213d207"; + sha256 = "1i1fpy9v6r4w3lrmz7bmf5ppq65925rv90gx39b3pykfmn0hcb9c"; + }; + }; + + luuid = stdenv.mkDerivation rec { + name = "luuid"; + src = fetchgit { + url = "https://github.com/LuaDist/luuid"; + sha256 = "062gdf1rild11jg46vry93hcbb36b4527pf1dy7q9fv89f7m2nav"; + }; + + preConfigure = '' + cmakeFlags="-DLUA_LIBRARY=${luajit}/lib/lua/${luajit.luaversion} -DINSTALL_CMOD=$out/lib/lua/${luajit.luaversion} -DINSTALL_MOD=$out/lib/lua/${luajit.luaversion}" + ''; + + buildInputs = [cmake libuuid luajit]; + meta = { + # FIXME: set the exact revision for src + broken = true; + }; + }; + + # Doesn't work due to missing deps (according to luarocs). + itorch = buildLuaRocks rec { + name = "itorch"; + luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot + optim sys dok lbase64 lua-cjson luuid]; + buildInputs = [czmq openssl]; + src = "${distro_src}/extra/iTorch"; + meta = { + # FIXME: figure out whats wrong with deps + broken = true; + }; + }; + + + }; + +in + +luapkgs + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c283e4acb1..a1d5a683c3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13427,6 +13427,8 @@ let quazip = qt5.quazip.override { qt = qt4; }; }; + torch-packages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch { } ); + torchat = callPackage ../applications/networking/instant-messengers/torchat { wrapPython = pythonPackages.wrapPython; }; From f499f61c85245d28adcd6393b3b2e2a5e891fffc Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Wed, 16 Mar 2016 11:36:04 +0300 Subject: [PATCH 011/165] torch: don't use default value for src --- .../science/machine-learning/torch/torch-distro.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 66e7b15a568..cbbaf0383c7 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -1,8 +1,7 @@ { luarocks, lib , stdenv, writeText , readline, makeWrapper, less, ncurses, cmake, openblas, coreutils, fetchgit, libuuid, czmq, openssl, gnuplot, fetchurl, - - src ? ./. + src } : let From 1b0513941425af8967e637032bd88dc933892e0a Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Wed, 16 Mar 2016 23:52:09 +0300 Subject: [PATCH 012/165] torch: Read LUA_PATH and LUA_CPATH set by users --- .../science/machine-learning/torch/torch-distro.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index cbbaf0383c7..2204af0597e 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -117,8 +117,10 @@ let wrapProgram $p \ --set LD_LIBRARY_PATH "${lib.makeSearchPath "lib" runtimeDeps_}" \ --set PATH "${lib.makeSearchPath "bin" runtimeDeps_}" \ - --set LUA_PATH "'$LUA_PATH;$out/share/lua/${luajit.luaversion}/?.lua;$out/share/lua/${luajit.luaversion}/?/init.lua'" \ - --set LUA_CPATH "'$LUA_CPATH;$out/lib/lua/${luajit.luaversion}/?.so;$out/lib/lua/${luajit.luaversion}/?/init.so'" + --suffix LUA_PATH ';' "\"$LUA_PATH\"" \ + --suffix LUA_PATH ';' "\"$out/share/lua/${luajit.luaversion}/?.lua;$out/share/lua/${luajit.luaversion}/?/init.lua\"" \ + --suffix LUA_CPATH ';' "\"$LUA_CPATH\"" \ + --suffix LUA_CPATH ';' "\"$out/lib/lua/${luajit.luaversion}/?.so;$out/lib/lua/${luajit.luaversion}/?/init.so\"" done eval "$postInstall" From da66fd2b115c564d87ffb904e764bbb0cbd92f9b Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Sat, 19 Mar 2016 12:35:20 +0300 Subject: [PATCH 013/165] luajit: bump to 2.1.0-beta1 --- pkgs/development/interpreters/luajit/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 8e148f1189c..903af0bfd5f 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { name = "luajit-${version}"; - version = "2.0.4"; + version = "2.1.0-beta1"; + luaversion = "5.1"; src = fetchurl { url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2"; + sha256 = "06170d38387c59d1292001a166e7f5524f5c5deafa8705a49a46fa42905668dd"; }; enableParallelBuilding = true; @@ -24,13 +25,16 @@ stdenv.mkDerivation rec { configurePhase = false; buildFlags = [ "amalg" ]; # Build highly optimized version - installPhase = "make install PREFIX=$out"; + installPhase = '' + make install INSTALL_INC=$out/include PREFIX=$out + ln -s $out/bin/luajit* $out/bin/luajit + ''; meta = with stdenv.lib; { description = "high-performance JIT compiler for Lua 5.1"; homepage = http://luajit.org; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = with maintainers ; [ thoughtpolice smironov ]; }; } From a56b9ab5bebf9534404cd46f6b61f82e17164a0b Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Sat, 19 Mar 2016 12:35:40 +0300 Subject: [PATCH 014/165] torch: use default luajit --- .../machine-learning/torch/torch-distro.nix | 44 +------------------ 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 2204af0597e..1de2b51a19d 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -1,7 +1,6 @@ { luarocks, lib , stdenv, writeText , readline, makeWrapper, less, ncurses, cmake, openblas, coreutils, fetchgit, libuuid, czmq, openssl, - gnuplot, fetchurl, - src + gnuplot, fetchurl, luajit, src } : let @@ -21,47 +20,6 @@ let luapkgs = rec { - - luajit = - stdenv.mkDerivation rec { - name = "luajit-${version}"; - version = "2.1.0-beta1"; - luaversion = "5.1"; - - src = fetchurl { - url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - sha256 = "06170d38387c59d1292001a166e7f5524f5c5deafa8705a49a46fa42905668dd"; - }; - - enableParallelBuilding = true; - - patchPhase = '' - substituteInPlace Makefile \ - --replace /usr/local $out - - substituteInPlace src/Makefile --replace gcc cc - '' + stdenv.lib.optionalString (stdenv.cc.libc != null) - '' - substituteInPlace Makefile \ - --replace ldconfig ${stdenv.cc.libc}/sbin/ldconfig - ''; - - configurePhase = false; - buildFlags = [ "amalg" ]; # Build highly optimized version - installPhase = '' - make install INSTALL_INC=$out/include PREFIX=$out - ln -s $out/bin/luajit* $out/bin/luajit - ''; - - meta = with stdenv.lib; { - description = "high-performance JIT compiler for Lua 5.1"; - homepage = http://luajit.org; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.thoughtpolice ]; - }; - }; - luarocks = default_luarocks.override { lua = luajit; }; From d8cae4d0cb0091641354fdad9fed0987c5d31a43 Mon Sep 17 00:00:00 2001 From: leenaars Date: Sun, 20 Mar 2016 15:36:03 +0100 Subject: [PATCH 015/165] blink: added icon and updated license --- .../instant-messengers/blink/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 0a6d04aef64..1cb345ba63a 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pythonPackages, pyqt4, cython, libvncserver, zlib, twisted -, gnutls, libvpx }: +, gnutls, libvpx, makeDesktopItem }: pythonPackages.buildPythonApplication rec { name = "blink-${version}"; @@ -20,16 +20,30 @@ pythonPackages.buildPythonApplication rec { buildInputs = [ cython zlib libvncserver libvpx ]; + desktopItem = makeDesktopItem { + name = "Blink"; + exec = "blink"; + comment = meta.description; + desktopName = "Blink"; + icon = "blink"; + genericName = "Instant Messaging"; + categories = "Application;Internet;"; + }; + postInstall = '' wrapProgram $out/bin/blink \ --prefix LD_LIBRARY_PATH ":" ${gnutls}/lib + mkdir -p "$out/share/applications" + mkdir -p "$out/share/pixmaps" + cp "$desktopItem"/share/applications/* "$out/share/applications" + cp "$out"/share/blink/icons/blink.* "$out/share/pixmaps" ''; meta = with stdenv.lib; { homepage = http://icanblink.com/; - description = "A state of the art, easy to use SIP client"; + description = "A state of the art, easy to use SIP client for Voice, Video and IM"; platforms = platforms.linux; - license = licenses.mit; + license = licenses.gplv3; maintainers = with maintainers; [ pSub ]; }; } From 4a36a0c5047e64e7e5227e1b77cc87b177e47f75 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Mon, 21 Mar 2016 12:51:20 +0300 Subject: [PATCH 016/165] torch: unhardcode references to luajit --- .../machine-learning/torch/default.nix | 4 ++-- .../machine-learning/torch/torch-distro.nix | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 5 ++++- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/science/machine-learning/torch/default.nix b/pkgs/applications/science/machine-learning/torch/default.nix index 0444e664502..bdeeaad189a 100644 --- a/pkgs/applications/science/machine-learning/torch/default.nix +++ b/pkgs/applications/science/machine-learning/torch/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchgit } : +{ callPackage, fetchgit, lua } : let src = fetchgit { url = "https://github.com/grwlf/torch-distro"; @@ -7,4 +7,4 @@ let }; in - callPackage (import ./torch-distro.nix) { inherit src; } + callPackage (import ./torch-distro.nix) { inherit lua src; } diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 1de2b51a19d..617ba53e516 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -1,6 +1,6 @@ { luarocks, lib , stdenv, writeText , readline, makeWrapper, less, ncurses, cmake, openblas, coreutils, fetchgit, libuuid, czmq, openssl, - gnuplot, fetchurl, luajit, src + gnuplot, fetchurl, lua, src } : let @@ -21,7 +21,7 @@ let luapkgs = rec { luarocks = default_luarocks.override { - lua = luajit; + inherit lua; }; buildLuaRocks = { rockspec ? "", luadeps ? [] , buildInputs ? [] @@ -36,7 +36,7 @@ let runtimeDeps_ = runtimeDeps ++ (lib.concatMap (d : if d ? runtimeDeps then d.runtimeDeps else []) luadeps) ++ - [ luajit coreutils ]; + [ lua coreutils ]; mkcfg = '' export LUAROCKS_CONFIG=config.lua @@ -49,7 +49,7 @@ let variables = { LUA_BINDIR = "$out/bin"; LUA_INCDIR = "$out/include"; - LUA_LIBDIR = "$out/lib/lua/${luajit.luaversion}"; + LUA_LIBDIR = "$out/lib/lua/${lua.luaversion}"; }; EOF ''; @@ -63,7 +63,7 @@ let phases = [ "unpackPhase" "patchPhase" "buildPhase"]; - buildInputs = runtimeDeps ++ buildInputs ++ [ makeWrapper luajit ]; + buildInputs = runtimeDeps ++ buildInputs ++ [ makeWrapper lua ]; buildPhase = '' eval "$preBuild" @@ -76,9 +76,9 @@ let --set LD_LIBRARY_PATH "${lib.makeSearchPath "lib" runtimeDeps_}" \ --set PATH "${lib.makeSearchPath "bin" runtimeDeps_}" \ --suffix LUA_PATH ';' "\"$LUA_PATH\"" \ - --suffix LUA_PATH ';' "\"$out/share/lua/${luajit.luaversion}/?.lua;$out/share/lua/${luajit.luaversion}/?/init.lua\"" \ + --suffix LUA_PATH ';' "\"$out/share/lua/${lua.luaversion}/?.lua;$out/share/lua/${lua.luaversion}/?/init.lua\"" \ --suffix LUA_CPATH ';' "\"$LUA_CPATH\"" \ - --suffix LUA_CPATH ';' "\"$out/lib/lua/${luajit.luaversion}/?.so;$out/lib/lua/${luajit.luaversion}/?/init.so\"" + --suffix LUA_CPATH ';' "\"$out/lib/lua/${lua.luaversion}/?.so;$out/lib/lua/${lua.luaversion}/?/init.so\"" done eval "$postInstall" @@ -100,7 +100,7 @@ let makeFlags="PREFIX=$out LUA_LIBRARY=$out/lib/lua" ''; - buildInputs = [luajit]; + buildInputs = [lua]; installPhase = '' make install-extra $makeFlags @@ -260,7 +260,7 @@ let runtimeDeps = [ ncurses readline ]; src = "${distro_src}/exe/trepl"; meta = common_meta // { - description = "A pure Lua REPL for LuaJIT, with heavy support for Torch types."; + description = "A pure Lua REPL for Lua(JIT), with heavy support for Torch types."; }; }; @@ -281,10 +281,10 @@ let }; preConfigure = '' - cmakeFlags="-DLUA_LIBRARY=${luajit}/lib/lua/${luajit.luaversion} -DINSTALL_CMOD=$out/lib/lua/${luajit.luaversion} -DINSTALL_MOD=$out/lib/lua/${luajit.luaversion}" + cmakeFlags="-DLUA_LIBRARY=${lua}/lib/lua/${lua.luaversion} -DINSTALL_CMOD=$out/lib/lua/${lua.luaversion} -DINSTALL_MOD=$out/lib/lua/${lua.luaversion}" ''; - buildInputs = [cmake libuuid luajit]; + buildInputs = [cmake libuuid lua]; meta = { # FIXME: set the exact revision for src broken = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1d5a683c3d..f540404b505 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5159,6 +5159,7 @@ let lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); + luajitPackages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = luajit; }); luaPackages = lua52Packages; @@ -13427,7 +13428,9 @@ let quazip = qt5.quazip.override { qt = qt4; }; }; - torch-packages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch { } ); + torchPackages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch { + lua = luajit ; + } ); torchat = callPackage ../applications/networking/instant-messengers/torchat { wrapPython = pythonPackages.wrapPython; From 5211ddb92ea5b9bc326f4b0f9edb4813e03ee811 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Mon, 21 Mar 2016 22:08:32 +0300 Subject: [PATCH 017/165] torch: add main application to the top-level --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f540404b505..3d7f6969929 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13432,6 +13432,8 @@ let lua = luajit ; } ); + torch-repl = lib.setName "torch-repl" torchPackages.trepl; + torchat = callPackage ../applications/networking/instant-messengers/torchat { wrapPython = pythonPackages.wrapPython; }; From 8dd955cc10329cbe0461b69bd796ecbd06b8b441 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 21:09:20 +0100 Subject: [PATCH 018/165] virtinst: remove sqlalchemy7 dependency sqlalchemy is never used: ``` $ nix-shell default.nix -A virtinst $ unpackPhase && cd virtinst-* $ grep -r sqlalchemy . $ ``` --- pkgs/applications/virtualization/virtinst/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index c9a62ce5f92..6064972fe95 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; pythonPath = with pythonPackages; - [ setuptools eventlet greenlet gflags netaddr sqlalchemy7 carrot routes + [ setuptools eventlet greenlet gflags netaddr carrot routes PasteDeploy m2crypto ipy twisted sqlalchemy_migrate distutils_extra simplejson readline glanceclient cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that From 41729a9074769ee5119d3ceb67547b93af03f8c9 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 21:57:20 +0100 Subject: [PATCH 019/165] pythonPackages.webtest: 2.0.15 -> 2.0.20 --- 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 a8e30995336..7b28cbceaad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22376,12 +22376,12 @@ in modules // { webtest = buildPythonPackage rec { - version = "2.0.15"; + version = "2.0.20"; name = "webtest-${version}"; src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.zip"; - sha256 = "c320adc2cd862ea71ca9e2012e6157eb12f5f8d1632d1541f2eabf984aaa3ecc"; + url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.tar.gz"; + sha256 = "0bv0qhdjakdsdgj4sk21gnpp8xp8bga4x03p6gjb83ihrsb7n4xv"; }; preConfigure = '' From c899444c69d88cba028382692f15bd7fbeb80e54 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 22 Mar 2016 00:17:31 +0300 Subject: [PATCH 020/165] luajit: symlinked as 'lua' --- pkgs/development/interpreters/luajit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 903af0bfd5f..8b5da052852 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { buildFlags = [ "amalg" ]; # Build highly optimized version installPhase = '' make install INSTALL_INC=$out/include PREFIX=$out + ln -s $out/bin/luajit* $out/bin/lua ln -s $out/bin/luajit* $out/bin/luajit ''; From 7be460d54cefbd43030f4488e8d7edeea1e2c48b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 22:19:31 +0100 Subject: [PATCH 021/165] pythonPackges.beaker: 1.7.0 -> 1.8.0 --- pkgs/top-level/python-packages.nix | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b28cbceaad..9e607dd0f2e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1640,27 +1640,32 @@ in modules // { }); beaker = buildPythonPackage rec { - name = "Beaker-1.7.0"; + name = "Beaker-${version}"; + version = "1.8.0"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/B/Beaker/${name}.tar.gz"; - sha256 = "0vv4y22b3ly1212n9nnhgvc8yz32adlfl7w7s1wj0i5srpjcgvlq"; + # The pypy release do not contains the tests + src = pkgs.fetchFromGitHub { + owner = "bbangert"; + repo = "beaker"; + rev = "${version}"; + sha256 = "17yfr7a307n8rdl09was4j60xqk2s0hk0hywdkigrpj4qnw0is7g"; }; buildInputs = - [ self.sqlalchemy7 - self.pycryptopp - self.nose + [ self.nose self.mock self.webtest ]; - - # http://hydra.nixos.org/build/4511591/log/raw - doCheck = false; + propagatedBuildInputs = [ + self.sqlalchemy + self.pycrypto + ] ++ optionals (isPy26 || isPy27) [ + self.funcsigs + self.pycryptopp + ]; meta = { + description = "A Session and Caching library with WSGI Middleware"; maintainers = with maintainers; [ garbas iElectric ]; platforms = platforms.all; }; From 6bb8f451826f1bd7bbed69df785ff8e4a5f30fde Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 22 Mar 2016 00:37:56 +0300 Subject: [PATCH 022/165] torch: image, enable JPEG and PNG support --- .../science/machine-learning/torch/torch-distro.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 617ba53e516..88a3071d897 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -1,6 +1,6 @@ { luarocks, lib , stdenv, writeText , readline, makeWrapper, less, ncurses, cmake, openblas, coreutils, fetchgit, libuuid, czmq, openssl, - gnuplot, fetchurl, lua, src + gnuplot, fetchurl, lua, src, libjpeg, libpng } : let @@ -227,7 +227,7 @@ let image = buildLuaRocks rec { name = "image"; luadeps = [ torch dok sys xlua ]; - buildInputs = [cmake]; + buildInputs = [cmake libjpeg libpng]; src = "${distro_src}/pkg/image"; rockspec = "image-1.1.alpha-0.rockspec"; preBuild = '' From 56b34be0016276b7bae8c7d4cfcafb90f813be9d Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 22 Mar 2016 00:47:23 +0300 Subject: [PATCH 023/165] torch: read user PATH and LD_LIBRARY_PATH --- .../science/machine-learning/torch/torch-distro.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index 88a3071d897..c0c8c056ab5 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -73,8 +73,8 @@ let for p in $out/bin/*; do wrapProgram $p \ - --set LD_LIBRARY_PATH "${lib.makeSearchPath "lib" runtimeDeps_}" \ - --set PATH "${lib.makeSearchPath "bin" runtimeDeps_}" \ + --suffix LD_LIBRARY_PATH ';' "${lib.makeSearchPath "lib" runtimeDeps_}" \ + --suffix PATH ';' "${lib.makeSearchPath "bin" runtimeDeps_}" \ --suffix LUA_PATH ';' "\"$LUA_PATH\"" \ --suffix LUA_PATH ';' "\"$out/share/lua/${lua.luaversion}/?.lua;$out/share/lua/${lua.luaversion}/?/init.lua\"" \ --suffix LUA_CPATH ';' "\"$LUA_CPATH\"" \ From 9d5fcad5e7e420f75c85f9e00b1135985b792059 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 22:49:00 +0100 Subject: [PATCH 024/165] pythonPackages.pythondaemon: init at 2.1.1 --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e607dd0f2e..5ebb2c58f12 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20025,6 +20025,28 @@ in modules // { }; + pythondaemon = buildPythonPackage rec { + name = "python-daemon-${version}"; + version = "2.1.1"; + + src = pkgs.fetchurl { + url = " https://pypi.python.org/packages/source/p/python-daemon/${name}.tar.gz"; + sha256 = "17v80qb98p1gv4j9mq6wb55cv7hc4j1hzw5y2f4s5hrpxs3w3a2q"; + }; + + # A test fail within chroot builds. + doCheck = false; + + buildInputs = with self; [ mock testscenarios ]; + propagatedBuildInputs = with self; [ docutils lockfile ]; + + meta = { + description = "Library to implement a well-behaved Unix daemon process"; + homepage = https://alioth.debian.org/projects/python-daemon/; + licenses = [ licenses.gpl3Plus licenses.asl20 ]; + }; + }; + sympy = buildPythonPackage rec { name = "sympy-0.7.6.1"; disabled = isPy34 || isPy35 || isPyPy; # some tests fail From 3cd7934783939e9ea14c9493252d37a73a4dd259 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 23:05:55 +0100 Subject: [PATCH 025/165] pythonPakcages.pid: init at 2.0.1 --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ebb2c58f12..ae189293f2d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20012,6 +20012,22 @@ in modules // { }; }; + pid = buildPythonPackage rec { + name = "pid-${version}"; + version = "2.0.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pid/${name}.tar.gz"; + sha256 = "0cylj8p25nwkdfgy4pzai21wyzmrxdqlwwbzqag9gb5qcjfdwk05"; + }; + + meta = { + description = "Pidfile featuring stale detection and file-locking"; + homepage = https://github.com/trbs/pid/; + license = licenses.asl20; + }; + }; + pydns = buildPythonPackage rec { name = "pydns-2.3.6"; disabled = isPy3k; From bbb78ae98174c9580827262e511eaa57c176ff8e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 23:14:16 +0100 Subject: [PATCH 026/165] pythonPackages.coilmq: 0.6.1 -> 1.0.0 --- pkgs/top-level/python-packages.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae189293f2d..9db9d2ebda4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3277,23 +3277,19 @@ in modules // { coilmq = buildPythonPackage (rec { - name = "coilmq-0.6.1"; + name = "CoilMQ-${version}"; + version = "1.0.0"; src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/C/CoilMQ/CoilMQ-0.6.1.tar.gz"; - sha256 = "9755733bdae33a9d87630232d166a7da2382f68c2cffb3bb81503806e8d310cb"; + url = "http://pypi.python.org/packages/source/C/CoilMQ/${name}.tar.gz"; + sha256 = "0wwa6fsqw1mxsryvgp0yrdjil8axyj0kslzi7lr45cnhgp5ab375"; }; - propagatedBuildInputs = with self; [ self.stompclient ]; + propagatedBuildInputs = with self; [ stompclient pythondaemon redis pid]; - preConfigure = '' - sed -i '/distribute/d' setup.py - ''; + buildInputs = with self; [ pytest six click coverage sqlalchemy ]; - buildInputs = with self; [ self.coverage self.sqlalchemy7 ]; - - # ValueError: Could not parse auth file: - # /tmp/nix-build-.../CoilMQ-0.6.1/coilmq/tests/resources/auth.ini + # The teste data is not included in the distribution doCheck = false; meta = { From ac6851b4f58858b42f5a2be66684f64833069906 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 23:35:10 +0100 Subject: [PATCH 027/165] pythonPackages.geeknote: upgrade sqlalchemy dependency --- 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 9db9d2ebda4..83af9f52382 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25323,7 +25323,7 @@ in modules // { thrift beautifulsoup4 markdown2 - sqlalchemy7 + sqlalchemy html2text evernote ]; From ebd7598da486772c2634bd71735c6d7ddad2c600 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 22 Mar 2016 18:03:33 +0300 Subject: [PATCH 028/165] torch: remove broken luajitPackages --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d7f6969929..710118172aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5159,7 +5159,6 @@ let lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); - luajitPackages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = luajit; }); luaPackages = lua52Packages; From de4f541b0e7b2c042dd4a2b1a1a0c0381c392699 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 22 Mar 2016 19:42:32 +0300 Subject: [PATCH 029/165] torch: add unsup package --- .../machine-learning/torch/torch-distro.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index c0c8c056ab5..067cb134114 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -254,9 +254,24 @@ let rockspec = "rocks/gnuplot-scm-1.rockspec"; }; + unsup = buildLuaRocks rec { + name = "unsup"; + luadeps = [ torch xlua optim ]; + buildInputs = [ cmake ]; + src = fetchgit { + url = "https://github.com/koraykv/unsup"; + rev = "1d4632e716dc3c82feecc7dd4b22549df442859f"; + sha256 = "0npjq3y1cfmk026sdijcw3f766innrmb3qggnxsz62grczhfvgls"; + }; + rockspec = "unsup-0.1-0.rockspec"; + preBuild = '' + export Torch_DIR=${torch}/share/cmake/torch + ''; + }; + trepl = buildLuaRocks rec { name = "trepl"; - luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot optim sys dok]; + luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot optim sys dok unsup]; runtimeDeps = [ ncurses readline ]; src = "${distro_src}/exe/trepl"; meta = common_meta // { From a4d741ef9deb66d84ad22ec4c33c15eaea9e9c39 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 24 Mar 2016 19:25:42 +0000 Subject: [PATCH 030/165] 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 43349178211..dd07e53ee6f 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 031/165] 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 88c238ef8b4..39e47be572b 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 032/165] 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 485d8c54eb3..3ffc18e3b18 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 00000000000..f2f963e5169 --- /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 00000000000..ad41f56d39d --- /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 7f0ab25e92e..3e5ef30d5ef 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 6579acd0157d0c7c96c02d58ee850e91685be5c3 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 25 Mar 2016 21:05:32 +0000 Subject: [PATCH 033/165] git: add openssh as a runtime dependency Fixes #1923 --- .../git-and-tools/default.nix | 2 +- .../git-and-tools/git/default.nix | 11 +++++++- .../git-and-tools/git/ssh-path.patch | 26 +++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/version-management/git-and-tools/git/ssh-path.patch diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 584c880566a..fa8f43a45c6 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -8,7 +8,7 @@ let gitBase = lib.makeOverridable (import ./git) { inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl - tk makeWrapper subversionClient gzip libiconv; + tk makeWrapper subversionClient gzip openssh libiconv; texinfo = texinfo5; svnSupport = false; # for git-svn support guiSupport = false; # requires tcl/tk 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 5083c73fb14..089bf8a863e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip +{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio +, gnugrep, gzip, openssh , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv , svnSupport, subversionClient, perlLibs, smtpPerlLibs @@ -25,8 +26,16 @@ stdenv.mkDerivation { ./docbook2texi.patch ./symlinks-in-bin.patch ./git-sh-i18n.patch + ./ssh-path.patch ]; + postPatch = '' + for x in connect.c git-gui/lib/remote_add.tcl ; do + substituteInPlace "$x" \ + --subst-var-by ssh "${openssh}/bin/ssh" + done + ''; + buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv] ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ] diff --git a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch new file mode 100644 index 00000000000..26db3d81082 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch @@ -0,0 +1,26 @@ +diff --git a/connect.c b/connect.c +index fd7ffe1..20cd992 100644 +--- a/connect.c ++++ b/connect.c +@@ -768,7 +768,7 @@ struct child_process *git_connect(int fd[2], const char *url, + + ssh = getenv("GIT_SSH"); + if (!ssh) +- ssh = "ssh"; ++ ssh = "@ssh@"; + + ssh_dup = xstrdup(ssh); + base = basename(ssh_dup); +diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl +index 50029d0..17b9594 100644 +--- a/git-gui/lib/remote_add.tcl ++++ b/git-gui/lib/remote_add.tcl +@@ -139,7 +139,7 @@ method _add {} { + # Parse the location + if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path] + || [regexp {([^:][^:]+):(.+)} $location xx host path]} { +- set ssh ssh ++ set ssh @ssh@ + if {[info exists env(GIT_SSH)]} { + set ssh $env(GIT_SSH) + } From c54d577db429743df61c1fc0e4b2671ace0e8010 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Fri, 25 Mar 2016 18:28:57 +0900 Subject: [PATCH 034/165] cached-property: init at 1.3.0 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88c238ef8b4..5353cf367be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1809,6 +1809,26 @@ in modules // { propagatedBuildInputs = with self; [ boto crcmod psutil ]; }; + cached-property = buildPythonPackage rec { + version = "1.3.0"; + name = "cached-property-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/cached-property/${name}.tar.gz"; + sha256 = "10dwi3s6f154ag9dvqy5jiwp31fs57lbxjcjgn4cwvi8qyqpi3j5"; + }; + + buildInputs = with self; [ freezegun ]; + + meta = { + description = "A decorator for caching properties in classes"; + homepage = https://github.com/pydanny/cached-property; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ ericsagnes ]; + }; + }; + cgroup-utils = buildPythonPackage rec { version = "0.6"; name = "cgroup-utils-${version}"; From c867346b055320af07518190a98234e99a211f6d Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sun, 27 Mar 2016 01:42:13 +0900 Subject: [PATCH 035/165] dockerpty: 0.3.4 -> 0.4.1 --- 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 5353cf367be..bdf2b7d1317 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4932,11 +4932,11 @@ in modules // { }; dockerpty = buildPythonPackage rec { - name = "dockerpty-0.3.4"; + name = "dockerpty-0.4.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dockerpty/${name}.tar.gz"; - sha256 = "a51044cc49089a2408fdf6769a63eebe0b16d91f34716ecee681984446ce467d"; + sha256 = "1kjn64wx23jmr8dcc6g7bwlmrhfmxr77gh6iphqsl39sayfxdab9"; }; propagatedBuildInputs = with self; [ six ]; From bdbdb03a160a99f071c8884099f4f30369d034af Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sun, 27 Mar 2016 01:43:38 +0900 Subject: [PATCH 036/165] docker-py: 1.5.0 -> 1.7.2 --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdf2b7d1317..1438e48ddd3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4912,11 +4912,12 @@ in modules // { }; docker = buildPythonPackage rec { - name = "docker-py-1.5.0"; + name = "docker-py-${version}"; + version = "1.7.2"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/docker-py/${name}.tar.gz"; - sha256 = "1l7q0179y4lmv24z4q12653141wc1b1zzgbfw46yzbs6mj7i4939"; + sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm"; }; propagatedBuildInputs = with self; [ six requests2 websocket_client ]; From e3f00861dfe92d12df93dd9123ef72033206160a Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sun, 27 Mar 2016 01:44:49 +0900 Subject: [PATCH 037/165] docker-compose: 1.5.2 -> 1.6.2 --- 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 1438e48ddd3..62dd47cba92 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8839,14 +8839,13 @@ in modules // { }; docker_compose = buildPythonPackage rec { - version = "1.5.2"; + version = "1.6.2"; name = "docker-compose-${version}"; namePrefix = ""; - disabled = isPy3k || isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/docker-compose/${name}.tar.gz"; - sha256 = "79aa7e2e6ef9ab1936f8777476ffd4bb329875ec3d3664d239896d2f2a3c4f4f"; + sha256 = "10i4032d99hm5nj1p74pcad9i3gz1h5x3096byklncgssfyjqki6"; }; # lots of networking and other fails @@ -8854,8 +8853,9 @@ in modules // { buildInputs = with self; [ mock pytest nose ]; propagatedBuildInputs = with self; [ requests2 six pyyaml texttable docopt docker dockerpty websocket_client - enum34 jsonschema + enum34 jsonschema cached-property ]; + patchPhase = '' sed -i "s/'requests >= 2.6.1, < 2.8'/'requests'/" setup.py ''; From 695c2e4ee46c9533f4081fff74c3de157aec9a79 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 27 Mar 2016 03:06:58 +0100 Subject: [PATCH 038/165] kernel-config: do not use NFSD_PNFS on >=4.6 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index f3dd32386bc..e7e81f4877f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -210,7 +210,7 @@ with stdenv.lib; OCFS2_DEBUG_MASKLOG? n BTRFS_FS_POSIX_ACL y UBIFS_FS_ADVANCED_COMPR? y - ${optionalString (versionAtLeast version "4.0") '' + ${optionalString (versionAtLeast version "4.0" && versionOlder version "4.6") '' NFSD_PNFS y ''} NFSD_V2_ACL y From 8b7e150bb94fec38451eda20e644bda928caac9d Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sun, 27 Mar 2016 03:08:24 +0100 Subject: [PATCH 039/165] linux-testing: 4.5-rc7 -> 4.6-rc1 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 57a825ec0a0..e58230712a9 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.5-rc7"; - modDirVersion = "4.5.0-rc7"; - extraMeta.branch = "4.5"; + version = "4.6-rc1"; + modDirVersion = "4.6.0-rc1"; + extraMeta.branch = "4.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0z43s7ccikmqigv4insjvizs3bkx2lgjvzsz5rmmpcga28dz44kq"; + sha256 = "1y73sjd7i48d1c8x52z59imx8g8d00wy67r5666cvwqrq8d407h0"; }; features.iwlwifi = true; From a314814c19fa9744ee3f3c333a1c00b27574b90e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 23 Mar 2016 15:33:28 +0800 Subject: [PATCH 040/165] 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 3dd60ad99dc..934fb56bc10 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 00000000000..4220a2e17b3 --- /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 0b96e0daf3d3cd0a01056612c8bf33739d2082e5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 27 Mar 2016 20:28:45 +0000 Subject: [PATCH 041/165] 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 f4010131f60..00000000000 --- 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 9c1dd23b39f..23c3b237c57 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 8d1660ce1498343df366b40c4821cf0cc7b0640c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 24 Mar 2016 22:08:40 +0800 Subject: [PATCH 042/165] virtualbox service: fix use of deprecated option names --- nixos/modules/programs/virtualbox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix index a00b1e5f64d..be96cf23b39 100644 --- a/nixos/modules/programs/virtualbox.nix +++ b/nixos/modules/programs/virtualbox.nix @@ -1,8 +1,8 @@ let msg = "Importing is " - + "deprecated, please use `services.virtualboxHost.enable = true' " + + "deprecated, please use `virtualisation.virtualbox.host.enable = true' " + "instead."; in { config.warnings = [ msg ]; - config.services.virtualboxHost.enable = true; + config.virtualisation.virtualbox.host.enable = true; } From 5ca8c23b2ab96164bb8652d95c740ebc0e498d52 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 26 Mar 2016 14:21:23 +0000 Subject: [PATCH 043/165] 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 12d0aff2616..dbe500aea5e 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 044/165] 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 dbe500aea5e..ae365e3bd79 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 045/165] 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 057beb999b2..11d88ae10e9 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 9c458eb9130..1ec3fa9cd96 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 ae365e3bd79..7cd7245edd8 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 e67aecca695..600ea00b93e 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 fca110d2a01..d8eb668107b 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 046/165] 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 00000000000..ba15b588160 --- /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 1ec3fa9cd96..bccceb12e04 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 047/165] 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 00000000000..742d3c2e9fe --- /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 ab62afa40d6..63c4b7dec60 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 048/165] 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 9c458eb9130..b9383f1bdab 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 2636fcf7cd66307745801ec5f3e4241e5c2712f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 28 Mar 2016 14:24:06 +0200 Subject: [PATCH 049/165] fix license --- .../networking/instant-messengers/blink/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 1cb345ba63a..8076b27d1c5 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -43,7 +43,7 @@ pythonPackages.buildPythonApplication rec { homepage = http://icanblink.com/; description = "A state of the art, easy to use SIP client for Voice, Video and IM"; platforms = platforms.linux; - license = licenses.gplv3; + license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; }; } From 729c06910899b59309a620d66aff192cdad8690b Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 19 Mar 2016 21:16:15 +0100 Subject: [PATCH 050/165] bugseverywhere: init at 1.1.1 --- .../bugseverywhere/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/version-management/bugseverywhere/default.nix diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix new file mode 100644 index 00000000000..f8081ade61f --- /dev/null +++ b/pkgs/applications/version-management/bugseverywhere/default.nix @@ -0,0 +1,34 @@ +{ stdenv, pythonPackages, fetchurl }: + +# +# Upstream stopped development of this package. If this package does not build +# anymore, feel free to remove it by reverting the appropriate patch +# (git log --grep bugseverywhere) +# +pythonPackages.buildPythonApplication rec { + version = "1.1.1"; + name = "bugseverywhere-${version}"; + + src = fetchurl { + url = + "https://pypi.python.org/packages/source/b/bugs-everywhere/bugs-everywhere-${version}.tar.gz"; + sha256 = "1ikm3ckwpimwcvx32vy7gh5gbp7q750j3327m17nvrj99g3daz2d"; + }; + + # There are no tests in the repository. + doCheck = false; + + buildInputs = with pythonPackages; [ + jinja2 + cherrypy + ]; + + meta = with stdenv.lib; { + description = "Bugtracker supporting distributed revision control"; + homepage = "http://www.bugseverywhere.org/"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2ef687d587..a7a2a810058 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -87,6 +87,8 @@ in modules // { blivet = callPackage ../development/python-modules/blivet { }; + bugseverywhere = callPackage ../applications/version-management/bugseverywhere {}; + dbus = callPackage ../development/python-modules/dbus { dbus = pkgs.dbus; }; From ed47bb1ca8a56a06b5ff27e35c115087520b9b7a 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:35:47 +0200 Subject: [PATCH 051/165] qt55.vlc: fix build I tested it on a video to make sure the bug doesn't appear. --- pkgs/applications/video/vlc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 0e08c21fc99..a84f24a303a 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { sha256 = "1dazxbmzx2g5570pkg519a7fsj07rdr155kjsw7b9y8npql33lls"; }; + # Comment-out the Qt 5.5 version check, as we do apply the relevant patch. + # https://trac.videolan.org/vlc/ticket/16497 + postPatch = if (!withQt5) then null else + "sed '/I78ef29975181ee22429c9bd4b11d96d9e68b7a9c/s/^/: #/' -i configure"; + buildInputs = [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt From be447475d308489b2f2379b33b5b06fe97226ebb 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:42:16 +0200 Subject: [PATCH 052/165] clang-3.5: mark as broken It seems unlikely someone will want to fix it anymore. --- pkgs/development/compilers/llvm/3.5/clang.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index 42ca4ba70e4..d3ce8a4f9ff 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -50,5 +50,6 @@ in stdenv.mkDerivation { homepage = http://llvm.org/; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; + broken = true; }; } From c39fe339987b394f915bfac1c86dfa9a16d9d378 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 22 Jan 2016 11:36:00 +0100 Subject: [PATCH 053/165] kde5.yakuake: init at 3.0.2 --- pkgs/applications/misc/yakuake/3.0.nix | 66 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/applications/misc/yakuake/3.0.nix diff --git a/pkgs/applications/misc/yakuake/3.0.nix b/pkgs/applications/misc/yakuake/3.0.nix new file mode 100644 index 00000000000..f3aff480914 --- /dev/null +++ b/pkgs/applications/misc/yakuake/3.0.nix @@ -0,0 +1,66 @@ +{ stdenv +, lib +, fetchurl +, cmake +, extra-cmake-modules +, karchive +, kcrash +, kdbusaddons +, ki18n +, kiconthemes +, knewstuff +, knotifications +, knotifyconfig +, konsole +, kparts +, kwindowsystem +, makeQtWrapper + +}: + +let + pname = "yakuake"; + version = "3.0.2"; +in +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5"; + }; + + buildInputs = [ + cmake + extra-cmake-modules + karchive + kcrash + kdbusaddons + ki18n + kiconthemes + knewstuff + knotifications + knotifyconfig + kparts + kwindowsystem + ]; + + nativeBuildInputs = [ + extra-cmake-modules + makeQtWrapper + ]; + + propagatedUserEnvPkgs = [ + konsole + ]; + + postInstall = '' + wrapQtProgram "$out/bin/yakuake" + ''; + + meta = { + homepage = https://yakuake.kde.org; + description = "Quad-style terminal emulator for KDE"; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f0ab25e92e..f3b7ac04327 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15272,6 +15272,8 @@ in themes = []; # extra themes, etc. }; + yakuake = callPackage ../applications/misc/yakuake/3.0.nix {}; + }; kde5 = From 86435a1b41a35daa09bb0ea15593cba16dcc27d9 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 28 Mar 2016 13:39:38 +0000 Subject: [PATCH 054/165] 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 814a2c56dd1..8b487ec0daf 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 c1abb1d404dff522a4316b91748efdf18398d73a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 28 Mar 2016 15:58:10 +0200 Subject: [PATCH 055/165] openblas: 0.2.15 -> 0.2.17 --- pkgs/development/libraries/science/math/openblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index f028e65694e..8c73353efbb 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -22,13 +22,13 @@ let local = config.openblas.preferLocalBuild or false; optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ]; blas64 = if blas64_ != null then blas64_ else hasPrefix "x86_64" stdenv.system; - version = "0.2.15"; + version = "0.2.17"; in stdenv.mkDerivation { name = "openblas-${version}"; src = fetchurl { url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"; - sha256 = "0i4hrjx622vw5ff35wm6cnga3ic8hcfa88p1wlj24a3qb770mi3k"; + sha256 = "1gqdrxgc7qmr3xqq4wqcysjhv7ix4ar7ymn3vk5g97r1xvgkds0g"; name = "openblas-${version}.tar.gz"; }; From 9ee7b3f6284649f97c0c97125848ba0f651d3a41 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 28 Mar 2016 15:51:23 +0200 Subject: [PATCH 056/165] pythonPackages.scipy: use latest numpy version --- 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 ff3a203d4fe..19041ad50c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19469,7 +19469,7 @@ in modules // { url = "https://pypi.python.org/packages/source/s/scipy/scipy-${version}.tar.gz"; sha256 = "f600b755fb69437d0f70361f9e560ab4d304b1b66987ed5a28bdd9dd7793e089"; }; - numpy = self.numpy_1_10; + numpy = self.numpy; }; scikitimage = buildPythonPackage rec { From 654d2e672d2ec77a75d00645c9fff92d40979aa0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 28 Mar 2016 15:01:37 +0200 Subject: [PATCH 057/165] pythonPackages.numpy: 1.10 -> 1.11 --- pkgs/top-level/python-packages.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19041ad50c7..9c4a6989daa 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_10; + numpy = self.numpy_1_11; numpy_1_10 = self.buildNumpyPackage rec { version = "1.10.4"; @@ -13217,6 +13217,14 @@ in modules // { }; }; + numpy_1_11 = self.buildNumpyPackage rec { + version = "1.11.0"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/numpy/numpy-${version}.tar.gz"; + sha256 = "0gml1ng7iqk4xcrvspjd5vnfqdwfinvjfyksfawvy5h8426jdld1"; + }; + }; + numpydoc = buildPythonPackage rec { name = "numpydoc-${version}"; version = "0.5"; From b8cc1117645279fd310a7403411307ddd0d91f25 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 28 Mar 2016 23:14:33 +0900 Subject: [PATCH 058/165] 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 48a586ffb0f..554e3fc9838 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 0f6c4ad668a..554e3fc9838 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 059/165] 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 8b487ec0daf..d0bbe1bb370 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 060/165] 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 d0bbe1bb370..02512ebf713 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 061/165] 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 02512ebf713..6bf888aae2b 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 062/165] 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 814a2c56dd1..78fe4bbe56c 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 063/165] 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 51637fe6dbd..349b35549b6 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 064/165] 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 498a4be7ff4..243d1e49c7b 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 065/165] 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 77d268f3a47..5d788af1682 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 066/165] 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 51925078838..dd109462dd5 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 067/165] 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 51782449a25..89d694cc497 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 068/165] 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 00000000000..29fa2739f24 --- /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 60ec2ba3564..29d7a1f1161 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 069/165] 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 00000000000..f71def55583 --- /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 29d7a1f1161..f7386d8f3b0 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 070/165] 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 00000000000..116f248b3b4 --- /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 00000000000..0245b47815e --- /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 f7386d8f3b0..b4052536305 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 071/165] 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 00000000000..3452c72839f --- /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 00000000000..2f9605a3a72 --- /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 00000000000..0b10c2cdb52 --- /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 b4052536305..a45fd4d72b7 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 072/165] 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 00000000000..0d1aa4a9085 --- /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 00000000000..1b71e45eb82 --- /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 a45fd4d72b7..e4dd0c5127f 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 073/165] 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 e15febda231..d6ba094f458 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 00000000000..a738cd0b82a --- /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 074/165] 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 9e5a6ad04e1..05c3f267eb9 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 075/165] 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 a8f445a2c73..53648aef1e0 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 076/165] 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 c1c79f8ac43..a8037be8f83 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 077/165] 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 c843f0d2eef..0b16723866b 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 078/165] 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 b5b4db7e729..20a338dd2cb 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 079/165] 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 19477d86a3c..e3ffa283ad9 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 080/165] 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 a87e599cbc0..962bb547263 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 081/165] 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 5083c73fb14..82a3dc79d7c 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 082/165] 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 00000000000..d6b9b943b6e --- /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 c8bbccaf53c..72a3094a12d 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 083/165] 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 63c4b7dec60..395d4688021 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 084/165] 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 7cb1bf7506d..08da13b569a 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 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 085/165] 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 dd109462dd5..c8f6b65cba2 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 086/165] 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 3d92dcf3e12..b4c0a51f6dd 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 087/165] 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 9e6d6fe492a..9ecf94e21c0 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 00000000000..dfb54893b6c --- /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 ccc3318ff6b..63fc169355c 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 00000000000..ac26ac7126f --- /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 00000000000..9b931894f66 --- /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 752f2307995..8d15f689b0f 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 088/165] 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 8be2ec05f07..c0f15fbd116 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 089/165] 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 dec18aea961..192e4406b6d 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 090/165] 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 5b9d57cfcac..185dd278fba 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 307c073fa36dde3e959c685d0e08857e642e8c8a Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Tue, 29 Mar 2016 13:28:20 +0100 Subject: [PATCH 091/165] spl: 0.6.5.5 -> 0.6.5.6 --- pkgs/os-specific/linux/spl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 09cdcbf8a24..2db3a397aeb 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -17,13 +17,13 @@ assert buildKernel -> kernel != null; stdenv.mkDerivation rec { name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.6.5.5"; + version = "0.6.5.6"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "1f49qv648klg2sn1v1wzwd6ls1njjj0hrazz7msd74ayhwm0zcw7"; + sha256 = "08lbfwsd368sk7dgydabzkyyn2l2n82ifcqakra3xknwgg1ka9bn"; }; patches = [ ./const.patch ./install_prefix.patch ]; From 259eb362050aee50db54c0d22241cc96ff89f38a Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Tue, 29 Mar 2016 13:28:35 +0100 Subject: [PATCH 092/165] zfs: 0.6.5.5 -> 0.6.5.6 --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index d29a7560771..9fc28996a83 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -20,13 +20,13 @@ assert buildKernel -> kernel != null && spl != null; stdenv.mkDerivation rec { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.6.5.5"; + version = "0.6.5.6"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; rev = "zfs-${version}"; - sha256 = "0np03p5zkx87a0a5rw629f9m4wp5gd01c1jkh5p7h63mmvaxfdda"; + sha256 = "0lsb93y5zbwc8fafxzm9vyfpr6fmvl8h86ny4llbd2xy2hnfwk2i"; }; patches = [ ./nix-build.patch ]; From 14fd473894b82194a1c2904c9b8642f5c8b2c03f Mon Sep 17 00:00:00 2001 From: obadz Date: Tue, 29 Mar 2016 14:09:34 +0100 Subject: [PATCH 093/165] 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 ac85a03cc98..06a67e9cb8b 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 094/165] 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 e085adbdcda..532ab361313 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 095/165] 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 46500077a08..f0c244af05e 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 096/165] 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 3ffc18e3b18..177f3d1b20c 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 097/165] 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 a97bae57d9b..4e044deca21 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 aa1cec1ea02..f7159634e4f 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 098/165] 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 350025da7b0..47654064163 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 099/165] 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 4177846c433..a7e1bd11977 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 100/165] 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 639d881f415..ec343c90238 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 2e9d55a3f3f..f9ea3173b43 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 101/165] 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 dfb54893b6c..c166a6e4acf 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 102/165] 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 0fcea6ce5e4..76431f21124 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 103/165] 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 bb07596ab97..1ada615d500 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 104/165] 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 1ada615d500..d62b4758f75 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 105/165] 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 d62b4758f75..5866d43b4e0 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 106/165] 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 62b16f69e6b..763e1aa15ff 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 107/165] 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 5866d43b4e0..28fce379968 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 108/165] 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 d7c52ccfd6b..89ee38a7380 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 109/165] 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 298a99ef665..5fdccc9acad 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 110/165] 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 cfe86ce4e70..38d7e50bdf8 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 111/165] 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 93da9d332f7..ff118a53e3a 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 cd123f49f76..7db99c26c3c 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 5aa986fba2d9da27e0ddadcee3c17f81371b6817 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 30 Mar 2016 06:57:59 +0200 Subject: [PATCH 112/165] dhcpcd: 6.9.4 -> 6.10.1 (security) Fixes CVE-2016-1503 & CVE-2016-1504. Changelog: - http://roy.marples.name/archives/dhcpcd-discuss/2016/1143.html - http://roy.marples.name/archives/dhcpcd-discuss/2016/1146.html --- pkgs/tools/networking/dhcpcd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 856f75f0633..578fe6ea4f7 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.9.4"; + name = "dhcpcd-6.10.1"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "184vpid8m5175xa2nkh6mmvk8b6z4isfm6nvf4g8l5ggfdsgzwy3"; + sha256 = "0yxfx3r6ik47rsv1f8q7siw0vas6jcsrbjpaqnx0nn707f6byji8"; }; buildInputs = [ pkgconfig udev ]; @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; homepage = http://roy.marples.name/projects/dhcpcd; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = with stdenv.lib.maintainers; [ eelco fpletz ]; }; } From e498a645c1087cd85b3f4168e0b56233c729959c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 26 Jan 2016 02:58:17 +0100 Subject: [PATCH 113/165] 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 8f81e9284b6..00000000000 --- 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 ed4c93673aa..00000000000 --- 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 9d278b19342..23e05eb6c9e 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 8d15f689b0f..edc2abe1f4d 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 9a10fad4e9f..bd2223b4b04 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 cc1e9b791f7..24ea9bdc470 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 114/165] 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 5add4e45129..537107f3f6a 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 00000000000..02443d56afa --- /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 959abc44d24..e13ce337f38 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 00000000000..1f25aa1f898 --- /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 248c4fa385e..f738f76ca02 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 07a987c8ff6..bb619c7fda5 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 b1f47b80d78..e8f0a3d4da7 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 00000000000..b6e8b073c9d --- /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 5fd10816168..1abfcbb6c86 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 00000000000..24bf690d8b8 --- /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 00000000000..5a9df0ddae9 --- /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 00000000000..5e2b36bf62d --- /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 00000000000..a7bf859d6c6 --- /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 70af93f0ca9b5cd9c3a424dd56ec1f8eac381b1c Mon Sep 17 00:00:00 2001 From: Julien Dehos Date: Wed, 30 Mar 2016 09:40:48 +0200 Subject: [PATCH 115/165] fswebcam: init 20140113 --- pkgs/os-specific/linux/fswebcam/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/os-specific/linux/fswebcam/default.nix diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix new file mode 100644 index 00000000000..fa0797bf7a3 --- /dev/null +++ b/pkgs/os-specific/linux/fswebcam/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, libv4l, gd }: + +stdenv.mkDerivation rec { + name = "fswebcam-20140113"; + + src = fetchurl { + url = "http://www.sanslogic.co.uk/fswebcam/files/${name}.tar.gz"; + sha256 = "3ee389f72a7737700d22e0c954720b1e3bbadc8a0daad6426c25489ba9dc3199"; + }; + + buildInputs = + [ libv4l gd ]; + + meta = { + description = "neat and simple webcam app"; + homepage = http://www.sanslogic.co.uk/fswebcam; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e8ba331e89..19a04f92231 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1539,6 +1539,8 @@ in fsfs = callPackage ../tools/filesystems/fsfs { }; + fswebcam = callPackage ../os-specific/linux/fswebcam { }; + fuseiso = callPackage ../tools/filesystems/fuseiso { }; fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; From 070b123d4b0b15801861e2e37c554190bc61d48b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Mar 2016 10:57:22 +0200 Subject: [PATCH 116/165] 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 f6beaf3a006..e480a6f837c 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 }; } From 19abd5542011950ab8206d7df46088c3f608fc14 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sun, 27 Mar 2016 21:48:54 -0700 Subject: [PATCH 117/165] idea.idea15-ultimate: init at 15.0.5 --- pkgs/applications/editors/idea/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 7a9f409d128..5d20d0578ea 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -195,6 +195,18 @@ in }; }; + idea15-ultimate = buildIdea rec { + name = "idea-ultimate-${version}"; + version = "15.0.5"; + build = "IU-143.2332.3"; + description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; + sha256 = "1hvc5cmbfpp0qad0236ffh3g7zwfk64rh5bkkb750h3387jz7nr2"; + }; + }; + idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; version = "2016.1"; From ca983ec20c2e39c3ec3a4e01c8f6c4ab14764fe1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Mar 2016 11:32:40 +0200 Subject: [PATCH 118/165] thunderbird: 38.7.0 -> 38.7.1 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index ef9ec03ecd9..81d725d3621 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -let version = "38.7.0"; in +let version = "38.7.1"; in let verName = "${version}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://archive.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2"; - sha256 = "1wbkj8a0p62mcbxlq8yyzrx51xi65qm8f2ccqiv5pb6qd51b5d0v"; + sha256 = "0a4kbmas0a6wavp8dxkva0fl1y1qrx6b7l3xdjdan7qx7ysmm626"; }; buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx From caa395a56020bdf5b2035529f7232da78f7d76a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 Mar 2016 13:25:51 +0200 Subject: [PATCH 119/165] enblend-enfuse: 4.1.5 -> 4.2; maintain Removed dependency on libxmi (unneeded since 4.1.5). Added new (since 4.2) dependency on tetex (for `pdflatex`). Changes: http://hg.code.sf.net/p/enblend/code/file/a7a247e1e64b/NEWS --- .../tools/graphics/enblend-enfuse/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index f1f5ac878ba..cf0fd55ad15 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,26 +1,30 @@ { stdenv, fetchurl -, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libxmi, mesa, vigra -, help2man, pkgconfig, perl }: +, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, mesa, vigra +, help2man, pkgconfig, perl, tetex }: -let version = "4.1.5"; in stdenv.mkDerivation rec { name = "enblend-enfuse-${version}"; + version = "4.2"; src = fetchurl { url = "mirror://sourceforge/enblend/${name}.tar.gz"; - sha256 = "08dz73jgrwfhz0kh57kz048qy1c6a35ckqn9xs5rajm449vnw0pg"; + sha256 = "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7"; }; - buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ]; + buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff mesa vigra ]; - nativeBuildInputs = [ help2man perl pkgconfig ]; + nativeBuildInputs = [ help2man perl pkgconfig tetex ]; + + preConfigure = '' + patchShebangs src/embrace + ''; enableParallelBuilding = true; - meta = { - inherit version; + meta = with stdenv.lib; { homepage = http://enblend.sourceforge.net/; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = with maintainers; [ nckx ]; }; } From 6605fbfe25dbda61c21a42d68df57a21e4a48415 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 Mar 2016 14:21:19 +0200 Subject: [PATCH 120/165] libpsl: list 2016-03-10 -> 2016-03-30 --- pkgs/development/libraries/libpsl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 74fc4270b80..8a834621194 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -3,10 +3,10 @@ let - listVersion = "2016-03-10"; + listVersion = "2016-03-30"; listSources = fetchFromGitHub { - sha256 = "10kc0b41y5cn0cnqvalz9i14j1dj6b9wgr21zz3ngqf943q6z5r9"; - rev = "1e52b7efc42b1505f9580ec15a1d692523db4a3b"; + sha256 = "0433ck6ykcq6pc48mvgif9f785q0ndprk77jsk58gb5289b87yns"; + rev = "6ec573d549e25fc89d930bb64939d947bae38f68"; repo = "list"; owner = "publicsuffix"; }; From 63032dae9d9d87d6b82c3420f099b8feb62b535e Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Wed, 30 Mar 2016 15:00:15 +0200 Subject: [PATCH 121/165] Finance::Quote: 1.37 -> 1.38 & add missing dependency on CGI --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fbc237b5de4..6d86f5d3e0e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5151,12 +5151,12 @@ let self = _self // overrides; _self = with self; { }; FinanceQuote = buildPerlPackage rec { - name = "Finance-Quote-1.37"; + name = "Finance-Quote-1.38"; src = fetchurl { url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz"; - sha256 = "1b6pbh7f76fb5sa4f0lhx085xy55pprz5v7z7li7pqiyw7i4f4bf"; + sha256 = "0zhqb27y4vdxn476s2kwm9zl2f970yjcyyybnjm9b406krr2fm59"; }; - propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc DateTime JSON ]; + propagatedBuildInputs = [ CGI CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc DateTime JSON ]; meta = with stdenv.lib; { homepage = http://finance-quote.sourceforge.net/; description = "Get stock and mutual fund quotes from various exchanges"; From ef753d210e877ef122bbd26001409a94abd959db Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 30 Mar 2016 01:05:07 +0200 Subject: [PATCH 122/165] chromium: Update all channels to latest versions Overview of the updated versions: stable: 49.0.2623.87 -> 49.0.2623.110 beta: 50.0.2661.26 -> 50.0.2661.49 dev: 50.0.2661.18 -> 51.0.2693.2 Most notably, this includes a series of urgent security fixes: * CVE-2016-1646: Out-of-bounds read in V8. Credit to Wen Xu from Tencent KeenLab. * CVE-2016-1647: Use-after-free in Navigation. Credit to anonymous. * CVE-2016-1648: Use-after-free in Extensions. Credit to anonymous. * CVE-2016-1649: Buffer overflow in libANGLE. Credit to lokihardt working with HP's Zero Day Initiative / Pwn2Own. * CVE-2016-1650: Denial of service in PageCaptureSaveAsMHTMLFunction The official release announcement with details about these fixes can be found here: http://googlechromereleases.blogspot.de/2016/03/stable-channel-update_24.html Beta and stable could be also affected, although I didn't do a detailed check whether that's the case. As this introduces Chromium 51 as the dev version, I had to make the following changes to make it build: * libexif got removed, so let's do that on our end as well. See https://codereview.chromium.org/1803883002 for details. * Chromium doesn't seem to compile with our version of libpng, so let's resort to the bundled libpng for now. * site_engagement_ui.cc uses isnan outside of std namespace, so we're fixing that in postPatch using sed. I have successfully built all versions on i686-linux and x86_64-linux and tested it using the VM tests. Test reports can be found at the following evaluation of my Hydra: https://headcounter.org/hydra/eval/314584 Thanks to @grahamc for reporting this. Signed-off-by: aszlig Reported-by: Graham Christensen Fixes: #14299 --- .../networking/browsers/chromium/common.nix | 24 ++++++++++++------- .../browsers/chromium/upstream-info.nix | 18 +++++++------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 5494b77b807..7bcc6242389 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -5,7 +5,7 @@ , libevent, expat, libjpeg, snappy , libpng, libxml2, libxslt, libcap , xdg_utils, yasm, minizip, libwebp -, libusb1, libexif, pciutils, nss +, libusb1, pciutils, nss , python, pythonPackages, perl, pkgconfig , nspr, udev, kerberos @@ -17,6 +17,7 @@ # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport +, libexif ? null # only needed for Chromium before version 51 # package customization , enableSELinux ? false, libselinux ? null @@ -55,9 +56,8 @@ let use_system_flac = true; use_system_libevent = true; use_system_libexpat = true; - use_system_libexif = true; use_system_libjpeg = true; - use_system_libpng = true; + use_system_libpng = versionOlder upstream-info.version "51.0.0.0"; use_system_libwebp = true; use_system_libxml = true; use_system_opus = true; @@ -86,7 +86,7 @@ let libevent expat libjpeg snappy libpng libxml2 libxslt libcap xdg_utils yasm minizip libwebp - libusb1 libexif + libusb1 ]; # build paths and release info @@ -123,7 +123,8 @@ let ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio; + ++ optional pulseSupport libpulseaudio + ++ optional (versionOlder version "51.0.0.0") libexif; patches = [ ./patches/build_fixes_46.patch @@ -140,15 +141,20 @@ let -e "/python_arch/s/: *'[^']*'/: '""'/" \ build/common.gypi chrome/chrome_tests.gypi - sed -i -e '/module_path *=.*libexif.so/ { - s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| - }' chrome/utility/media_galleries/image_metadata_extractor.cc + ${optionalString (versionOlder version "51.0.0.0") '' + sed -i -e '/module_path *=.*libexif.so/ { + s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| + }' chrome/utility/media_galleries/image_metadata_extractor.cc + ''} sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${udev}/lib/\1!' \ device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ gpu/config/gpu_info_collector_linux.cc + '' + optionalString (!versionOlder version "51.0.0.0") '' + sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ + chrome/browser/ui/webui/engagement/site_engagement_ui.cc ''; gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { @@ -180,6 +186,8 @@ let google_default_client_id = "404761575300.apps.googleusercontent.com"; google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; + } // optionalAttrs (versionOlder version "51.0.0.0") { + use_system_libexif = true; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index bcb5c3f2311..8e5a5d4c90d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1lgpjnjhy3idha5b6wp31kdk6knic96dmajyrgn1701q3mq81g1i"; - sha256bin64 = "1yb3rk38zfgjzka0aim1xc4r0qaz2qkwaq06mjifpkszmfffhyd0"; - version = "50.0.2661.26"; + sha256 = "1jwk0x5hjpah0bl4dpirxwyfxv0d0wnkvfgyja91kkbh8471gzmk"; + sha256bin64 = "10sl3ddd77i1gl3l4yvhkpavfq2bygv7gwql0jnhchmrvyax1cjh"; + version = "50.0.2661.49"; }; dev = { - sha256 = "0z9m1mv6pv43y3ccd0nzqg5f9q8qxc8mlmy9y3dc9kqpvmqggnvp"; - sha256bin64 = "0khsxci970vclfg24b7m8w1jqfkv5rzswgwa62b4r7jzrglx1azj"; - version = "50.0.2661.18"; + sha256 = "042h6klyijnhkb4m9lsnfi3qss6pbs4p4981rm4cbc86rsyppkhl"; + sha256bin64 = "1p6lhd3n9q93fkydxksgfv68vz26yj8i2zx1kqby2z9yc0pdcniq"; + version = "51.0.2693.2"; }; stable = { - sha256 = "0kbph3l964bh7cb9yf8nydjaxa20yf8ls5a2vzsj8phz7n20z3f9"; - sha256bin64 = "1k6nhccdqzzzicwi07nldqfsdlic65i2xfyb7dbasbbg9zl3s9yw"; - version = "49.0.2623.87"; + sha256 = "1lmv6nmbqhxmr4340s5i4ypgz2b7vkh0wy5x9v75b5bnscjhk121"; + sha256bin64 = "1djd2i9phym1d8afv4vfajb7l1bz0ny2wmihwi6jaz712vil4a13"; + version = "49.0.2623.110"; }; } From 96be420e44338776c083224ba892795c57d730a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 30 Mar 2016 14:39:53 +0100 Subject: [PATCH 123/165] move growpart out of nixos into cloud-init package --- .../virtualisation/amazon-grow-partition.nix | 28 +------------------ pkgs/tools/misc/cloud-utils/default.nix | 18 ++++++++++++ .../growpart-util-linux-2.26.patch | 0 pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 21 insertions(+), 27 deletions(-) create mode 100644 pkgs/tools/misc/cloud-utils/default.nix rename {nixos/modules/virtualisation => pkgs/tools/misc/cloud-utils}/growpart-util-linux-2.26.patch (100%) diff --git a/nixos/modules/virtualisation/amazon-grow-partition.nix b/nixos/modules/virtualisation/amazon-grow-partition.nix index 44a9fa93e7e..aa13cea2a94 100644 --- a/nixos/modules/virtualisation/amazon-grow-partition.nix +++ b/nixos/modules/virtualisation/amazon-grow-partition.nix @@ -4,37 +4,13 @@ { config, lib, pkgs, ... }: -with lib; - -let - - growpart = pkgs.stdenv.mkDerivation { - name = "growpart"; - src = pkgs.fetchurl { - url = "https://launchpad.net/cloud-utils/trunk/0.27/+download/cloud-utils-0.27.tar.gz"; - sha256 = "16shlmg36lidp614km41y6qk3xccil02f5n3r4wf6d1zr5n4v8vd"; - }; - patches = [ ./growpart-util-linux-2.26.patch ]; - buildPhase = '' - cp bin/growpart $out - sed -i 's|awk|gawk|' $out - sed -i 's|sed|gnused|' $out - ''; - dontInstall = true; - dontPatchShebangs = true; - }; - -in - { - config = mkIf config.ec2.hvm { - boot.initrd.extraUtilsCommands = '' copy_bin_and_libs ${pkgs.gawk}/bin/gawk copy_bin_and_libs ${pkgs.gnused}/bin/sed copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk - cp -v ${growpart} $out/bin/growpart + cp -v ${pkgs.cloud-utils}/bin/growpart $out/bin/growpart ln -s sed $out/bin/gnused ''; @@ -44,7 +20,5 @@ in udevadm settle fi ''; - }; - } diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix new file mode 100644 index 00000000000..fa03962bcdc --- /dev/null +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "cloud-utils-0.27"; + src = fetchurl { + url = "https://launchpad.net/cloud-utils/trunk/0.27/+download/cloud-utils-0.27.tar.gz"; + sha256 = "16shlmg36lidp614km41y6qk3xccil02f5n3r4wf6d1zr5n4v8vd"; + }; + patches = [ ./growpart-util-linux-2.26.patch ]; + buildPhase = '' + mkdir -p $out/bin + cp bin/growpart $out/bin/growpart + sed -i 's|awk|gawk|' $out/bin/growpart + sed -i 's|sed|gnused|' $out/bin/growpart + ''; + dontInstall = true; + dontPatchShebangs = true; +} diff --git a/nixos/modules/virtualisation/growpart-util-linux-2.26.patch b/pkgs/tools/misc/cloud-utils/growpart-util-linux-2.26.patch similarity index 100% rename from nixos/modules/virtualisation/growpart-util-linux-2.26.patch rename to pkgs/tools/misc/cloud-utils/growpart-util-linux-2.26.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b09a913f8e7..e4b5cf174c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1111,6 +1111,8 @@ in cloogppl = callPackage ../development/libraries/cloog-ppl { }; + cloud-utils = callPackage ../tools/misc/cloud-utils { }; + compass = callPackage ../development/tools/compass { }; convmv = callPackage ../tools/misc/convmv { }; From 8a34a3b37a620904a8237216e543774b18b220cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 30 Mar 2016 15:12:41 +0100 Subject: [PATCH 124/165] qemu: 2.5.0 -> 2.5.1 Hopefully this also fixes installer tests on i686 --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 158231a6e64..06d75a00b97 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -15,7 +15,7 @@ with stdenv.lib; let - version = "2.5.0"; + version = "2.5.1"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "1m3j6xl7msrniidkvr5pw9d44yba5m7hm42xz8xy77v105s8hhrl"; + sha256 = "0b2xa8604absdmzpcyjs7fix19y5blqmgflnwjzsp1mp7g1m51q2"; }; buildInputs = From c94f8a4abd521debf926be2f8523edcf643a8ce2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Mar 2016 16:12:44 +0200 Subject: [PATCH 125/165] nixos-rebuild: Fix Nix fallback Somebody forgot that Bash is not a real programming language... --- nixos/modules/installer/tools/nixos-rebuild.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index e0e79f63fab..cd30958d9e8 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -257,9 +257,9 @@ fi prebuiltNix() { machine="$1" if [ "$machine" = x86_64 ]; then - return /nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10 + echo /nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10 elif [[ "$machine" =~ i.86 ]]; then - return /nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10 + echo /nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10 else echo "$0: unsupported platform" exit 1 From e2e56a902f2c46e904ce4447246c9ede61d4e7d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 30 Mar 2016 16:43:14 +0100 Subject: [PATCH 126/165] fix eval --- nixos/modules/virtualisation/amazon-grow-partition.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/amazon-grow-partition.nix b/nixos/modules/virtualisation/amazon-grow-partition.nix index aa13cea2a94..69b80d900ba 100644 --- a/nixos/modules/virtualisation/amazon-grow-partition.nix +++ b/nixos/modules/virtualisation/amazon-grow-partition.nix @@ -5,7 +5,7 @@ { config, lib, pkgs, ... }: { - config = mkIf config.ec2.hvm { + config = lib.mkIf config.ec2.hvm { boot.initrd.extraUtilsCommands = '' copy_bin_and_libs ${pkgs.gawk}/bin/gawk copy_bin_and_libs ${pkgs.gnused}/bin/sed From 088231fe9ff77b1a03f8e87fe4f402e9f4a38be7 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 30 Mar 2016 17:51:00 +0200 Subject: [PATCH 127/165] libiberty: add static variant --- pkgs/development/libraries/libiberty/default.nix | 13 +++++++++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 6a68b5610da..c3dc3a4e852 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, staticBuild ? false }: stdenv.mkDerivation rec { version = "4.9.3"; @@ -11,11 +11,16 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/libiberty"; - enable_shared = 1; + enable_shared = !staticBuild; installPhase = '' - mkdir -p $out/lib - cp pic/libiberty.a $out/lib/libiberty_pic.a + mkdir -p $out/lib $out/include + cp ../include/libiberty.h $out/include/ + if [ -z "$enabled_shared" ]; then + cp libiberty.a $out/lib/libiberty.a + else + cp pic/libiberty.a $out/lib/libiberty_pic.a + fi ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d40165b05d2..caab56d4b76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2206,6 +2206,8 @@ in libiberty = callPackage ../development/libraries/libiberty { }; + libiberty_static = callPackage ../development/libraries/libiberty { staticBuild = true; }; + libibverbs = callPackage ../development/libraries/libibverbs { }; libxcomp = callPackage ../development/libraries/libxcomp { }; From 18918507f2f0cf1edc9c2fa43656acf4e62d70cb Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 30 Mar 2016 17:51:12 +0200 Subject: [PATCH 128/165] oprofile: depend on libiberty_static --- pkgs/development/tools/profiling/oprofile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 01e8152ea96..063b0375fc7 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders -, withGUI ? false , qt4 ? null}: +, libiberty_static, withGUI ? false , qt4 ? null}: # libX11 is needed because the Qt build stuff automatically adds `-lX11'. assert withGUI -> qt4 != null; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0v1nn38h227bgxjwqf22rjp2iqgjm4ls3gckzifks0x6w5nrlxfg"; }; - buildInputs = [ binutils zlib popt pkgconfig linuxHeaders ] + buildInputs = [ binutils zlib popt pkgconfig linuxHeaders libiberty_static ] ++ stdenv.lib.optionals withGUI [ qt4 ]; configureFlags = [ From 449d908b8856bb1a7209425d5bed6824b48bccb4 Mon Sep 17 00:00:00 2001 From: Ben Booth Date: Tue, 29 Mar 2016 10:40:49 -0700 Subject: [PATCH 129/165] xe-guest-utilities: init at 6.2.0 use mkEnableOption use sha256 add xe-guest-utilities to module-list.nix --- lib/maintainers.nix | 1 + nixos/modules/module-list.nix | 1 + .../virtualisation/xe-guest-utilities.nix | 52 +++++++++++++ .../xe-guest-utilities/default.nix | 75 +++++++++++++++++++ .../xe-guest-utilities/ip-address.patch | 16 ++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 147 insertions(+) create mode 100644 nixos/modules/virtualisation/xe-guest-utilities.nix create mode 100644 pkgs/tools/virtualization/xe-guest-utilities/default.nix create mode 100644 pkgs/tools/virtualization/xe-guest-utilities/ip-address.patch diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 12c8c2369b4..ae97005c655 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -51,6 +51,7 @@ bdimcheff = "Brandon Dimcheff "; benley = "Benjamin Staffin "; bennofs = "Benno Fünfstück "; + benwbooth = "Ben Booth "; berdario = "Dario Bertini "; bergey = "Daniel Bergey "; bjg = "Brian Gough "; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d317333f963..0d4b37a9f03 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -542,4 +542,5 @@ ./virtualisation/virtualbox-host.nix ./virtualisation/vmware-guest.nix ./virtualisation/xen-dom0.nix + ./virtualisation/xe-guest-utilities.nix ] diff --git a/nixos/modules/virtualisation/xe-guest-utilities.nix b/nixos/modules/virtualisation/xe-guest-utilities.nix new file mode 100644 index 00000000000..d703353858c --- /dev/null +++ b/nixos/modules/virtualisation/xe-guest-utilities.nix @@ -0,0 +1,52 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.xe-guest-utilities; +in { + options = { + services.xe-guest-utilities = { + enable = mkEnableOption "Whether to enable the Xen guest utilities daemon."; + }; + }; + config = mkIf cfg.enable { + services.udev.packages = [ pkgs.xe-guest-utilities ]; + systemd.tmpfiles.rules = [ "d /run/xenstored 0755 - - -" ]; + + systemd.services.xe-daemon = { + description = "xen daemon file"; + wantedBy = [ "multi-user.target" ]; + after = [ "xe-linux-distribution.service" ]; + requires = [ "proc-xen.mount" ]; + path = [ pkgs.coreutils pkgs.iproute ]; + serviceConfig = { + PIDFile = "/run/xe-daemon.pid"; + ExecStart = "${pkgs.xe-guest-utilities}/bin/xe-daemon -p /run/xe-daemon.pid"; + ExecStop = "${pkgs.procps}/bin/pkill -TERM -F /run/xe-daemon.pid"; + }; + }; + + systemd.services.xe-linux-distribution = { + description = "xen linux distribution service"; + wantedBy = [ "multi-user.target" ]; + before = [ "xend.service" ]; + path = [ pkgs.xe-guest-utilities pkgs.coreutils pkgs.gawk pkgs.gnused ]; + serviceConfig = { + Type = "simple"; + RemainAfterExit = "yes"; + ExecStart = "${pkgs.xe-guest-utilities}/bin/xe-linux-distribution /var/cache/xe-linux-distribution"; + }; + }; + + systemd.mounts = [ + { description = "Mount /proc/xen files"; + what = "xenfs"; + where = "/proc/xen"; + type = "xenfs"; + unitConfig = { + ConditionPathExists = "/proc/xen"; + RefuseManualStop = "true"; + }; + } + ]; + }; +} diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix new file mode 100644 index 00000000000..9c783023d66 --- /dev/null +++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }: + +stdenv.mkDerivation (rec { + name = "xe-guest-utilities"; + version = "6.2.0"; + meta = { + description = "Citrix XenServer Tools"; + homepage = http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US; + maintainers = with stdenv.lib.maintainers; [ benwbooth ]; + platforms = stdenv.lib.platforms.linux; + license = [ stdenv.lib.licenses.gpl2 stdenv.lib.licenses.lgpl21 ]; + }; + src = fetchurl { + url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz"; + sha256 = "f9593cd9588188f80253e736f48d8dd94c5b517abb18316085f86acffab48794"; + }; + buildInputs = [ bzip2 gnutar gnused python lzo zlib xz stdenv gnugrep which ]; + patches = [ ./ip-address.patch ]; + postPatch = '' + tar xf "$NIX_BUILD_TOP/$name-$version/xenstore-sources.tar.bz2" + ''; + + buildPhase = '' + export CC=gcc + export CFLAGS='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess' + export PYTHON=python2 + cd "$NIX_BUILD_TOP/$name-$version/uclibc-sources" + for file in Config.mk tools/libxc/Makefile tools/misc/Makefile tools/misc/lomount/Makefile tools/xenstore/Makefile; do + substituteInPlace "$file" --replace -Werror "" + done + make -C tools/include + make -C tools/libxc + make -C tools/xenstore + ''; + + installPhase = '' + export CFLAGS+='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess' + if [[ $CARCH == x86_64 ]]; then + export LIBLEAFDIR_x86_64=lib + fi + for f in include libxc xenstore; do + [[ ! -d $NIX_BUILD_TOP/$name-$version/uclibc-sources/tools/$f ]] && continue + make -C "$NIX_BUILD_TOP/$name-$version/uclibc-sources/tools/$f" DESTDIR="$out" BINDIR=/bin SBINDIR=/bin INCLUDEDIR=/include LIBDIR=/lib install + done + rm -r "$out"/var + + cd "$NIX_BUILD_TOP/$name-$version" + install -Dm755 xe-update-guest-attrs "$out/bin/xe-update-guest-attrs" + install -Dm755 xe-daemon "$out/bin/xe-daemon" + install -Dm644 xen-vcpu-hotplug.rules "$out/lib/udev/rules.d/10-xen-vcpu-hotplug.rules" + substituteInPlace "$out/bin/xe-daemon" --replace sbin bin + substituteInPlace "$out/bin/xe-daemon" --replace /usr/ "$out/" + substituteInPlace "$out/bin/xe-update-guest-attrs" --replace /usr/ "$out/" + substituteInPlace "$out/bin/xe-update-guest-attrs" --replace 'export PATH=' 'export PATH=$PATH:' + substituteInPlace "$out/lib/udev/rules.d/10-xen-vcpu-hotplug.rules" --replace /bin/sh '${bash}/bin/sh' + + cat <<'EOS' >"$out/bin/xe-linux-distribution" + #!${bash}/bin/bash -eu + . /etc/os-release + if [[ $# -gt 0 ]]; then + mkdir -p "$(dirname "$1")" + exec 1>"$1" + fi + cat < Date: Wed, 30 Mar 2016 11:47:05 -0500 Subject: [PATCH 130/165] jenkins: copy .war to $out, fixes #14137 --- .../tools/continuous-integration/jenkins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 8cde6e1e365..ca154469dfd 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -16,5 +16,5 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.coconnor ]; }; - buildCommand = "ln -s $src $out"; + buildCommand = "cp $src $out"; } From ccdda96c2f6f15bb344190770a828744af45b6ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 30 Mar 2016 18:07:34 +0100 Subject: [PATCH 131/165] manual: use a better relaxng validation tool #4966 --- doc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/default.nix b/doc/default.nix index 5c97bc32a88..ddbee65f1ac 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -67,9 +67,9 @@ stdenv.mkDerivation { + '' echo ${nixpkgsVersion} > .version - xmllint --noout --nonet --xinclude --noxincludenode \ - --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ - manual.xml + # validate against relaxng schema + xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml + ${jing}/bin/jing ${docbook5}/xml/rng/docbook/docbook.rng manual-full.xml dst=$out/share/doc/nixpkgs mkdir -p $dst From 11d09c91c5359e0db9d7e7001cf98784719feed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 30 Mar 2016 11:34:54 -0300 Subject: [PATCH 132/165] cbatticon: 1.4.2 -> 1.6.4 --- pkgs/applications/misc/cbatticon/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index 0a7fb1e5f3f..10c8c483694 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -1,21 +1,25 @@ -{ stdenv, fetchzip, gtk, libnotify, unzip, glib, pkgconfig }: +{ stdenv, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, libnotify }: stdenv.mkDerivation rec { name = "cbatticon-${version}"; - version = "1.4.2"; + version = "1.6.4"; - src = fetchzip { - url = "https://github.com/valr/cbatticon/archive/${version}.zip"; - sha256 = "0ixkxvlrn84b8nh75c9s2gvxnycis89mf047iz8j38814979di5l"; + src = fetchFromGitHub { + owner = "valr"; + repo = "cbatticon"; + rev = version; + sha256 = "0m3bj408mbini97kq0cdf048lnfkdn7bd8ikbfijd7dwfdzv27i5"; }; makeFlags = "PREFIX=$(out)"; - buildInputs = [ gtk libnotify unzip glib pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext ]; + + buildInputs = [ glib gtk3 libnotify ]; meta = with stdenv.lib; { - description = "A lightweight and fast battery icon that sits in your system tray"; + description = "Lightweight and fast battery icon that sits in the system tray"; homepage = https://github.com/valr/cbatticon; license = licenses.gpl2; maintainers = [ maintainers.iElectric ]; From a1cfdb9c88d26f61ea78b2a3801f8b3a94402cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 30 Mar 2016 18:54:58 +0100 Subject: [PATCH 133/165] remove erlangR14: outdated and doesn't build --- pkgs/development/interpreters/erlang/R14.nix | 63 -------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 64 deletions(-) delete mode 100644 pkgs/development/interpreters/erlang/R14.nix diff --git a/pkgs/development/interpreters/erlang/R14.nix b/pkgs/development/interpreters/erlang/R14.nix deleted file mode 100644 index 773ad698629..00000000000 --- a/pkgs/development/interpreters/erlang/R14.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, fetchurl, perl, gnum4, ncurses, openssl -, makeWrapper, gnused, gawk }: - -let version = "14B04"; in - -stdenv.mkDerivation { - name = "erlang-" + version; - - src = fetchurl { - url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz"; - sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9"; - }; - - buildInputs = [ perl gnum4 ncurses openssl makeWrapper ]; - - patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; - - preConfigure = '' - export HOME=$PWD/../ - sed -e s@/bin/pwd@pwd@g -i otp_build - ''; - - configureFlags = "--with-ssl=${openssl}"; - - postInstall = let - manpages = fetchurl { - url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; - sha256 = "1nh7l7wilyyaxvlwkjxgm3cq7wpd90sk6vxhgpvg7hwai8g52545"; - }; - in '' - tar xf "${manpages}" -C "$out/lib/erlang" - for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do - prefix="''${i%/*}" - ensureDir "$out/share/man/''${prefix##*/}" - ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" - done - ''; - - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://www.erlang.org/"; - description = "Programming language used for massively scalable soft real-time systems"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - ''; - - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index caab56d4b76..795f593653e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5220,7 +5220,6 @@ in clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; - erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { }; erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { }; erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; }; erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { }; From 71d7eaf55d3d28eb778dcfd3975c4743662c10e9 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 30 Mar 2016 20:55:40 +0300 Subject: [PATCH 134/165] ntfs-3g: 2015.3.14 -> 2016.2.22; maintain Also old homepage seems to be in a redirect loop. --- pkgs/tools/filesystems/ntfs-3g/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index fd714b89054..d5c5456515c 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "ntfs-3g"; - version = "2015.3.14"; + version = "2016.2.22"; name = "${pname}-${version}"; buildInputs = [ libuuid ] ++ stdenv.lib.optionals crypto [ gnutls libgcrypt ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz"; - sha256 = "1wiqcmy07y02k3iqq56cscnhg5syisbjj9mxfaid85l3bl0rdycp"; + sha256 = "180y5y09h30ryf2vim8j30a2npwz1iv9ly5yjmh3wjdkwh2jrdyp"; }; patchPhase = '' @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.tuxera.com/community/; + homepage = http://www.tuxera.com/community/open-source-ntfs-3g/; description = "FUSE-based NTFS driver with full write support"; - maintainers = [ maintainers.urkud ]; + maintainers = with maintainers; [ urkud dezgeg ]; platforms = platforms.linux; license = licenses.gpl2Plus; # and (lib)fuse-lite under LGPL2+ }; From 0e882ccf740289f191fdda5581c51629a8959c5f Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Wed, 30 Mar 2016 20:06:58 +0200 Subject: [PATCH 135/165] hwinfo: 21.12 -> 21.23 --- pkgs/tools/system/hwinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 6ecbbb98a54..57dfbbeeeb9 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.12"; + version = "21.23"; src = fetchurl { url = "https://github.com/opensuse/hwinfo/archive/${version}.tar.gz"; - sha256 = "01y5jk2jns0a3mgsgmvmpvi5yyc0df7b3yqsg32hn5r2nv17i47p"; + sha256 = "1a8815zp3a7n2jx0cn0hcr69rfr6vmw8r8grbn5mv61g90bbcj6p"; }; patchPhase = '' From 318fdda01cbfe4476b0c6eca1d51961f5e7e5485 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Wed, 30 Mar 2016 20:25:50 +0200 Subject: [PATCH 136/165] git-cola: 2.2.1 -> 2.5 --- .../version-management/git-and-tools/git-cola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 44a617d70e1..77c2f45bbd5 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "git-cola-${version}"; - version = "2.2.1"; + version = "2.5"; src = fetchurl { url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz"; - sha256 = "1v1s9gx16xihdcck4qp92bdci8zc6pb5a3z3y8k9jqj97hfkw2nz"; + sha256 = "0ybjmlwm1plnvqi20y91ci7sgldzwlwn86vyyn9a157h7lf4ngb8"; }; buildInputs = [ makeWrapper gettext ]; From c091e61a098c5cab1f5b6b850d8fc05741cb112e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 28 Mar 2016 13:26:46 +0300 Subject: [PATCH 137/165] pcre: add 16- and 32-bit character size versions --- pkgs/development/libraries/pcre/default.nix | 25 +++++++++++++++------ pkgs/top-level/all-packages.nix | 8 +++++++ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 92f53b06720..afeffae3e5f 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,14 +1,24 @@ -{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true +{ stdenv, lib, fetchurl, unicodeSupport ? true, cplusplusSupport ? true , windows ? null +, withCharSize ? 8 }: with stdenv.lib; -stdenv.mkDerivation rec { - name = "pcre-8.38"; +assert withCharSize != 8 -> !cplusplusSupport; + +let + charFlags = if withCharSize == 8 then [ ] + else if withCharSize == 16 then [ "--enable-pcre16" "--disable-pcre8" ] + else if withCharSize == 32 then [ "--enable-pcre32" "--disable-pcre8" ] + else abort "Invalid character size"; + +in stdenv.mkDerivation rec { + name = "pcre${lib.optionalString (withCharSize != 8) (toString withCharSize)}-8.38"; + # FIXME: add "version" attribute and use it in URL src = fetchurl { - url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; + url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.38.tar.bz2"; sha256 = "1pvra19ljkr5ky35y2iywjnsckrs9ch2anrf5b0dc91hw8v2vq5r"; }; @@ -17,11 +27,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" "man" ]; + # FIXME: Refactor into list! configureFlags = '' --enable-jit - ${if unicodeSupport then "--enable-unicode-properties" else ""} - ${if !cplusplusSupport then "--disable-cpp" else ""} - ''; + ${lib.optionalString unicodeSupport "--enable-unicode-properties"} + ${lib.optionalString (!cplusplusSupport) "--disable-cpp"} + '' + lib.optionalString (charFlags != []) " ${toString charFlags}"; doCheck = with stdenv; !(isCygwin || isFreeBSD); # XXX: test failure on Cygwin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 795f593653e..4bb16b69dca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8345,6 +8345,14 @@ in pcre = callPackage ../development/libraries/pcre { unicodeSupport = config.pcre.unicode or true; }; + pcre16 = pcre.override { + cplusplusSupport = false; + withCharSize = 16; + }; + pcre32 = pcre.override { + cplusplusSupport = false; + withCharSize = 32; + }; pcre2 = callPackage ../development/libraries/pcre2 { }; From c419e3c6d6eda71e5ee1f8abcc7ca5a0406cc5e4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 28 Mar 2016 16:44:43 +0300 Subject: [PATCH 138/165] libgee_0_6: init at 0.6.8 --- pkgs/development/libraries/libgee/0.6.nix | 27 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/libgee/0.6.nix diff --git a/pkgs/development/libraries/libgee/0.6.nix b/pkgs/development/libraries/libgee/0.6.nix new file mode 100644 index 00000000000..e30641f0e76 --- /dev/null +++ b/pkgs/development/libraries/libgee/0.6.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, glib }: + +let + ver_maj = "0.6"; + ver_min = "8"; +in +stdenv.mkDerivation rec { + name = "libgee-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; + sha256 = "1lzmxgz1bcs14ghfp8qqzarhn7s64ayx8c508ihizm3kc5wqs7x6"; + }; + + buildInputs = [ glib ]; + nativeBuildInputs = [ pkgconfig ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + homepage = "http://live.gnome.org/Libgee"; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bb16b69dca..0f3c76ba4dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7424,6 +7424,8 @@ in libgdata = gnome3.libgdata; + libgee_0_6 = callPackage ../development/libraries/libgee/0.6.nix { }; + libgig = callPackage ../development/libraries/libgig { }; libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; From 01e251166883a32c8e47cb72de7f4634f61b0e12 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 28 Mar 2016 16:45:10 +0300 Subject: [PATCH 139/165] dee: init at 1.2.7 --- pkgs/development/libraries/dee/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/dee/default.nix diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix new file mode 100644 index 00000000000..e4d12de28fd --- /dev/null +++ b/pkgs/development/libraries/dee/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, python, pkgconfig +, glib, icu, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "dee-${version}"; + version = "1.2.7"; + + src = fetchurl { + url = "https://launchpad.net/dee/1.0/${version}/+download/${name}.tar.gz"; + sha256 = "12mzffk0lyd566y46x57jlvb9af152b4dqpasr40zal4wrn37w0v"; + }; + + buildInputs = [ glib gobjectIntrospection icu ]; + nativeBuildInputs = [ python pkgconfig ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus"; + homepage = "https://launchpad.net/dee"; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f3c76ba4dc..9801434578b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6549,6 +6549,8 @@ in dbus_libs = pkgs.dbus.libs; dbus_daemon = pkgs.dbus.daemon; + dee = callPackage ../development/libraries/dee { }; + dhex = callPackage ../applications/editors/dhex { }; double_conversion = callPackage ../development/libraries/double-conversion { }; From e0ee6dc8fca8a511280084ad2fc35537ed68c4b7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 28 Mar 2016 16:45:37 +0300 Subject: [PATCH 140/165] breakpad: init at 2016-03-28 --- .../libraries/breakpad/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/breakpad/default.nix diff --git a/pkgs/development/libraries/breakpad/default.nix b/pkgs/development/libraries/breakpad/default.nix new file mode 100644 index 00000000000..f5876d09a71 --- /dev/null +++ b/pkgs/development/libraries/breakpad/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation { + name = "breakpad-2016-03-28"; + + src = fetchgit { + url = "https://chromium.googlesource.com/breakpad/breakpad"; + rev = "512cac3a1b69721ab727f3079f4d29e4580467b1"; + sha256 = "0v7k7racdl2f16mbi3r0vkbkagh0gf6ksnpf3ri28b9pjfngkl5s"; + }; + + breakpad_lss = fetchgit { + url = "https://chromium.googlesource.com/linux-syscall-support"; + rev = "08056836f2b4a5747daff75435d10d649bed22f6"; + sha256 = "1ryshs2nyxwa0kn3rlbnd5b3fhna9vqm560yviddcfgdm2jyg0hz"; + }; + + enableParallelBuilding = true; + + prePatch = '' + cp -r $breakpad_lss src/third_party/lss + chmod +w -R src/third_party/lss + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9801434578b..675a9dca673 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6389,6 +6389,8 @@ in box2d = callPackage ../development/libraries/box2d { }; box2d_2_0_1 = callPackage ../development/libraries/box2d/2.0.1.nix { }; + breakpad = callPackage ../development/libraries/breakpad { }; + buddy = callPackage ../development/libraries/buddy { }; bwidget = callPackage ../development/libraries/bwidget { }; From a8f5991db775a89b0ce8cb3673828c6ec0d4a91e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 28 Mar 2016 16:46:10 +0300 Subject: [PATCH 141/165] libunity: init at 6.12.0 --- .../libraries/libunity/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/libunity/default.nix diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix new file mode 100644 index 00000000000..94e19f97e80 --- /dev/null +++ b/pkgs/development/libraries/libunity/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, vala, python, intltool, pkgconfig +, glib, libgee_0_6, gtk3, dee, libdbusmenu-glib +}: + +stdenv.mkDerivation rec { + name = "libunity-${version}"; + version = "6.12.0"; + + src = fetchurl { + url = "https://launchpad.net/libunity/6.0/${version}/+download/${name}.tar.gz"; + sha256 = "1nadapl3390x98q1wv2yarh60hzi7ck0d1s8zz9xsiq3zz6msbjd"; + }; + + buildInputs = [ glib libgee_0_6 gtk3 ]; + propagatedBuildInputs = [ dee libdbusmenu-glib ]; + nativeBuildInputs = [ vala python intltool pkgconfig ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A library for instrumenting- and integrating with all aspects of the Unity shell"; + homepage = "https://launchpad.net/libunity"; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 675a9dca673..9449ae4035c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7906,6 +7906,8 @@ in libu2f-server = callPackage ../development/libraries/libu2f-server { }; + libunity = callPackage ../development/libraries/libunity { }; + libunistring = callPackage ../development/libraries/libunistring { }; libupnp = callPackage ../development/libraries/pupnp { }; From 1d24a7b6f889e1ed23fd94ca21e5ee02aeac6d26 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 28 Mar 2016 16:46:44 +0300 Subject: [PATCH 142/165] tdesktop: init at 0.9.33 --- .../telegram/tdesktop/default.nix | 164 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix new file mode 100644 index 00000000000..2422d180869 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -0,0 +1,164 @@ +{ stdenv, lib, fetchFromGitHub, fetchgit, qtbase, qtimageformats +, breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus +, gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2 +, libunity, dee, libdbusmenu-glib, libva + +, pkgconfig, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms +, libxkbcommon, libpng, libjpeg, freetype, harfbuzz, pcre16 +, xproto, libX11, inputproto, sqlite, dbus +}: + +let + system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; +in stdenv.mkDerivation rec { + name = "telegram-desktop-${version}"; + version = "0.9.33"; + qtVersion = lib.replaceStrings ["."] ["_"] qtbase.version; + + src = fetchFromGitHub { + owner = "telegramdesktop"; + repo = "tdesktop"; + rev = "v${version}"; + sha256 = "020vwm7h22951v9zh457d82qy5ifp746vwishkvb16h1vwr1qx4s"; + }; + + tgaur = fetchgit { + url = "https://aur.archlinux.org/telegram-desktop.git"; + rev = "df47a864282959b103a08b65844e9088e012fdb3"; + sha256 = "1v1dbi8yiaf2hgghniykm5qbnda456xj3zfjnbqysn41f5cn40h4"; + }; + + buildInputs = [ + breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus + gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk + dee libdbusmenu-glib libva + # Qt dependencies + libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon + libpng libjpeg freetype harfbuzz pcre16 xproto libX11 + inputproto sqlite dbus + ]; + + nativeBuildInputs = [ pkgconfig ]; + + enableParallelBuilding = true; + + qmakeFlags = [ + "CONFIG+=release" + "DEFINES+=TDESKTOP_DISABLE_AUTOUPDATE" + "DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" + "INCLUDEPATH+=${gtk2}/include/gtk-2.0" + "INCLUDEPATH+=${glib}/include/glib-2.0" + "INCLUDEPATH+=${glib}/lib/glib-2.0/include" + "INCLUDEPATH+=${cairo}/include/cairo" + "INCLUDEPATH+=${pango}/include/pango-1.0" + "INCLUDEPATH+=${gtk2}/lib/gtk-2.0/include" + "INCLUDEPATH+=${gdk_pixbuf}/include/gdk-pixbuf-2.0" + "INCLUDEPATH+=${atk}/include/atk-1.0" + "INCLUDEPATH+=${libappindicator-gtk2}/include/libappindicator-0.1" + "INCLUDEPATH+=${libunity}/include/unity" + "INCLUDEPATH+=${dee}/include/dee-1.0" + "INCLUDEPATH+=${libdbusmenu-glib}/include/libdbusmenu-glib-0.4" + "INCLUDEPATH+=${breakpad}/include/breakpad" + "LIBS+=-lcrypto" + "LIBS+=-lssl" + "LIBS+=-lz" + "LIBS+=-lgobject-2.0" + "LIBS+=-lxkbcommon" + "LIBS+=-lX11" + "LIBS+=${breakpad}/lib/libbreakpad_client.a" + "LIBS+=./../../../Libraries/QtStatic/qtbase/plugins/platforms/libqxcb.a" + "LIBS+=./../../../Libraries/QtStatic/qtimageformats/plugins/imageformats/libqwebp.a" + ]; + + qtSrcs = qtbase.srcs ++ [ qtimageformats.src ]; + qtPatches = qtbase.patches; + + buildCommand = '' + # We don't use nativeBuildInputs to avoid adding system Qt 5 libraries to various paths. + export PATH="${qtbase}/bin:$PATH" + + unpackPhase + cd "$sourceRoot" + patchPhase + sed -i 'Telegram/Telegram.pro' \ + -e 's/CUSTOM_API_ID//g' \ + -e 's,/usr,/does-not-exist,g' \ + -e '/LIBS += .*libxkbcommon.a/d' \ + -e '/LIBS += .*libz.a/d' \ + -e '/LIBS += .*libbreakpad_client.a/d' \ + -e 's,-flto ,,g' + echo "Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)" >> Telegram/SourceFiles/stdafx.cpp + + ( mkdir -p ../Libraries + cd ../Libraries + for i in $qtSrcs; do + tar -xaf $i + done + mv qt-everywhere-opensource-src-* QtStatic + mv qtbase-opensource-src-* ./QtStatic/qtbase + mv qtimageformats-opensource-src-* ./QtStatic/qtimageformats + cd QtStatic/qtbase + patch -p1 < ../../../$sourceRoot/Telegram/_qtbase_${qtVersion}_patch.diff + cd .. + for i in $qtPatches; do + patch -p1 < $i + done + ${qtbase.postPatch} + + export configureFlags="-prefix "../../qt" -release -opensource -confirm-license -system-zlib \ + -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \ + -system-xkbcommon-x11 -no-opengl -static -nomake examples -nomake tests \ + -openssl-linked -dbus-linked -system-sqlite -verbose \ + ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 -no-ssse3 \ + -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2" + export dontAddPrefix=1 + export buildFlags="module-qtbase module-qtimageformats" + export installFlags="module-qtbase-install_subtargets module-qtimageformats-install_subtargets" + + ( export MAKEFLAGS=-j$NIX_BUILD_CORES + configurePhase + ) + buildPhase + installPhase + ) + + ( mkdir -p Linux/DebugIntermediateStyle + cd Linux/DebugIntermediateStyle + qmake CONFIG+=debug ../../Telegram/MetaStyle.pro + buildPhase + ) + ( mkdir -p Linux/DebugIntermediateLang + cd Linux/DebugIntermediateLang + qmake CONFIG+=debug ../../Telegram/MetaLang.pro + buildPhase + ) + + ( mkdir -p Linux/ReleaseIntermediate + cd Linux/ReleaseIntermediate + qmake $qmakeFlags ../../Telegram/Telegram.pro + pattern="^PRE_TARGETDEPS +=" + grep "$pattern" "../../Telegram/Telegram.pro" | sed "s/$pattern//g" | xargs make + + qmake $qmakeFlags ../../Telegram/Telegram.pro + buildPhase + ) + + install -Dm755 Linux/Release/Telegram $out/bin/telegram-desktop + mkdir -p $out/share/applications $out/share/kde4/services + sed "s,/usr/bin,$out/bin,g" $tgaur/telegramdesktop.desktop > $out/share/applications/telegramdesktop.desktop + sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol + for icon_size in 16 32 48 64 128 256 512; do + install -Dm644 "Telegram/SourceFiles/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png" + done + + fixupPhase + ''; + + meta = with stdenv.lib; { + description = "Telegram Desktop messaging app"; + license = licenses.gpl3; + platforms = platforms.linux; + homepage = "https://desktop.telegram.org/"; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9449ae4035c..4628630b533 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13852,7 +13852,9 @@ in taskserver = callPackage ../servers/misc/taskserver { }; - telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli/default.nix { }; + tdesktop = qt55.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }; + + telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; From 184b7ba3c684c5be64c4908ac4973f71865acf4e Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 30 Mar 2016 21:27:20 +0200 Subject: [PATCH 143/165] glib-tested: suppress gdbus test needing machine-id --- pkgs/development/libraries/glib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 9a3303684a1..9dd927d55ce 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -100,6 +100,7 @@ stdenv.mkDerivation rec { substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true" # Needs machine-id, comment the test sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c + sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-unix-addresses.c # All gschemas fail to pass the test, upstream bug? sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c # Cannot reproduce the failing test_associations on hydra From 77d79ef6a4fc548a13b45d8cba9f16b8eb2bf49e Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Wed, 30 Mar 2016 21:45:49 +0200 Subject: [PATCH 144/165] fsharp: 4.0.0.4 -> 4.0.1.1 --- pkgs/development/compilers/fsharp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 12df5721cc4..c00cea0029e 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "fsharp-${version}"; - version = "4.0.0.4"; + version = "4.0.1.1"; src = fetchurl { url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; - sha256 = "1m9pwr4xjl3ikaf3pzsa4pb3pr533xa0v34y2cy4pjcc6j0f71av"; + sha256 = "0mvmvwwpl4zq0yvgzdizww8l9azvlrc82xm32nz1fi1nw8x5qfqk"; }; buildInputs = [ mono pkgconfig dotnetbuildhelpers autoconf automake which ]; From 0d3738cdcc48bd32a7eae9b914440b67c8db252e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Mar 2016 21:48:12 +0200 Subject: [PATCH 145/165] Fix the EC2 test We now generate a qcow2 image to prevent hitting Hydra's output size limit. Also updated /root/user-data -> /etc/ec2-metadata/user-data. http://hydra.nixos.org/build/33843133 --- nixos/lib/make-disk-image.nix | 6 ++++-- nixos/maintainers/scripts/ec2/amazon-image.nix | 4 +++- nixos/modules/virtualisation/amazon-image.nix | 3 +-- nixos/tests/ec2.nix | 11 +++++------ 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 7387bf14738..caf0ab4c07b 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -23,6 +23,8 @@ postVM ? "" , name ? "nixos-disk-image" + +, format ? "raw" }: with lib; @@ -32,8 +34,8 @@ pkgs.vmTools.runInLinuxVM ( { preVM = '' mkdir $out - diskImage=$out/nixos.img - ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "${toString diskSize}M" + diskImage=$out/nixos.${if format == "qcow2" then "qcow2" else "img"} + ${pkgs.vmTools.qemu}/bin/qemu-img create -f ${format} $diskImage "${toString diskSize}M" mv closure xchg/ ''; buildInputs = [ pkgs.utillinux pkgs.perl pkgs.e2fsprogs pkgs.parted ]; diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index ef8646c66d1..bfa4f4b3ca5 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -10,9 +10,11 @@ with lib; ]; system.build.amazonImage = import ../../../lib/make-disk-image.nix { - inherit pkgs lib config; + inherit lib config; + pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package partitioned = config.ec2.hvm; diskSize = if config.ec2.hvm then 2048 else 8192; + format = "qcow2"; configFile = pkgs.writeText "configuration.nix" '' { diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 35af905bc62..5d99bccb0e9 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -65,8 +65,7 @@ let cfg = config.ec2; in fi if ! [ -e "$metaDir/user-data" ]; then - wget -q -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data - chmod 600 "$metaDir/user-data" + wget -q -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" fi if ! [ -e "$metaDir/hostname" ]; then diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index 0a95d6cfeff..597bfe89fb0 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -11,7 +11,6 @@ let modules = [ ../maintainers/scripts/ec2/amazon-image.nix ../modules/testing/test-instrumentation.nix - ../modules/profiles/minimal.nix ../modules/profiles/qemu-guest.nix { ec2.hvm = true; @@ -30,9 +29,8 @@ let metaData = pkgs.stdenv.mkDerivation { name = "metadata"; buildCommand = '' - mkdir -p $out/2011-01-01 - ln -s ${pkgs.writeText "userData" userData} $out/2011-01-01/user-data mkdir -p $out/1.0/meta-data + ln -s ${pkgs.writeText "userData" userData} $out/1.0/user-data echo "${hostname}" > $out/1.0/meta-data/hostname echo "(unknown)" > $out/1.0/meta-data/ami-manifest-path '' + optionalString (sshPublicKey != null) '' @@ -48,7 +46,7 @@ let my $imageDir = ($ENV{'TMPDIR'} // "/tmp") . "/vm-state-machine"; mkdir $imageDir, 0700; my $diskImage = "$imageDir/machine.qcow2"; - system("qemu-img create -f qcow2 -o backing_file=${image}/nixos.img $diskImage") == 0 or die; + system("qemu-img create -f qcow2 -o backing_file=${image}/nixos.qcow2 $diskImage") == 0 or die; system("qemu-img resize $diskImage 10G") == 0 or die; # Note: we use net=169.0.0.0/8 rather than @@ -91,7 +89,7 @@ in { ''; script = '' $machine->start; - $machine->waitForFile("/root/user-data"); + $machine->waitForFile("/etc/ec2-metadata/user-data"); $machine->waitForUnit("sshd.service"); $machine->succeed("grep unknown /etc/ec2-metadata/ami-manifest-path"); @@ -121,7 +119,7 @@ in { # Just to make sure resizing is idempotent. $machine->shutdown; $machine->start; - $machine->waitForFile("/root/user-data"); + $machine->waitForFile("/etc/ec2-metadata/user-data"); ''; }; @@ -135,6 +133,7 @@ in { imports = [ + ]; environment.etc.testFile = { text = "whoa"; From 04d4d0000f7b6eb6b06bbab5eb608798dd4544e1 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 30 Mar 2016 21:53:44 +0200 Subject: [PATCH 146/165] namazu: mark as broken --- pkgs/tools/text/namazu/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 72caa7ba5cb..21548de5efb 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ ]; + broken = true; # File-MMagic is not compatible with our Perl version }; } From 18451597059455d3dd7683dad42d6d5f58d7f8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 30 Mar 2016 21:06:28 +0100 Subject: [PATCH 147/165] perlPackages.UnicodeString: fix build (also imapsync) --- .../perl-modules/Unicode-String-perl-5-22.patch | 11 +++++++++++ pkgs/top-level/perl-packages.nix | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/perl-modules/Unicode-String-perl-5-22.patch diff --git a/pkgs/development/perl-modules/Unicode-String-perl-5-22.patch b/pkgs/development/perl-modules/Unicode-String-perl-5-22.patch new file mode 100644 index 00000000000..08d0d13b41f --- /dev/null +++ b/pkgs/development/perl-modules/Unicode-String-perl-5-22.patch @@ -0,0 +1,11 @@ +diff -ru libunicode-string-perl-2.09.pristine/lib/Unicode/CharName.pm libunicode-string-perl-2.09/lib/Unicode/CharName.pm +--- libunicode-string-perl-2.09.pristine/lib/Unicode/CharName.pm 2005-10-25 19:11:00.000000000 +0100 ++++ libunicode-string-perl-2.09/lib/Unicode/CharName.pm 2012-01-24 12:56:59.730653088 +0000 +@@ -77,7 +77,7 @@ + return join("", "HANGUL SYLLABLE ", @s) + } + } +- _init_names() unless defined %NAMES; ++ _init_names() unless %NAMES; + $NAMES{sprintf("%04X",$code)} + } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6d86f5d3e0e..5568d45e7cf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13202,6 +13202,9 @@ let self = _self // overrides; _self = with self; { UnicodeString = buildPerlPackage rec { name = "Unicode-String-2.09"; + patches = [ + ../development/perl-modules/Unicode-String-perl-5-22.patch + ]; src = fetchurl { url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; sha256 = "1bgsaf3dgmlgyvi84r42ysc037mr5280amnypa4d98jfjpdvw5y8"; From 1783e33b060abce8471219b582195b30eee6e9c9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Mar 2016 22:21:56 +0200 Subject: [PATCH 148/165] Fix the boot-ec2-config test --- nixos/modules/profiles/headless.nix | 3 +++ nixos/tests/ec2.nix | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/nixos/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix index 4be0fb44216..67f8d633bab 100644 --- a/nixos/modules/profiles/headless.nix +++ b/nixos/modules/profiles/headless.nix @@ -20,4 +20,7 @@ with lib; # Don't allow emergency mode, because we don't have a console. systemd.enableEmergencyMode = false; + + # Being headless, we don't need a GRUB splash image. + boot.loader.grub.splashImage = null; } diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index 597bfe89fb0..e1f7143e3a9 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -20,6 +20,14 @@ let ln -s vda /dev/xvda ln -s vda1 /dev/xvda1 ''; + + # Needed by nixos-rebuild due to the lack of network + # access. Mostly copied from + # modules/profiles/installation-device.nix. + system.extraDependencies = + [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio + pkgs.unionfs-fuse pkgs.mkinitcpio-nfs-utils + ]; } ]; }).config.system.build.amazonImage; From 2d4af4b97908f129602390e6ab9c0c7f2be00a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= Date: Thu, 31 Mar 2016 00:08:27 +0200 Subject: [PATCH 149/165] oidentd: Set C dialect to gnu89 (broken by GCC 5) --- pkgs/servers/identd/oidentd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index 04ad25b3fd3..b8eb21e492b 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -3,6 +3,8 @@ stdenv.mkDerivation rec { name = "oidentd-2.0.8"; + CFLAGS = [ "--std=gnu89" ]; + src = fetchurl { url = "mirror://sourceforge/ojnk/${name}.tar.gz"; sha256 = "0vzv2086rrxcaavrm3js7aqvyc0grgaqy78x61d8s7r8hz8vwk55"; From cd87edce149b38cc2d32358d196bb6039a7b33a4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 31 Mar 2016 00:16:01 +0200 Subject: [PATCH 150/165] tinycc: 0.9.26 -> 0.9.27pre-20160328 (from git); apparently fixes the segfaults --- pkgs/development/compilers/tinycc/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index c9378451d1f..f1a52f5de91 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -1,13 +1,19 @@ -{ stdenv, fetchurl, perl, texinfo }: +{ stdenv, fetchurl, fetchgit, perl, texinfo }: assert stdenv ? glibc; stdenv.mkDerivation rec { - name = "tcc-0.9.26"; + #name = "tcc-0.9.26"; + name = "tcc-git-0.9.27pre-20160328"; - src = fetchurl { - url = "mirror://savannah/tinycc/${name}.tar.bz2"; - sha256 = "0wbdbdq6090ayw8bxnbikiv989kykff3m5rzbia05hrnwhd707jj"; + #src = fetchurl { + # url = "mirror://savannah/tinycc/${name}.tar.bz2"; + # sha256 = "0wbdbdq6090ayw8bxnbikiv989kykff3m5rzbia05hrnwhd707jj"; + #}; + src = fetchgit { + url = "git://repo.or.cz/tinycc.git"; + rev = "80343ab7d829c21c65f8f9a14dd20158d028549f"; + sha256 = "1bz75aj93ivb2d8hfk2bczsrwa56lv7vprvdi8c1r5phjvawbshy"; }; nativeBuildInputs = [ perl texinfo ]; From 254e2cc982808467539b232ffe8f15348b84c36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 30 Mar 2016 22:17:59 +0200 Subject: [PATCH 151/165] hhvm: disable parallel building /cc #14151. http://hydra.nixos.org/build/33846692/nixlog/1/tail --- pkgs/development/compilers/hhvm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index d976b6edab8..23f0484e8ea 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gmp libyaml libedit libvpx imagemagick fribidi gperf ]; - enableParallelBuilding = true; + enableParallelBuilding = false; # occasional build problems; dontUseCmakeBuildDir = true; NIX_LDFLAGS = "-lpam -L${pam}/lib"; MYSQL_INCLUDE_DIR="${mariadb}/include/mysql"; From 016d523d8260d867ea4a2f2e4a6675c873fb9866 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 31 Mar 2016 01:52:23 +0200 Subject: [PATCH 152/165] cvc4: fix the build by skipping line markers in cpp expansions during configure, helps the configure script to find Boost version --- pkgs/applications/science/logic/cvc4/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 769f86d5d77..5175037f01b 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -10,7 +10,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ gmp libantlr3c boost autoreconfHook ]; - preConfigure = "patchShebangs ./src/"; + preConfigure = '' + patchShebangs ./src/ + OLD_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS -P" + ''; + postConfigure = ''CPPFLAGS="$OLD_CPPFLAGS"''; doChecks = true; meta = with stdenv.lib; { From 8347f94216c6f33d5f28c3ebc33c40a64d02fc62 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 30 Mar 2016 19:49:22 -0400 Subject: [PATCH 153/165] fix nesting error resulting in topydo metadata being attached to the enclosing set --- pkgs/top-level/python-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 763e1aa15ff..c75c433cd37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26325,12 +26325,12 @@ in modules // { buildInputs = with self; [ mock freezegun coverage pkgs.glibcLocales ]; LC_ALL="en_US.UTF-8"; - }; - meta = { - description = "A cli todo application compatible with the todo.txt format"; - homepage = "https://github.com/bram85/topydo"; - license = license.gpl3; + meta = { + description = "A cli todo application compatible with the todo.txt format"; + homepage = "https://github.com/bram85/topydo"; + license = licenses.gpl3; + }; }; } From e0c53be9918e591e5a67a092544ca965ce371cfc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 31 Mar 2016 02:38:14 +0200 Subject: [PATCH 154/165] tzdata: 2016b -> 2016c --- pkgs/data/misc/tzdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 0c58ebe6046..5b51da58e62 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "tzdata-${version}"; - version = "2016b"; + version = "2016c"; srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "6392091d92556a32de488ea06a055c51bc46b7d8046c8a677f0ccfe286b3dbdc"; + sha256 = "0j1dk830rkr1pijfac5wkdifi47k28mmvfys6z07l07jws0xj047"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "e935c4fe78b5c5da3791f58f3ab7f07fb059a7c71d6b62b69ef345211ae5dfa7"; + sha256 = "05m4ql1x3b4bmlg0vv1ibz2128mkk4xxnixagcmwlnwkhva1njrl"; }) ]; From 57f4678bbb266496edf122602fe7815ccf77b0d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 31 Mar 2016 02:40:18 +0200 Subject: [PATCH 155/165] x2goclient: 4.0.5.0 -> 4.0.5.1 --- pkgs/applications/networking/remote/x2goclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index ffebeb744ce..02a25b9a270 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "x2goclient-${version}"; - version = "4.0.5.0"; + version = "4.0.5.1"; src = fetchurl { url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; - sha256 = "18a2pszh0nq2ir64a1ah1mlzddn4qcd12b339bv30n0y1ir92bi4"; + sha256 = "04gdccqywas029a76k3r9zhr2mfn385i9r06cmi8mznxpczrhkl4"; }; buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ]; From 1532ce35b84cb3ccac89fc6b4171f1bef2293b7a Mon Sep 17 00:00:00 2001 From: ne0phyte Date: Thu, 31 Mar 2016 04:28:01 +0200 Subject: [PATCH 156/165] librecad: 2.0.8 -> 2.0.9 --- pkgs/applications/misc/librecad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 135291a1490..b41ef70394e 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }: stdenv.mkDerivation rec { - version = "2.0.8"; + version = "2.0.9"; name = "librecad-${version}"; src = fetchurl { url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}"; name = name + ".tar.gz"; - sha256 = "110vn1rvzidg8k6ifz1zws2wsn4cd05xl5ha0hbff2ln7izy84zc"; + sha256 = "0npr2nxwmx1qil7lqhkh6yvkw7dwym0nfashxjglxspjallqjya7"; }; patchPhase = '' From c12f63821fbcebd0ba42af0bf8633bcd13b17c11 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 31 Mar 2016 07:20:21 +0300 Subject: [PATCH 157/165] ios-cross-compile: Don't build on hydra --- pkgs/development/compilers/ios-cross-compile/9.2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix index 5ec24e01617..9c4b38f87de 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2.nix +++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix @@ -58,6 +58,7 @@ clangStdenv.mkDerivation rec { description = "Provides an iOS cross compiler from 7.1 up to iOS-${version} and ldid"; platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; maintainers = with stdenv.lib.maintainers; [ fxfactorial ]; license = stdenv.lib.licenses.gpl2; }; From e21dd19168a726f749a00bc96950ce2e09f9eecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 30 Mar 2016 09:45:23 +0200 Subject: [PATCH 158/165] Making vm's interactive shell handle the terminal well. --- pkgs/build-support/vm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 23f95bd4979..cddca950ef4 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -66,6 +66,7 @@ rec { mknod -m 666 ${dev}/random c 1 8 mknod -m 666 ${dev}/urandom c 1 9 mknod -m 666 ${dev}/tty c 5 0 + mknod -m 666 ${dev}/ttyS0 c 4 64 mknod ${dev}/rtc c 254 0 . /sys/class/block/${hd}/uevent mknod ${dev}/${hd} b $MAJOR $MINOR @@ -208,7 +209,7 @@ rec { export PATH=/bin:/usr/bin:${coreutils}/bin echo "Starting interactive shell..." echo "(To run the original builder: \$origBuilder \$origArgs)" - exec ${bash}/bin/sh + exec ${busybox}/bin/setsid ${bashInteractive}/bin/bash < /dev/ttyS0 &> /dev/ttyS0 fi ''; From ab93f8c137ac8d7d67f42c24aa3844f6cd233d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 30 Mar 2016 09:46:33 +0200 Subject: [PATCH 159/165] Making vm's qemu cache=unsafe. Faster. I don't think it's unsafe, if it's meant for nix expressions. --- pkgs/build-support/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index cddca950ef4..c11c21170e0 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -220,7 +220,7 @@ rec { -nographic -no-reboot \ -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ - -drive file=$diskImage,if=virtio,cache=writeback,werror=report \ + -drive file=$diskImage,if=virtio,cache=unsafe,werror=report \ -kernel ${kernel}/${img} \ -initrd ${initrd}/initrd \ -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ From a3ac6300923039901d185ed5a5f57d59fa99a6a5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 31 Mar 2016 09:26:58 +0200 Subject: [PATCH 160/165] nixos/tests: Add a test for keyboard layouts I had the basic version of this laying around for some while but didn't continue on it. Originally it was for testing support for the Neo layout introduced back then (8cd6d53). We only test the first three Neo layers, because the last three layers are largely comprised of special characters and in addition to that the support for the VT keymap seems to be limited compared to the Xorg keymap. Yesterday @NicolasPetton on IRC had troubles with the Colemak layout (IRC logs: http://nixos.org/irc/logs/log.20160330, starting at 16:08) and I found that test again, so I went for improving and adding to . While the original problem seemed to be related to GDM, we can still add another subtest that checks whether GDM correctly applies the keyboard layout. However I don't have a clue how to properly configure the keyboard layout on GDM, at least not within the NixOS configuration. The main goal of this test is not to test a complete set of all key mappings but to check whether the keymap is loaded and working at all. It also serves as an example for NixOS keyboard configurations. The list of keyboard layouts is by no means complete, so everybody is free to add their own to the test or improve the existing ones. Signed-off-by: aszlig --- nixos/release.nix | 1 + nixos/tests/keymap.nix | 160 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 161 insertions(+) create mode 100644 nixos/tests/keymap.nix diff --git a/nixos/release.nix b/nixos/release.nix index d190733d5c1..8a01b2685a7 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -219,6 +219,7 @@ in rec { tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; tests.kde4 = callTest tests/kde4.nix {}; + tests.keymap = callSubTests tests/keymap.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {}; tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; }); tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; }; diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix new file mode 100644 index 00000000000..55a0e760388 --- /dev/null +++ b/nixos/tests/keymap.nix @@ -0,0 +1,160 @@ +{ system ? builtins.currentSystem }: + +with import ../lib/testing.nix { inherit system; }; + +let + testReader = pkgs.writeScript "test-input-reader" '' + #!${pkgs.stdenv.shell} + readInput() { + touch /tmp/reader.ready + echo "Waiting for '$1' to be typed" + read -r -n1 c + if [ "$c" = "$2" ]; then + echo "SUCCESS: Got back '$c' as expected." + echo 0 >&2 + else + echo "FAIL: Expected '$2' but got '$c' instead." + echo 1 >&2 + fi + } + + main() { + error=0 + while [ $# -gt 0 ]; do + ret="$((readInput "$2" "$3" | systemd-cat -t "$1") 2>&1)" + if [ $ret -ne 0 ]; then error=1; fi + shift 3 + done + return $error + } + + main "$@"; echo -n $? > /tmp/reader.exit + ''; + + mkReaderInput = testname: { qwerty, expect }: with pkgs.lib; let + lq = length qwerty; + le = length expect; + msg = "`qwerty' (${lq}) and `expect' (${le}) lists" + + " need to be of the same length!"; + result = flatten (zipListsWith (a: b: [testname a b]) qwerty expect); + in if lq != le then throw msg else result; + + mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; let + readerInput = flatten (mapAttrsToList mkReaderInput tests); + perlStr = val: "'${escape ["'" "\\"] val}'"; + perlReaderInput = concatMapStringsSep ", " perlStr readerInput; + in makeTest { + name = "keymap-${layout}"; + + machine.i18n.consoleKeyMap = mkOverride 900 layout; + machine.services.xserver.layout = mkOverride 900 layout; + machine.imports = [ ./common/x11.nix extraConfig ]; + + testScript = '' + sub waitCatAndDelete ($) { + return $machine->succeed( + "for i in \$(seq 600); do if [ -e '$_[0]' ]; then ". + "cat '$_[0]' && rm -f '$_[0]' && exit 0; ". + "fi; sleep 0.1; done; echo timed out after 60 seconds >&2; exit 1" + ); + }; + + sub mkTest ($$) { + my ($desc, $cmd) = @_; + + my @testdata = (${perlReaderInput}); + my $shellTestdata = join ' ', map { "'".s/'/'\\'''/gr."'" } @testdata; + + subtest $desc, sub { + $machine->succeed("$cmd ${testReader} $shellTestdata &"); + while (my ($testname, $qwerty, $expect) = splice(@testdata, 0, 3)) { + waitCatAndDelete "/tmp/reader.ready"; + $machine->sendKeys($qwerty); + }; + my $exitcode = waitCatAndDelete "/tmp/reader.exit"; + die "tests for $desc failed" if $exitcode ne 0; + }; + } + + $machine->waitForX; + + mkTest "VT keymap", "openvt -sw --"; + mkTest "Xorg keymap", "DISPLAY=:0 xterm -fullscreen -e"; + ''; + }; + +in pkgs.lib.mapAttrs mkKeyboardTest { + azerty = { + tests = { + azqw.qwerty = [ "q" "w" ]; + azqw.expect = [ "a" "z" ]; + altgr.qwerty = [ "alt_r-2" "alt_r-3" "alt_r-4" "alt_r-5" "alt_r-6" ]; + altgr.expect = [ "~" "#" "{" "[" "|" ]; + }; + + extraConfig.i18n.consoleKeyMap = "azerty/fr"; + extraConfig.services.xserver.layout = "fr"; + }; + + colemak = { + tests = { + homerow.qwerty = [ "a" "s" "d" "f" "j" "k" "l" "semicolon" ]; + homerow.expect = [ "a" "r" "s" "t" "n" "e" "i" "o" ]; + }; + + extraConfig.i18n.consoleKeyMap = "en-latin9"; + extraConfig.services.xserver.layout = "us"; + extraConfig.services.xserver.xkbVariant = "colemak"; + }; + + dvorak = { + tests = { + homerow.qwerty = [ "a" "s" "d" "f" "j" "k" "l" "semicolon" ]; + homerow.expect = [ "a" "o" "e" "u" "h" "t" "n" "s" ]; + symbols.qwerty = [ "q" "w" "e" "minus" "equal" ]; + symbols.expect = [ "'" "," "." "[" "]" ]; + }; + }; + + dvp = { + tests = { + homerow.qwerty = [ "a" "s" "d" "f" "j" "k" "l" "semicolon" ]; + homerow.expect = [ "a" "o" "e" "u" "h" "t" "n" "s" ]; + numbers.qwerty = map (x: "shift-${x}") + [ "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "minus" ]; + numbers.expect = [ "%" "7" "5" "3" "1" "9" "0" "2" "4" "6" "8" ]; + symbols.qwerty = [ "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "minus" ]; + symbols.expect = [ "&" "[" "{" "}" "(" "=" "*" ")" "+" "]" "!" ]; + }; + + extraConfig.services.xserver.layout = "us"; + extraConfig.services.xserver.xkbVariant = "dvp"; + }; + + neo = { + tests = { + layer1.qwerty = [ "f" "j" ]; + layer1.expect = [ "e" "n" ]; + layer2.qwerty = [ "shift-f" "shift-j" "shift-6" ]; + layer2.expect = [ "E" "N" "$" ]; + layer3.qwerty = [ "caps_lock-d" "caps_lock-f" ]; + layer3.expect = [ "{" "}" ]; + }; + + extraConfig.services.xserver.layout = "de"; + extraConfig.services.xserver.xkbVariant = "neo"; + }; + + qwertz = { + tests = { + zy.qwerty = [ "z" "y" ]; + zy.expect = [ "y" "z" ]; + altgr.qwerty = map (x: "alt_r-${x}") + [ "q" "less" "7" "8" "9" "0" ]; + altgr.expect = [ "@" "|" "{" "[" "]" "}" ]; + }; + + extraConfig.i18n.consoleKeyMap = "de"; + extraConfig.services.xserver.layout = "de"; + }; +} From 7f69d5ed8c47beafc04efb88aeb818b84b48c2e2 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 31 Mar 2016 10:37:02 +0200 Subject: [PATCH 161/165] skype: build qt4 with the 32bits clangStdenv This allows to build skype without errors like this: clang++ -Wl,-O1 -o libmng libmng.o -lmng /nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/72nklasrjg774iwxxnpyxwkzxz2j37v5-libmng-2.0.2/lib/libmng.so when searching for -lmng /nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: cannot find -lmng /nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/n0y8pv4kaff7vnq7rmzwrd654gqaj0ki-glibc-2.23/lib/libm.so when searching for -lm /nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/n0y8pv4kaff7vnq7rmzwrd654gqaj0ki-glibc-2.23/lib/libm.a when searching for -lm clang-3.7: error: linker command failed with exit code 1 (use -v to see invocation) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d40165b05d2..e2d75da40ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13612,7 +13612,7 @@ in skype = callPackage_i686 ../applications/networking/instant-messengers/skype { qt4 = pkgsi686Linux.qt4.override { - stdenv = clangStdenv; + stdenv = pkgsi686Linux.clangStdenv; }; }; From e60be0923ba138d3309038585b8d04db5affda86 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 31 Mar 2016 12:30:05 +0200 Subject: [PATCH 162/165] NixOS manual: Add some release notes --- nixos/doc/manual/release-notes/rl-1603.xml | 68 +++++++++++++++++++--- 1 file changed, 59 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 47654064163..8119470385f 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -12,14 +12,44 @@ has the following highlights: - Firefox and similar browsers are now wrapped by default. - The package and attribute names are plain firefox - or midori, etc. Backward-compatibility attributes were set up, - but note that nix-env -u will not update - your current firefox-with-plugins; - you have to uninstall it and install firefox instead. - More discussion is - on the PR. + Systemd 229, bringing numerous + improvements over 217. + + + + Linux 4.4 (was 3.18). + + + + GCC 5.3 (was 4.9). Note that GCC 5 changes + the C++ ABI in an incompatible way; this may cause problems + if you try to link objects compiled with different versions of + GCC. + + + + Glibc 2.23 (was 2.21). + + + + Improved support for ensuring bitwise reproducible + builds. For example, stdenv now sets the + environment variable SOURCE_DATE_EPOCH + to a deterministic value, and Nix has gained + an option to repeat a build a number of times to test + determinism. An ongoing project, the goal of exact reproducibility + is to allow binaries to be verified independently (e.g., a user + might only trust binaries that appear in three independent binary + caches). + + + + Perl 5.22. @@ -39,6 +69,22 @@ has the following highlights: following incompatible changes: + + + We no longer produce graphical ISO images and VirtualBox + images for i686-linux. A minimal ISO image is + still provided. + + + + Firefox and similar browsers are now wrapped by default. + The package and attribute names are plain firefox + or midori, etc. Backward-compatibility attributes were set up, + but note that nix-env -u will not update + your current firefox-with-plugins; + you have to uninstall it and install firefox instead. + + wmiiSnap has been replaced with wmii_hg, but @@ -292,14 +338,18 @@ services.syncthing = { Other notable improvements: + + + ejabberd module is brought back and now works on From d2c00001f8a5c99cab09992d104f795025d37fce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 31 Mar 2016 12:35:15 +0200 Subject: [PATCH 163/165] freeimage: updating to 3.17 It is buggy in 32-bit: sizeof(uint64) != 8 !!. --- pkgs/development/libraries/freeimage/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 2cfb5d3522f..2a75f7693e1 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "freeimage-3.15.3"; + name = "freeimage-3.17.0"; src = fetchurl { - url = mirror://sourceforge/freeimage/FreeImage3153.zip; - sha256 = "0i60fn1n9rw55dci0yw92zrw7k1jz3f9kv2z1wxmh84s5ngxa626"; + url = mirror://sourceforge/freeimage/FreeImage3170.zip; + sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v"; }; buildInputs = [ unzip ]; prePatch = '' @@ -11,6 +11,10 @@ stdenv.mkDerivation { -e 's@-o root -g root@@' \ -e 's@ldconfig@echo not running ldconfig@' \ -i Makefile.gnu Makefile.fip + + # Fix gcc 5.1 macro problems + # https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef%5E!/ + sed -i -e 's/"\(#[^"]*\)"/" \1 "/g' Source/LibWebP/src/dsp/* ''; postBuild = "make -f Makefile.fip"; From cdb2bc77c43ac3bc0a4a5b4783e407b1b40a78b6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 31 Mar 2016 14:14:32 +0200 Subject: [PATCH 164/165] davfs2: 1.4.7 -> 1.5.2; fixes the build --- .../filesystems/davfs2/davfs2-install.patch | 49 ------------------- pkgs/tools/filesystems/davfs2/default.nix | 8 +-- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 6 insertions(+), 55 deletions(-) delete mode 100644 pkgs/tools/filesystems/davfs2/davfs2-install.patch diff --git a/pkgs/tools/filesystems/davfs2/davfs2-install.patch b/pkgs/tools/filesystems/davfs2/davfs2-install.patch deleted file mode 100644 index 93e9b09a914..00000000000 --- a/pkgs/tools/filesystems/davfs2/davfs2-install.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -rc davfs2-1.4.1/src/Makefile.in davfs2-1.4.1-new/src/Makefile.in -*** davfs2-1.4.1/src/Makefile.in 2009-06-13 18:31:22.000000000 +0200 ---- davfs2-1.4.1-new/src/Makefile.in 2009-09-22 09:12:09.523154536 +0200 -*************** -*** 489,500 **** - - - install-exec-hook: -! chmod u+s $(DESTDIR)$(sbindir)/mount.davfs; \ -! if test "$(sbindir)" != "$(ssbindir)"; then \ -! $(mkinstalldirs) $(DESTDIR)$(ssbindir); \ -! $(LN_S) -f $(DESTDIR)$(sbindir)/mount.davfs $(DESTDIR)$(ssbindir)/mount.davfs; \ -! $(LN_S) -f $(DESTDIR)$(sbindir)/umount.davfs $(DESTDIR)$(ssbindir)/umount.davfs; \ -! fi - - uninstall-hook: - if test "$(sbindir)" != "$(ssbindir)"; then \ ---- 489,495 ---- - - - install-exec-hook: -! chmod u+s $(DESTDIR)$(sbindir)/mount.davfs; - - uninstall-hook: - if test "$(sbindir)" != "$(ssbindir)"; then \ -diff -rc davfs2-1.4.1/src/mount_davfs.c davfs2-1.4.1-new/src/mount_davfs.c -*** davfs2-1.4.1/src/mount_davfs.c 2009-06-12 11:54:58.000000000 +0200 ---- davfs2-1.4.1-new/src/mount_davfs.c 2009-09-22 09:45:21.462726033 +0200 -*************** -*** 2327,2335 **** - } - if (st.st_uid != geteuid()) - error(EXIT_FAILURE, 0, _("file %s has wrong owner"), filename); -! if ((st.st_mode & - (S_IXUSR | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISVTX)) != 0) -! error(EXIT_FAILURE, 0, _("file %s has wrong permissions"), filename); - - FILE *file = fopen(filename, "r"); - if (!file) { ---- 2327,2335 ---- - } - if (st.st_uid != geteuid()) - error(EXIT_FAILURE, 0, _("file %s has wrong owner"), filename); -! /* if ((st.st_mode & - (S_IXUSR | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISVTX)) != 0) -! error(EXIT_FAILURE, 0, _("file %s has wrong permissions"), filename); */ - - FILE *file = fopen(filename, "r"); - if (!file) { diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index d16af28010c..20b71af6331 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchurl, neon, zlib }: stdenv.mkDerivation rec { - name = "davfs2-1.4.7"; + name = "davfs2-1.5.2"; src = fetchurl { url = "mirror://savannah/davfs2/${name}.tar.gz"; - sha256 = "0i7hrwlfzisb4l2mza1kjj9q9xxixggjplsjm339zl7828mfxh2h"; + sha256 = "0n5k2xxfxmbsavg5fhp65lmy30hq9jg3w242rdzafvksnnda2d5y"; }; buildInputs = [ neon zlib ]; - patches = [ ./davfs2-install.patch ./isdir.patch ./fix-sysconfdir.patch ]; + patches = [ ./isdir.patch ./fix-sysconfdir.patch ]; configureFlags = "--sysconfdir=/etc"; + makeFlags = ["sbindir=$(out)/sbin" "ssbindir=$(out)/sbin"]; + meta = { homepage = "http://savannah.nongnu.org/projects/davfs2"; description = "mount WebDAV shares like a typical filesystem"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b35c94d692f..200084285fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1185,9 +1185,7 @@ in darkstat = callPackage ../tools/networking/darkstat { }; - davfs2 = callPackage ../tools/filesystems/davfs2 { - neon = neon_0_29; - }; + davfs2 = callPackage ../tools/filesystems/davfs2 { }; dbench = callPackage ../development/tools/misc/dbench { }; From 4e356cefd7cc2b4f581db53203222ee495f7285f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 31 Mar 2016 14:13:59 +0200 Subject: [PATCH 165/165] Move the EC2 AMI registry from the NixOps repo NixOps has infrequent releases, so it's not the best place for keeping the list of current AMIs. Putting them in Nixpkgs means that AMI updates will be delivered as part of the NixOS channels. --- nixos/modules/virtualisation/ec2-amis.nix | 92 +++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 nixos/modules/virtualisation/ec2-amis.nix diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix new file mode 100644 index 00000000000..15ea7bb1944 --- /dev/null +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -0,0 +1,92 @@ +{ + "14.04".ap-northeast-1.hvm-ebs = "ami-71c6f470"; + "14.04".ap-northeast-1.pv-ebs = "ami-4dcbf84c"; + "14.04".ap-northeast-1.pv-s3 = "ami-8fc4f68e"; + "14.04".ap-southeast-1.hvm-ebs = "ami-da280888"; + "14.04".ap-southeast-1.pv-ebs = "ami-7a9dbc28"; + "14.04".ap-southeast-1.pv-s3 = "ami-c4290996"; + "14.04".ap-southeast-2.hvm-ebs = "ami-ab523e91"; + "14.04".ap-southeast-2.pv-ebs = "ami-6769055d"; + "14.04".ap-southeast-2.pv-s3 = "ami-15533f2f"; + "14.04".eu-central-1.hvm-ebs = "ami-ba0234a7"; + "14.04".eu-west-1.hvm-ebs = "ami-96cb63e1"; + "14.04".eu-west-1.pv-ebs = "ami-b48c25c3"; + "14.04".eu-west-1.pv-s3 = "ami-06cd6571"; + "14.04".sa-east-1.hvm-ebs = "ami-01b90e1c"; + "14.04".sa-east-1.pv-ebs = "ami-69e35474"; + "14.04".sa-east-1.pv-s3 = "ami-61b90e7c"; + "14.04".us-east-1.hvm-ebs = "ami-58ba3a30"; + "14.04".us-east-1.pv-ebs = "ami-9e0583f6"; + "14.04".us-east-1.pv-s3 = "ami-9cbe3ef4"; + "14.04".us-west-1.hvm-ebs = "ami-0bc3d74e"; + "14.04".us-west-1.pv-ebs = "ami-8b1703ce"; + "14.04".us-west-1.pv-s3 = "ami-27ccd862"; + "14.04".us-west-2.hvm-ebs = "ami-3bf1bf0b"; + "14.04".us-west-2.pv-ebs = "ami-259bd515"; + "14.04".us-west-2.pv-s3 = "ami-07094037"; + + "14.12".ap-northeast-1.hvm-ebs = "ami-24435f25"; + "14.12".ap-northeast-1.pv-ebs = "ami-b0425eb1"; + "14.12".ap-northeast-1.pv-s3 = "ami-fed3c6ff"; + "14.12".ap-southeast-1.hvm-ebs = "ami-6c765d3e"; + "14.12".ap-southeast-1.pv-ebs = "ami-6a765d38"; + "14.12".ap-southeast-1.pv-s3 = "ami-d1bf9183"; + "14.12".ap-southeast-2.hvm-ebs = "ami-af86f395"; + "14.12".ap-southeast-2.pv-ebs = "ami-b386f389"; + "14.12".ap-southeast-2.pv-s3 = "ami-69c5ae53"; + "14.12".eu-central-1.hvm-ebs = "ami-4a497a57"; + "14.12".eu-central-1.pv-ebs = "ami-4c497a51"; + "14.12".eu-central-1.pv-s3 = "ami-60f2c27d"; + "14.12".eu-west-1.hvm-ebs = "ami-d126a5a6"; + "14.12".eu-west-1.pv-ebs = "ami-0126a576"; + "14.12".eu-west-1.pv-s3 = "ami-deda5fa9"; + "14.12".sa-east-1.hvm-ebs = "ami-2d239e30"; + "14.12".sa-east-1.pv-ebs = "ami-35239e28"; + "14.12".sa-east-1.pv-s3 = "ami-81e3519c"; + "14.12".us-east-1.hvm-ebs = "ami-0c463a64"; + "14.12".us-east-1.pv-ebs = "ami-ac473bc4"; + "14.12".us-east-1.pv-s3 = "ami-00e18a68"; + "14.12".us-west-1.hvm-ebs = "ami-ca534a8f"; + "14.12".us-west-1.pv-ebs = "ami-3e534a7b"; + "14.12".us-west-1.pv-s3 = "ami-2905196c"; + "14.12".us-west-2.hvm-ebs = "ami-fb9dc3cb"; + "14.12".us-west-2.pv-ebs = "ami-899dc3b9"; + "14.12".us-west-2.pv-s3 = "ami-cb7f2dfb"; + + "15.09".ap-northeast-1.hvm-ebs = "ami-58cac236"; + "15.09".ap-northeast-1.hvm-s3 = "ami-39c8c057"; + "15.09".ap-northeast-1.pv-ebs = "ami-5ac9c134"; + "15.09".ap-northeast-1.pv-s3 = "ami-03cec66d"; + "15.09".ap-southeast-1.hvm-ebs = "ami-2fc2094c"; + "15.09".ap-southeast-1.hvm-s3 = "ami-9ec308fd"; + "15.09".ap-southeast-1.pv-ebs = "ami-95c00bf6"; + "15.09".ap-southeast-1.pv-s3 = "ami-bfc00bdc"; + "15.09".ap-southeast-2.hvm-ebs = "ami-996c4cfa"; + "15.09".ap-southeast-2.hvm-s3 = "ami-3f6e4e5c"; + "15.09".ap-southeast-2.pv-ebs = "ami-066d4d65"; + "15.09".ap-southeast-2.pv-s3 = "ami-cc6e4eaf"; + "15.09".eu-central-1.hvm-ebs = "ami-3f8c6b50"; + "15.09".eu-central-1.hvm-s3 = "ami-5b836434"; + "15.09".eu-central-1.pv-ebs = "ami-118c6b7e"; + "15.09".eu-central-1.pv-s3 = "ami-2c977043"; + "15.09".eu-west-1.hvm-ebs = "ami-9cf04aef"; + "15.09".eu-west-1.hvm-s3 = "ami-2bea5058"; + "15.09".eu-west-1.pv-ebs = "ami-c9e852ba"; + "15.09".eu-west-1.pv-s3 = "ami-c6f64cb5"; + "15.09".sa-east-1.hvm-ebs = "ami-6e52df02"; + "15.09".sa-east-1.hvm-s3 = "ami-1852df74"; + "15.09".sa-east-1.pv-ebs = "ami-4368e52f"; + "15.09".sa-east-1.pv-s3 = "ami-f15ad79d"; + "15.09".us-east-1.hvm-ebs = "ami-84a6a0ee"; + "15.09".us-east-1.hvm-s3 = "ami-06a7a16c"; + "15.09".us-east-1.pv-ebs = "ami-a4a1a7ce"; + "15.09".us-east-1.pv-s3 = "ami-5ba8ae31"; + "15.09".us-west-1.hvm-ebs = "ami-22c8bb42"; + "15.09".us-west-1.hvm-s3 = "ami-a2ccbfc2"; + "15.09".us-west-1.pv-ebs = "ami-10cebd70"; + "15.09".us-west-1.pv-s3 = "ami-fa30429a"; + "15.09".us-west-2.hvm-ebs = "ami-ce57b9ae"; + "15.09".us-west-2.hvm-s3 = "ami-2956b849"; + "15.09".us-west-2.pv-ebs = "ami-005fb160"; + "15.09".us-west-2.pv-s3 = "ami-cd55bbad"; +}